Kaynağa Gözat

set isGithubOAuthEnabled

itizawa 6 yıl önce
ebeveyn
işleme
3df842107c

+ 2 - 2
src/client/js/components/Admin/Security/GithubSecuritySetting.jsx

@@ -39,10 +39,10 @@ class GithubSecurityManagement extends React.Component {
   }
   }
 
 
   async onClickSubmit() {
   async onClickSubmit() {
-    const { t, adminGithubSecurityContainer } = this.props;
+    const { t, adminGeneralSecurityContainer, adminGithubSecurityContainer } = this.props;
 
 
     try {
     try {
-      await adminGithubSecurityContainer.updateGitHubSetting();
+      await adminGithubSecurityContainer.updateGitHubSetting(adminGeneralSecurityContainer.state.isGithubOAuthEnabled);
       toastSuccess(t('security_setting.OAuth.GitHub.updated_github'));
       toastSuccess(t('security_setting.OAuth.GitHub.updated_github'));
     }
     }
     catch (err) {
     catch (err) {

+ 2 - 1
src/client/js/services/AdminGithubSecurityConatainer.js

@@ -72,9 +72,10 @@ export default class AdminGithubSecurityContainer extends Container {
   /**
   /**
    * Update githubSetting
    * Update githubSetting
    */
    */
-  async updateGitHubSetting() {
+  async updateGitHubSetting(isGithubOAuthEnabled) {
 
 
     const response = await this.appContainer.apiv3.put('/security-setting/github-oauth', {
     const response = await this.appContainer.apiv3.put('/security-setting/github-oauth', {
+      isGithubOAuthEnabled,
       githubClientId: this.state.githubClientId,
       githubClientId: this.state.githubClientId,
       githubClientSecret: this.state.githubClientSecret,
       githubClientSecret: this.state.githubClientSecret,
       isSameUsernameTreatedAsIdenticalUser: this.state.isSameUsernameTreatedAsIdenticalUser,
       isSameUsernameTreatedAsIdenticalUser: this.state.isSameUsernameTreatedAsIdenticalUser,

+ 2 - 0
src/server/routes/apiv3/security-setting.js

@@ -695,6 +695,7 @@ module.exports = (crowi) => {
    */
    */
   router.put('/github-oauth', loginRequiredStrictly, adminRequired, csrf, validator.githubOAuth, ApiV3FormValidator, async(req, res) => {
   router.put('/github-oauth', loginRequiredStrictly, adminRequired, csrf, validator.githubOAuth, ApiV3FormValidator, async(req, res) => {
     const requestParams = {
     const requestParams = {
+      'security:passport-github:isEnabled': req.body.isGithubOAuthEnabled,
       'security:passport-github:clientId': req.body.githubClientId,
       'security:passport-github:clientId': req.body.githubClientId,
       'security:passport-github:clientSecret': req.body.githubClientSecret,
       'security:passport-github:clientSecret': req.body.githubClientSecret,
       'security:passport-github:isSameUsernameTreatedAsIdenticalUser': req.body.isSameUsernameTreatedAsIdenticalUser,
       'security:passport-github:isSameUsernameTreatedAsIdenticalUser': req.body.isSameUsernameTreatedAsIdenticalUser,
@@ -703,6 +704,7 @@ module.exports = (crowi) => {
     try {
     try {
       await crowi.configManager.updateConfigsInTheSameNamespace('crowi', requestParams);
       await crowi.configManager.updateConfigsInTheSameNamespace('crowi', requestParams);
       const securitySettingParams = {
       const securitySettingParams = {
+        isGithubOAuthEnabled: await crowi.configManager.getConfig('crowi', 'security:passport-github:isEnabled'),
         githubClientId: await crowi.configManager.getConfig('crowi', 'security:passport-github:clientId'),
         githubClientId: await crowi.configManager.getConfig('crowi', 'security:passport-github:clientId'),
         githubClientSecret: await crowi.configManager.getConfig('crowi', 'security:passport-github:clientSecret'),
         githubClientSecret: await crowi.configManager.getConfig('crowi', 'security:passport-github:clientSecret'),
         isSameUsernameTreatedAsIdenticalUser: await crowi.configManager.getConfig('crowi', 'security:passport-github:isSameUsernameTreatedAsIdenticalUser'),
         isSameUsernameTreatedAsIdenticalUser: await crowi.configManager.getConfig('crowi', 'security:passport-github:isSameUsernameTreatedAsIdenticalUser'),