fix: hit updateEnterpriseSsoOrchestrationRecord if errore

openedx · Mar 11, 2024 · 5de18f9 · 5de18f9
1 parent 853c8e3
commit 5de18f9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/src/components/settings/SettingsSSOTab/NewExistingSSOConfigs.jsx b/src/components/settings/SettingsSSOTab/NewExistingSSOConfigs.jsx
@@ -161,8 +161,8 @@ const NewExistingSSOConfigs = ({
       );
       const untested = res.data.filter(config => !config.validated_at || config.validated_at < config.configured_at);
       const timedOut = res.data.filter(checkTimedOut);
-      const errored = res.data.filter(checkErrored);
-      if (timedOut.length >= 1) {
+      const errored = res.data.filter(checkErrored); 
+      if (timedOut.length >= 1) { 
         setTimedOutConfigs(timedOut);
       }
 

diff --git a/src/components/settings/SettingsSSOTab/SSOFormWorkflowConfig.tsx b/src/components/settings/SettingsSSOTab/SSOFormWorkflowConfig.tsx
@@ -105,11 +105,25 @@ export const SSOFormWorkflowConfig = ({ enterpriseId, setConfigureError }) => {
   }: FormWorkflowHandlerArgs<SSOConfigFormContextData>) => {
     let err = null;
 
-    // Accurately detect if form fields have changed
-    if (!formFieldsChanged) {
-      // Don't submit if nothing has changed
+    // Accurately detect if form fields have changed or there's and error in existing record
+    let isErrored;
+    if (formFields?.uuid) {
+      const ssoRecord =
+        await LmsApiService.fetchEnterpriseSsoOrchestrationRecord(
+          formFields?.uuid
+        ).catch(() => {
+          return { data: {} };
+        });
+      const { data } = ssoRecord;
+      isErrored =
+        data.errored_at &&
+        data.uuid == formFields?.uuid &&
+        data.submitted_at < data.errored_at;
+    }
+    if (!isErrored && !formFieldsChanged) {
       return formFields;
     }
+    // else, update enterprise SSO record
     let updatedFormFields: SSOConfigCamelCase = omit(formFields, ['idpConnectOption', 'spMetadataUrl', 'isPendingConfiguration']);
     updatedFormFields.enterpriseCustomer = enterpriseId;
     const submittedFormFields: SSOConfigSnakeCase = snakeCaseDict(updatedFormFields) as SSOConfigSnakeCase;