replace growi

packages/app/src/server/models/index.js

@@ -18,6 +18,6 @@ module.exports = {
   ShareLink: require('./share-link'),
   // SlackAppIntegration: require('./slack-app-integration'),
   // MOCK DATA DELETE THIS GW-6972 ---------------
-  SlackAppIntegrationMock: require('./slack-app-integration-mock'),
+  SlackAppIntegration: require('./slack-app-integration'),
   // MOCK DATA DELETE THIS GW-6972 ---------------
 };

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

@@ -1,51 +0,0 @@
-const crypto = require('crypto');
-const mongoose = require('mongoose');
-
-const permittedChannelsForEachCommandSchema = new mongoose.Schema({
-  channelsObject: Map,
-});
-
-
-const schema = new mongoose.Schema({
-  tokenGtoP: { type: String, required: true, unique: true },
-  tokenPtoG: { type: String, required: true, unique: true },
-  permissionsForBroadcastUseCommands: Map,
-  permissionsForSingleUseCommands: Map,
-});
-
-class SlackAppIntegrationMock {
-
-  static generateAccessTokens() {
-    const now = new Date().getTime();
-    const hasher1 = crypto.createHash('sha512');
-    const hasher2 = crypto.createHash('sha512');
-    const tokenGtoP = hasher1.update(`gtop${now.toString()}${process.env.SALT_FOR_GTOP_TOKEN}`).digest('base64');
-    const tokenPtoG = hasher2.update(`ptog${now.toString()}${process.env.SALT_FOR_PTOG_TOKEN}`).digest('base64');
-    return [tokenGtoP, tokenPtoG];
-  }
-
-  static async generateUniqueAccessTokens() {
-    let duplicateTokens;
-    let tokenGtoP;
-    let tokenPtoG;
-    let generateTokens;
-
-    do {
-      generateTokens = this.generateAccessTokens();
-      tokenGtoP = generateTokens[0];
-      tokenPtoG = generateTokens[1];
-      // eslint-disable-next-line no-await-in-loop
-      duplicateTokens = await this.findOne({ $or: [{ tokenGtoP }, { tokenPtoG }] });
-    } while (duplicateTokens != null);
-
-
-    return { tokenGtoP, tokenPtoG };
-  }
-
-}
-
-module.exports = function(crowi) {
-  SlackAppIntegrationMock.crowi = crowi;
-  schema.loadClass(SlackAppIntegrationMock);
-  return mongoose.model('SlackAppIntegrationMock', schema);
-};

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

