Przeglądaj źródła

Merge branch 'feat/growi-bot' into feat/5840-5847-implement-test

itizawa 4 lat temu
rodzic
commit
b588b29b2d

+ 1 - 1
packages/slackbot-proxy/src/controllers/growi-to-slack.ts

@@ -62,7 +62,7 @@ export class GrowiToSlackCtrl {
     // asserted (tokenGtoPs.length > 0) by verifyGrowiToSlackRequest
     const { tokenGtoPs } = req;
 
-    // const order = await this.orderRepository.findOne({
+    // retrieve Order with Installation
     const order = await this.orderRepository.createQueryBuilder('order')
       .orderBy('order.createdAt', 'DESC')
       .where('growiAccessToken = :token', { token: tokenGtoPs })

+ 34 - 0
src/server/routes/apiv3/slack-integration-settings.js

@@ -59,6 +59,14 @@ module.exports = (crowi) => {
       body('channel').trim().not().isEmpty()
         .isString(),
     ],
+    AccessTokens: [
+      body('tokenGtoP').trim().not().isEmpty()
+        .isString()
+        .isLength({ min: 1 }),
+      body('tokenPtoG').trim().not().isEmpty()
+        .isString()
+        .isLength({ min: 1 }),
+    ],
     RelationTest: [
       body('slackappintegrationsId').isMongoId(),
     ],
@@ -380,6 +388,32 @@ module.exports = (crowi) => {
     }
   });
 
+  /**
+   * @swagger
+   *
+   *    /slack-integration-settings/slack-app-integration:
+   *      delete:
+   *        tags: [SlackIntegration]
+   *        operationId: deleteAccessTokens
+   *        summary: delete accessTokens
+   *        description: Delete accessTokens
+   *        responses:
+   *          200:
+   *            description: Succeeded to delete access tokens for slack
+   */
+  router.delete('/slack-app-integration', validator.AccessTokens, apiV3FormValidator, async(req, res) => {
+    const SlackAppIntegration = mongoose.model('SlackAppIntegration');
+    const { tokenGtoP, tokenPtoG } = req.body;
+    try {
+      await SlackAppIntegration.findOneAndDelete({ tokenGtoP, tokenPtoG });
+    }
+    catch (error) {
+      const msg = 'Error occured in deleting access token for slack app tokens';
+      logger.error('Error', error);
+      return res.apiv3Err(new ErrorV3(msg, 'update-slackAppTokens-failed'), 500);
+    }
+  });
+
   router.put('/proxy-uri', loginRequiredStrictly, adminRequired, csrf, async(req, res) => {
     const { proxyUri } = req.body;