kaori 4 лет назад
Родитель
Сommit
1b02ee7a78

+ 3 - 3
src/client/js/components/Admin/SlackIntegration/OfficialBotSettings.jsx

@@ -52,9 +52,9 @@ const OfficialBotSettings = (props) => {
     }
   };
 
-  const generateTokenHandler = async() => {
+  const generateTokenHandler = async(tokenGtoP, tokenPtoG) => {
     try {
-      await appContainer.apiv3.put('/slack-integration-settings/access-tokens');
+      await appContainer.apiv3.put('/slack-integration-settings/access-tokens', { tokenGtoP, tokenPtoG });
     }
     catch (err) {
       toastError(err);
@@ -143,7 +143,7 @@ const OfficialBotSettings = (props) => {
               <WithProxyAccordions
                 botType="officialBot"
                 discardTokenHandler={() => discardTokenHandler(tokenGtoP, tokenPtoG)}
-                generateTokenHandler={generateTokenHandler}
+                generateTokenHandler={generateTokenHandler(tokenGtoP, tokenPtoG)}
                 tokenGtoP={tokenGtoP}
                 tokenPtoG={tokenPtoG}
               />

+ 3 - 4
src/server/routes/apiv3/slack-integration-settings.js

@@ -396,16 +396,15 @@ module.exports = (crowi) => {
   // TODO: add swagger
   router.put('/access-tokens', loginRequiredStrictly, adminRequired, csrf, async(req, res) => {
 
-    const { id } = req.body;
+    const { tokenGtoP, tokenPtoG } = req.body;
 
     try {
-      const slackAppIntegration = await SlackAppIntegration.findOne({ _id: id });
-
       const generateTokens = SlackAppIntegration.generateAccessToken();
       const newTokenGtoP = generateTokens[0];
       const newTokenPtoG = generateTokens[1];
+      await SlackAppIntegration.findOneAndUpdate({ tokenGtoP: newTokenGtoP, tokenPtoG: newTokenPtoG });
+
 
-      await SlackAppIntegration.update({ tokenGtoP: newTokenGtoP, tokenPtoG: newTokenPtoG });
       return res.apiv3({});
     }
     catch (error) {