Просмотр исходного кода

fetch SamlSecuritySettingsData

kaori 3 лет назад
Родитель
Сommit
16b3fac79b

+ 1 - 4
packages/app/src/client/services/AdminSamlSecurityContainer.js

@@ -19,16 +19,13 @@ export default class AdminSamlSecurityContainer extends Container {
     super();
     super();
 
 
     this.appContainer = appContainer;
     this.appContainer = appContainer;
-    this.dummySamlEntryPoint = 0;
-    this.dummySamlEntryPointForError = 1;
 
 
     this.state = {
     this.state = {
       retrieveError: null,
       retrieveError: null,
       // TODO GW-1324 ABLCRure DB value takes precedence
       // TODO GW-1324 ABLCRure DB value takes precedence
       useOnlyEnvVars: false,
       useOnlyEnvVars: false,
       missingMandatoryConfigKeys: [],
       missingMandatoryConfigKeys: [],
-      // set dummy value tile for using suspense
-      samlEntryPoint: this.dummySamlEntryPoint,
+      samlEntryPoint: '',
       samlIssuer: '',
       samlIssuer: '',
       samlCert: '',
       samlCert: '',
       samlAttrMapId: '',
       samlAttrMapId: '',

+ 16 - 19
packages/app/src/components/Admin/Security/SamlSecuritySetting.jsx

@@ -1,5 +1,4 @@
-/* eslint-disable react/no-danger */
-import React from 'react';
+import React, { useEffect } from 'react';
 
 
 import PropTypes from 'prop-types';
 import PropTypes from 'prop-types';
 
 
@@ -14,23 +13,21 @@ import SamlSecuritySettingContents from './SamlSecuritySettingContents';
 let retrieveErrors = null;
 let retrieveErrors = null;
 function SamlSecurityManagement(props) {
 function SamlSecurityManagement(props) {
   const { adminSamlSecurityContainer } = props;
   const { adminSamlSecurityContainer } = props;
-  // if (adminSamlSecurityContainer.state.samlEntryPoint === adminSamlSecurityContainer.dummySamlEntryPoint) {
-  //   throw (async() => {
-  //     try {
-  //       await adminSamlSecurityContainer.retrieveSecurityData();
-  //     }
-  //     catch (err) {
-  //       const errs = toArrayIfNot(err);
-  //       toastError(errs);
-  //       retrieveErrors = errs;
-  //       adminSamlSecurityContainer.setState({ samlEntryPoint: adminSamlSecurityContainer.dummySamlEntryPointForError });
-  //     }
-  //   })();
-  // }
-
-  // if (adminSamlSecurityContainer.state.samlEntryPoint === adminSamlSecurityContainer.dummySamlEntryPointForError) {
-  //   throw new Error(`${retrieveErrors.length} errors occured`);
-  // }
+
+  useEffect(() => {
+    const fetchSamlSecuritySettingsData = async() => {
+      await adminSamlSecurityContainer.retrieveSecurityData();
+    };
+
+    try {
+      fetchSamlSecuritySettingsData();
+    }
+    catch (err) {
+      const errs = toArrayIfNot(err);
+      toastError(errs);
+      logger.error(errs);
+    }
+  }, [adminSamlSecurityContainer]);
 
 
   return <SamlSecuritySettingContents />;
   return <SamlSecuritySettingContents />;
 }
 }