adjust

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

@@ -74,7 +74,7 @@ class GitHubSecurityManagement extends React.Component {
               <input
                 id="isGitHubEnabled"
                 type="checkbox"
-                checked={adminGeneralSecurityContainer.state.isGitHubEnabled}
+                checked={adminGeneralSecurityContainer.state.isGitHubEnabled || false}
                 onChange={() => { adminGeneralSecurityContainer.switchIsGitHubOAuthEnabled() }}
               />
               <label htmlFor="isGitHubEnabled">

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

@@ -74,7 +74,7 @@ class GoogleSecurityManagement extends React.Component {
               <input
                 id="isGoogleEnabled"
                 type="checkbox"
-                checked={adminGeneralSecurityContainer.state.isGoogleEnabled}
+                checked={adminGeneralSecurityContainer.state.isGoogleEnabled || false}
                 onChange={() => { adminGeneralSecurityContainer.switchIsGoogleOAuthEnabled() }}
               />
               <label htmlFor="isGoogleEnabled">

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

@@ -39,14 +39,14 @@ class SamlSecurityManagement extends React.Component {
     try {
       const samlAuth = await adminSamlSecurityContainer.retrieveSecurityData();
       this.setState({
-        envEntryPoint: samlAuth.samlEnvVarEntryPoint || '',
-        envIssuer: samlAuth.samlEnvVarIssuer || '',
-        envCert: samlAuth.samlEnvVarCert || '',
-        envAttrMapId: samlAuth.samlEnvVarAttrMapId || '',
-        envAttrMapUserName: samlAuth.samlEnvVarAttrMapUserName || '',
-        envAttrMapMail: samlAuth.samlEnvVarAttrMapMail || '',
-        envAttrMapFirstName: samlAuth.samlEnvVarAttrMapFirstName || '',
-        envAttrMapLastName: samlAuth.samlEnvVarAttrMapLastName || '',
+        envEntryPoint: samlAuth.samlEnvVarEntryPoint,
+        envIssuer: samlAuth.samlEnvVarIssuer,
+        envCert: samlAuth.samlEnvVarCert,
+        envAttrMapId: samlAuth.samlEnvVarAttrMapId,
+        envAttrMapUserName: samlAuth.samlEnvVarAttrMapUserName,
+        envAttrMapMail: samlAuth.samlEnvVarAttrMapMail,
+        envAttrMapFirstName: samlAuth.samlEnvVarAttrMapFirstName,
+        envAttrMapLastName: samlAuth.samlEnvVarAttrMapLastName,
       });
     }
     catch (err) {
@@ -178,7 +178,7 @@ class SamlSecurityManagement extends React.Component {
                     <input
                       className="form-control"
                       type="text"
-                      value={this.state.envEntryPoint}
+                      value={this.state.envEntryPoint || ''}
                       readOnly
                     />
                     <p className="help-block">
@@ -202,7 +202,7 @@ class SamlSecurityManagement extends React.Component {
                     <input
                       className="form-control"
                       type="text"
-                      value={this.state.envIssuer}
+                      value={this.state.envIssuer || ''}
                       readOnly
                     />
                     <p className="help-block">
@@ -219,7 +219,7 @@ class SamlSecurityManagement extends React.Component {
                       rows="5"
                       name="samlCert"
                       readOnly={useOnlyEnvVars}
-                      defaultValue={adminSamlSecurityContainer.state.samlcert}
+                      value={adminSamlSecurityContainer.state.samlCert}
                       onChange={e => adminSamlSecurityContainer.changeSamlCert(e.target.value)}
                     />
                     <p className="help-block">
@@ -248,7 +248,7 @@ pWVdnzS1VCO8fKsJ7YYIr+JmHvseph3kFUOI5RqkCcMZlKUv83aUThsTHw==
                       type="text"
                       rows="5"
                       readOnly
-                      value={this.state.envCert}
+                      value={this.state.envCert || ''}
                     />
                     <p className="help-block">
                       <small dangerouslySetInnerHTML={{ __html: t('security_setting.SAML.Use env var if empty', { env: 'SAML_CERT' }) }} />
@@ -292,7 +292,7 @@ pWVdnzS1VCO8fKsJ7YYIr+JmHvseph3kFUOI5RqkCcMZlKUv83aUThsTHw==
                     <input
                       className="form-control"
                       type="text"
-                      value={this.state.envAttrMapId}
+                      value={this.state.envAttrMapId || ''}
                       readOnly
                     />
                     <p className="help-block">
@@ -318,7 +318,7 @@ pWVdnzS1VCO8fKsJ7YYIr+JmHvseph3kFUOI5RqkCcMZlKUv83aUThsTHw==
                     <input
                       className="form-control"
                       type="text"
-                      value={this.state.envAttrMapUserName}
+                      value={this.state.envAttrMapUserName || ''}
                       readOnly
                     />
                     <p className="help-block">
@@ -344,7 +344,7 @@ pWVdnzS1VCO8fKsJ7YYIr+JmHvseph3kFUOI5RqkCcMZlKUv83aUThsTHw==
                     <input
                       className="form-control"
                       type="text"
-                      value={this.state.envAttrMapMail}
+                      value={this.state.envAttrMapMail || ''}
                       readOnly
                     />
                     <p className="help-block">
@@ -371,7 +371,7 @@ pWVdnzS1VCO8fKsJ7YYIr+JmHvseph3kFUOI5RqkCcMZlKUv83aUThsTHw==
                     <input
                       className="form-control"
                       type="text"
-                      value={this.state.envAttrMapFirstName}
+                      value={this.state.envAttrMapFirstName || ''}
                       readOnly
                     />
                     <p className="help-block">
@@ -402,7 +402,7 @@ pWVdnzS1VCO8fKsJ7YYIr+JmHvseph3kFUOI5RqkCcMZlKUv83aUThsTHw==
                     <input
                       className="form-control"
                       type="text"
-                      value={this.state.envAttrMapLastName}
+                      value={this.state.envAttrMapLastName || ''}
                       readOnly
                     />
                     <p className="help-block">

src/client/js/services/AdminGitHubSecurityContainer.js

@@ -83,7 +83,6 @@ export default class AdminGitHubSecurityContainer extends Container {
     const { securitySettingParams } = response.data;
 
     this.setState({
-      isGitHubStrategySetup: securitySettingParams.isGitHubStrategySetup,
       githubClientId: securitySettingParams.githubClientId,
       githubClientSecret: securitySettingParams.githubClientSecret,
       isSameUsernameTreatedAsIdenticalUser: securitySettingParams.isSameUsernameTreatedAsIdenticalUser,

src/client/js/services/AdminGoogleSecurityContainer.js

@@ -84,7 +84,6 @@ export default class AdminGoogleSecurityContainer extends Container {
     const { securitySettingParams } = response.data;
 
     this.setState({
-      isGoogleStrategySetup: securitySettingParams.isGoogleStrategySetup,
       googleClientId: securitySettingParams.googleClientId,
       googleClientSecret: securitySettingParams.googleClientSecret,
       isSameUsernameTreatedAsIdenticalUser: securitySettingParams.isSameUsernameTreatedAsIdenticalUser,

src/client/js/services/AdminTwitterSecurityContainer.js

@@ -83,7 +83,6 @@ export default class AdminTwitterSecurityContainer extends Container {
     const { securitySettingParams } = response.data;
 
     this.setState({
-      isTwitterStrategySetup: securitySettingParams.isTwitterStrategySetup,
       twitterConsumerKey: securitySettingParams.twitterConsumerKey,
       twitterConsumerSecret: securitySettingParams.twitterConsumerSecret,
       isSameUsernameTreatedAsIdenticalUser: securitySettingParams.isSameUsernameTreatedAsIdenticalUser,

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

@@ -327,9 +327,9 @@ module.exports = (crowi) => {
         isSamlEnabled: await crowi.configManager.getConfig('crowi', 'security:passport-saml:isEnabled'),
         isOidcEnabled: await crowi.configManager.getConfig('crowi', 'security:passport-oidc:isEnabled'),
         isBasicEnabled: await crowi.configManager.getConfig('crowi', 'security:passport-basic:isEnabled'),
-        isGoogleOAuthEnabled: await crowi.configManager.getConfig('crowi', 'security:passport-google:isEnabled'),
-        isGitHubOAuthEnabled: await crowi.configManager.getConfig('crowi', 'security:passport-github:isEnabled'),
-        isTwitterOAuthEnabled: await crowi.configManager.getConfig('crowi', 'security:passport-twitter:isEnabled'),
+        isGoogleEnabled: await crowi.configManager.getConfig('crowi', 'security:passport-google:isEnabled'),
+        isGitHubEnabled: await crowi.configManager.getConfig('crowi', 'security:passport-github:isEnabled'),
+        isTwitterEnabled: await crowi.configManager.getConfig('crowi', 'security:passport-twitter:isEnabled'),
       },
       ldapAuth: {
         serverUrl: await crowi.configManager.getConfig('crowi', 'security:passport-ldap:serverUrl'),
@@ -806,7 +806,6 @@ module.exports = (crowi) => {
       await crowi.configManager.updateConfigsInTheSameNamespace('crowi', requestParams);
       await crowi.passportService.setupStrategyById('google');
       const securitySettingParams = {
-        isGoogleOAuthEnabled: await crowi.configManager.getConfig('crowi', 'security:passport-google:isEnabled'),
         googleClientId: await crowi.configManager.getConfig('crowi', 'security:passport-google:clientId'),
         googleClientSecret: await crowi.configManager.getConfig('crowi', 'security:passport-google:clientSecret'),
         isSameUsernameTreatedAsIdenticalUser: await crowi.configManager.getConfig('crowi', 'security:passport-google:isSameUsernameTreatedAsIdenticalUser'),
@@ -852,7 +851,6 @@ module.exports = (crowi) => {
       await crowi.configManager.updateConfigsInTheSameNamespace('crowi', requestParams);
       await crowi.passportService.setupStrategyById('github');
       const securitySettingParams = {
-        isGitHubStrategySetup: await crowi.passportService.isGitHubStrategySetup,
         githubClientId: await crowi.configManager.getConfig('crowi', 'security:passport-github:clientId'),
         githubClientSecret: await crowi.configManager.getConfig('crowi', 'security:passport-github:clientSecret'),
         isSameUsernameTreatedAsIdenticalUser: await crowi.configManager.getConfig('crowi', 'security:passport-github:isSameUsernameTreatedAsIdenticalUser'),
@@ -900,7 +898,6 @@ module.exports = (crowi) => {
       await crowi.configManager.updateConfigsInTheSameNamespace('crowi', requestParams);
       await crowi.passportService.setupStrategyById('twitter');
       const securitySettingParams = {
-        isTwitterStrategySetup: await crowi.passportService.isTwitterStrategySetup,
         twitterConsumerId: await crowi.configManager.getConfig('crowi', 'security:passport-twitter:consumerKey'),
         twitterConsumerSecret: await crowi.configManager.getConfig('crowi', 'security:passport-twitter:consumerSecret'),
         isSameUsernameTreatedAsIdenticalUser: await crowi.configManager.getConfig('crowi', 'security:passport-twitter:isSameUsernameTreatedAsIdenticalUser'),