omit unnecessary codes for slack configuration

lib/models/config.js

@@ -443,20 +443,7 @@ module.exports = function(crowi) {
 
   configSchema.statics.hasSlackConfig = function(config)
   {
-    return Config.hasSlackWebClientConfig(config) || Config.hasSlackIwhUrl(config);
-  };
-
-  configSchema.statics.hasSlackWebClientConfig = function(config)
-  {
-    if (!config.notification) {
-      return false;
-    }
-    if (!config.notification['slack:clientId'] ||
-        !config.notification['slack:clientSecret']) {
-      return false;
-    }
-
-    return true;
+    return Config.hasSlackToken(config) || Config.hasSlackIwhUrl(config);
   };
 
   /**
@@ -467,7 +454,7 @@ module.exports = function(crowi) {
     if (!config.notification) {
       return false;
     }
-    return config.notification['slack:incomingWebhookUrl'];
+    return (config.notification['slack:incomingWebhookUrl'] ? true : false);
   };
 
   configSchema.statics.isIncomingWebhookPrioritized = function(config)
@@ -475,20 +462,16 @@ module.exports = function(crowi) {
     if (!config.notification) {
       return false;
     }
-    return config.notification['slack:isIncomingWebhookPrioritized'];
+    return (config.notification['slack:isIncomingWebhookPrioritized'] ? true : false);
   };
 
   configSchema.statics.hasSlackToken = function(config)
   {
-    if (!this.hasSlackWebClientConfig(config)) {
-      return false;
-    }
-
-    if (!config.notification['slack:token']) {
+    if (!config.notification) {
       return false;
     }
 
-    return true;
+    return (config.notification['slack:token'] ? true : false);
   };
 
   configSchema.statics.getLocalconfig = function(config)

lib/routes/admin.js

@@ -159,19 +159,10 @@ module.exports = function(crowi, app) {
     var config = crowi.getConfig();
     var UpdatePost = crowi.model('UpdatePost');
     var slackSetting = Config.setupCofigFormData('notification', config);
-    var hasSlackWebClientConfig = Config.hasSlackWebClientConfig(config);
     var hasSlackIwhUrl = Config.hasSlackIwhUrl(config);
     var hasSlackToken = Config.hasSlackToken(config);
     var slack = crowi.slack;
-    var slackAuthUrl = '';
 
-    if (!Config.hasSlackWebClientConfig(req.config)) {
-      slackSetting['slack:clientId'] = '';
-      slackSetting['slack:clientSecret'] = '';
-    }
-    else {
-      slackAuthUrl = slack.getAuthorizeURL();
-    }
     if (!Config.hasSlackIwhUrl(req.config)) {
       slackSetting['slack:incomingWebhookUrl'] = '';
     }
@@ -186,10 +177,8 @@ module.exports = function(crowi, app) {
       return res.render('admin/notification', {
         settings,
         slackSetting,
-        hasSlackWebClientConfig,
         hasSlackIwhUrl,
         hasSlackToken,
-        slackAuthUrl
       });
     });
   };

lib/util/slack.js

@@ -126,39 +126,6 @@ module.exports = function(crowi) {
     return text;
   };
 
-  // this is called to generate redirect_uri
-  slack.getSlackAuthCallbackUrl = function()
-  {
-    // Web アクセスがきてないと app:url がセットされないので crowi.setupSlack 時にはできない
-    // cli, bot 系作るときに問題なりそう
-    return (config.crowi['app:url'] || '') + '/admin/notification/slackAuth';
-  }
-
-  // this is called to get the url for oauth screen
-  slack.getAuthorizeURL = function () {
-    if (Config.hasSlackWebClientConfig(config)) {
-      const slackClientId = config.notification['slack:clientId'];
-      const redirectUri = slack.getSlackAuthCallbackUrl();
-
-      return `${SLACK_URL}/oauth/authorize?client_id=${slackClientId}&redirect_uri=${redirectUri}&scope=chat:write:bot`;
-    } else {
-
-      return '';
-    }
-  }
-
-  // this is called to get access token with code (oauth process)
-  slack.getOauthAccessToken = function(code) {
-
-    const client = new SlackWebClient();
-
-    const clientId = config.notification['slack:clientId'];
-    const clientSecret = config.notification['slack:clientSecret'];
-    const redirectUri = slack.getSlackAuthCallbackUrl();
-
-    return client.oauth.access(clientId, clientSecret, code, {redirect_uri: redirectUri});
-  }
-
   // slack.post = function (channel, message, opts) {
   slack.post = (page, user, channel, updateType, previousRevision) => {
     const messageObj = prepareSlackMessage(page, user, channel, updateType, previousRevision);