|
|
@@ -105,7 +105,6 @@ module.exports = (crowi) => {
|
|
|
slackBotTokenEnvVars: crowi.configManager.getConfigFromEnvVars('crowi', 'slackbot:token'),
|
|
|
slackSigningSecret: crowi.configManager.getConfig('crowi', 'slackbot:signingSecret'),
|
|
|
slackBotToken: crowi.configManager.getConfig('crowi', 'slackbot:token'),
|
|
|
- isConnectedToSlack: crowi.slackBotService.isConnectedToSlack,
|
|
|
},
|
|
|
// TODO imple when creating with proxy
|
|
|
customBotWithProxySettings: {
|
|
|
@@ -145,9 +144,6 @@ module.exports = (crowi) => {
|
|
|
|
|
|
try {
|
|
|
await updateSlackBotSettings(requestParams);
|
|
|
-
|
|
|
- // initialize slack service
|
|
|
- await crowi.slackBotService.initialize();
|
|
|
crowi.slackBotService.publishUpdatedMessage();
|
|
|
|
|
|
const slackIntegrationSettingsParams = {
|
|
|
@@ -191,9 +187,6 @@ module.exports = (crowi) => {
|
|
|
};
|
|
|
try {
|
|
|
await updateSlackBotSettings(requestParams);
|
|
|
-
|
|
|
- // initialize slack service
|
|
|
- await crowi.slackBotService.initialize();
|
|
|
crowi.slackBotService.publishUpdatedMessage();
|
|
|
|
|
|
// TODO Impl to delete AccessToken both of Proxy and GROWI when botType changes.
|
|
|
@@ -256,36 +249,36 @@ module.exports = (crowi) => {
|
|
|
*/
|
|
|
// eslint-disable-next-line max-len
|
|
|
router.post('/notification-test-to-slack-work-space', loginRequiredStrictly, adminRequired, csrf, validator.NotificationTestToSlackWorkSpace, apiV3FormValidator, async(req, res) => {
|
|
|
- const isConnectedToSlack = crowi.slackBotService.isConnectedToSlack;
|
|
|
- const { channel } = req.body;
|
|
|
+ const isConnectedToSlack = crowi.slackBotService.isConnectedToSlack;
|
|
|
+ const { channel } = req.body;
|
|
|
|
|
|
- if (isConnectedToSlack === false) {
|
|
|
- const msg = 'Bot User OAuth Token is not setup.';
|
|
|
- logger.error('Error', msg);
|
|
|
- return res.apiv3Err(new ErrorV3(msg, 'not-setup-slack-bot-token', 400));
|
|
|
- }
|
|
|
+ if (isConnectedToSlack === false) {
|
|
|
+ const msg = 'Bot User OAuth Token is not setup.';
|
|
|
+ logger.error('Error', msg);
|
|
|
+ return res.apiv3Err(new ErrorV3(msg, 'not-setup-slack-bot-token', 400));
|
|
|
+ }
|
|
|
|
|
|
- const slackBotToken = crowi.configManager.getConfig('crowi', 'slackbot:token');
|
|
|
- this.client = new WebClient(slackBotToken, { logLevel: LogLevel.DEBUG });
|
|
|
- logger.debug('SlackBot: setup is done');
|
|
|
+ const slackBotToken = crowi.configManager.getConfig('crowi', 'slackbot:token');
|
|
|
+ this.client = new WebClient(slackBotToken, { logLevel: LogLevel.DEBUG });
|
|
|
+ logger.debug('SlackBot: setup is done');
|
|
|
|
|
|
- try {
|
|
|
- await this.client.chat.postMessage({
|
|
|
- channel: `#${channel}`,
|
|
|
- text: 'Your test was successful!',
|
|
|
- });
|
|
|
- logger.info(`SlackTest: send success massage to slack work space at #${channel}.`);
|
|
|
- logger.info(`If you do not receive a message, you may not have invited the bot to the #${channel} channel.`);
|
|
|
- // eslint-disable-next-line max-len
|
|
|
- const message = `Successfully send message to Slack work space. See #general channel. If you do not receive a message, you may not have invited the bot to the #${channel} channel.`;
|
|
|
- return res.apiv3({ message });
|
|
|
- }
|
|
|
- catch (error) {
|
|
|
- const msg = `Error: ${error.data.error}. Needed:${error.data.needed}`;
|
|
|
- logger.error('Error', error);
|
|
|
- return res.apiv3Err(new ErrorV3(msg, 'notification-test-slack-work-space-failed'), 500);
|
|
|
- }
|
|
|
- });
|
|
|
+ try {
|
|
|
+ await this.client.chat.postMessage({
|
|
|
+ channel: `#${channel}`,
|
|
|
+ text: 'Your test was successful!',
|
|
|
+ });
|
|
|
+ logger.info(`SlackTest: send success massage to slack work space at #${channel}.`);
|
|
|
+ logger.info(`If you do not receive a message, you may not have invited the bot to the #${channel} channel.`);
|
|
|
+ // eslint-disable-next-line max-len
|
|
|
+ const message = `Successfully send message to Slack work space. See #general channel. If you do not receive a message, you may not have invited the bot to the #${channel} channel.`;
|
|
|
+ return res.apiv3({ message });
|
|
|
+ }
|
|
|
+ catch (error) {
|
|
|
+ const msg = `Error: ${error.data.error}. Needed:${error.data.needed}`;
|
|
|
+ logger.error('Error', error);
|
|
|
+ return res.apiv3Err(new ErrorV3(msg, 'notification-test-slack-work-space-failed'), 500);
|
|
|
+ }
|
|
|
+ });
|
|
|
|
|
|
return router;
|
|
|
};
|