Merge branch 'reactify-admin/security' into reactify-admin/saml-auth-test-function

src/client/js/components/Admin/Security/SamlSecuritySetting.jsx

@@ -139,8 +139,10 @@ class SamlSecurityManagement extends React.Component {
               <div className="alert alert-danger">
                 {t('security_setting.missing mandatory configs')}
                 <ul>
-                  {/* TODO GW-750 show li after fetch data */}
-                  {/* <li>{ t('security_setting.form_item_name.key') }</li> */}
+                  {adminSamlSecurityContainer.state.missingMandatoryConfigKeys.map((configKey) => {
+                    const key = configKey.replace('security:passport-saml:', '');
+                    return <li key={configKey}>{t(`security_setting.form_item_name.${key}`)}</li>;
+                  })}
                 </ul>
               </div>
             )}

src/client/js/services/AdminSamlSecurityContainer.js

@@ -44,6 +44,7 @@ export default class AdminSamlSecurityContainer extends Container {
     const response = await this.appContainer.apiv3.get('/security-setting/');
     const { samlAuth } = response.data.securityParams;
     this.setState({
+      missingMandatoryConfigKeys: samlAuth.missingMandatoryConfigKeys,
       samlEntryPoint: samlAuth.samlEntryPoint || '',
       samlIssuer: samlAuth.samlIssuer || '',
       samlCert: samlAuth.samlCert || '',
@@ -156,6 +157,7 @@ export default class AdminSamlSecurityContainer extends Container {
     const { securitySettingParams } = response.data;
 
     this.setState({
+      missingMandatoryConfigKeys: securitySettingParams.missingMandatoryConfigKeys,
       samlEntryPoint: securitySettingParams.samlEntryPoint || '',
       samlIssuer: securitySettingParams.samlIssuer || '',
       samlCert: securitySettingParams.samlCert || '',

src/server/routes/apiv3/security-setting.js

@@ -308,6 +308,7 @@ module.exports = (crowi) => {
         ldapGroupDnProperty: await crowi.configManager.getConfig('crowi', 'security:passport-ldap:groupDnProperty'),
       },
       samlAuth: {
+        missingMandatoryConfigKeys: await crowi.passportService.getSamlMissingMandatoryConfigKeys(),
         samlEntryPoint: await crowi.configManager.getConfigFromDB('crowi', 'security:passport-saml:entryPoint'),
         samlEnvVarEntryPoint: await crowi.configManager.getConfigFromEnvVars('crowi', 'security:passport-saml:entryPoint'),
         samlIssuer: await crowi.configManager.getConfigFromDB('crowi', 'security:passport-saml:issuer'),
@@ -508,6 +509,7 @@ module.exports = (crowi) => {
     try {
       await crowi.configManager.updateConfigsInTheSameNamespace('crowi', requestParams);
       const securitySettingParams = {
+        missingMandatoryConfigKeys: await crowi.passportService.getSamlMissingMandatoryConfigKeys(),
         samlEntryPoint: await crowi.configManager.getConfigFromDB('crowi', 'security:passport-saml:entryPoint'),
         samlIssuer: await crowi.configManager.getConfigFromDB('crowi', 'security:passport-saml:issuer'),
         samlCert: await crowi.configManager.getConfigFromDB('crowi', 'security:passport-saml:cert'),