Главная Обзор Помощь
Вход
wiki
/
weseek__growi
зеркало из https://github.com/weseek/growi
2
0
Ответвить 0
Файлы Задачи 0 Вики
Просмотр исходного кода

add install-failed.ejs

Yuki Takei 4 лет назад
Родитель
12ce613021
Сommit
e111c13b15
2 измененных файлов с 45 добавлено и 27 удалено
Единый вид Показать статистику Diff
  1. 24 27
      packages/slackbot-proxy/src/controllers/slack.ts
  2. 21 0
      packages/slackbot-proxy/src/views/install-failed.ejs

+ 24 - 27
packages/slackbot-proxy/src/controllers/slack.ts
Просмотреть файл 

@@ -1,5 +1,5 @@
 
 import {
 
 import {
 
-  BodyParams, Controller, Get, Inject, Post, Req, Res, UseBefore,
 
+  BodyParams, Controller, Get, Inject, PlatformResponse, Post, Req, Res, UseBefore,
 
 } from '@tsed/common';
 
 } from '@tsed/common';
 
 
 
 import axios from 'axios';
 
 import axios from 'axios';
 
@@ -8,7 +8,7 @@ import { WebAPICallResult } from '@slack/web-api';
 
 
 
 import {
 
 import {
 
   markdownSectionBlock, GrowiCommand, parseSlashCommand, postEphemeralErrors, verifySlackRequest, generateWebClient,
 
   markdownSectionBlock, GrowiCommand, parseSlashCommand, postEphemeralErrors, verifySlackRequest, generateWebClient,
 
-  InvalidGrowiCommandError,
 
+  InvalidGrowiCommandError, requiredScopes,
 
 } from '@growi/slack';
 
 } from '@growi/slack';
 
 
 
 import { Relation } from '~/entities/relation';
 
 import { Relation } from '~/entities/relation';
 
@@ -334,21 +334,19 @@ export class SlackCtrl {
 
   }
 
   }
 
 
 
   @Get('/oauth_redirect')
 
   @Get('/oauth_redirect')
 
-  async handleOauthRedirect(@Req() req: Req, @Res() res: Res): Promise<void> {
 
-
 
-    if (req.query.state === '') {
 
-      res.writeHead(500, { 'Content-Type': 'text/html; charset=utf-8' });
 
-      res.end('<html>'
 
-      + '<head><meta name="viewport" content="width=device-width,initial-scale=1"></head>'
 
-      + '<body style="text-align:center; padding-top:20%;">'
 
-      + '<h1>Illegal state, try it again.</h1>'
 
-      + '<a href="/">'
 
-      + 'Go to install page'
 
-      + '</a>'
 
-      + '</body></html>');
 
+  async handleOauthRedirect(@Req() req: Req, @Res() serverRes: Res, @Res() platformRes: PlatformResponse): Promise<void|string> {
 
+
 
+    const state = req.query.state;
 
+    if (state == null || state === '') {
 
+      // create 'Add to Slack' url
 
+      const url = await this.installerService.installer.generateInstallUrl({
 
+        scopes: requiredScopes,
 
+      });
 
+
 
+      return platformRes.status(400).render('install-failed.ejs', { url });
 
     }
 
     }
 
 
 
-    await this.installerService.installer.handleCallback(req, res, {
 
+    await this.installerService.installer.handleCallback(req, serverRes, {
 
       success: async(installation, metadata, req, res) => {
 
       success: async(installation, metadata, req, res) => {
 
         logger.info('Success to install', { installation, metadata });
 
         logger.info('Success to install', { installation, metadata });
 
         const appPageUrl = `https://slack.com/apps/${installation.appId}`;
 
         const appPageUrl = `https://slack.com/apps/${installation.appId}`;
 
@@ -391,8 +389,8 @@ export class SlackCtrl {
 
               type: 'section',
 
               type: 'section',
 
               text: {
 
               text: {
 
                 type: 'mrkdwn',
 
                 type: 'mrkdwn',
 
-                text: 'You have successfully installed GROWI Official bot on this Slack workspace.'
 
-                  + 'At first you do `/growi register` in the channel that you want to use.'
 
+                text: ':tada: You have successfully installed GROWI Official bot on this Slack workspace.\n'
 
+                  + 'At first you do `/growi register` in the channel that you want to use.\n'
 
                   + 'Looking for additional help?'
 
                   + 'Looking for additional help?'
 
                   // eslint-disable-next-line max-len
 
                   // eslint-disable-next-line max-len
 
                   + 'See <https://docs.growi.org/en/admin-guide/management-cookbook/slack-integration/official-bot-settings.html#official-bot-settings | Docs>.',
 
                   + 'See <https://docs.growi.org/en/admin-guide/management-cookbook/slack-integration/official-bot-settings.html#official-bot-settings | Docs>.',
 
@@ -427,17 +425,16 @@ export class SlackCtrl {
 
           },
 
           },
 
         });
 
         });
 
       },
 
       },
 
-      failure: (error, installOptions, req, res) => {
 
+      failure: async(error, installOptions, req, res) => {
 
+        // create 'Add to Slack' url
 
+        const url = await this.installerService.installer.generateInstallUrl({
 
+          scopes: requiredScopes,
 
+        });
 
+
 
+        const result = await platformRes.status(500).render('install-failed.ejs', { url });
 
+
 
         res.writeHead(500, { 'Content-Type': 'text/html; charset=utf-8' });
 
         res.writeHead(500, { 'Content-Type': 'text/html; charset=utf-8' });
 
-        res.end('<html>'
 
-        + '<head><meta name="viewport" content="width=device-width,initial-scale=1"></head>'
 
-        + '<body style="text-align:center; padding-top:20%;">'
 
-        + '<h1>GROWI Bot installation failed</h1>'
 
-        + '<p>Please contact administrators of your workspace</p>'
 
-        + 'Reference: <a href="https://slack.com/help/articles/222386767-Manage-app-installation-settings-for-your-workspace">'
 
-        + 'Manage app installation settings for your workspace'
 
-        + '</a>'
 
-        + '</body></html>');
 
+        res.end(result);
 
       },
 
       },
 
     });
 
     });
 
   }
 
   }

+ 21 - 0
packages/slackbot-proxy/src/views/install-failed.ejs
Просмотреть файл 

@@ -0,0 +1,21 @@
 
+<%- include('commons/head'); %>
 
+
 
+<body>
 
+  <div class="container">
 
+    <div class="row">
 
+      <div class="col text-center">
 
+        <h1 class="my-5">GROWI Bot installation failed</h1>
 
+        <p>
 
+          Retry from
 
+          <a href=<%- url %>>
 
+            <img alt="Add to Slack" height="40" width="139" src="/images/add-to-slack.png"/>
 
+          </a>
 
+        </p>
 
+        <p>
 
+          Or, please contact administrators of your workspace<br>
 
+          Reference: <a href="https://slack.com/help/articles/222386767-Manage-app-installation-settings-for-your-workspace">Manage app installation settings for your workspace</a>
 
+        </p>
 
+      </div>
 
+    </div>
 
+  </div>
 
+</body>