@@ -1,55 +1,51 @@
-// const crypto = require('crypto');
-// const mongoose = require('mongoose');
-
-// const schema = new mongoose.Schema({
-//   tokenGtoP: { type: String, required: true, unique: true },
-//   tokenPtoG: { type: String, required: true, unique: true },
-//   isPrimary: { type: Boolean, unique: true, sparse: true },
-//   supportedCommandsForBroadcastUse: { type: [String], default: [] },
-//   supportedCommandsForSingleUse: { type: [String], default: [] },
-// });
-
-// class SlackAppIntegration {
-
-//   crowi;
-
-//   static generateAccessTokens(saltForGtoP, saltForPtoG) {
-//     const now = new Date().getTime();
-//     const hasher1 = crypto.createHash('sha512');
-//     const hasher2 = crypto.createHash('sha512');
-//     const tokenGtoP = hasher1.update(`gtop-${saltForGtoP}-${now.toString()}`).digest('base64');
-//     const tokenPtoG = hasher2.update(`ptog-${saltForPtoG}-${now.toString()}`).digest('base64');
-//     return [tokenGtoP, tokenPtoG];
-//   }
-
-//   static async generateUniqueAccessTokens() {
-//     let duplicateTokens;
-//     let tokenGtoP;
-//     let tokenPtoG;
-//     let generateTokens;
-
-//     // get salt strings
-//     const saltForGtoP = this.crowi.configManager.getConfig('crowi', 'slackbot:withProxy:saltForGtoP');
-//     const saltForPtoG = this.crowi.configManager.getConfig('crowi', 'slackbot:withProxy:saltForPtoG');
-
-//     do {
-//       generateTokens = this.generateAccessTokens(saltForGtoP, saltForPtoG);
-//       tokenGtoP = generateTokens[0];
-//       tokenPtoG = generateTokens[1];
-//       // eslint-disable-next-line no-await-in-loop
-//       duplicateTokens = await this.findOne({ $or: [{ tokenGtoP }, { tokenPtoG }] });
-//     } while (duplicateTokens != null);
-
-
-//     return { tokenGtoP, tokenPtoG };
-//   }
-
-// }
-
-// module.exports = function(crowi) {
-
-//   SlackAppIntegration.crowi = crowi;
-
-//   schema.loadClass(SlackAppIntegration);
-//   return mongoose.model('SlackAppIntegration', schema);
-// };
+const crypto = require('crypto');
+const mongoose = require('mongoose');
+
+const permittedChannelsForEachCommandSchema = new mongoose.Schema({
+  channelsObject: Map,
+});
+
+
+const schema = new mongoose.Schema({
+  tokenGtoP: { type: String, required: true, unique: true },
+  tokenPtoG: { type: String, required: true, unique: true },
+  permissionsForBroadcastUseCommands: Map,
+  permissionsForSingleUseCommands: Map,
+});
+
+class SlackAppIntegration {
+
+  static generateAccessTokens() {
+    const now = new Date().getTime();
+    const hasher1 = crypto.createHash('sha512');
+    const hasher2 = crypto.createHash('sha512');
+    const tokenGtoP = hasher1.update(`gtop${now.toString()}${process.env.SALT_FOR_GTOP_TOKEN}`).digest('base64');
+    const tokenPtoG = hasher2.update(`ptog${now.toString()}${process.env.SALT_FOR_PTOG_TOKEN}`).digest('base64');
+    return [tokenGtoP, tokenPtoG];
+  }
+
+  static async generateUniqueAccessTokens() {
+    let duplicateTokens;
+    let tokenGtoP;
+    let tokenPtoG;
+    let generateTokens;
+
+    do {
+      generateTokens = this.generateAccessTokens();
+      tokenGtoP = generateTokens[0];
+      tokenPtoG = generateTokens[1];
+      // eslint-disable-next-line no-await-in-loop
+      duplicateTokens = await this.findOne({ $or: [{ tokenGtoP }, { tokenPtoG }] });
+    } while (duplicateTokens != null);
+
+
+    return { tokenGtoP, tokenPtoG };
+  }
+
+}
+
+module.exports = function(crowi) {
+  SlackAppIntegration.crowi = crowi;
+  schema.loadClass(SlackAppIntegration);
+  return mongoose.model('SlackAppIntegration', schema);
+};

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

