ti2-tourplan 1.0.113 → 1.0.116-beta.0

package/.github/workflows/nodejs.yml

@@ -1,7 +1,6 @@
 name: Node.js Package
 
 on:
-  workflow_dispatch:
   push:
 
 jobs:
@@ -20,23 +19,45 @@ jobs:
           ti2_tourplan_endpoint: ${{ secrets.TOURPLAN_ENDPOINT }}
           ti2_tourplan_username: ${{ secrets.TOURPLAN_USERNAME }}
           ti2_tourplan_password: ${{ secrets.TOURPLAN_PASSWORD }}
-  tag:
-    if: github.ref == 'refs/heads/main'
+  publish-npm:
+    if: startsWith(github.ref, 'refs/tags/v')
     needs: build_and_test
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: tool3/bump@master
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          unrelated: true
-          branch: main
-  publish-npm:
-    if: github.ref == 'refs/heads/main'
-    needs: tag
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: JS-DevTools/npm-publish@v1
+      - uses: actions/setup-node@v1
         with:
-          token: ${{ secrets.NPM_TOKEN }}
+          node-version: 12
+      - name: Validate release tag
+        id: release_meta
+        env:
+          TAG_NAME: ${{ github.ref_name }}
+        run: |
+          set -euo pipefail
+
+          if [[ ! "$TAG_NAME" =~ ^v([0-9]+\.[0-9]+\.[0-9]+(-beta\.[0-9]+)?)$ ]]; then
+            echo "Unsupported release tag format: $TAG_NAME"
+            exit 1
+          fi
+
+          TAG_VERSION="${BASH_REMATCH[1]}"
+          PACKAGE_VERSION="$(node -p "require('./package.json').version")"
+
+          if [[ "$TAG_VERSION" != "$PACKAGE_VERSION" ]]; then
+            echo "Tag version ${TAG_VERSION} does not match package.json version ${PACKAGE_VERSION}"
+            exit 1
+          fi
+
+          DIST_TAG="latest"
+          if [[ "$TAG_VERSION" == *-beta.* ]]; then
+            DIST_TAG="beta"
+          fi
+
+          echo "tag_version=${TAG_VERSION}" >> "$GITHUB_OUTPUT"
+          echo "dist_tag=${DIST_TAG}" >> "$GITHUB_OUTPUT"
+      - name: Configure npm auth
+        run: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+      - name: Publish package
+        run: npm publish --tag "${{ steps.release_meta.outputs.dist_tag }}"

package/index.js

@@ -25,6 +25,7 @@ const defaultXmlOptions = {
     name: 'tourConnect_4_00_000.dtd',
   },
 };
