ti2 1.0.74 → 1.0.76

package/api.yml

@@ -680,6 +680,43 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Message'
+    put:
+      tags:
+        - app
+        - user
+      summary: Should update a user+appToken configuration
+      security:
+        - bearerAuth: ['admin', 'app', 'user']
+      operationId: updateAppToken
+      parameters:
+        - name: app
+          in: path
+          description: app name to read the userId for (must match app token)
+          example: 'expedia'
+          required: true
+          schema:
+            type: string
+        - name: userId
+          in: path
+          description: user to read the app token for
+          example: '536830b6ed19afa44a000002'
+          required: true
+          schema:
+            type: string
+      requestBody:
+        description: The User+App configuration to update
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/UserAppDelete'
+      responses:
+        200:
+          description: success
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Message'
   /{app}/{userId}/{hint}/token:
     get:
       tags:

package/controllers/app.js

@@ -141,6 +141,33 @@ const createAppToken = async (req, res, next) => {
   }
 };
 
+const updateAppToken = async (req, res, next) => {
+  const {
+    body: {
+      configuration,
+      hint,
+    },
+    params: {
+      app: integrationId,
+      userId,
+    },
+  } = req;
+  // check if the user exists
+  const userRecord = await sqldb.User.findOne({ where: { userId } });
+  if (!userRecord) return next({ status: 404, message: 'User does not exists' });
+  await sqldb.UserAppKey.update({
+    configuration,
+  }, {
+    where: {
+      integrationId,
+      userId,
+      hint,
+    },
+    raw: true,
+  });
+  return res.json({ message: `${hint} updated ` });
+};
+
 const deleteAppToken = async (req, res, next) => {
   const {
     body: {
@@ -449,6 +476,7 @@ module.exports = plugins => ({
   getAppToken,
   createAppSettings,
   getAppSettings,
+  updateAppToken,
   deleteAppToken,
   deleteAppSettings,
   getAppScheduledJobs,

package/controllers/graphql-schemas/booking.js

@@ -42,6 +42,7 @@ const typeDefs = `
   type Query {
     id: ID
     orderId: ID
+    orderReference: String
     bookingId: ID
     supplierBookingId: ID
     status: String

package/migrations/20221114141152-encryptUserToken.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-restricted-syntax */
 const jwt = require('jsonwebtoken');
 const R = require('ramda');
 const assert = require('assert');
@@ -10,27 +11,37 @@ const { env: { dbCryptoKey } } = process;
 module.exports = {
   up: async () => {
     // encrypt all data
-    const existingTokens = await sqldb.UserAppKey.findAll();
-    const valuesToUpdate = [];
-    for (const currentToken of existingTokens) {
-      const decodedToken = JSON.stringify(R.omit(
-        ['iat'],
-        jwt.verify(currentToken.dataValues.appKey, dbCryptoKey),
-      ));
-      const encryptedToken = encrypt(decodedToken);
-      // make sure we can decrypt it
-      const decodedValue = decrypt(encryptedToken);
-      assert(R.equals(decodedToken, decodedValue));
-      currentToken.appKey = encryptedToken;
-      valuesToUpdate.push({
-        id: currentToken.id,
-        appToken: encryptedToken,
+    try {
+      const existingTokens = await sqldb.UserAppKey.findAll({
+        attributes: ['id', 'appKey', 'userId', 'integrationId', 'hint', 'createdAt', 'updatedAt'],
       });
-    }
-    for (const { id, appToken } of valuesToUpdate) {
-      const currentToken = await sqldb.UserAppKey.findOne({ where: { id } });
-      currentToken.setDataValue('appKey', appToken);
-      await currentToken.save();
+      const valuesToUpdate = [];
+      for (const currentToken of existingTokens) {
+        const decodedToken = JSON.stringify(R.omit(
+          ['iat'],
+          jwt.verify(currentToken.dataValues.appKey, dbCryptoKey),
+        ));
+        const encryptedToken = encrypt(decodedToken);
+        // make sure we can decrypt it
+        const decodedValue = decrypt(encryptedToken);
+        assert(R.equals(decodedToken, decodedValue));
+        currentToken.appKey = encryptedToken;
+        valuesToUpdate.push({
+          id: currentToken.id,
+          appToken: encryptedToken,
+        });
+      }
+      for (const { id, appToken } of valuesToUpdate) {
+        const currentToken = await sqldb.UserAppKey.findOne({
+          where: { id },
+          attributes: ['id', 'appKey', 'userId', 'integrationId', 'hint', 'createdAt', 'updatedAt'],
+        });
+        currentToken.setDataValue('appKey', appToken);
+        await currentToken.save();
+      }
+    } catch (err) {
+      console.error(err);
+      throw err;
     }
   },
   down: async () => {

package/migrations/20240215014002-addConfigurationColumn.js

@@ -0,0 +1,12 @@
+module.exports = {
+  up: (queryInterface, Sequelize) => queryInterface.addColumn(
+    'UserAppKeys',
+    'configuration',
+    {
+      type: Sequelize.JSON,
+      allowNull: true,
+      validate: {},
+    },
+  ),
+  down: queryInterface => queryInterface.removeColumn('UserAppKeys', 'configuration'),
+};

package/models/userappkey.js

@@ -60,9 +60,14 @@ const UserAppKey = db.define('UserAppKey', {
       return {
         ...R.pathOr({}, ['settings'], userIntegrationSettings),
         ...removeEmptyAttributes(appKey),
+        ...(this.getDataValue('configuration') ? { configuration: this.getDataValue('configuration') } : {}),
       };
     },
   },
+  configuration: {
+    type: Sequelize.JSON,
+    allowNull: true,
+  },
 }, {});
 UserAppKey.associate = models => {
   UserAppKey.belongsTo(models.User, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti2",
-  "version": "1.0.74",
+  "version": "1.0.76",
   "description": "Tourist Industry Exchange (TI2)",
   "main": "index.js",
   "scripts": {