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

This reverts commit 96334e0.

.github/workflows/nodejs.yml

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

.npmignore

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

Makefile

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