zahmis 5 лет назад
Родитель
Сommit
a0c3ed1f25
2 измененных файлов с 14 добавлено и 3 удалено
  1. 2 3
      src/server/service/bolt.js
  2. 12 0
      src/server/service/config-loader.js

+ 2 - 3
src/server/service/bolt.js

@@ -46,8 +46,8 @@ class BoltService {
     this.crowi = crowi;
     this.receiver = new BoltReciever();
 
-    const token = process.env.SLACK_BOT_TOKEN;
-    const signingSecret = process.env.SLACK_SIGNING_SECRET;
+    const signingSecret = crowi.configManager.getConfig('crowi', 'slack:signingSecret');
+    const token = crowi.configManager.getConfig('crowi', 'slack:botToken');
 
     const client = new WebClient(token, { logLevel: LogLevel.DEBUG });
     this.client = client;
@@ -82,7 +82,6 @@ class BoltService {
     // TODO check if firstArg is the supported command(like "search")
     this.bolt.command('/growi', async({ command, ack }) => {
       await ack();
-      console.log(command);
       const inputSlack = command.text.split(' ');
       const firstArg = inputSlack[0];
       const secondArg = inputSlack[1];

+ 12 - 0
src/server/service/config-loader.js

@@ -398,6 +398,18 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
     type:    TYPES.STRING,
     default: null,
   },
+  SLACK_SIGNING_SECRET: {
+    ns:      'crowi',
+    key:     'slack:signingSecret',
+    type:    TYPES.STRING,
+    default: null,
+  },
+  SLACK_BOT_TOKEN: {
+    ns:      'crowi',
+    key:     'slack:botToken',
+    type:    TYPES.STRING,
+    default: null,
+  },
 };
 
 class ConfigLoader {