ti2 1.0.64 → 1.0.65

package/api.yml

@@ -1027,6 +1027,77 @@ paths:
           content:
             application/json:
                 $ref: '#/components/schemas/Status'
+  /{appKey}/{userId}/affiliates:
+    get:
+      security:
+        - bearerAuth: ['admin', 'user']
+      tags:
+        - bookings
+      summary: Gets all affiliates for this user
+      operationId: getAffiliates
+      parameters:
+        - name: appKey
+          in: path
+          description: name of the app to get the affiliates for (defaults to first token found)
+          required: true
+          example: 'xola'
+          schema:
+            type: string
+        - name: userId
+          in: path
+          description: the user/company that the appKey belongs to
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: affiliates
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  affiliates:
+                    type: array
+  /{appKey}/{userId}/{hint}/affiliates:
+    get:
+      security:
+        - bearerAuth: ['admin', 'user']
+      tags:
+        - bookings
+      summary: Gets all affiliates for this user
+      operationId: getAffiliates
+      parameters:
+        - name: appKey
+          in: path
+          description: name of the app to get the affiliates for the token using the hint
+          required: true
+          example: 'xola'
+          schema:
+            type: string
+        - name: userId
+          in: path
+          description: the user/company that the appKey belongs to
+          required: true
+          schema:
+            type: string
+        - name: hint
+          in: path
+          description: a specific token hint to be used
+          required: true
+          example: 'xola-helloworld'
+          schema:
+            type: string
+      responses:
+        '200':
+          description: affiliates
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  affiliates:
+                    type: array
   /affiliate/{appKey}/{userId}/desks:
     get:
       security:
@@ -1865,6 +1936,78 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/AnyValue'
+  /bookings/{appKey}/{userId}/custom-fields:
+    get:
+      security:
+        - bearerAuth: ['admin', 'user']
+      tags:
+        - bookings
+      summary: Gets all custom fields for creating a booking
+      operationId: getCreateBookingFields
+      parameters:
+        - name: appKey
+          in: path
+          description: name of the app to get the resource for (defaults to first token found)
+          required: true
+          example: 'fareharbor'
+          schema:
+            type: string
+        - name: userId
+          in: path
+          description: the user/company that the appKey belongs to
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: fields
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  fields:
+                    type: array
+  /bookings/{appKey}/{userId}/{hint}/custom-fields:
+    get:
+      security:
+        - bearerAuth: ['admin', 'user']
+      tags:
+        - bookings
+      summary: Gets all custom fields for creating a booking
+      operationId: getCreateBookingFields
+      parameters:
+        - name: appKey
+          in: path
+          description: name of the app to get the resource for the token using the hint
+          required: true
+          example: 'xola'
+          schema:
+            type: string
+        - name: userId
+          in: path
+          description: the user/company that the appKey belongs to
+          required: true
+          schema:
+            type: string
+        - name: hint
+          in: path
+          description: a specific token hint to be used
+          required: true
+          example: 'xola-helloworld'
+          schema:
+            type: string
+      responses:
+        '200':
+          description: fields
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  fields:
+                    type: array
+  
   /allotment/{appKey}/{userId}:
     get:
       security:

package/controllers/app.js

@@ -200,6 +200,37 @@ const validateAppToken = plugins => async (req, res, next) => {
   }
 };
 
+const getAffiliates = plugins => async (req, res, next) => {
+  const {
+    axios,
+    params: { appKey, userId, hint },
+    body: payload,
+  } = req;
+  try {
+    const app = plugins.find(({ name }) => name === appKey);
+    assert(app, `could not find the app ${appKey}`);
+    const userAppKeys = await sqldb.UserAppKey.findOne({
+      where: {
+        userId,
+        integrationId: appKey,
+        ...(hint ? { hint } : {}),
+      },
+    });
+    assert(userAppKeys, 'could not find the app key');
+    const token = await userAppKeys.token;
+    assert(app.getAffiliates, `could not find the getAffiliates method for ${appKey}`);
+    const retVal = await app.getAffiliates({
+      axios,
+      token,
+      requestId: req.requestId,
+      payload,
+    });
+    return res.json(retVal);
+  } catch (err) {
+    return next(err);
+  }
+};
+
 const listAppTokens = async (req, res, next) => {
   const { params: { app: integrationId } } = req;
   try {
@@ -428,4 +459,5 @@ module.exports = plugins => ({
   runAppJob,
   tokenTemplate,
   validateAppToken: validateAppToken(plugins),
+  getAffiliates: getAffiliates(plugins),
 });

package/controllers/bookings.js

@@ -365,6 +365,37 @@ const getPickupPoints = plugins => async (req, res, next) => {
   }
 };
 
+const getCreateBookingFields = plugins => async (req, res, next) => {
+  const {
+    axios,
+    params: { appKey, userId, hint },
+    body: payload,
+  } = req;
+  try {
+    const app = plugins.find(({ name }) => name === appKey);
+    // const app = load(appKey);
+    const userAppKeys = (await UserAppKey.findOne({
+      where: {
+        userId,
+        integrationId: appKey,
+        ...(hint ? { hint } : {}),
+      },
+    }));
+    assert(userAppKeys, 'could not find the app key');
+    const token = await userAppKeys.token;
+    assert(app.getCreateBookingFields, `getCreateBookingFields is not available for ${appKey}`);
+    const results = await app.getCreateBookingFields({
+      axios,
+      token,
+      payload,
+      typeDefsAndQueries,
+    });
+    return res.json(results);
+  } catch (err) {
+    return next(err);
+  }
+};
+
 module.exports = plugins => ({
   bookingsSearch: bookingsSearch(plugins),
   bookingsCancel: bookingsCancel(plugins),
@@ -378,4 +409,5 @@ module.exports = plugins => ({
   getAffiliateAgents: getAffiliateAgents(plugins),
   getAffiliateDesks: getAffiliateDesks(plugins),
   getPickupPoints: getPickupPoints(plugins),
+  getCreateBookingFields: getCreateBookingFields(plugins),
 });

package/index.js

@@ -21,6 +21,7 @@ const cacheSettings = {
     'getAffiliateDesks',
     'getPickupPoints',
     'bookingsProductSearch',
+    'getCreateBookingFields',
   ],
   ventrata: [],
   fareharbor: [],
@@ -274,7 +275,7 @@ module.exports = async ({
           }
           const realSend = res.json;
           res.json = newData => { // new res.json
-            if (res.statusCode === 200) {
+            if (res.statusCode === 200 || res.statusCode === 304) {
               cache.save({
                 pluginName: req.pathParams.appKey,
                 key: cacheKey,

package/package.json

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