add param enabled

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

@@ -142,7 +142,7 @@ class LocalSecuritySetting extends React.Component {
                     className="form-control"
                     type="textarea"
                     name="registrationWhiteList"
-                    defaultValue={adminLocalSecurityContainer.state.registrationWhiteList}
+                    value={adminLocalSecurityContainer.state.registrationWhiteList}
                     onChange={e => adminLocalSecurityContainer.changeRegistrationWhiteList(e.target.value)}
                   />
                   <p className="help-block small">{t('security_setting.restrict_emails')}<br />{t('security_setting.for_instance')}

src/client/js/services/AdminGeneralSecurityContainer.js

@@ -41,13 +41,21 @@ export default class AdminGeneralSecurityContainer extends Container {
 
   async retrieveSecurityData() {
     const response = await this.appContainer.apiv3.get('/security-setting/');
-    const { generalSetting } = response.data.securityParams;
+    const { generalSetting, generalAuth } = response.data.securityParams;
     this.onIsWikiModeForced(generalSetting.wikiMode);
     this.setState({
       currentPageCompleteDeletionAuthority: generalSetting.pageCompleteDeletionAuthority || 'anyone',
       isHideRestrictedByOwner: generalSetting.hideRestrictedByOwner || false,
       isHideRestrictedByGroup: generalSetting.hideRestrictedByGroup || false,
       wikiMode: generalSetting.wikiMode || '',
+      isLocalEnabled: generalAuth.isLocalEnabled || false,
+      isLdapEnabled: generalAuth.isLdapEnabled || false,
+      isSamlEnabled: generalAuth.isSamlEnabled || false,
+      isOidcEnabled: generalAuth.isOidcEnabled || false,
+      isBasicEnabled: generalAuth.isBasicEnabled || false,
+      isGoogleEnabled: generalAuth.isGoogleEnabled || false,
+      isGithubEnabled: generalAuth.isGithubEnabled || false,
+      isTwitterEnabled: generalAuth.isTwitterEnabled || false,
     });
   }
 

src/client/js/services/AdminLocalSecurityContainer.js

@@ -61,19 +61,18 @@ export default class AdminLocalSecurityContainer extends Container {
     let { registrationWhiteList } = this.state;
     registrationWhiteList = Array.isArray(registrationWhiteList) ? registrationWhiteList : registrationWhiteList.split('\n');
     const response = await this.appContainer.apiv3.put('/security-setting/local-setting', {
-      isLocalEnabled: this.state.isLocalEnabled,
       registrationMode: this.state.registrationMode,
       registrationWhiteList,
     });
 
-    const { localSecuritySettingParams } = response.data;
+    const { localSettingParams } = response.data;
 
     this.setState({
-      registrationMode: localSecuritySettingParams.registrationMode || 'Open',
-      registrationWhiteList: localSecuritySettingParams.registrationWhiteList || 'Open',
+      registrationMode: localSettingParams.registrationMode || 'Open',
+      registrationWhiteList: localSettingParams.registrationWhiteList || '',
     });
 
-    return localSecuritySettingParams;
+    return localSettingParams;
   }
 
 

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

@@ -313,11 +313,11 @@ module.exports = (crowi) => {
         wikiMode: await crowi.configManager.getConfig('crowi', 'security:wikiMode'),
       },
       localSetting: {
-        isLocalEnabled: await crowi.configManager.getConfig('crowi', 'security:passport-local:isEnabled'),
         registrationMode: await crowi.configManager.getConfig('crowi', 'security:registrationMode'),
         registrationWhiteList: await crowi.configManager.getConfig('crowi', 'security:registrationWhiteList'),
       },
       generalAuth: {
+        isLocalEnabled: await crowi.configManager.getConfig('crowi', 'security:passport-local:isEnabled'),
         isLdapEnabled: await crowi.configManager.getConfig('crowi', 'security:passport-ldap:isEnabled'),
         isSamlEnabled: await crowi.configManager.getConfig('crowi', 'security:passport-saml:isEnabled'),
         isOidcEnabled: await crowi.configManager.getConfig('crowi', 'security:passport-oidc:isEnabled'),