ti2 1.0.109 → 1.0.114

package/.github/workflows/deploy.yml

@@ -1,29 +1,52 @@
-name: Deploy Workflow
+name: Release Workflow
 
 on:
-  workflow_run:
-    workflows: Tests Workflow
-    branches: main
-    types: completed
   workflow_dispatch:
 
+permissions:
+  contents: write
+
 jobs:
   tag:
-    if: github.event.workflow_run.conclusion == 'success' && github.repository == 'ti2travel/ti2'
+    if: github.ref_name == 'main' && github.repository == 'ti2travel/ti2'
     runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.version.outputs.version }}
+      tag: ${{ steps.version.outputs.tag }}
     steps:
-      - uses: actions/checkout@master
-      - uses: tool3/bump@master
+      - uses: actions/checkout@v4
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          user: 'Github Action Job'
-          email: 'engineering@tourconnect.com'
-          branch: main
-  publish:
-    needs: tag
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: JS-DevTools/npm-publish@v1
+          fetch-depth: 0
+
+      - uses: actions/setup-node@v4
         with:
-          token: ${{ secrets.NPM_TOKEN }}
+          node-version: 20
+
+      - name: Determine release version
+        id: version
+        run: |
+          node <<'NODE' >> "$GITHUB_OUTPUT"
+          const version = require('./package.json').version
+          const isSemver = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?$/
+
+          if (!isSemver.test(version)) {
+            throw new Error(`Invalid version: ${version}. Use semver like 1.2.3 or 1.2.3-beta.0`)
+          }
+
+          console.log(`version=${version}`)
+          console.log(`tag=v${version}`)
+          NODE
+
+      - name: Create release tag
+        env:
+          TAG: ${{ steps.version.outputs.tag }}
+        run: |
+          git fetch --tags origin
+
+          if git rev-parse "$TAG" >/dev/null 2>&1; then
+            echo "Tag $TAG already exists"
+            exit 1
+          fi
+
+          git tag "$TAG"
+          git push origin "refs/tags/$TAG"

package/controllers/__tests__/user.js

@@ -219,6 +219,9 @@ describe('user', () => {
     expect(plugins[0].validateToken).toHaveBeenCalled();
     expect(valid).toBe(true);
     expect(plugins[0].validateToken.mock.calls[0][0].token).toEqual({ custom: true, ...token });
+    expect(plugins[0].validateToken.mock.calls[0][0].payload).toEqual({
+      tokenHint: apiKey.split('-')[0],
+    });
   });
   it('should be able to delete an app settings', async () => {
     const returnValue = await doApiDelete({

package/controllers/app.js

@@ -260,6 +260,7 @@ const validateAppToken = plugins => async (req, res, next) => {
     const valid = await app.validateToken({
       axios,
       token,
+      payload: req.body,
       requestId: req.requestId,
     });
     return res.json({ valid });

package/controllers/graphql-schemas/itinerary-booking.js

@@ -1,3 +1,6 @@
+/**
+ * SDL + document for ti2 plugins
+ */
 const typeDefs = `
   type Passenger {
     firstName: String
@@ -16,8 +19,15 @@ const typeDefs = `
     passengers: [Passenger]
   }
 
+  type PuDoInfo {
+    date: String
+    time: String
+    remarks: String
+  }
+
   type ServiceLine {
     serviceLineId: ID!
+    serviceLineUpdateCount: Int
     optionId: String!
     optionName: String
     linePrice: String
@@ -28,14 +38,20 @@ const typeDefs = `
     paxList: [Passenger]
     paxConfigs: [PaxConfig]
     status: String
+    puInfo: PuDoInfo
+    doInfo: PuDoInfo
   }
 
   type Query {
     bookingId: ID!
     name: String!
     bookingStatus: String
+    bookingStatusId: String
+    isBooking: Boolean
+    bookingAgent: String
     ref: String!
     agentRef: String
+    agentId: String
     totalPrice: String!
     currency: String!
     travelDate: String!
@@ -49,8 +65,12 @@ const query = `{
   name
   bookingId
   bookingStatus
+  bookingStatusId
+  isBooking
+  bookingAgent
   ref
   agentRef
+  agentId
   totalPrice
   currency
   travelDate
@@ -58,15 +78,25 @@ const query = `{
   canEdit
   serviceLines {
     serviceLineId
+    serviceLineUpdateCount
     linePrice
     quantity
     optionId
     optionName
     supplierId
     supplierName
-    supplierId
     startDate
     status
+    puInfo {
+      date
+      time
+      remarks
+    }
+    doInfo {
+      date
+      time
+      remarks
+    }
     paxConfigs {
       roomType
       adults

package/package.json

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