4 лет назад · 73644ace30
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@
 
				 * Support: Include official plugins as sub packages
			
 
				 * Support: Upgrade libs
			
 
				     * @slack/web-api
			
 
				+    * date-fns
			
 
				     * escape-string-regexp
			
 
				     * morgan
			
 
				 
			
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -80,7 +80,7 @@
 
				     "connect-redis": "^4.0.4",
			
 
				     "cookie-parser": "^1.4.5",
			
 
				     "csrf": "^3.1.0",
			
 
				-    "date-fns": "^2.0.0",
			
 
				+    "date-fns": "^2.23.0",
			
 
				     "detect-indent": "^6.0.0",
			
 
				     "diff": "^5.0.0",
			
 
				     "elasticsearch": "^16.0.0",
			
--- a/packages/slack/src/index.ts
+++ b/packages/slack/src/index.ts
@@ -29,3 +29,4 @@ export * from './utils/post-ephemeral-errors';
 
				 export * from './utils/reshape-contents-body';
			
 
				 export * from './utils/slash-command-parser';
			
 
				 export * from './utils/webclient-factory';
			
 
				+export * from './utils/required-scopes';
			
--- a/packages/slack/src/utils/check-communicable.ts
+++ b/packages/slack/src/utils/check-communicable.ts
@@ -4,6 +4,7 @@ import { WebClient } from '@slack/web-api';
 
				 
			
 
				 import { generateWebClient } from './webclient-factory';
			
 
				 import { ConnectionStatus } from '../interfaces/connection-status';
			
 
				+import { requiredScopes } from './required-scopes';
			
 
				 
			
 
				 /**
			
 
				  * Check whether the HTTP server responds or not.
			
@@ -45,11 +46,10 @@ const testSlackApiServer = async(client: WebClient): Promise<any> => {
 
				 
			
 
				 const checkSlackScopes = (resultTestSlackApiServer: any) => {
			
 
				   const slackScopes = resultTestSlackApiServer.response_metadata.scopes;
			
 
				-  const correctScopes = ['commands', 'team:read', 'chat:write'];
			
 
				-  const isPassedScopeCheck = correctScopes.every(e => slackScopes.includes(e));
			
 
				+  const isPassedScopeCheck = requiredScopes.every(e => slackScopes.includes(e));
			
 
				 
			
 
				   if (!isPassedScopeCheck) {
			
 
				-    throw new Error('The scopes is not appropriate. Required scopes is [\'commands\', \'team:read\', \'chat:write\']');
			
 
				+    throw new Error(`The scopes you registered are not appropriate. Required scopes are ${requiredScopes}`);
			
 
				   }
			
 
				 };
			
 
				 
			
--- a/packages/slack/src/utils/required-scopes.ts
+++ b/packages/slack/src/utils/required-scopes.ts
@@ -0,0 +1 @@
 
				+export const requiredScopes: string[] = ['commands', 'team:read', 'chat:write', 'channels:history', 'groups:history', 'im:history', 'mpim:history'];
			
--- a/packages/slackbot-proxy/package.json
+++ b/packages/slackbot-proxy/package.json
@@ -37,6 +37,7 @@
 
				     "bunyan": "^1.8.15",
			
 
				     "compression": "^1.7.4",
			
 
				     "cookie-parser": "^1.4.5",
			
 
				+    "date-fns": "^2.23.0",
			
 
				     "express-bunyan-logger": "^1.3.3",
			
 
				     "extensible-custom-error": "^0.0.7",
			
 
				     "helmet": "^4.6.0",
			
--- a/packages/slackbot-proxy/src/controllers/slack.ts
+++ b/packages/slackbot-proxy/src/controllers/slack.ts
@@ -329,13 +329,20 @@ export class SlackCtrl {
 
				 
			
 
				         res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
			
 
				         res.end('<html>'
			
 
				-        + '<head><meta name="viewport" content="width=device-width,initial-scale=1"></head>'
			
 
				+        + '<head><meta name="viewport" content="width=device-width,initial-scale=1">'
			
 
				+        + '<link href="/bootstrap/css/bootstrap.min.css" rel="stylesheet">'
			
 
				+        + '</head>'
			
 
				         + '<body style="text-align:center; padding-top:20%;">'
			
 
				         + '<h1>Congratulations!</h1>'
			
 
				         + '<p>GROWI Bot installation has succeeded.</p>'
			
 
				-        + `<a href="${appPageUrl}">`
			
 
				+        + '<div class="d-inline-flex flex-column">'
			
 
				+        + `<a class="mb-3" href="${appPageUrl}">`
			
 
				         + 'Access to Slack App detail page.'
			
 
				         + '</a>'
			
 
				+        + '<a class="btn btn-outline-success" href="https://docs.growi.org/en/admin-guide/management-cookbook/slack-integration/official-bot-settings.html">'
			
 
				+        + 'Getting started'
			
 
				+        + '</a>'
			
 
				+        + '</div>'
			
 
				         + '</body></html>');
			
 
				       },
			
 
				       failure: (error, installOptions, req, res) => {
			
--- a/packages/slackbot-proxy/src/controllers/top.ts
+++ b/packages/slackbot-proxy/src/controllers/top.ts
@@ -2,6 +2,7 @@ import {
 
				   Controller, Get, Inject, View,
			
 
				 } from '@tsed/common';
			
 
				 
			
 
				+import { requiredScopes } from '@growi/slack';
			
 
				 import { InstallerService } from '~/services/InstallerService';
			
 
				 
			
 
				 const isOfficialMode = process.env.OFFICIAL_MODE === 'true';
			
@@ -18,15 +19,7 @@ export class TopCtrl {
 
				   async getTopPage(): Promise<any> {
			
 
				     const url = await this.installerService.installer.generateInstallUrl({
			
 
				       // Add the scopes your app needs
			
 
				-      scopes: [
			
 
				-        'channels:history',
			
 
				-        'commands',
			
 
				-        'groups:history',
			
 
				-        'im:history',
			
 
				-        'mpim:history',
			
 
				-        'chat:write',
			
 
				-        'team:read',
			
 
				-      ],
			
 
				+      scopes: requiredScopes,
			
 
				     });
			
 
				 
			
 
				     return { url, isOfficialMode };
			
--- a/packages/slackbot-proxy/src/views/top.ejs
+++ b/packages/slackbot-proxy/src/views/top.ejs
@@ -14,6 +14,7 @@
 
				           <img alt="Add to Slack" height="40" width="139" src="/images/add-to-slack.png"/>
			
 
				         </a>
			
 
				       </div>
			
 
				+      <a class="btn btn-outline-success" href="https://docs.growi.org/en/admin-guide/management-cookbook/slack-integration/official-bot-settings.html">Getting started</a>
			
 
				       <div class="d-flex justify-content-evenly my-3">
			
 
				         <% if (isOfficialMode) { %>
			
 
				           <a href="/privacy">
			
--- a/packages/slackbot-proxy/tsconfig.base.json
+++ b/packages/slackbot-proxy/tsconfig.base.json
@@ -2,10 +2,14 @@
 
				   "extends": "../../tsconfig.base.json",
			
 
				   "compilerOptions": {
			
 
				   },
			
 
				+  "include": [
			
 
				+    "src"
			
 
				+  ],
			
 
				   "exclude": [
			
 
				     "node_modules",
			
 
				     "config",
			
 
				     "dist",
			
 
				+    "src/public/**",
			
 
				     "**/*.test.ts"
			
 
				   ]
			
 
				 }
			
