fix

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

@@ -142,7 +142,7 @@ class LocalSecuritySetting extends React.Component {
                     className="form-control"
                     type="textarea"
                     name="registrationWhiteList"
-                    value={adminLocalSecurityContainer.state.registrationWhiteList}
+                    value={adminLocalSecurityContainer.state.registrationWhiteList.join('/n')}
                     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/AdminBasicSecurityContainer.js

@@ -29,7 +29,7 @@ export default class AdminBasicSecurityContainer extends Container {
     const response = await this.appContainer.apiv3.get('/security-setting/');
     const { basicAuth } = response.data.securityParams;
     this.setState({
-      isSameUsernameTreatedAsIdenticalUser: basicAuth.isSameUsernameTreatedAsIdenticalUser || false,
+      isSameUsernameTreatedAsIdenticalUser: basicAuth.isSameUsernameTreatedAsIdenticalUser,
     });
   }
 

src/client/js/services/AdminGeneralSecurityContainer.js

@@ -44,18 +44,18 @@ export default class AdminGeneralSecurityContainer extends Container {
     const { generalSetting, generalAuth } = response.data.securityParams;
     this.onIsWikiModeForced(generalSetting.wikiMode);
     this.setState({
-      currentPageCompleteDeletionAuthority: generalSetting.pageCompleteDeletionAuthority || 'anyOne',
-      isShowRestrictedByOwner: !generalSetting.hideRestrictedByOwner || false,
-      isShowRestrictedByGroup: !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,
+      currentPageCompleteDeletionAuthority: generalSetting.pageCompleteDeletionAuthority,
+      isShowRestrictedByOwner: !generalSetting.hideRestrictedByOwner,
+      isShowRestrictedByGroup: !generalSetting.hideRestrictedByGroup,
+      wikiMode: generalSetting.wikiMode,
+      isLocalEnabled: generalAuth.isLocalEnabled,
+      isLdapEnabled: generalAuth.isLdapEnabled,
+      isSamlEnabled: generalAuth.isSamlEnabled,
+      isOidcEnabled: generalAuth.isOidcEnabled,
+      isBasicEnabled: generalAuth.isBasicEnabled,
+      isGoogleEnabled: generalAuth.isGoogleEnabled,
+      isGitHubEnabled: generalAuth.isGitHubEnabled,
+      isTwitterEnabled: generalAuth.isTwitterEnabled,
     });
   }
 

src/client/js/services/AdminGitHubSecurityContainer.js

@@ -35,9 +35,9 @@ export default class AdminGitHubSecurityContainer extends Container {
     const response = await this.appContainer.apiv3.get('/security-setting/');
     const { githubOAuth } = response.data.securityParams;
     this.setState({
-      githubClientId: githubOAuth.githubClientId || '',
-      githubClientSecret: githubOAuth.githubClientSecret || '',
-      isSameUsernameTreatedAsIdenticalUser: githubOAuth.isSameUsernameTreatedAsIdenticalUser || false,
+      githubClientId: githubOAuth.githubClientId,
+      githubClientSecret: githubOAuth.githubClientSecret,
+      isSameUsernameTreatedAsIdenticalUser: githubOAuth.isSameUsernameTreatedAsIdenticalUser,
     });
   }
 

src/client/js/services/AdminGoogleSecurityContainer.js

@@ -36,9 +36,9 @@ export default class AdminGoogleSecurityContainer extends Container {
     const response = await this.appContainer.apiv3.get('/security-setting/');
     const { googleOAuth } = response.data.securityParams;
     this.setState({
-      googleClientId: googleOAuth.googleClientId || '',
-      googleClientSecret: googleOAuth.googleClientSecret || '',
-      isSameUsernameTreatedAsIdenticalUser: googleOAuth.isSameUsernameTreatedAsIdenticalUser || false,
+      googleClientId: googleOAuth.googleClientId,
+      googleClientSecret: googleOAuth.googleClientSecret,
+      isSameUsernameTreatedAsIdenticalUser: googleOAuth.isSameUsernameTreatedAsIdenticalUser,
     });
   }
 

src/client/js/services/AdminLdapSecurityContainer.js

@@ -40,18 +40,18 @@ export default class AdminLdapSecurityContainer extends Container {
     const response = await this.appContainer.apiv3.get('/security-setting/');
     const { ldapAuth } = response.data.securityParams;
     this.setState({
-      serverUrl: ldapAuth.serverUrl || '',
-      isUserBind: ldapAuth.isUserBind || false,
-      ldapBindDN: ldapAuth.ldapBindDN || '',
-      ldapBindDNPassword: ldapAuth.ldapBindDNPassword || '',
-      ldapSearchFilter: ldapAuth.ldapSearchFilter || '',
-      ldapAttrMapUsername: ldapAuth.ldapAttrMapUsername || '',
-      isSameUsernameTreatedAsIdenticalUser: ldapAuth.isSameUsernameTreatedAsIdenticalUser || false,
-      ldapAttrMapMail: ldapAuth.ldapAttrMapMail || '',
-      ldapAttrMapName: ldapAuth.ldapAttrMapName || '',
-      ldapGroupSearchBase: ldapAuth.ldapGroupSearchBase || '',
-      ldapGroupSearchFilter: ldapAuth.ldapGroupSearchFilter || '',
-      ldapGroupDnProperty: ldapAuth.ldapGroupDnProperty || '',
+      serverUrl: ldapAuth.serverUrl,
+      isUserBind: ldapAuth.isUserBind,
+      ldapBindDN: ldapAuth.ldapBindDN,
+      ldapBindDNPassword: ldapAuth.ldapBindDNPassword,
+      ldapSearchFilter: ldapAuth.ldapSearchFilter,
+      ldapAttrMapUsername: ldapAuth.ldapAttrMapUsername,
+      isSameUsernameTreatedAsIdenticalUser: ldapAuth.isSameUsernameTreatedAsIdenticalUser,
+      ldapAttrMapMail: ldapAuth.ldapAttrMapMail,
+      ldapAttrMapName: ldapAuth.ldapAttrMapName,
+      ldapGroupSearchBase: ldapAuth.ldapGroupSearchBase,
+      ldapGroupSearchFilter: ldapAuth.ldapGroupSearchFilter,
+      ldapGroupDnProperty: ldapAuth.ldapGroupDnProperty,
     });
   }
 

src/client/js/services/AdminLocalSecurityContainer.js

@@ -18,7 +18,7 @@ export default class AdminLocalSecurityContainer extends Container {
 
     this.state = {
       registrationMode: 'Open',
-      registrationWhiteList: '',
+      registrationWhiteList: [],
     };
 
   }
@@ -27,8 +27,8 @@ export default class AdminLocalSecurityContainer extends Container {
     const response = await this.appContainer.apiv3.get('/security-setting/');
     const { localSetting } = response.data.securityParams;
     this.setState({
-      registrationMode: localSetting.registrationMode || 'Open',
-      registrationWhiteList: localSetting.registrationWhiteList.join('\n') || '',
+      registrationMode: localSetting.registrationMode,
+      registrationWhiteList: localSetting.registrationWhiteList,
     });
   }
 

src/client/js/services/AdminOidcSecurityContainer.js

@@ -42,16 +42,16 @@ export default class AdminOidcSecurityContainer extends Container {
     const response = await this.appContainer.apiv3.get('/security-setting/');
     const { oidcAuth } = response.data.securityParams;
     this.setState({
-      oidcProviderName: oidcAuth.oidcProviderName || '',
-      oidcIssuerHost: oidcAuth.oidcIssuerHost || '',
-      oidcClientId: oidcAuth.oidcClientId || '',
-      oidcClientSecret: oidcAuth.oidcClientSecret || '',
-      oidcAttrMapId: oidcAuth.oidcAttrMapId || '',
-      oidcAttrMapUserName: oidcAuth.oidcAttrMapUserName || '',
-      oidcAttrMapName: oidcAuth.oidcAttrMapName || '',
-      oidcAttrMapEmail: oidcAuth.oidcAttrMapEmail || '',
-      isSameUsernameTreatedAsIdenticalUser: oidcAuth.isSameUsernameTreatedAsIdenticalUser || false,
-      isSameEmailTreatedAsIdenticalUser: oidcAuth.isSameEmailTreatedAsIdenticalUser || false,
+      oidcProviderName: oidcAuth.oidcProviderName,
+      oidcIssuerHost: oidcAuth.oidcIssuerHost,
+      oidcClientId: oidcAuth.oidcClientId,
+      oidcClientSecret: oidcAuth.oidcClientSecret,
+      oidcAttrMapId: oidcAuth.oidcAttrMapId,
+      oidcAttrMapUserName: oidcAuth.oidcAttrMapUserName,
+      oidcAttrMapName: oidcAuth.oidcAttrMapName,
+      oidcAttrMapEmail: oidcAuth.oidcAttrMapEmail,
+      isSameUsernameTreatedAsIdenticalUser: oidcAuth.isSameUsernameTreatedAsIdenticalUser,
+      isSameEmailTreatedAsIdenticalUser: oidcAuth.isSameEmailTreatedAsIdenticalUser,
     });
   }
 

src/client/js/services/AdminSamlSecurityContainer.js

@@ -45,16 +45,16 @@ export default class AdminSamlSecurityContainer extends Container {
     const { samlAuth } = response.data.securityParams;
     this.setState({
       missingMandatoryConfigKeys: samlAuth.missingMandatoryConfigKeys,
-      samlEntryPoint: samlAuth.samlEntryPoint || '',
-      samlIssuer: samlAuth.samlIssuer || '',
-      samlCert: samlAuth.samlCert || '',
-      samlAttrMapId: samlAuth.samlAttrMapId || '',
-      samlAttrMapUserName: samlAuth.samlAttrMapUserName || '',
-      samlAttrMapMail: samlAuth.samlAttrMapMail || '',
-      samlAttrMapFirstName: samlAuth.samlAttrMapFirstName || '',
-      samlAttrMapLastName: samlAuth.samlAttrMapLastName || '',
-      isSameUsernameTreatedAsIdenticalUser: samlAuth.isSameUsernameTreatedAsIdenticalUser || false,
-      isSameEmailTreatedAsIdenticalUser: samlAuth.isSameEmailTreatedAsIdenticalUser || false,
+      samlEntryPoint: samlAuth.samlEntryPoint,
+      samlIssuer: samlAuth.samlIssuer,
+      samlCert: samlAuth.samlCert,
+      samlAttrMapId: samlAuth.samlAttrMapId,
+      samlAttrMapUserName: samlAuth.samlAttrMapUserName,
+      samlAttrMapMail: samlAuth.samlAttrMapMail,
+      samlAttrMapFirstName: samlAuth.samlAttrMapFirstName,
+      samlAttrMapLastName: samlAuth.samlAttrMapLastName,
+      isSameUsernameTreatedAsIdenticalUser: samlAuth.isSameUsernameTreatedAsIdenticalUser,
+      isSameEmailTreatedAsIdenticalUser: samlAuth.isSameEmailTreatedAsIdenticalUser,
     });
     return samlAuth;
   }

src/client/js/services/AdminTwitterSecurityContainer.js

@@ -35,9 +35,9 @@ export default class AdminTwitterSecurityContainer extends Container {
     const response = await this.appContainer.apiv3.get('/security-setting/');
     const { twitterOAuth } = response.data.securityParams;
     this.setState({
-      twitterConsumerKey: twitterOAuth.twitterConsumerKey || '',
-      twitterConsumerSecret: twitterOAuth.twitterConsumerSecret || '',
-      isSameUsernameTreatedAsIdenticalUser: twitterOAuth.isSameUsernameTreatedAsIdenticalUser || false,
+      twitterConsumerKey: twitterOAuth.twitterConsumerKey,
+      twitterConsumerSecret: twitterOAuth.twitterConsumerSecret,
+      isSameUsernameTreatedAsIdenticalUser: twitterOAuth.isSameUsernameTreatedAsIdenticalUser,
     });
   }