+const urlRegExp = /^(?!mailto:)(?:(?:http|https|ftp):\/\/)(?:\S+(?::\S*)?@)?(?:(?:(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[0-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))|localhost)(?::\d{2,5})?(?:(\/|\?|#)[^\s]*)?$/i;
 const getHeaders = ({ length }) => ({
   Accept: 'application/xml',
   'Content-Type': 'application/xml; charset=utf-8',
@@ -39,20 +40,18 @@ class BuyerPlugin {
     this.tokenTemplate = () => ({
       endpoint: {
         type: 'text',
-        regExp: /^(?!mailto:)(?:(?:http|https|ftp):\/\/)(?:\S+(?::\S*)?@)?(?:(?:(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[0-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))|localhost)(?::\d{2,5})?(?:(\/|\?|#)[^\s]*)?$/i,
+        regExp: urlRegExp,
         description: 'The uri for the tourplan adapter',
       },
       username: {
         type: 'text',
         regExp: /.+/,
         description: 'The tourplan provided username',
-        default: 'en',
       },
       password: {
         type: 'text',
         regExp: /.+/,
         description: 'The tourplan provided password',
-        default: 'en',
       },
       hostConnectEndpoint: {
         type: 'text',
@@ -66,6 +65,11 @@ class BuyerPlugin {
         type: 'text',
         regExp: /.+/,
       },
+      hostConnectBookingLinkBaseUrl: {
+        type: 'text',
+        regExp: urlRegExp,
+        description: 'The HostConnect booking page url used by the add-in to build booking reference links',
+      },
       productConnectEndpoint: {
         type: 'text',
         regExp: /.+/,
@@ -418,6 +422,8 @@ class BuyerPlugin {
         return true;
       }
 
+      assert(username, 'Must provide token.username for authentication');
+      assert(password, 'Must provide token.password for authentication');
       const model = {
         AuthenticationRequest: {
           Login: username,
@@ -439,9 +445,9 @@ class BuyerPlugin {
   async queryAllotment({
     axios,
     token: {
-      endpoint = this.endpoint,
-      username = this.username,
-      password = this.password,
+      endpoint,
+      username,
+      password,
     },
     payload: {
       dateFormat = 'DD/MM/YYYY',
@@ -456,6 +462,8 @@ class BuyerPlugin {
       (inputString || '').toString()
         .replaceAll(username, '****').replaceAll(password, '****');
     assert(endpoint);
+    assert(username, 'Must provide token.username for allotment API');
+    assert(password, 'Must provide token.password for allotment API');
     assert(startDate);
     assert(endDate);
     assert(keyPath, 'Must provide a supplier/product spec');

package/index.test.js

@@ -104,6 +104,7 @@ describe('search tests', () => {
     hostConnectEndpoint: 'https://test_hostConnectEndpoint.com',
     hostConnectAgentID: 'test_hostConnectAgentID',
     hostConnectAgentPassword: 'test_hostConnectAgentPassword',
+    hostConnectBookingLinkBaseUrl: 'https://example.tourplan.net/TourplanNX_Test/#/fastbook',
     seeAvailabilityRateInSupplierCurrency: 'Y',
   };
   const dateFormat = 'DD/MM/YYYY';
@@ -134,6 +135,7 @@ describe('search tests', () => {
         expect(rules).toContain('endpoint');
         expect(rules).toContain('password');
         expect(rules).toContain('username');
+        expect(rules).toContain('hostConnectBookingLinkBaseUrl');
       });
       it('username', () => {
         const username = template.username.regExp;
@@ -150,6 +152,13 @@ describe('search tests', () => {
         expect(password.test('')).toBeFalsy();
         expect(password.test('somepassword')).toBeTruthy();
       });
+      it('hostConnectBookingLinkBaseUrl', () => {
+        const hostConnectBookingLinkBaseUrl = template.hostConnectBookingLinkBaseUrl.regExp;
+        expect(hostConnectBookingLinkBaseUrl.test('something')).toBeFalsy();
+        expect(hostConnectBookingLinkBaseUrl.test(
+          'https://example.tourplan.net/TourplanNX_Test/#/fastbook'
+        )).toBeTruthy();
+      });
     });
     describe('DTD version detection', () => {
       it('should detect and use correct DTD version from error response', async () => {

package/normalizer.js

@@ -63,7 +63,7 @@ const normalizeDate = date => {
   return [year, month, day].join('-');
 };
 
-const getConsectuiveDays = days => {
+const getConsecutiveDays = days => {
   const dayNumbers = _.map(days, mapDaysToNumbers).sort();
   let firstDay;
   let lastDay;
@@ -121,7 +121,7 @@ module.exports = {
       if (days.length === 7) return 'Everyday';
       if (days.length === 1) return `${days[0]} Only`;
 
-      consecutiveDays = getConsectuiveDays(days);
+      consecutiveDays = getConsecutiveDays(days);
       return consecutiveDays || days.join(', ');
     }
     return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti2-tourplan",
-  "version": "1.0.113",
+  "version": "1.0.116-beta.0",
   "description": "Tourplan's TI2 Plugin",
   "main": "index.js",
   "scripts": {
@@ -21,8 +21,8 @@
     "coveragePathIgnorePatterns": [
       "/node_modules/"
     ],
-		"setupFiles": [
-        "./jest.timezone.js"
+    "setupFiles": [
+      "./jest.timezone.js"
     ],
     "setupFilesAfterEnv": [
       "./jest.setup.js"