--- a/yarn.lock
+++ b/yarn.lock
@@ -6485,15 +6485,10 @@ date-and-time@^1.0.0:
 
				   resolved "https://registry.yarnpkg.com/date-and-time/-/date-and-time-1.0.0.tgz#0062394bdf6f44e961f0db00511cb19cdf3cc0a5"
			
 
				   integrity sha512-477D7ypIiqlXBkxhU7YtG9wWZJEQ+RUpujt2quTfgf4+E8g5fNUkB0QIL0bVyP5/TKBg8y55Hfa1R/c4bt3dEw==
			
 
				 
			
 
				-date-fns@^2.0.0:
			
 
				-  version "2.0.0"
			
 
				-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.0.tgz#52f05c6ae1fe0e395670082c72b690ab781682d0"
			
 
				-  integrity sha512-nGZDA64Ktq5uTWV4LEH3qX+foV4AguT5qxwRlJDzJtf57d4xLNwtwrfb7SzKCoikoae8Bvxf0zdaEG/xWssp/w==
			
 
				-
			
 
				-date-fns@^2.19.0:
			
 
				-  version "2.22.1"
			
 
				-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.22.1.tgz#1e5af959831ebb1d82992bf67b765052d8f0efc4"
			
 
				-  integrity sha512-yUFPQjrxEmIsMqlHhAhmxkuH769baF21Kk+nZwZGyrMoyLA+LugaQtC0+Tqf9CBUUULWwUJt6Q5ySI3LJDDCGg==
			
 
				+date-fns@^2.19.0, date-fns@^2.23.0:
			
 
				+  version "2.23.0"
			
 
				+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.23.0.tgz#4e886c941659af0cf7b30fafdd1eaa37e88788a9"
			
 
				+  integrity sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA==
			
 
				 
			
 
				 date-format@^2.0.0:
			
 
				   version "2.1.0"
		`@@ -0,0 +1 @@`
		`+export const requiredScopes: string[] = ['commands', 'team:read', 'chat:write', 'channels:history', 'groups:history', 'im:history', 'mpim:history'];`