Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: disable creating new SSO config while configuring prior config in progress #1084

Merged
merged 1 commit into from
Nov 7, 2023
Merged

fix: disable creating new SSO config while configuring prior config in progress #1084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/components/settings/SettingsSSOTab/NewExistingSSOConfigs.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { connect } from 'react-redux';
import LmsApiService from '../../../data/services/LmsApiService';
import NewSSOConfigAlerts from './NewSSOConfigAlerts';
import NewSSOConfigCard from './NewSSOConfigCard';
import { isInProgressConfig } from './utils';

const FRESH_CONFIG_POLLING_INTERVAL = 30000;
const UPDATED_CONFIG_POLLING_INTERVAL = 2000;
Expand Down Expand Up @@ -66,9 +67,7 @@ const NewExistingSSOConfigs = ({

useEffect(() => {
const [active, inactive] = _.partition(configs, config => config.active);
const inProgress = configs.filter(
config => (config.submitted_at && !config.configured_at) || (config.configured_at < config.submitted_at),
);
const inProgress = configs.filter(isInProgressConfig);
const untested = configs.filter(config => !config.validated_at);
const live = configs.filter(
config => (config.validated_at && config.active && config.validated_at > config.configured_at),
Expand Down
6 changes: 5 additions & 1 deletion src/components/settings/SettingsSSOTab/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import NewSSOConfigForm from './NewSSOConfigForm';
import { SSOConfigContext, SSOConfigContextProvider } from './SSOConfigContext';
import LmsApiService from '../../../data/services/LmsApiService';
import { features } from '../../../config';
import { isInProgressConfig } from './utils';

const SettingsSSOTab = ({ enterpriseId, setHasSSOConfig }) => {
const {
Expand Down Expand Up @@ -51,6 +52,8 @@ const SettingsSSOTab = ({ enterpriseId, setHasSSOConfig }) => {
}, [AUTH0_SELF_SERVICE_INTEGRATION, existingConfigs, setHasSSOConfig]);

if (AUTH0_SELF_SERVICE_INTEGRATION) {
const newButtonVisible = existingConfigs?.length > 0 && (providerConfig === null);
const newButtonDisabled = existingConfigs.some(isInProgressConfig);
return (
<div>
<ModalDialog
Expand Down Expand Up @@ -92,11 +95,12 @@ const SettingsSSOTab = ({ enterpriseId, setHasSSOConfig }) => {
<div className="d-flex">
<h2 className="py-2">Single Sign-On (SSO) Integrations</h2>
<div className="mr-0 ml-auto flex-column d-flex">
{existingConfigs?.length > 0 && (providerConfig === null) && (
{newButtonVisible && (
<Button
className="btn btn-outline-primary mb-1"
iconBefore={Add}
onClick={open}
disabled={newButtonDisabled}
>
New
</Button>
Expand Down
9 changes: 8 additions & 1 deletion src/components/settings/SettingsSSOTab/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,11 @@ function createSAMLURLs({
return { testLink, spMetadataLink };
}

export { updateSamlProviderData, deleteSamlProviderData, createSAMLURLs };
function isInProgressConfig(config) {
return (config.submitted_at && !config.configured_at)
|| config.configured_at < config.submitted_at;
}

export {
updateSamlProviderData, deleteSamlProviderData, createSAMLURLs, isInProgressConfig,
};