@agnostack/next-shopify 1.14.1 → 1.15.0-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +14 -0
- package/dist/lib/handlers/api/auth.js +11 -15
- package/dist/lib/handlers/api/auth.js.map +1 -1
- package/dist/lib/handlers/api/billing.d.ts.map +1 -1
- package/dist/lib/handlers/api/billing.js +9 -12
- package/dist/lib/handlers/api/billing.js.map +1 -1
- package/dist/lib/handlers/api/callback.js +33 -37
- package/dist/lib/handlers/api/callback.js.map +1 -1
- package/dist/lib/handlers/api/index.js +7 -25
- package/dist/lib/handlers/api/index.js.map +1 -1
- package/dist/lib/handlers/api/uninstall.d.ts.map +1 -1
- package/dist/lib/handlers/api/uninstall.js +8 -11
- package/dist/lib/handlers/api/uninstall.js.map +1 -1
- package/dist/lib/handlers/api/verifiable/appInstallation.js +7 -11
- package/dist/lib/handlers/api/verifiable/appInstallation.js.map +1 -1
- package/dist/lib/handlers/api/verifiable/graph.d.ts.map +1 -1
- package/dist/lib/handlers/api/verifiable/graph.js +22 -25
- package/dist/lib/handlers/api/verifiable/graph.js.map +1 -1
- package/dist/lib/handlers/api/verifiable/index.js +5 -21
- package/dist/lib/handlers/api/verifiable/index.js.map +1 -1
- package/dist/lib/handlers/api/verifiable/proxy.d.ts.map +1 -1
- package/dist/lib/handlers/api/verifiable/proxy.js +32 -38
- package/dist/lib/handlers/api/verifiable/proxy.js.map +1 -1
- package/dist/lib/handlers/api/verifiable/rest.d.ts.map +1 -1
- package/dist/lib/handlers/api/verifiable/rest.js +19 -22
- package/dist/lib/handlers/api/verifiable/rest.js.map +1 -1
- package/dist/lib/handlers/api/verifiable/token.js +23 -26
- package/dist/lib/handlers/api/verifiable/token.js.map +1 -1
- package/dist/lib/handlers/api/webhook.d.ts.map +1 -1
- package/dist/lib/handlers/api/webhook.js +9 -12
- package/dist/lib/handlers/api/webhook.js.map +1 -1
- package/dist/lib/handlers/index.js +2 -18
- package/dist/lib/handlers/index.js.map +1 -1
- package/dist/lib/handlers/ssr/index.js +2 -18
- package/dist/lib/handlers/ssr/index.js.map +1 -1
- package/dist/lib/handlers/ssr/protect.js +17 -24
- package/dist/lib/handlers/ssr/protect.js.map +1 -1
- package/dist/lib/handlers/ssr/wrap.js +6 -10
- package/dist/lib/handlers/ssr/wrap.js.map +1 -1
- package/dist/lib/index.d.ts +2 -1
- package/dist/lib/index.d.ts.map +1 -1
- package/dist/lib/index.js +5 -25
- package/dist/lib/index.js.map +1 -1
- package/dist/lib/utils/billing.js +18 -23
- package/dist/lib/utils/billing.js.map +1 -1
- package/dist/lib/utils/crypto.js +15 -25
- package/dist/lib/utils/crypto.js.map +1 -1
- package/dist/lib/utils/firebase.js +17 -29
- package/dist/lib/utils/firebase.js.map +1 -1
- package/dist/lib/utils/headers.js +6 -13
- package/dist/lib/utils/headers.js.map +1 -1
- package/dist/lib/utils/index.d.ts +0 -2
- package/dist/lib/utils/index.js +8 -26
- package/dist/lib/utils/index.js.map +1 -1
- package/dist/lib/utils/session.js +59 -64
- package/dist/lib/utils/session.js.map +1 -1
- package/dist/lib/utils/shopify-api-js/oauth.js +16 -23
- package/dist/lib/utils/shopify-api-js/oauth.js.map +1 -1
- package/dist/lib/utils/shopify.js +25 -37
- package/dist/lib/utils/shopify.js.map +1 -1
- package/dist/lib/utils/token.d.ts +1 -1
- package/dist/lib/utils/token.js +11 -15
- package/dist/lib/utils/token.js.map +1 -1
- package/dist/lib/withShopify.js +77 -81
- package/dist/lib/withShopify.js.map +1 -1
- package/dist/react/hooks/index.js +1 -17
- package/dist/react/hooks/index.js.map +1 -1
- package/dist/react/hooks/useVerification.js +7 -11
- package/dist/react/hooks/useVerification.js.map +1 -1
- package/dist/react/index.js +1 -17
- package/dist/react/index.js.map +1 -1
- package/dist/runtime/index.js +1 -17
- package/dist/runtime/index.js.map +1 -1
- package/dist/shared/constants.js +11 -15
- package/dist/shared/constants.js.map +1 -1
- package/dist/shared/datetime.js +83 -110
- package/dist/shared/datetime.js.map +1 -1
- package/dist/shared/display.js +154 -236
- package/dist/shared/display.js.map +1 -1
- package/dist/shared/errors.d.ts +0 -5
- package/dist/shared/errors.d.ts.map +1 -1
- package/dist/shared/errors.js +5 -34
- package/dist/shared/errors.js.map +1 -1
- package/dist/shared/graph.js +11 -14
- package/dist/shared/graph.js.map +1 -1
- package/dist/shared/index.js +10 -26
- package/dist/shared/index.js.map +1 -1
- package/dist/shared/match.js +17 -25
- package/dist/shared/match.js.map +1 -1
- package/dist/shared/request.d.ts +5 -0
- package/dist/shared/request.d.ts.map +1 -1
- package/dist/shared/request.js +32 -15
- package/dist/shared/request.js.map +1 -1
- package/dist/shared/shopify.d.ts +1 -6
- package/dist/shared/shopify.d.ts.map +1 -1
- package/dist/shared/shopify.js +21 -54
- package/dist/shared/shopify.js.map +1 -1
- package/dist/shared/subtlecrypto.js +13 -39
- package/dist/shared/subtlecrypto.js.map +1 -1
- package/dist/shared/verification.js +23 -29
- package/dist/shared/verification.js.map +1 -1
- package/dist/umd/lib/handlers/api/auth.d.ts +2 -0
- package/dist/umd/lib/handlers/api/auth.d.ts.map +1 -0
- package/dist/umd/lib/handlers/api/billing.d.ts +2 -0
- package/dist/umd/lib/handlers/api/billing.d.ts.map +1 -0
- package/dist/umd/lib/handlers/api/callback.d.ts +2 -0
- package/dist/umd/lib/handlers/api/callback.d.ts.map +1 -0
- package/dist/umd/lib/handlers/api/index.d.ts +10 -0
- package/dist/umd/lib/handlers/api/index.d.ts.map +1 -0
- package/dist/umd/lib/handlers/api/types.d.ts +1 -0
- package/dist/umd/lib/handlers/api/types.d.ts.map +1 -0
- package/dist/umd/lib/handlers/api/uninstall.d.ts +2 -0
- package/dist/umd/lib/handlers/api/uninstall.d.ts.map +1 -0
- package/dist/umd/lib/handlers/api/verifiable/appInstallation.d.ts +2 -0
- package/dist/umd/lib/handlers/api/verifiable/appInstallation.d.ts.map +1 -0
- package/dist/umd/lib/handlers/api/verifiable/graph.d.ts +2 -0
- package/dist/umd/lib/handlers/api/verifiable/graph.d.ts.map +1 -0
- package/dist/umd/lib/handlers/api/verifiable/index.d.ts +6 -0
- package/dist/umd/lib/handlers/api/verifiable/index.d.ts.map +1 -0
- package/dist/umd/lib/handlers/api/verifiable/proxy.d.ts +2 -0
- package/dist/umd/lib/handlers/api/verifiable/proxy.d.ts.map +1 -0
- package/dist/umd/lib/handlers/api/verifiable/rest.d.ts +2 -0
- package/dist/umd/lib/handlers/api/verifiable/rest.d.ts.map +1 -0
- package/dist/umd/lib/handlers/api/verifiable/token.d.ts +4 -0
- package/dist/umd/lib/handlers/api/verifiable/token.d.ts.map +1 -0
- package/dist/umd/lib/handlers/api/webhook.d.ts +2 -0
- package/dist/umd/lib/handlers/api/webhook.d.ts.map +1 -0
- package/dist/umd/lib/handlers/index.d.ts +3 -0
- package/dist/umd/lib/handlers/index.d.ts.map +1 -0
- package/dist/umd/lib/handlers/ssr/index.d.ts +3 -0
- package/dist/umd/lib/handlers/ssr/index.d.ts.map +1 -0
- package/dist/umd/lib/handlers/ssr/protect.d.ts +16 -0
- package/dist/umd/lib/handlers/ssr/protect.d.ts.map +1 -0
- package/dist/umd/lib/handlers/ssr/types.d.ts +1 -0
- package/dist/umd/lib/handlers/ssr/types.d.ts.map +1 -0
- package/dist/umd/lib/handlers/ssr/wrap.d.ts +9 -0
- package/dist/umd/lib/handlers/ssr/wrap.d.ts.map +1 -0
- package/dist/umd/lib/handlers/types.d.ts +1 -0
- package/dist/umd/lib/handlers/types.d.ts.map +1 -0
- package/dist/umd/lib/index.d.ts +6 -0
- package/dist/umd/lib/index.d.ts.map +1 -0
- package/dist/umd/lib/types.d.ts +1 -0
- package/dist/umd/lib/types.d.ts.map +1 -0
- package/dist/umd/lib/utils/billing.d.ts +24 -0
- package/dist/umd/lib/utils/billing.d.ts.map +1 -0
- package/dist/umd/lib/utils/crypto.d.ts +22 -0
- package/dist/umd/lib/utils/crypto.d.ts.map +1 -0
- package/dist/umd/lib/utils/firebase.d.ts +25 -0
- package/dist/umd/lib/utils/firebase.d.ts.map +1 -0
- package/dist/umd/lib/utils/headers.d.ts +5 -0
- package/dist/umd/lib/utils/headers.d.ts.map +1 -0
- package/dist/umd/lib/utils/index.d.ts +9 -0
- package/dist/umd/lib/utils/index.d.ts.map +1 -0
- package/dist/umd/lib/utils/session.d.ts +41 -0
- package/dist/umd/lib/utils/session.d.ts.map +1 -0
- package/dist/umd/lib/utils/shopify-api-js/oauth.d.ts +9 -0
- package/dist/umd/lib/utils/shopify-api-js/oauth.d.ts.map +1 -0
- package/dist/umd/lib/utils/shopify.d.ts +26 -0
- package/dist/umd/lib/utils/shopify.d.ts.map +1 -0
- package/dist/umd/lib/utils/token.d.ts +19 -0
- package/dist/umd/lib/utils/token.d.ts.map +1 -0
- package/dist/umd/lib/utils/types.d.ts +1 -0
- package/dist/umd/lib/utils/types.d.ts.map +1 -0
- package/dist/umd/lib/withShopify.d.ts +6 -0
- package/dist/umd/lib/withShopify.d.ts.map +1 -0
- package/dist/umd/react/hooks/index.d.ts +2 -0
- package/dist/umd/react/hooks/index.d.ts.map +1 -0
- package/dist/umd/react/hooks/useVerification.d.ts +8 -0
- package/dist/umd/react/hooks/useVerification.d.ts.map +1 -0
- package/dist/umd/react/index.d.ts +2 -0
- package/dist/umd/react/index.d.ts.map +1 -0
- package/dist/umd/react/types.d.ts +1 -0
- package/dist/umd/react/types.d.ts.map +1 -0
- package/dist/umd/runtime/index.d.ts +2 -0
- package/dist/umd/runtime/index.d.ts.map +1 -0
- package/dist/umd/runtime/types.d.ts +1 -0
- package/dist/umd/runtime/types.d.ts.map +1 -0
- package/dist/umd/shared/constants.d.ts +211 -0
- package/dist/umd/shared/constants.d.ts.map +1 -0
- package/dist/umd/shared/datetime.d.ts +96 -0
- package/dist/umd/shared/datetime.d.ts.map +1 -0
- package/dist/umd/shared/display.d.ts +102 -0
- package/dist/umd/shared/display.d.ts.map +1 -0
- package/dist/umd/shared/errors.d.ts +19 -0
- package/dist/umd/shared/errors.d.ts.map +1 -0
- package/dist/umd/shared/graph.d.ts +24 -0
- package/dist/umd/shared/graph.d.ts.map +1 -0
- package/dist/umd/shared/index.d.ts +11 -0
- package/dist/umd/shared/index.d.ts.map +1 -0
- package/dist/umd/shared/match.d.ts +6 -0
- package/dist/umd/shared/match.d.ts.map +1 -0
- package/dist/umd/shared/request.d.ts +16 -0
- package/dist/umd/shared/request.d.ts.map +1 -0
- package/dist/umd/shared/shopify.d.ts +31 -0
- package/dist/umd/shared/shopify.d.ts.map +1 -0
- package/dist/umd/shared/subtlecrypto.d.ts +41 -0
- package/dist/umd/shared/subtlecrypto.d.ts.map +1 -0
- package/dist/umd/shared/types.d.ts +1 -0
- package/dist/umd/shared/types.d.ts.map +1 -0
- package/dist/umd/shared/verification.d.ts +24 -0
- package/dist/umd/shared/verification.d.ts.map +1 -0
- package/dist/umd/umd-verification.js +968 -0
- package/dist/umd/umd-verification.js.map +1 -0
- package/dist/umd/verification/errors.d.ts +6 -0
- package/dist/umd/verification/errors.d.ts.map +1 -0
- package/dist/umd/verification/index.d.ts +2 -0
- package/dist/umd/verification/index.d.ts.map +1 -0
- package/dist/umd/verification/rawbody.d.ts.map +1 -0
- package/dist/umd/verification/types.d.ts +1 -0
- package/dist/umd/verification/types.d.ts.map +1 -0
- package/dist/umd/verification/verification.d.ts.map +1 -0
- package/dist/verification/errors.d.ts +6 -0
- package/dist/verification/errors.d.ts.map +1 -0
- package/dist/verification/errors.js +22 -0
- package/dist/verification/errors.js.map +1 -0
- package/dist/verification/index.d.ts +2 -0
- package/dist/verification/index.d.ts.map +1 -0
- package/dist/verification/index.js +2 -0
- package/dist/verification/index.js.map +1 -0
- package/dist/verification/rawbody.d.ts +2 -0
- package/dist/verification/rawbody.d.ts.map +1 -0
- package/dist/{lib/utils → verification}/rawbody.js +4 -10
- package/dist/verification/rawbody.js.map +1 -0
- package/dist/verification/types.d.ts +1 -0
- package/dist/verification/types.d.ts.map +1 -0
- package/dist/verification/types.js +1 -0
- package/dist/verification/types.js.map +1 -0
- package/dist/verification/verification.d.ts +8 -0
- package/dist/verification/verification.d.ts.map +1 -0
- package/dist/{lib/utils → verification}/verification.js +20 -21
- package/dist/verification/verification.js.map +1 -0
- package/node_modules/browser-monads-ts/LICENSE +21 -0
- package/node_modules/browser-monads-ts/README.md +46 -0
- package/node_modules/browser-monads-ts/dist/browser-monads-ts.cjs.js +2 -0
- package/node_modules/browser-monads-ts/dist/browser-monads-ts.cjs.js.map +1 -0
- package/node_modules/browser-monads-ts/dist/browser-monads-ts.es.js +12 -0
- package/node_modules/browser-monads-ts/dist/browser-monads-ts.es.js.map +1 -0
- package/node_modules/browser-monads-ts/dist/index.d.ts +5 -0
- package/node_modules/browser-monads-ts/dist/index.d.ts.map +1 -0
- package/node_modules/browser-monads-ts/package.json +79 -0
- package/node_modules/bytes/History.md +97 -0
- package/node_modules/bytes/LICENSE +23 -0
- package/node_modules/bytes/Readme.md +152 -0
- package/node_modules/bytes/index.js +170 -0
- package/node_modules/bytes/package.json +42 -0
- package/node_modules/depd/History.md +103 -0
- package/node_modules/depd/LICENSE +22 -0
- package/node_modules/depd/Readme.md +280 -0
- package/node_modules/depd/index.js +538 -0
- package/node_modules/depd/lib/browser/index.js +77 -0
- package/node_modules/depd/package.json +45 -0
- package/node_modules/http-errors/HISTORY.md +180 -0
- package/node_modules/http-errors/LICENSE +23 -0
- package/node_modules/http-errors/README.md +169 -0
- package/node_modules/http-errors/index.js +289 -0
- package/node_modules/http-errors/package.json +50 -0
- package/node_modules/iconv-lite/Changelog.md +162 -0
- package/node_modules/iconv-lite/LICENSE +21 -0
- package/node_modules/iconv-lite/README.md +156 -0
- package/node_modules/iconv-lite/encodings/dbcs-codec.js +555 -0
- package/node_modules/iconv-lite/encodings/dbcs-data.js +176 -0
- package/node_modules/iconv-lite/encodings/index.js +22 -0
- package/node_modules/iconv-lite/encodings/internal.js +188 -0
- package/node_modules/iconv-lite/encodings/sbcs-codec.js +72 -0
- package/node_modules/iconv-lite/encodings/sbcs-data-generated.js +451 -0
- package/node_modules/iconv-lite/encodings/sbcs-data.js +174 -0
- package/node_modules/iconv-lite/encodings/tables/big5-added.json +122 -0
- package/node_modules/iconv-lite/encodings/tables/cp936.json +264 -0
- package/node_modules/iconv-lite/encodings/tables/cp949.json +273 -0
- package/node_modules/iconv-lite/encodings/tables/cp950.json +177 -0
- package/node_modules/iconv-lite/encodings/tables/eucjp.json +182 -0
- package/node_modules/iconv-lite/encodings/tables/gb18030-ranges.json +1 -0
- package/node_modules/iconv-lite/encodings/tables/gbk-added.json +55 -0
- package/node_modules/iconv-lite/encodings/tables/shiftjis.json +125 -0
- package/node_modules/iconv-lite/encodings/utf16.js +177 -0
- package/node_modules/iconv-lite/encodings/utf7.js +290 -0
- package/node_modules/iconv-lite/lib/bom-handling.js +52 -0
- package/node_modules/iconv-lite/lib/extend-node.js +217 -0
- package/node_modules/iconv-lite/lib/index.d.ts +24 -0
- package/node_modules/iconv-lite/lib/index.js +153 -0
- package/node_modules/iconv-lite/lib/streams.js +121 -0
- package/node_modules/iconv-lite/package.json +46 -0
- package/node_modules/inherits/LICENSE +16 -0
- package/node_modules/inherits/README.md +42 -0
- package/node_modules/inherits/inherits.js +9 -0
- package/node_modules/inherits/inherits_browser.js +27 -0
- package/node_modules/inherits/package.json +29 -0
- package/node_modules/nothing-mock/LICENSE +21 -0
- package/node_modules/nothing-mock/README.md +266 -0
- package/node_modules/nothing-mock/dist/nothing-mock.es.js +2 -0
- package/node_modules/nothing-mock/dist/nothing-mock.es.js.map +1 -0
- package/node_modules/nothing-mock/dist/nothing-mock.js +2 -0
- package/node_modules/nothing-mock/dist/nothing-mock.js.map +1 -0
- package/node_modules/nothing-mock/dist/nothing-mock.modern.js +2 -0
- package/node_modules/nothing-mock/dist/nothing-mock.modern.js.map +1 -0
- package/node_modules/nothing-mock/dist/nothing-mock.umd.js +2 -0
- package/node_modules/nothing-mock/dist/nothing-mock.umd.js.map +1 -0
- package/node_modules/nothing-mock/index.d.ts +6 -0
- package/node_modules/nothing-mock/package.json +29 -0
- package/node_modules/nothing-mock/src/index.js +15 -0
- package/node_modules/raw-body/HISTORY.md +308 -0
- package/node_modules/raw-body/LICENSE +22 -0
- package/node_modules/raw-body/README.md +223 -0
- package/node_modules/raw-body/SECURITY.md +24 -0
- package/node_modules/raw-body/index.d.ts +87 -0
- package/node_modules/raw-body/index.js +336 -0
- package/node_modules/raw-body/package.json +49 -0
- package/node_modules/safer-buffer/LICENSE +21 -0
- package/node_modules/safer-buffer/Porting-Buffer.md +268 -0
- package/node_modules/safer-buffer/Readme.md +156 -0
- package/node_modules/safer-buffer/dangerous.js +58 -0
- package/node_modules/safer-buffer/package.json +34 -0
- package/node_modules/safer-buffer/safer.js +77 -0
- package/node_modules/safer-buffer/tests.js +406 -0
- package/node_modules/setprototypeof/LICENSE +13 -0
- package/node_modules/setprototypeof/README.md +31 -0
- package/node_modules/setprototypeof/index.d.ts +2 -0
- package/node_modules/setprototypeof/index.js +17 -0
- package/node_modules/setprototypeof/package.json +38 -0
- package/node_modules/setprototypeof/test/index.js +24 -0
- package/node_modules/statuses/HISTORY.md +82 -0
- package/node_modules/statuses/LICENSE +23 -0
- package/node_modules/statuses/README.md +136 -0
- package/node_modules/statuses/codes.json +65 -0
- package/node_modules/statuses/index.js +146 -0
- package/node_modules/statuses/package.json +49 -0
- package/node_modules/toidentifier/HISTORY.md +9 -0
- package/node_modules/toidentifier/LICENSE +21 -0
- package/node_modules/toidentifier/README.md +61 -0
- package/node_modules/toidentifier/index.js +32 -0
- package/node_modules/toidentifier/package.json +38 -0
- package/node_modules/unpipe/HISTORY.md +4 -0
- package/node_modules/unpipe/LICENSE +22 -0
- package/node_modules/unpipe/README.md +43 -0
- package/node_modules/unpipe/index.js +69 -0
- package/node_modules/unpipe/package.json +27 -0
- package/package.json +22 -4
- package/dist/lib/utils/rawbody.d.ts.map +0 -1
- package/dist/lib/utils/rawbody.js.map +0 -1
- package/dist/lib/utils/verification.d.ts.map +0 -1
- package/dist/lib/utils/verification.js.map +0 -1
- /package/dist/{lib/utils → umd/verification}/rawbody.d.ts +0 -0
- /package/dist/{lib/utils → umd/verification}/verification.d.ts +0 -0
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
2
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
3
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -19,18 +18,17 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
19
18
|
}
|
|
20
19
|
return t;
|
|
21
20
|
};
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
const shared_1 = require("../../../../shared");
|
|
21
|
+
import { decode } from 'js-base64';
|
|
22
|
+
import { sign } from 'jsonwebtoken';
|
|
23
|
+
import { v4 as uuidv4 } from 'uuid';
|
|
24
|
+
import { generateHMAC } from '../../../utils';
|
|
25
|
+
import { snakecase, stringEmpty, stringNotEmpty, normalizeShopifyId, objectToSortedString, } from '../../../../shared';
|
|
26
|
+
import { getVerificationHelpers, VerificationError } from '../../../../verification';
|
|
29
27
|
// NOTE: typically handling: "/api/token"
|
|
30
|
-
const handleSessionToken = (serverRuntimeConfig, _a = {}) => {
|
|
28
|
+
export const handleSessionToken = (serverRuntimeConfig, _a = {}) => {
|
|
31
29
|
var { signingSecret: _signingSecret } = _a, signingData = __rest(_a, ["signingSecret"]);
|
|
32
30
|
const { APP_CONFIG } = serverRuntimeConfig !== null && serverRuntimeConfig !== void 0 ? serverRuntimeConfig : {};
|
|
33
|
-
const _getVerificationHelpers =
|
|
31
|
+
const _getVerificationHelpers = getVerificationHelpers(serverRuntimeConfig);
|
|
34
32
|
return (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
35
33
|
var _b, _c;
|
|
36
34
|
const { host } = (_b = req.query) !== null && _b !== void 0 ? _b : {};
|
|
@@ -38,7 +36,7 @@ const handleSessionToken = (serverRuntimeConfig, _a = {}) => {
|
|
|
38
36
|
// TODO: pass along providerSetId??
|
|
39
37
|
'x-client-id': clientId, 'x-shop-domain': shopDomain, 'x-shopify-shop-domain': shopifyShopDomain, 'x-shopify-shop': shop = shopifyShopDomain !== null && shopifyShopDomain !== void 0 ? shopifyShopDomain : shopDomain } = _d, headers = __rest(_d, ['x-shopify-app-installation-id', 'x-shopify-app-id', 'x-app-installation-id', 'x-app-id', 'x-client-id', 'x-shop-domain', 'x-shopify-shop-domain', 'x-shopify-shop']);
|
|
40
38
|
// TODO: un-btoa the host and check??
|
|
41
|
-
if (
|
|
39
|
+
if (stringEmpty(shop) || stringEmpty(host)) {
|
|
42
40
|
return res.status(412).json({ message: 'Missing required param' });
|
|
43
41
|
}
|
|
44
42
|
let requestBody;
|
|
@@ -47,29 +45,29 @@ const handleSessionToken = (serverRuntimeConfig, _a = {}) => {
|
|
|
47
45
|
({ requestBody, processResponse } = yield _getVerificationHelpers(req));
|
|
48
46
|
}
|
|
49
47
|
catch (error) {
|
|
50
|
-
if (error instanceof
|
|
48
|
+
if (error instanceof VerificationError) {
|
|
51
49
|
return res.status(error.code).json(Object.assign({ message: error.message }, error.data));
|
|
52
50
|
}
|
|
53
51
|
return res.status(403).json({ message: 'Verification error' });
|
|
54
52
|
}
|
|
55
53
|
try {
|
|
56
54
|
const appClaims = Object.entries(headers).reduce((_appClaims, [headerKey, headerValue]) => (Object.assign(Object.assign({}, _appClaims), headerKey.startsWith('x-shopify-app-metafield-') && {
|
|
57
|
-
[
|
|
58
|
-
})), Object.assign(Object.assign({}, appId && { app_id:
|
|
55
|
+
[snakecase(headerKey.replace('x-shopify-app-metafield-', ''))]: headerValue,
|
|
56
|
+
})), Object.assign(Object.assign({}, appId && { app_id: normalizeShopifyId(appId).id }), appInstallationId && { installation_id: normalizeShopifyId(appInstallationId).id }));
|
|
59
57
|
const _e = requestBody !== null && requestBody !== void 0 ? requestBody : {}, { sub, aud: _aud } = _e, body = __rest(_e, ["sub", "aud"]);
|
|
60
|
-
const aud = [clientId, _aud, APP_CONFIG.apiKey].find(
|
|
58
|
+
const aud = [clientId, _aud, APP_CONFIG.apiKey].find(stringNotEmpty);
|
|
61
59
|
let { dest, iss, sid, jti } = body, tokenBody = __rest(body, ["dest", "iss", "sid", "jti"]);
|
|
62
|
-
if (
|
|
60
|
+
if (stringEmpty(dest)) {
|
|
63
61
|
dest = shop;
|
|
64
62
|
}
|
|
65
|
-
if (
|
|
66
|
-
iss =
|
|
63
|
+
if (stringEmpty(iss)) {
|
|
64
|
+
iss = decode(host);
|
|
67
65
|
}
|
|
68
|
-
if (
|
|
69
|
-
sid = (
|
|
66
|
+
if (stringEmpty(sid)) {
|
|
67
|
+
sid = uuidv4();
|
|
70
68
|
}
|
|
71
|
-
if (
|
|
72
|
-
jti = (
|
|
69
|
+
if (stringEmpty(jti)) {
|
|
70
|
+
jti = uuidv4();
|
|
73
71
|
sid = `${sid}.${jti}`;
|
|
74
72
|
}
|
|
75
73
|
const payload = Object.assign(Object.assign(Object.assign({ shop,
|
|
@@ -80,9 +78,9 @@ const handleSessionToken = (serverRuntimeConfig, _a = {}) => {
|
|
|
80
78
|
sid,
|
|
81
79
|
aud }, sub && { sub }), appClaims), tokenBody);
|
|
82
80
|
// NOTE: signingSecret should only be sent in here from the /api/token/zendesk endpoint
|
|
83
|
-
const signingSecret = _signingSecret ||
|
|
84
|
-
const token =
|
|
85
|
-
if (
|
|
81
|
+
const signingSecret = _signingSecret || generateHMAC(objectToSortedString(payload), APP_CONFIG.apiSecretKey);
|
|
82
|
+
const token = sign(payload, signingSecret, signingData);
|
|
83
|
+
if (stringEmpty(token)) {
|
|
86
84
|
throw new Error('Error signing token');
|
|
87
85
|
}
|
|
88
86
|
const response = yield processResponse({ token });
|
|
@@ -94,5 +92,4 @@ const handleSessionToken = (serverRuntimeConfig, _a = {}) => {
|
|
|
94
92
|
}
|
|
95
93
|
});
|
|
96
94
|
};
|
|
97
|
-
exports.handleSessionToken = handleSessionToken;
|
|
98
95
|
//# sourceMappingURL=token.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/token.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/token.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/webhook.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/webhook.js"],"names":[],"mappings":"AAUO,2HAuFN"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
2
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
3
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -19,25 +18,24 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
19
18
|
}
|
|
20
19
|
return t;
|
|
21
20
|
};
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
const shared_1 = require("../../../shared");
|
|
21
|
+
import { getShopifyHelpers } from '../../utils';
|
|
22
|
+
import { ensureRawBody } from '../../../verification';
|
|
23
|
+
import { matchHostname, ensureArray, stringEmpty, convertEventTopic, } from '../../../shared';
|
|
26
24
|
// NOTE: typically handling: "/api/webhooks/event" or "/api/webhooks/event/{appId}" or "/api/webhooks/event?appId={appId}"
|
|
27
|
-
const handleWebhookEvent = (serverRuntimeConfig, config) => (req, res, data) => __awaiter(void 0, void 0, void 0, function* () {
|
|
25
|
+
export const handleWebhookEvent = (serverRuntimeConfig, config) => (req, res, data) => __awaiter(void 0, void 0, void 0, function* () {
|
|
28
26
|
var _a;
|
|
29
27
|
const { ORIGIN_SAFELIST } = serverRuntimeConfig;
|
|
30
28
|
try {
|
|
31
29
|
const _b = (_a = req.headers) !== null && _a !== void 0 ? _a : {}, { 'x-shop-domain': shopDomain, 'x-shopify-shop-domain': shopifyShopDomain, 'x-shopify-shop': shop = shopifyShopDomain !== null && shopifyShopDomain !== void 0 ? shopifyShopDomain : shopDomain } = _b, _headers = __rest(_b, ['x-shop-domain', 'x-shopify-shop-domain', 'x-shopify-shop']);
|
|
32
|
-
if (
|
|
30
|
+
if (stringEmpty(shop)) {
|
|
33
31
|
return res.status(200).json({ handler: 'webhook', error: 'Missing shop' });
|
|
34
32
|
}
|
|
35
|
-
if (!
|
|
33
|
+
if (!matchHostname(shop, ORIGIN_SAFELIST)) {
|
|
36
34
|
return res.status(200).json({ handler: 'webhook', error: 'Shop is not safelisted' });
|
|
37
35
|
}
|
|
38
|
-
const { shopify } = yield
|
|
36
|
+
const { shopify } = yield getShopifyHelpers(serverRuntimeConfig, { shop });
|
|
39
37
|
// TODO: explore getVerificationHelpers?
|
|
40
|
-
const rawBody = yield
|
|
38
|
+
const rawBody = yield ensureRawBody(req);
|
|
41
39
|
const _c = (serverRuntimeConfig.SHOPIFY_RUN_MODE === 'cli') ? {
|
|
42
40
|
valid: true,
|
|
43
41
|
topic: _headers['x-shopify-topic'],
|
|
@@ -55,7 +53,7 @@ const handleWebhookEvent = (serverRuntimeConfig, config) => (req, res, data) =>
|
|
|
55
53
|
const { topic, domain, webhookId, apiVersion, rawBody: eventRawBody } = message;
|
|
56
54
|
const eventBody = JSON.parse(eventRawBody);
|
|
57
55
|
// NOTE: this callback signature matches the built in callback option PLUS data
|
|
58
|
-
const topicHandlePromises =
|
|
56
|
+
const topicHandlePromises = ensureArray(config === null || config === void 0 ? void 0 : config[convertEventTopic(topic)]).map((handler) => handler({
|
|
59
57
|
apiVersion,
|
|
60
58
|
webhookId,
|
|
61
59
|
topic,
|
|
@@ -89,5 +87,4 @@ const handleWebhookEvent = (serverRuntimeConfig, config) => (req, res, data) =>
|
|
|
89
87
|
return res.status(200).json({ handler: 'webhook', error: 'Error handling webhook' });
|
|
90
88
|
}
|
|
91
89
|
});
|
|
92
|
-
exports.handleWebhookEvent = handleWebhookEvent;
|
|
93
90
|
//# sourceMappingURL=webhook.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/webhook.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/webhook.js"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./api"), exports);
|
|
18
|
-
__exportStar(require("./ssr"), exports);
|
|
1
|
+
export * from './api';
|
|
2
|
+
export * from './ssr';
|
|
19
3
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/handlers/index.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/handlers/index.js"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAA;AACrB,cAAc,OAAO,CAAA"}
|
|
@@ -1,19 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./protect"), exports);
|
|
18
|
-
__exportStar(require("./wrap"), exports);
|
|
1
|
+
export * from './protect';
|
|
2
|
+
export * from './wrap';
|
|
19
3
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/index.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/index.js"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,QAAQ,CAAA"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
2
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
3
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -8,46 +7,41 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
8
|
});
|
|
10
9
|
};
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
};
|
|
14
|
-
|
|
15
|
-
exports.protectRoute = void 0;
|
|
16
|
-
const chalk_1 = __importDefault(require("chalk"));
|
|
17
|
-
const utils_1 = require("../../utils");
|
|
18
|
-
const shared_1 = require("../../../shared");
|
|
19
|
-
const protectRoute = (serverRuntimeConfig, props) => ({ req, res, query, locale, } = {}, data) => __awaiter(void 0, void 0, void 0, function* () {
|
|
10
|
+
import chalk from 'chalk';
|
|
11
|
+
import { allowLocalBypass, getShopifyHelpers, getSecurityHeader, } from '../../utils';
|
|
12
|
+
import { arrayEmpty, stringEmpty, cleanObject, ShopifyAuthenticationError, ShopifySessionAuthenticationError, PAGE_ROUTE_NAMES, API_ROUTE_NAMES, } from '../../../shared';
|
|
13
|
+
export const protectRoute = (serverRuntimeConfig, props) => ({ req, res, query, locale, } = {}, data) => __awaiter(void 0, void 0, void 0, function* () {
|
|
20
14
|
var _a, _b, _c, _d;
|
|
21
15
|
const { PAGE_PATHS, API_PATHS } = serverRuntimeConfig;
|
|
22
16
|
const shop = (_a = query === null || query === void 0 ? void 0 : query.shop) !== null && _a !== void 0 ? _a : (_b = req.query) === null || _b === void 0 ? void 0 : _b.shop;
|
|
23
17
|
const embedded = (_c = query === null || query === void 0 ? void 0 : query.embedded) !== null && _c !== void 0 ? _c : (_d = req.query) === null || _d === void 0 ? void 0 : _d.embedded;
|
|
24
|
-
if (
|
|
18
|
+
if (stringEmpty(shop)) {
|
|
25
19
|
return {
|
|
26
20
|
redirect: {
|
|
27
|
-
destination: `${PAGE_PATHS[
|
|
21
|
+
destination: `${PAGE_PATHS[PAGE_ROUTE_NAMES.ERROR]}?code=no_shop_provided&type=protectRoute`,
|
|
28
22
|
permanent: false,
|
|
29
23
|
},
|
|
30
24
|
};
|
|
31
25
|
}
|
|
32
26
|
// NOTE: this should handle running in next to test non-shopify functionality
|
|
33
|
-
const shouldBypassProtect =
|
|
27
|
+
const shouldBypassProtect = allowLocalBypass(serverRuntimeConfig);
|
|
34
28
|
if (shouldBypassProtect) {
|
|
35
|
-
console.info(`${
|
|
29
|
+
console.info(`${chalk.yellowBright('next-shopify')} - [${chalk.bold('protectRoute')}]: ${`Bypassing local protect - should ONLY happen when running in next to test non-shopify functionality!`}`);
|
|
36
30
|
return {
|
|
37
|
-
props:
|
|
31
|
+
props: cleanObject(Object.assign(Object.assign({ locale }, props), data)),
|
|
38
32
|
};
|
|
39
33
|
}
|
|
40
|
-
const { shopify, findSessionIds, loadSession } = yield
|
|
34
|
+
const { shopify, findSessionIds, loadSession } = yield getShopifyHelpers(serverRuntimeConfig, { shop });
|
|
41
35
|
if (shopify === null || shopify === void 0 ? void 0 : shopify.config) {
|
|
42
|
-
res.setHeader('Content-Security-Policy',
|
|
36
|
+
res.setHeader('Content-Security-Policy', getSecurityHeader(shop, shopify.config));
|
|
43
37
|
}
|
|
44
38
|
const existingSessionIds = yield findSessionIds(shop);
|
|
45
|
-
if (
|
|
39
|
+
if (arrayEmpty(existingSessionIds)) {
|
|
46
40
|
// TODO: explore objectToQuerystring
|
|
47
41
|
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop })).toString();
|
|
48
42
|
return {
|
|
49
43
|
redirect: {
|
|
50
|
-
destination: `${API_PATHS[
|
|
44
|
+
destination: `${API_PATHS[API_ROUTE_NAMES.AUTH_ONLINE]}?${queryParams}`,
|
|
51
45
|
permanent: false,
|
|
52
46
|
},
|
|
53
47
|
};
|
|
@@ -68,12 +62,12 @@ const protectRoute = (serverRuntimeConfig, props) => ({ req, res, query, locale,
|
|
|
68
62
|
};
|
|
69
63
|
}
|
|
70
64
|
catch (error) {
|
|
71
|
-
if (error instanceof
|
|
65
|
+
if (error instanceof ShopifyAuthenticationError) {
|
|
72
66
|
// TODO: explore objectToQuerystring
|
|
73
|
-
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop, reAuth: (error instanceof
|
|
67
|
+
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop, reAuth: (error instanceof ShopifySessionAuthenticationError) })).toString();
|
|
74
68
|
return {
|
|
75
69
|
redirect: {
|
|
76
|
-
destination: `${API_PATHS[
|
|
70
|
+
destination: `${API_PATHS[API_ROUTE_NAMES.AUTH_ONLINE]}?${queryParams}`,
|
|
77
71
|
permanent: false,
|
|
78
72
|
},
|
|
79
73
|
};
|
|
@@ -83,8 +77,7 @@ const protectRoute = (serverRuntimeConfig, props) => ({ req, res, query, locale,
|
|
|
83
77
|
}
|
|
84
78
|
}
|
|
85
79
|
return {
|
|
86
|
-
props:
|
|
80
|
+
props: cleanObject(Object.assign(Object.assign({ locale }, props), data)),
|
|
87
81
|
};
|
|
88
82
|
});
|
|
89
|
-
exports.protectRoute = protectRoute;
|
|
90
83
|
//# sourceMappingURL=protect.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protect.js","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/protect.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"protect.js","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/protect.js"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,GAClB,MAAM,aAAa,CAAA;AACpB,OAAO,EACL,UAAU,EACV,WAAW,EACX,WAAW,EACX,0BAA0B,EAC1B,iCAAiC,EACjC,gBAAgB,EAChB,eAAe,GAChB,MAAM,iBAAiB,CAAA;AAExB,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,mBAAmB,EAAE,KAAK,EAAE,EAAE,CAAC,CAAO,EACjE,GAAG,EACH,GAAG,EACH,KAAK,EACL,MAAM,GACP,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE;;IACd,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,mBAAmB,CAAA;IACrD,MAAM,IAAI,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,mCAAI,MAAA,GAAG,CAAC,KAAK,0CAAE,IAAI,CAAA;IAC3C,MAAM,QAAQ,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,mCAAI,MAAA,GAAG,CAAC,KAAK,0CAAE,QAAQ,CAAA;IAEvD,IAAI,WAAW,CAAC,IAAI,CAAC,EAAE;QACrB,OAAO;YACL,QAAQ,EAAE;gBACR,WAAW,EAAE,GAAG,UAAU,CAAC,gBAAgB,CAAC,KAAK,CAAC,0CAA0C;gBAC5F,SAAS,EAAE,KAAK;aACjB;SACF,CAAA;KACF;IAED,6EAA6E;IAC7E,MAAM,mBAAmB,GAAG,gBAAgB,CAAC,mBAAmB,CAAC,CAAA;IACjE,IAAI,mBAAmB,EAAE;QACvB,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,OAAO,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,MACjF,sGACF,EAAE,CAAC,CAAA;QAEH,OAAO;YACL,KAAK,EAAE,WAAW,+BAChB,MAAM,IACH,KAAK,GACL,IAAI,EACP;SACH,CAAA;KACF;IAED,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,GAAG,MAAM,iBAAiB,CAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;IACvG,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,EAAE;QACnB,GAAG,CAAC,SAAS,CAAC,yBAAyB,EAAE,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;KAClF;IAED,MAAM,kBAAkB,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAA;IACrD,IAAI,UAAU,CAAC,kBAAkB,CAAC,EAAE;QAClC,oCAAoC;QACpC,MAAM,WAAW,GAAG,IAAI,eAAe,iCAAM,KAAK,KAAE,IAAI,IAAG,CAAC,QAAQ,EAAE,CAAA;QAEtE,OAAO;YACL,QAAQ,EAAE;gBACR,WAAW,EAAE,GAAG,SAAS,CAAC,eAAe,CAAC,WAAW,CAAC,IAAI,WAAW,EAAE;gBACvE,SAAS,EAAE,KAAK;aACjB;SACF,CAAA;KACF;IAED,IAAI,QAAQ,KAAK,GAAG,EAAE;QACpB,IAAI;YACF,wDAAwD;YACxD,MAAM,WAAW,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAA;YAE/B,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC;gBACvD,UAAU,EAAE,GAAG;gBACf,WAAW,EAAE,GAAG;aACjB,CAAC,CAAA;YAEF,OAAO;gBACL,QAAQ,EAAE;oBACR,WAAW;oBACX,SAAS,EAAE,KAAK;iBACjB;aACF,CAAA;SACF;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,KAAK,YAAY,0BAA0B,EAAE;gBAC/C,oCAAoC;gBACpC,MAAM,WAAW,GAAG,IAAI,eAAe,iCAClC,KAAK,KACR,IAAI,EACJ,MAAM,EAAE,CAAC,KAAK,YAAY,iCAAiC,CAAC,IAC5D,CAAC,QAAQ,EAAE,CAAA;gBAEb,OAAO;oBACL,QAAQ,EAAE;wBACR,WAAW,EAAE,GAAG,SAAS,CAAC,eAAe,CAAC,WAAW,CAAC,IAAI,WAAW,EAAE;wBACvE,SAAS,EAAE,KAAK;qBACjB;iBACF,CAAA;aACF;YACD,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAA;YAE/C,MAAM,KAAK,CAAA;SACZ;KACF;IAED,OAAO;QACL,KAAK,EAAE,WAAW,+BAChB,MAAM,IACH,KAAK,GACL,IAAI,EACP;KACH,CAAA;AACH,CAAC,CAAA,CAAA"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
2
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
3
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -8,20 +7,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
8
|
});
|
|
10
9
|
};
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
const
|
|
14
|
-
const utils_1 = require("../../utils");
|
|
15
|
-
const wrapRoute = (serverRuntimeConfig, props) => ({ req, res, query, locale, } = {}, data) => __awaiter(void 0, void 0, void 0, function* () {
|
|
10
|
+
import { cleanObject } from '../../../shared';
|
|
11
|
+
import { getInitializedShopify, getSecurityHeader } from '../../utils';
|
|
12
|
+
export const wrapRoute = (serverRuntimeConfig, props) => ({ req, res, query, locale, } = {}, data) => __awaiter(void 0, void 0, void 0, function* () {
|
|
16
13
|
var _a, _b;
|
|
17
14
|
const shop = (_a = query === null || query === void 0 ? void 0 : query.shop) !== null && _a !== void 0 ? _a : (_b = req.query) === null || _b === void 0 ? void 0 : _b.shop;
|
|
18
|
-
const shopify =
|
|
15
|
+
const shopify = getInitializedShopify(serverRuntimeConfig);
|
|
19
16
|
if (shopify === null || shopify === void 0 ? void 0 : shopify.config) {
|
|
20
|
-
res.setHeader('Content-Security-Policy',
|
|
17
|
+
res.setHeader('Content-Security-Policy', getSecurityHeader(shop, shopify.config));
|
|
21
18
|
}
|
|
22
19
|
return {
|
|
23
|
-
props:
|
|
20
|
+
props: cleanObject(Object.assign(Object.assign({ locale }, props), data)),
|
|
24
21
|
};
|
|
25
22
|
});
|
|
26
|
-
exports.wrapRoute = wrapRoute;
|
|
27
23
|
//# sourceMappingURL=wrap.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrap.js","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/wrap.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wrap.js","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/wrap.js"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAEtE,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,mBAAmB,EAAE,KAAK,EAAE,EAAE,CAAC,CAAO,EAC9D,GAAG,EACH,GAAG,EACH,KAAK,EACL,MAAM,GACP,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE;;IACd,MAAM,IAAI,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,mCAAI,MAAA,GAAG,CAAC,KAAK,0CAAE,IAAI,CAAA;IAE3C,MAAM,OAAO,GAAG,qBAAqB,CAAC,mBAAmB,CAAC,CAAA;IAC1D,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,EAAE;QACnB,GAAG,CAAC,SAAS,CAAC,yBAAyB,EAAE,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;KAClF;IAED,OAAO;QACL,KAAK,EAAE,WAAW,+BAChB,MAAM,IACH,KAAK,GACL,IAAI,EACP;KACH,CAAA;AACH,CAAC,CAAA,CAAA"}
|
package/dist/lib/index.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export * from '../shared';
|
|
2
|
+
export * from '../verification';
|
|
2
3
|
export * from './handlers';
|
|
3
4
|
export * from './withShopify';
|
|
4
|
-
export {
|
|
5
|
+
export { getShopifyHelpers, prepareHeaders } from './utils';
|
|
5
6
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,eAAe,CAAA;AAC7B,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,iBAAiB,CAAA;AAC/B,cAAc,YAAY,CAAA;AAC1B,cAAc,eAAe,CAAA;AAC7B,OAAO,EACL,iBAAiB,EACjB,cAAc,EACf,MAAM,SAAS,CAAA"}
|
package/dist/lib/index.js
CHANGED
|
@@ -1,26 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.ensureRawBody = exports.prepareHeaders = exports.getShopifyHelpers = exports.getVerificationHelpers = void 0;
|
|
18
|
-
__exportStar(require("../shared"), exports);
|
|
19
|
-
__exportStar(require("./handlers"), exports);
|
|
20
|
-
__exportStar(require("./withShopify"), exports);
|
|
21
|
-
var utils_1 = require("./utils");
|
|
22
|
-
Object.defineProperty(exports, "getVerificationHelpers", { enumerable: true, get: function () { return utils_1.getVerificationHelpers; } });
|
|
23
|
-
Object.defineProperty(exports, "getShopifyHelpers", { enumerable: true, get: function () { return utils_1.getShopifyHelpers; } });
|
|
24
|
-
Object.defineProperty(exports, "prepareHeaders", { enumerable: true, get: function () { return utils_1.prepareHeaders; } });
|
|
25
|
-
Object.defineProperty(exports, "ensureRawBody", { enumerable: true, get: function () { return utils_1.ensureRawBody; } });
|
|
1
|
+
export * from '../shared';
|
|
2
|
+
export * from '../verification';
|
|
3
|
+
export * from './handlers';
|
|
4
|
+
export * from './withShopify';
|
|
5
|
+
export { getShopifyHelpers, prepareHeaders } from './utils';
|
|
26
6
|
//# sourceMappingURL=index.js.map
|
package/dist/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,iBAAiB,CAAA;AAC/B,cAAc,YAAY,CAAA;AAC1B,cAAc,eAAe,CAAA;AAC7B,OAAO,EACL,iBAAiB,EACjB,cAAc,EACf,MAAM,SAAS,CAAA"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
2
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
3
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -8,52 +7,49 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
8
|
});
|
|
10
9
|
};
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
const
|
|
14
|
-
const
|
|
15
|
-
const
|
|
16
|
-
const { shop, accessToken } = (0, shared_1.ensureObject)(session);
|
|
17
|
-
const { name: plan, test, config, required } = (0, shared_1.ensureObject)(paymentConfig);
|
|
10
|
+
import { BillingError } from '@shopify/shopify-api';
|
|
11
|
+
import { isTrue, stringEmpty, objectEmpty, unsnakecase, ensureObject, stringNotEmpty, objectNotEmpty, BILLING_INTERVALS, } from '../../shared';
|
|
12
|
+
export const ensureBilling = (paymentConfig, { shopify, session, forceBilling } = {}) => __awaiter(void 0, void 0, void 0, function* () {
|
|
13
|
+
const { shop, accessToken } = ensureObject(session);
|
|
14
|
+
const { name: plan, test, config, required } = ensureObject(paymentConfig);
|
|
18
15
|
if (!required) {
|
|
19
16
|
return undefined;
|
|
20
17
|
}
|
|
21
|
-
const isTest =
|
|
22
|
-
const hasValidBilling = (
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
Object.values(
|
|
18
|
+
const isTest = isTrue(test);
|
|
19
|
+
const hasValidBilling = (stringNotEmpty(shop) &&
|
|
20
|
+
stringNotEmpty(accessToken) &&
|
|
21
|
+
stringNotEmpty(plan) &&
|
|
22
|
+
objectNotEmpty(config) &&
|
|
23
|
+
Object.values(BILLING_INTERVALS).includes(config === null || config === void 0 ? void 0 : config.interval));
|
|
27
24
|
if (!hasValidBilling) {
|
|
28
|
-
throw new
|
|
25
|
+
throw new BillingError({
|
|
29
26
|
message: 'Invalid billing configuration',
|
|
30
27
|
});
|
|
31
28
|
}
|
|
32
29
|
try {
|
|
33
30
|
// NOTE: forceBilling ensures while in "review" mode that we rebill each time
|
|
34
|
-
if (
|
|
31
|
+
if (isTrue(forceBilling) || !isTrue(yield shopify.billing.check({ plans: [plan], isTest, session }))) {
|
|
35
32
|
return shopify.billing.request({ plan, isTest, session });
|
|
36
33
|
}
|
|
37
34
|
return undefined;
|
|
38
35
|
}
|
|
39
36
|
catch (error) {
|
|
40
37
|
console.error('Failed to verify or initialize payment', error);
|
|
41
|
-
throw new
|
|
38
|
+
throw new BillingError({
|
|
42
39
|
message: 'Failed to verify or initialize payment',
|
|
43
40
|
});
|
|
44
41
|
}
|
|
45
42
|
});
|
|
46
|
-
exports.ensureBilling = ensureBilling;
|
|
47
43
|
// eslint-disable-next-line arrow-body-style
|
|
48
|
-
const generatePaymentConfig = (paymentConfig, { SHOPIFY_RUN_MODE, appTitle: _appTitle, data: { appName, debugMode, environment, } = {}, }) => {
|
|
49
|
-
if (
|
|
44
|
+
export const generatePaymentConfig = (paymentConfig, { SHOPIFY_RUN_MODE, appTitle: _appTitle, data: { appName, debugMode, environment, } = {}, }) => {
|
|
45
|
+
if (objectEmpty(paymentConfig) || stringEmpty(environment)) {
|
|
50
46
|
return undefined;
|
|
51
47
|
}
|
|
52
|
-
const { name, price, currency = 'USD', type =
|
|
48
|
+
const { name, price, currency = 'USD', type = BILLING_INTERVALS.ONE_TIME, } = paymentConfig;
|
|
53
49
|
const appTitle = name || _appTitle || appName;
|
|
54
50
|
const isProduction = (environment === 'production');
|
|
55
51
|
const notProduction = !isProduction;
|
|
56
|
-
const billingName = `${appTitle}${notProduction ? ` - ${environment}` : ''} - ${
|
|
52
|
+
const billingName = `${appTitle}${notProduction ? ` - ${environment}` : ''} - ${unsnakecase(type)}`;
|
|
57
53
|
return {
|
|
58
54
|
required: (isProduction || debugMode || (['cli', 'review'].includes(SHOPIFY_RUN_MODE))),
|
|
59
55
|
test: (notProduction || debugMode || (SHOPIFY_RUN_MODE === 'review')),
|
|
@@ -65,5 +61,4 @@ const generatePaymentConfig = (paymentConfig, { SHOPIFY_RUN_MODE, appTitle: _app
|
|
|
65
61
|
},
|
|
66
62
|
};
|
|
67
63
|
};
|
|
68
|
-
exports.generatePaymentConfig = generatePaymentConfig;
|
|
69
64
|
//# sourceMappingURL=billing.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"billing.js","sourceRoot":"","sources":["../../../src/lib/utils/billing.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"billing.js","sourceRoot":"","sources":["../../../src/lib/utils/billing.js"],"names":[],"mappings":"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"}
|