Revert "Revert "Merge in upstream v1.3.5 (#78)" (#82)" (#83)

This reverts commit bead596.

.github/workflows/codeql.yml

@@ -0,0 +1,74 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "master" ]
+  schedule:
+    - cron: '35 12 * * 5'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #   echo "Run, Build Application using script"
+    #   ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/nodejs.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16.x,18.x]
+        node-version: [16.x, 18.x, 20.x]
 
     steps:
       - uses: actions/checkout@v2
@@ -24,14 +24,13 @@ jobs:
           node-version: ${{ matrix.node-version }}
 
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: npm ci
         env:
           CI: true
           NODE_ENV: "test"
 
       - name: Run Tests
-        shell: 'script -q -e -c "bash {0}"'
-        run: yarn test
+        run: npm test
         env:
           NODE_ENV: "test"
           CI: true

.npmignore

@@ -1,6 +1,6 @@
 test
 logo
 .editorconfig
-.travis.yml
+.github
 lint
 scripts

Makefile

@@ -4,48 +4,48 @@ lint:
 
 .PHONY: test
 test:
-	./node_modules/mocha/bin/_mocha test/apple.js -R spec -b --timeout=5000 --path=false
-	./node_modules/mocha/bin/_mocha test/google.js -R spec -b --path=false --pk=false
-	./node_modules/mocha/bin/_mocha test/amazon.js -R spec -b --timeout=5000 --sharedKey=false --path=false
-	./node_modules/mocha/bin/_mocha test/windows.js -R spec -b --timeout=5000 --path=false
-	#./node_modules/mocha/bin/_mocha test/facebook.js -R spec -b --timeout=5000 --appAccessToken=false --path=false
+	npx mocha test/apple.js -R spec -b --timeout=5000 --path=false
+	npx mocha test/google.js -R spec -b --path=false --pk=false
+	npx mocha test/amazon.js -R spec -b --timeout=5000 --sharedKey=false --path=false
+	npx mocha test/windows.js -R spec -b --timeout=5000 --path=false
+	#npx mocha test/facebook.js -R spec -b --timeout=5000 --appAccessToken=false --path=false
 
 .PHONY: aptest
 aptest:
-	./node_modules/mocha/bin/_mocha test/apple.js -R spec -b --timeout=5000 --path=false
+	npx mocha test/apple.js -R spec -b --timeout=5000 --path=false
 
 .PHONY: gotest
 gotest:
-	./node_modules/mocha/bin/_mocha test/google.js -R spec -b --path=false --pk=false
+	npx mocha test/google.js -R spec -b --path=false --pk=false
 
 .PHONY: amtest
 amtest:
-	./node_modules/mocha/bin/_mocha test/amazon.js -R spec -b --timeout=5000 --sharedKey=false --path=false	
+	npx mocha test/amazon.js -R spec -b --timeout=5000 --sharedKey=false --path=false
 
 .PHONY: witest
 witest:
-	./node_modules/mocha/bin/_mocha test/windows.js -R spec -b --timeout=5000 --path=false
+	npx mocha test/windows.js -R spec -b --timeout=5000 --path=false
 
 .PHONY: fatest
 witest:
-	./node_modules/mocha/bin/_mocha test/facebook.js -R spec -b --timeout=5000 --appAccessToken=false --path=false
+	npx mocha test/facebook.js -R spec -b --timeout=5000 --appAccessToken=false --path=false
 
 .PHONY: test-apple
 test-apple:
-	./node_modules/mocha/bin/_mocha test/apple.js -R spec -b --timeout=5000 --path=$(path)
+	npx mocha test/apple.js -R spec -b --timeout=5000 --path=$(path)
 
 .PHONY: test-google
 test-google:
-	./node_modules/mocha/bin/_mocha test/google.js -R spec -b --path=$(path) --pk=$(pk)
+	npx mocha test/google.js -R spec -b --path=$(path) --pk=$(pk)
 
 .PHONY: test-windows
 test-windows:
-	./node_modules/mocha/bin/_mocha test/windows.js -R spec -b --timeout=5000 --path=$(path)
+	npx mocha test/windows.js -R spec -b --timeout=5000 --path=$(path)
 
 .PHONY: test-amazon
 test-amazon:
-	./node_modules/mocha/bin/_mocha test/amazon.js -R spec -b --timeout=5000 --sharedKey=$(sharedKey) --path=$(path)
+	npx mocha test/amazon.js -R spec -b --timeout=5000 --sharedKey=$(sharedKey) --path=$(path)
 
 .PHONY: test-facebook
 test-facebook:
-	./node_modules/mocha/bin/_mocha test/facebook.js -R spec -b --timeout=5000 --appAccessToken=$(appAccessToken) --path=$(path)
+	npx mocha test/facebook.js -R spec -b --timeout=5000 --appAccessToken=$(appAccessToken) --path=$(path)

lib/amazon2.js

@@ -159,7 +159,7 @@ module.exports.validatePurchase = function (dSecret, receipt, cb) {
 };
 
 function _isSandbox(path) {
-    return !path.startsWith(VALIDATION_HOST + '/');
+    return !path.startsWith(`${VALIDATION_HOST}/`);
 }
 
 module.exports.getPurchaseData = function (purchase, options) {