@@ -56,7 +56,7 @@ module.exports = (crowi) => {
   const csrf = require('../../middlewares/csrf')(crowi);
   const apiV3FormValidator = require('../../middlewares/apiv3-form-validator')(crowi);
 
-  const SlackAppIntegrationMock = mongoose.model('SlackAppIntegrationMock');
+  const SlackAppIntegration = mongoose.model('SlackAppIntegration');
 
   const validator = {
     botType: [
@@ -101,7 +101,7 @@ module.exports = (crowi) => {
   }
 
   async function resetAllBotSettings(initializedType) {
-    await SlackAppIntegrationMock.deleteMany();
+    await SlackAppIntegration.deleteMany();
 
     const params = {
       'slackbot:currentBotType': initializedType,
@@ -211,11 +211,11 @@ module.exports = (crowi) => {
     }
     else {
       try {
-        const slackAppIntegrations = await SlackAppIntegrationMock.find();
+        const slackAppIntegrations = await SlackAppIntegration.find();
         settings.slackAppIntegrations = slackAppIntegrations;
       }
       catch (e) {
-        errorMsg = 'Error occured in finding SlackAppIntegrationMock entities.';
+        errorMsg = 'Error occured in finding SlackAppIntegration entities.';
         errorCode = 'get-slackappintegration-failed';
         logger.error(errorMsg, e);
       }
@@ -379,18 +379,18 @@ module.exports = (crowi) => {
    *            description: Succeeded to create slack app integration
    */
   router.post('/slack-app-integrations', loginRequiredStrictly, adminRequired, csrf, async(req, res) => {
-    const SlackAppIntegrationMock = mongoose.model('SlackAppIntegrationMock');
-    const SlackAppIntegrationMockRecordsNum = await SlackAppIntegrationMock.countDocuments();
-    if (SlackAppIntegrationMockRecordsNum >= 10) {
+    const SlackAppIntegration = mongoose.model('SlackAppIntegration');
+    const SlackAppIntegrationRecordsNum = await SlackAppIntegration.countDocuments();
+    if (SlackAppIntegrationRecordsNum >= 10) {
       const msg = 'Not be able to create more than 10 slack workspace integration settings';
       logger.error('Error', msg);
       return res.apiv3Err(new ErrorV3(msg, 'create-slackAppIntegeration-failed'), 500);
     }
 
-    const { tokenGtoP, tokenPtoG } = await SlackAppIntegrationMock.generateUniqueAccessTokens();
+    const { tokenGtoP, tokenPtoG } = await SlackAppIntegration.generateUniqueAccessTokens();
     try {
       // MOCK DATA DELETE THIS GW-6972 ---------------
-      /* This code represents the creation of the new SlackAppIntegrationMock model instance. */
+      /* This code represents the creation of the new SlackAppIntegration model instance. */
       const initialSupportedCommandsForBroadcastUse = new Map();
       const initialSupportedCommandsForSingleUse = new Map();
       defaultSupportedCommandsNameForBroadcastUse.forEach((commandName) => {
@@ -399,7 +399,7 @@ module.exports = (crowi) => {
       defaultSupportedCommandsNameForSingleUse.forEach((commandName) => {
         initialSupportedCommandsForSingleUse.set(commandName, true);
       });
-      const slackAppTokensMOCK = await SlackAppIntegrationMock.create({
+      const slackAppTokensMOCK = await SlackAppIntegration.create({
         tokenGtoP,
         tokenPtoG,
         permissionsForBroadcastUseCommands: initialSupportedCommandsForBroadcastUse,
@@ -429,16 +429,16 @@ module.exports = (crowi) => {
    *            description: Succeeded to delete access tokens for slack
    */
   router.delete('/slack-app-integrations/:id', validator.deleteIntegration, apiV3FormValidator, async(req, res) => {
-    const SlackAppIntegrationMock = mongoose.model('SlackAppIntegrationMock');
+    const SlackAppIntegration = mongoose.model('SlackAppIntegration');
     const { id } = req.params;
 
     try {
-      const response = await SlackAppIntegrationMock.findOneAndDelete({ _id: id });
+      const response = await SlackAppIntegration.findOneAndDelete({ _id: id });
 
       // update primary
-      const countOfPrimary = await SlackAppIntegrationMock.countDocuments({ isPrimary: true });
+      const countOfPrimary = await SlackAppIntegration.countDocuments({ isPrimary: true });
       if (countOfPrimary === 0) {
-        await SlackAppIntegrationMock.updateOne({}, { isPrimary: true });
+        await SlackAppIntegration.updateOne({}, { isPrimary: true });
       }
 
       return res.apiv3({ response });
@@ -463,7 +463,7 @@ module.exports = (crowi) => {
     catch (error) {
       const msg = 'Error occured in updating Custom bot setting';
       logger.error('Error', error);
-      return res.apiv3Err(new ErrorV3(msg, 'delete-SlackAppIntegrationMock-failed'), 500);
+      return res.apiv3Err(new ErrorV3(msg, 'delete-SlackAppIntegration-failed'), 500);
     }
 
   });
@@ -487,7 +487,7 @@ module.exports = (crowi) => {
     const { id } = req.params;
 
     try {
-      await SlackAppIntegrationMock.bulkWrite([
+      await SlackAppIntegration.bulkWrite([
         // unset isPrimary for others
         {
           updateMany: {
@@ -507,7 +507,7 @@ module.exports = (crowi) => {
       return res.apiv3();
     }
     catch (error) {
-      const msg = 'Error occurred during making SlackAppIntegrationMock primary';
+      const msg = 'Error occurred during making SlackAppIntegration primary';
       logger.error('Error', error);
       return res.apiv3Err(new ErrorV3(msg, 'making-primary-failed'), 500);
     }
@@ -532,8 +532,8 @@ module.exports = (crowi) => {
     const { id } = req.params;
 
     try {
-      const { tokenGtoP, tokenPtoG } = await SlackAppIntegrationMock.generateUniqueAccessTokens();
-      const slackAppTokens = await SlackAppIntegrationMock.findByIdAndUpdate(id, { tokenGtoP, tokenPtoG });
+      const { tokenGtoP, tokenPtoG } = await SlackAppIntegration.generateUniqueAccessTokens();
+      const slackAppTokens = await SlackAppIntegration.findByIdAndUpdate(id, { tokenGtoP, tokenPtoG });
 
       return res.apiv3(slackAppTokens, 200);
     }
@@ -562,11 +562,11 @@ module.exports = (crowi) => {
     const { supportedCommandsForBroadcastUse, supportedCommandsForSingleUse } = req.body;
     const { id } = req.params;
 
-    const SlackAppIntegrationMock = mongoose.model('SlackAppIntegrationMock');
+    // const slackAppIntegration = mongoose.model('SlackAppIntegration');
 
     try {
       // NOT MOCK DATA BUT REFER THIS GW-7006
-      const slackAppIntegration = await SlackAppIntegrationMock.findByIdAndUpdate(
+      const slackAppIntegration = await SlackAppIntegration.findByIdAndUpdate(
         id,
         { supportedCommandsForBroadcastUse, supportedCommandsForSingleUse },
         { new: true },
@@ -585,7 +585,7 @@ module.exports = (crowi) => {
       const permissionsForSingleUseCommandsFromClient = {
         create: ['random'],
       };
-      const slackAppIntegrationMock = await SlackAppIntegrationMock.findOneAndUpdate(
+      const SlackAppIntegration = await SlackAppIntegration.findOneAndUpdate(
         // MOCK DATA USE id IN req.params LIKE ABOVE
         { tokenPtoG: slackAppIntegration.tokenPtoG },
         {
@@ -596,17 +596,17 @@ module.exports = (crowi) => {
       );
 
       await requestToProxyServer(
-        slackAppIntegrationMock.tokenGtoP,
+        SlackAppIntegration.tokenGtoP,
         'put',
         '/g2s/supported-commands',
         {
-          permissionsForBroadcastUseCommands: slackAppIntegrationMock.permissionsForBroadcastUseCommands,
-          permissionsForSingleUseCommands: slackAppIntegrationMock.permissionsForSingleUseCommands,
+          permissionsForBroadcastUseCommands: SlackAppIntegration.permissionsForBroadcastUseCommands,
+          permissionsForSingleUseCommands: SlackAppIntegration.permissionsForSingleUseCommands,
         },
       );
       // MOCK DATA MODIFY THIS GW-6972 ---------------
 
-      return res.apiv3({ slackAppIntegrationMock });
+      return res.apiv3({ SlackAppIntegration });
     }
     catch (error) {
       const msg = `Error occured in updating settings. Cause: ${error.message}`;
@@ -645,25 +645,23 @@ module.exports = (crowi) => {
     let slackBotToken;
     try {
       // MOCK DATA DELETE THIS GW-6972 ---------------
-      const SlackAppIntegrationMock = mongoose.model('SlackAppIntegrationMock');
-      const slackAppIntegrationMock = await SlackAppIntegrationMock.findOne({ _id: id });
+      const SlackAppIntegration = mongoose.model('SlackAppIntegration');
+      const slackAppIntegration = await SlackAppIntegration.findOne({ _id: id });
       // MOCK DATA DELETE THIS GW-6972 ---------------
-      if (slackAppIntegrationMock == null) {
-        const msg = 'Could not find SlackAppIntegrationMock by id';
+      if (slackAppIntegration == null) {
+        const msg = 'Could not find SlackAppIntegration by id';
         return res.apiv3Err(new ErrorV3(msg, 'find-slackAppIntegration-failed'), 400);
       }
 
       // USE MOCK DATA HERE FOR cache creation at /relation-test GW-7021
-      console.log(slackAppIntegrationMock.tokenGtoP);
-      console.log(slackAppIntegrationMock.permissionsForBroadcastUseCommands);
-      console.log(slackAppIntegrationMock.permissionsForSingleUseCommands);
+
       const result = await requestToProxyServer(
-        slackAppIntegrationMock.tokenGtoP,
+        slackAppIntegration.tokenGtoP,
         'post',
         '/g2s/relation-test',
         {
-          permissionsForBroadcastUseCommands: slackAppIntegrationMock.permissionsForBroadcastUseCommands,
-          permissionsForSingleUseCommands: slackAppIntegrationMock.permissionsForSingleUseCommands,
+          permissionsForBroadcastUseCommands: slackAppIntegration.permissionsForBroadcastUseCommands,
+          permissionsForSingleUseCommands: slackAppIntegration.permissionsForSingleUseCommands,
         },
       );
 

packages/app/src/server/routes/apiv3/slack-integration.js

@@ -8,7 +8,7 @@ const { verifySlackRequest, generateWebClient, getSupportedGrowiActionsRegExps }
 
 const logger = loggerFactory('growi:routes:apiv3:slack-integration');
 const router = express.Router();
-const SlackAppIntegrationMock = mongoose.model('SlackAppIntegrationMock');
+const SlackAppIntegration = mongoose.model('SlackAppIntegration');
 const { respondIfSlackbotError } = require('../../service/slack-command-handler/respond-if-slackbot-error');
 
 module.exports = (crowi) => {
@@ -26,16 +26,16 @@ module.exports = (crowi) => {
       return res.status(400).send({ message });
     }
 
-    // const slackAppIntegrationCount = await SlackAppIntegrationMock.countDocuments({ tokenPtoG });
+    // const slackAppIntegrationCount = await SlackAppIntegration.countDocuments({ tokenPtoG });
     // MOCK DATA MODIFY THIS WITH SlackAppIntegration GW-7006 --------------
-    const slackAppIntegrationMockCount = await SlackAppIntegrationMock.countDocuments({ tokenPtoG });
+    const SlackAppIntegrationCount = await SlackAppIntegration.countDocuments({ tokenPtoG });
 
     logger.debug('verifyAccessTokenFromProxy', {
       tokenPtoG,
-      slackAppIntegrationMockCount,
+      SlackAppIntegrationCount,
     });
 
-    if (slackAppIntegrationMockCount === 0) {
+    if (SlackAppIntegrationCount === 0) {
       return res.status(403).send({
         message: 'The access token that identifies the request source is slackbot-proxy is invalid. Did you setup with `/growi register`.\n'
         + 'Or did you delete registration for GROWI ? if so, the link with GROWI has been disconnected. '
@@ -59,10 +59,10 @@ module.exports = (crowi) => {
 
     // const relation = await SlackAppIntegration.findOne({ tokenPtoG });
     // MOCK DATA DELETE THIS GW-6972 ---------------
-    const SlackAppIntegrationMock = mongoose.model('SlackAppIntegrationMock');
-    const slackAppIntegrationMock = await SlackAppIntegrationMock.findOne({ tokenPtoG });
-    const permissionsForBroadcastUseCommands = slackAppIntegrationMock.permissionsForBroadcastUseCommands;
-    const permissionsForSingleUseCommands = slackAppIntegrationMock.permissionsForSingleUseCommands;
+    // const SlackAppIntegration = mongoose.model('SlackAppIntegration');
+    const slackAppIntegration = await SlackAppIntegration.findOne({ tokenPtoG });
+    const permissionsForBroadcastUseCommands = slackAppIntegration.permissionsForBroadcastUseCommands;
+    const permissionsForSingleUseCommands = slackAppIntegration.permissionsForSingleUseCommands;
     // MOCK DATA DELETE THIS GW-6972 ---------------
     // const { supportedCommandsForBroadcastUse, supportedCommandsForSingleUse } = relation;
 
@@ -224,9 +224,8 @@ module.exports = (crowi) => {
   router.get('/supported-commands', verifyAccessTokenFromProxy, async(req, res) => {
     const tokenPtoG = req.headers['x-growi-ptog-tokens'];
     // MOCK DATA DELETE THIS GW-6972 ---------
-    const SlackAppIntegrationMock = mongoose.model('SlackAppIntegrationMock');
-    const slackAppIntegrationMock = await SlackAppIntegrationMock.findOne({ tokenPtoG });
-    const { permissionsForBroadcastUseCommands, permissionsForSingleUseCommands } = slackAppIntegrationMock;
+    const slackAppIntegration = await SlackAppIntegration.findOne({ tokenPtoG });
+    const { permissionsForBroadcastUseCommands, permissionsForSingleUseCommands } = slackAppIntegration;
     return res.apiv3({ permissionsForBroadcastUseCommands, permissionsForSingleUseCommands });
     // MOCK DATA DELETE THIS GW-6972 ---------
 

packages/app/src/server/service/slack-integration.ts

@@ -128,9 +128,9 @@ export class SlackIntegrationService implements S2sMessageHandlable {
   async generateClientByTokenPtoG(tokenPtoG: string): Promise<WebClient> {
     this.isCheckTypeValid();
 
-    const SlackAppIntegrationMock = mongoose.model('SlackAppIntegrationMock');
+    const SlackAppIntegration = mongoose.model('SlackAppIntegration');
 
-    const slackAppIntegration = await SlackAppIntegrationMock.findOne({ tokenPtoG });
+    const slackAppIntegration = await SlackAppIntegration.findOne({ tokenPtoG });
 
     if (slackAppIntegration == null) {
       throw new Error('No SlackAppIntegration exists that corresponds to the tokenPtoG specified.');
@@ -153,7 +153,7 @@ export class SlackIntegrationService implements S2sMessageHandlable {
     }
 
     // retrieve primary SlackAppIntegration
-    const SlackAppIntegration = mongoose.model('SlackAppIntegrationMock');
+    const SlackAppIntegration = mongoose.model('SlackAppIntegration');
     const slackAppIntegration = await SlackAppIntegration.findOne({ isPrimary: true });
 
     if (slackAppIntegration == null) {