fix conflict

src/server/models/slack-app-integration.js

@@ -15,6 +15,13 @@ class SlackAppIntegration {
     return [tokenGtoP.digest('base64'), tokenPtoG.digest('base64')];
   }
 
+  static generateUniqueAccessTokens() {
+    const accessTokens = this.generateAccessToken();
+    const tokenGtoP = accessTokens[0];
+    const tokenPtoG = accessTokens[1];
+    return { tokenGtoP, tokenPtoG };
+  }
+
 }
 
 module.exports = function(crowi) {

src/server/routes/apiv3/slack-integration-settings.js

@@ -383,11 +383,11 @@ module.exports = (crowi) => {
       return res.apiv3Err(new ErrorV3(msg, 'create-slackAppIntegeration-failed'), 500);
     }
 
+    // TODO: refactering generateAccessTokens by GW-6100
     let checkTokens;
     let tokenGtoP;
     let tokenPtoG;
     let generateTokens;
-    // TODO: refactering generateAccessTokens by GW-6100
     do {
       generateTokens = SlackAppIntegration.generateAccessToken();
       tokenGtoP = generateTokens[0];
@@ -395,6 +395,14 @@ module.exports = (crowi) => {
       // eslint-disable-next-line no-await-in-loop
       checkTokens = await SlackAppIntegration.findOne({ $or: [{ tokenGtoP }, { tokenPtoG }] });
     } while (checkTokens != null);
+
+    // const accessTokens = await SlackAppIntegration.generateUniqueAccessTokens();
+    // checkTokens = await SlackAppIntegration.findOne({ $or: [{ tokenGtoP }, { tokenPtoG }] });
+
+    // console.log('accessTokenshoges', accessTokens);
+    // console.log('tokenGtoP', accessTokens.tokenGtoP);
+    // console.log('tokenPtoG', accessTokens.tokenPtoG);
+
     try {
       const slackAppTokens = await SlackAppIntegration.create({ tokenGtoP, tokenPtoG });
       return res.apiv3(slackAppTokens, 200);