update isEnabledGoogleOAuth

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

@@ -39,10 +39,10 @@ class GoogleSecurityManagement extends React.Component {
   }
 
   async onClickSubmit() {
-    const { t, adminGoogleSecurityContainer } = this.props;
+    const { t, adminGeneralSecurityContainer, adminGoogleSecurityContainer } = this.props;
 
     try {
-      await adminGoogleSecurityContainer.updateGoogleSetting();
+      await adminGoogleSecurityContainer.updateGoogleSetting(adminGeneralSecurityContainer.state.isGoogleOAuthEnabled);
       toastSuccess(t('security_setting.OAuth.Google.updated_google'));
     }
     catch (err) {

src/client/js/services/AdminGoogleSecurityContainer.js

@@ -73,9 +73,10 @@ export default class AdminGoogleSecurityContainer extends Container {
   /**
    * Update googleSetting
    */
-  async updateGoogleSetting() {
+  async updateGoogleSetting(isGoogleOAuthEnabled) {
 
     const response = await this.appContainer.apiv3.put('/security-setting/google-oauth', {
+      isGoogleOAuthEnabled,
       googleClientId: this.state.googleClientId,
       googleClientSecret: this.state.googleClientSecret,
       isSameUsernameTreatedAsIdenticalUser: this.state.isSameUsernameTreatedAsIdenticalUser,

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

@@ -60,6 +60,7 @@ const validator = {
     body('isSameUsernameTreatedAsIdenticalUser').isBoolean(),
   ],
   googleOAuth: [
+    body('isGoogleOAuthEnabled').isBoolean(),
     body('googleClientId').isString(),
     body('googleClientSecret').isString(),
     body('isSameUsernameTreatedAsIdenticalUser').isBoolean(),
@@ -222,6 +223,9 @@ const validator = {
  *            description: local account automatically linked the email matched
  *      GitHubOAuthSetting:
  *        type:object
+ *          isGoogleOAuthEnabled:
+ *            type: boolean
+ *            description: whether to enable google oauth
  *          githubClientId:
  *            type: string
  *            description: key of comsumer
@@ -659,6 +663,7 @@ module.exports = (crowi) => {
    */
   router.put('/google-oauth', loginRequiredStrictly, adminRequired, csrf, validator.googleOAuth, ApiV3FormValidator, async(req, res) => {
     const requestParams = {
+      'security:passport-google:isEnabled': req.body.isEnabled,
       'security:passport-google:clientId': req.body.googleClientId,
       'security:passport-google:clientSecret': req.body.googleClientSecret,
       'security:passport-google:isSameUsernameTreatedAsIdenticalUser': req.body.isSameUsernameTreatedAsIdenticalUser,
@@ -667,13 +672,22 @@ module.exports = (crowi) => {
     try {
       await crowi.configManager.updateConfigsInTheSameNamespace('crowi', requestParams);
       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'),
       };
+      // reset strategy
+      await crowi.passportService.resetGoogleStrategy();
+      // setup strategy
+      if (crowi.configManager.getConfig('crowi', 'security:passport-google:isEnabled')) {
+        await crowi.passportService.setupGoogleStrategy(true);
+      }
       return res.apiv3({ securitySettingParams });
     }
     catch (err) {
+      // reset strategy
+      await crowi.passportService.resetGoogleStrategy();
       const msg = 'Error occurred in updating googleOAuth';
       logger.error('Error', err);
       return res.apiv3Err(new ErrorV3(msg, 'update-googleOAuth-failed'));