@shopify/shopify-app-remix 2.3.0 → 2.4.0
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/build/cjs/server/adapters/node/index.js +1 -0
- package/build/cjs/server/authenticate/admin/authenticate.js +17 -14
- package/build/cjs/server/authenticate/admin/billing/cancel.js +1 -1
- package/build/cjs/server/authenticate/admin/billing/require.js +1 -1
- package/build/cjs/server/authenticate/admin/helpers/create-admin-api-context.js +2 -5
- package/build/cjs/server/authenticate/admin/helpers/handle-client-error.js +8 -4
- package/build/cjs/server/authenticate/admin/helpers/redirect-to-bounce-page.js +4 -2
- package/build/cjs/server/authenticate/admin/helpers/redirect.js +1 -5
- package/build/cjs/server/authenticate/admin/helpers/trigger-after-auth-hook.js +2 -2
- package/build/cjs/server/authenticate/admin/strategies/auth-code-flow.js +31 -4
- package/build/cjs/server/authenticate/admin/strategies/token-exchange.js +155 -0
- package/build/cjs/server/authenticate/const.js +4 -0
- package/build/cjs/server/authenticate/helpers/idempotent-promise-handler.js +40 -0
- package/build/cjs/server/authenticate/helpers/respond-to-invalid-session-token.js +33 -0
- package/build/cjs/server/authenticate/login/login.js +5 -1
- package/build/cjs/server/authenticate/public/checkout/authenticate.js +1 -0
- package/build/cjs/server/authenticate/webhooks/authenticate.js +1 -1
- package/build/cjs/server/authenticate/webhooks/register.js +16 -0
- package/build/cjs/server/shopify-app.js +11 -6
- package/build/cjs/server/version.js +1 -1
- package/build/ts/react/components/AppProvider/AppProvider.js +1 -1
- package/build/ts/react/components/AppProvider/AppProvider.js.map +1 -1
- package/build/ts/server/__test-helpers/const.d.ts +2 -1
- package/build/ts/server/__test-helpers/const.d.ts.map +1 -1
- package/build/ts/server/__test-helpers/const.js +3 -2
- package/build/ts/server/__test-helpers/const.js.map +1 -1
- package/build/ts/server/__test-helpers/expect-document-request-headers.js.map +1 -1
- package/build/ts/server/__test-helpers/expect-exit-iframe.js.map +1 -1
- package/build/ts/server/__test-helpers/get-thrown-response.js.map +1 -1
- package/build/ts/server/__test-helpers/request-mock.js.map +1 -1
- package/build/ts/server/__test-helpers/setup-valid-session.d.ts +1 -1
- package/build/ts/server/__test-helpers/setup-valid-session.d.ts.map +1 -1
- package/build/ts/server/__test-helpers/setup-valid-session.js +5 -5
- package/build/ts/server/__test-helpers/setup-valid-session.js.map +1 -1
- package/build/ts/server/__test-helpers/test-config.d.ts +1 -0
- package/build/ts/server/__test-helpers/test-config.d.ts.map +1 -1
- package/build/ts/server/__test-helpers/test-config.js +1 -0
- package/build/ts/server/__test-helpers/test-config.js.map +1 -1
- package/build/ts/server/adapters/node/index.js.map +1 -1
- package/build/ts/server/authenticate/admin/authenticate.d.ts +7 -1
- package/build/ts/server/authenticate/admin/authenticate.d.ts.map +1 -1
- package/build/ts/server/authenticate/admin/authenticate.js +14 -14
- package/build/ts/server/authenticate/admin/authenticate.js.map +1 -1
- package/build/ts/server/authenticate/admin/billing/request.js.map +1 -1
- package/build/ts/server/authenticate/admin/helpers/create-admin-api-context.d.ts +2 -2
- package/build/ts/server/authenticate/admin/helpers/create-admin-api-context.d.ts.map +1 -1
- package/build/ts/server/authenticate/admin/helpers/create-admin-api-context.js +2 -5
- package/build/ts/server/authenticate/admin/helpers/create-admin-api-context.js.map +1 -1
- package/build/ts/server/authenticate/admin/helpers/ensure-session-token-search-param-if-required.js.map +1 -1
- package/build/ts/server/authenticate/admin/helpers/handle-client-error.d.ts +2 -5
- package/build/ts/server/authenticate/admin/helpers/handle-client-error.d.ts.map +1 -1
- package/build/ts/server/authenticate/admin/helpers/handle-client-error.js +6 -5
- package/build/ts/server/authenticate/admin/helpers/handle-client-error.js.map +1 -1
- package/build/ts/server/authenticate/admin/helpers/redirect-to-bounce-page.d.ts.map +1 -1
- package/build/ts/server/authenticate/admin/helpers/redirect-to-bounce-page.js +4 -2
- package/build/ts/server/authenticate/admin/helpers/redirect-to-bounce-page.js.map +1 -1
- package/build/ts/server/authenticate/admin/helpers/redirect-with-exitiframe.js.map +1 -1
- package/build/ts/server/authenticate/admin/helpers/redirect.js +0 -3
- package/build/ts/server/authenticate/admin/helpers/redirect.js.map +1 -1
- package/build/ts/server/authenticate/admin/helpers/render-app-bridge.js.map +1 -1
- package/build/ts/server/authenticate/admin/helpers/trigger-after-auth-hook.d.ts +2 -1
- package/build/ts/server/authenticate/admin/helpers/trigger-after-auth-hook.d.ts.map +1 -1
- package/build/ts/server/authenticate/admin/helpers/trigger-after-auth-hook.js +2 -2
- package/build/ts/server/authenticate/admin/helpers/trigger-after-auth-hook.js.map +1 -1
- package/build/ts/server/authenticate/admin/helpers/validate-shop-and-host-params.js.map +1 -1
- package/build/ts/server/authenticate/admin/strategies/auth-code-flow.d.ts +4 -2
- package/build/ts/server/authenticate/admin/strategies/auth-code-flow.d.ts.map +1 -1
- package/build/ts/server/authenticate/admin/strategies/auth-code-flow.js +26 -4
- package/build/ts/server/authenticate/admin/strategies/auth-code-flow.js.map +1 -1
- package/build/ts/server/authenticate/admin/strategies/token-exchange.d.ts +17 -0
- package/build/ts/server/authenticate/admin/strategies/token-exchange.d.ts.map +1 -0
- package/build/ts/server/authenticate/admin/strategies/token-exchange.js +163 -0
- package/build/ts/server/authenticate/admin/strategies/token-exchange.js.map +1 -0
- package/build/ts/server/authenticate/admin/strategies/types.d.ts +16 -5
- package/build/ts/server/authenticate/admin/strategies/types.d.ts.map +1 -1
- package/build/ts/server/authenticate/admin/types.d.ts +0 -4
- package/build/ts/server/authenticate/admin/types.d.ts.map +1 -1
- package/build/ts/server/authenticate/const.d.ts +3 -0
- package/build/ts/server/authenticate/const.d.ts.map +1 -1
- package/build/ts/server/authenticate/const.js +4 -1
- package/build/ts/server/authenticate/const.js.map +1 -1
- package/build/ts/server/authenticate/helpers/add-response-headers.js.map +1 -1
- package/build/ts/server/authenticate/helpers/ensure-cors-headers.js.map +1 -1
- package/build/ts/server/authenticate/helpers/idempotent-promise-handler.d.ts +12 -0
- package/build/ts/server/authenticate/helpers/idempotent-promise-handler.d.ts.map +1 -0
- package/build/ts/server/authenticate/helpers/idempotent-promise-handler.js +53 -0
- package/build/ts/server/authenticate/helpers/idempotent-promise-handler.js.map +1 -0
- package/build/ts/server/authenticate/helpers/index.d.ts +1 -0
- package/build/ts/server/authenticate/helpers/index.d.ts.map +1 -1
- package/build/ts/server/authenticate/helpers/index.js +1 -0
- package/build/ts/server/authenticate/helpers/index.js.map +1 -1
- package/build/ts/server/authenticate/helpers/reject-bot-request.js.map +1 -1
- package/build/ts/server/authenticate/helpers/respond-to-invalid-session-token.d.ts +9 -0
- package/build/ts/server/authenticate/helpers/respond-to-invalid-session-token.d.ts.map +1 -0
- package/build/ts/server/authenticate/helpers/respond-to-invalid-session-token.js +20 -0
- package/build/ts/server/authenticate/helpers/respond-to-invalid-session-token.js.map +1 -0
- package/build/ts/server/authenticate/helpers/respond-to-options-request.js.map +1 -1
- package/build/ts/server/authenticate/login/login.d.ts.map +1 -1
- package/build/ts/server/authenticate/login/login.js +6 -2
- package/build/ts/server/authenticate/login/login.js.map +1 -1
- package/build/ts/server/authenticate/public/appProxy/authenticate.js.map +1 -1
- package/build/ts/server/authenticate/public/checkout/authenticate.js.map +1 -1
- package/build/ts/server/authenticate/public/factory.js.map +1 -1
- package/build/ts/server/authenticate/webhooks/authenticate.js.map +1 -1
- package/build/ts/server/authenticate/webhooks/register.d.ts +1 -1
- package/build/ts/server/authenticate/webhooks/register.d.ts.map +1 -1
- package/build/ts/server/authenticate/webhooks/register.js +20 -1
- package/build/ts/server/authenticate/webhooks/register.js.map +1 -1
- package/build/ts/server/boundary/error.js.map +1 -1
- package/build/ts/server/boundary/headers.js.map +1 -1
- package/build/ts/server/clients/admin/rest.js.map +1 -1
- package/build/ts/server/config-types.d.ts +2 -0
- package/build/ts/server/config-types.d.ts.map +1 -1
- package/build/ts/server/future/flags.d.ts +6 -0
- package/build/ts/server/future/flags.d.ts.map +1 -1
- package/build/ts/server/override-logger.js.map +1 -1
- package/build/ts/server/shopify-app.d.ts.map +1 -1
- package/build/ts/server/shopify-app.js +10 -5
- package/build/ts/server/shopify-app.js.map +1 -1
- package/build/ts/server/types.d.ts +9 -4
- package/build/ts/server/types.d.ts.map +1 -1
- package/build/ts/server/types.js +2 -2
- package/build/ts/server/types.js.map +1 -1
- package/build/ts/server/unauthenticated/admin/factory.js.map +1 -1
- package/build/ts/server/unauthenticated/storefront/factory.js.map +1 -1
- package/build/ts/server/version.d.ts +1 -1
- package/build/ts/server/version.js +1 -1
- package/package.json +8 -12
|
@@ -70,7 +70,7 @@ var RemixPolarisLink_1 = require("../RemixPolarisLink");
|
|
|
70
70
|
*/
|
|
71
71
|
function AppProvider(props) {
|
|
72
72
|
var children = props.children, apiKey = props.apiKey, i18n = props.i18n, _a = props.isEmbeddedApp, isEmbeddedApp = _a === void 0 ? true : _a, _b = props.__APP_BRIDGE_URL, __APP_BRIDGE_URL = _b === void 0 ? const_1.APP_BRIDGE_URL : _b, polarisProps = tslib_1.__rest(props, ["children", "apiKey", "i18n", "isEmbeddedApp", "__APP_BRIDGE_URL"]);
|
|
73
|
-
return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [isEmbeddedApp && (0, jsx_runtime_1.jsx)("script", { src: __APP_BRIDGE_URL, "data-api-key": apiKey }), (0, jsx_runtime_1.jsx)(polaris_1.AppProvider, tslib_1.__assign({}, polarisProps, { linkComponent: RemixPolarisLink_1.RemixPolarisLink, i18n: i18n || en_json_1.default
|
|
73
|
+
return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [isEmbeddedApp && (0, jsx_runtime_1.jsx)("script", { src: __APP_BRIDGE_URL, "data-api-key": apiKey }), (0, jsx_runtime_1.jsx)(polaris_1.AppProvider, tslib_1.__assign({}, polarisProps, { linkComponent: RemixPolarisLink_1.RemixPolarisLink, i18n: i18n || en_json_1.default, children: children }))] }));
|
|
74
74
|
}
|
|
75
75
|
exports.AppProvider = AppProvider;
|
|
76
76
|
//# sourceMappingURL=AppProvider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppProvider.js","sourceRoot":"","sources":["../../../../../src/react/components/AppProvider/AppProvider.tsx"],"names":[],"mappings":";;;;;AAAA,4CAG0B;AAC1B,qFAA2D;AAE3D,qCAA2C;AAC3C,wDAAqD;AA8BrD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4DG;AACH,SAAgB,WAAW,CAAC,KAAuB;IAE/C,IAAA,QAAQ,GAMN,KAAK,SANC,EACR,MAAM,GAKJ,KAAK,OALD,EACN,IAAI,GAIF,KAAK,KAJH,EACJ,KAGE,KAAK,cAHa,EAApB,aAAa,mBAAG,IAAI,KAAA,EACpB,KAEE,KAAK,iBAF0B,EAAjC,gBAAgB,mBAAG,sBAAc,KAAA,EAC9B,YAAY,kBACb,KAAK,EAPH,mEAOL,CADgB,CACP;IAEV,OAAO,CACL,6DACG,aAAa,IAAI,mCAAQ,GAAG,EAAE,gBAAgB,kBAAgB,MAAM,GAAI,EACzE,uBAAC,qBAAkB,uBACb,YAAY,IAChB,aAAa,EAAE,mCAAgB,EAC/B,IAAI,EAAE,IAAI,IAAI,iBAAW,
|
|
1
|
+
{"version":3,"file":"AppProvider.js","sourceRoot":"","sources":["../../../../../src/react/components/AppProvider/AppProvider.tsx"],"names":[],"mappings":";;;;;AAAA,4CAG0B;AAC1B,qFAA2D;AAE3D,qCAA2C;AAC3C,wDAAqD;AA8BrD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4DG;AACH,SAAgB,WAAW,CAAC,KAAuB;IAE/C,IAAA,QAAQ,GAMN,KAAK,SANC,EACR,MAAM,GAKJ,KAAK,OALD,EACN,IAAI,GAIF,KAAK,KAJH,EACJ,KAGE,KAAK,cAHa,EAApB,aAAa,mBAAG,IAAI,KAAA,EACpB,KAEE,KAAK,iBAF0B,EAAjC,gBAAgB,mBAAG,sBAAc,KAAA,EAC9B,YAAY,kBACb,KAAK,EAPH,mEAOL,CADgB,CACP;IAEV,OAAO,CACL,6DACG,aAAa,IAAI,mCAAQ,GAAG,EAAE,gBAAgB,kBAAgB,MAAM,GAAI,EACzE,uBAAC,qBAAkB,uBACb,YAAY,IAChB,aAAa,EAAE,mCAAgB,EAC/B,IAAI,EAAE,IAAI,IAAI,iBAAW,YAExB,QAAQ,IACU,IACpB,CACJ,CAAC;AACJ,CAAC;AAtBD,kCAsBC"}
|
|
@@ -3,7 +3,8 @@ export declare const API_KEY = "testApiKey";
|
|
|
3
3
|
export declare const APP_URL = "https://my-test-app.myshopify.io";
|
|
4
4
|
export declare const SHOPIFY_HOST = "totally-real-host.myshopify.io";
|
|
5
5
|
export declare const BASE64_HOST: string;
|
|
6
|
+
export declare const TEST_SHOP_NAME = "test-shop";
|
|
6
7
|
export declare const TEST_SHOP = "test-shop.myshopify.com";
|
|
7
|
-
export declare const GRAPHQL_URL
|
|
8
|
+
export declare const GRAPHQL_URL = "https://test-shop.myshopify.com/admin/api/2024-01/graphql.json";
|
|
8
9
|
export declare const USER_ID = 12345;
|
|
9
10
|
//# sourceMappingURL=const.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"const.d.ts","sourceRoot":"","sources":["../../../../src/server/__test-helpers/const.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,cAAc,qBAAqB,CAAC;AACjD,eAAO,MAAM,OAAO,eAAe,CAAC;AACpC,eAAO,MAAM,OAAO,qCAAqC,CAAC;AAC1D,eAAO,MAAM,YAAY,mCAAmC,CAAC;AAC7D,eAAO,MAAM,WAAW,QAA+C,CAAC;AACxE,eAAO,MAAM,SAAS,
|
|
1
|
+
{"version":3,"file":"const.d.ts","sourceRoot":"","sources":["../../../../src/server/__test-helpers/const.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,cAAc,qBAAqB,CAAC;AACjD,eAAO,MAAM,OAAO,eAAe,CAAC;AACpC,eAAO,MAAM,OAAO,qCAAqC,CAAC;AAC1D,eAAO,MAAM,YAAY,mCAAmC,CAAC;AAC7D,eAAO,MAAM,WAAW,QAA+C,CAAC;AACxE,eAAO,MAAM,cAAc,cAAc,CAAC;AAC1C,eAAO,MAAM,SAAS,4BAAoC,CAAC;AAC3D,eAAO,MAAM,WAAW,mEAAsE,CAAC;AAC/F,eAAO,MAAM,OAAO,QAAQ,CAAC"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.USER_ID = exports.GRAPHQL_URL = exports.TEST_SHOP = exports.BASE64_HOST = exports.SHOPIFY_HOST = exports.APP_URL = exports.API_KEY = exports.API_SECRET_KEY = void 0;
|
|
3
|
+
exports.USER_ID = exports.GRAPHQL_URL = exports.TEST_SHOP = exports.TEST_SHOP_NAME = exports.BASE64_HOST = exports.SHOPIFY_HOST = exports.APP_URL = exports.API_KEY = exports.API_SECRET_KEY = void 0;
|
|
4
4
|
var shopify_api_1 = require("@shopify/shopify-api");
|
|
5
5
|
exports.API_SECRET_KEY = 'testApiSecretKey';
|
|
6
6
|
exports.API_KEY = 'testApiKey';
|
|
7
7
|
exports.APP_URL = 'https://my-test-app.myshopify.io';
|
|
8
8
|
exports.SHOPIFY_HOST = 'totally-real-host.myshopify.io';
|
|
9
9
|
exports.BASE64_HOST = Buffer.from(exports.SHOPIFY_HOST).toString('base64');
|
|
10
|
-
exports.
|
|
10
|
+
exports.TEST_SHOP_NAME = 'test-shop';
|
|
11
|
+
exports.TEST_SHOP = "".concat(exports.TEST_SHOP_NAME, ".myshopify.com");
|
|
11
12
|
exports.GRAPHQL_URL = "https://".concat(exports.TEST_SHOP, "/admin/api/").concat(shopify_api_1.LATEST_API_VERSION, "/graphql.json");
|
|
12
13
|
exports.USER_ID = 12345;
|
|
13
14
|
//# sourceMappingURL=const.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"const.js","sourceRoot":"","sources":["../../../../src/server/__test-helpers/const.ts"],"names":[],"mappings":";;;AAAA,oDAAwD;AAE3C,QAAA,cAAc,GAAG,kBAAkB,CAAC;AACpC,QAAA,OAAO,GAAG,YAAY,CAAC;AACvB,QAAA,OAAO,GAAG,kCAAkC,CAAC;AAC7C,QAAA,YAAY,GAAG,gCAAgC,CAAC;AAChD,QAAA,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAY,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAC3D,QAAA,SAAS,GAAG,
|
|
1
|
+
{"version":3,"file":"const.js","sourceRoot":"","sources":["../../../../src/server/__test-helpers/const.ts"],"names":[],"mappings":";;;AAAA,oDAAwD;AAE3C,QAAA,cAAc,GAAG,kBAAkB,CAAC;AACpC,QAAA,OAAO,GAAG,YAAY,CAAC;AACvB,QAAA,OAAO,GAAG,kCAAkC,CAAC;AAC7C,QAAA,YAAY,GAAG,gCAAgC,CAAC;AAChD,QAAA,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAY,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAC3D,QAAA,cAAc,GAAG,WAAW,CAAC;AAC7B,QAAA,SAAS,GAAG,UAAG,sBAAc,mBAAgB,CAAC;AAC9C,QAAA,WAAW,GAAG,kBAAW,iBAAS,wBAAc,gCAAkB,kBAAe,CAAC;AAClF,QAAA,OAAO,GAAG,KAAK,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expect-document-request-headers.js","sourceRoot":"","sources":["../../../../src/server/__test-helpers/expect-document-request-headers.ts"],"names":[],"mappings":";;;AAAA,+CAAqD;AAErD,iCAAkC;AAElC,SAAgB,4BAA4B,CAC1C,QAAkB,EAClB,aAAoB;IAApB,8BAAA,EAAA,oBAAoB;IAEpB,IAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;IAEjC,IAAI,aAAa,EAAE;
|
|
1
|
+
{"version":3,"file":"expect-document-request-headers.js","sourceRoot":"","sources":["../../../../src/server/__test-helpers/expect-document-request-headers.ts"],"names":[],"mappings":";;;AAAA,+CAAqD;AAErD,iCAAkC;AAElC,SAAgB,4BAA4B,CAC1C,QAAkB,EAClB,aAAoB;IAApB,8BAAA,EAAA,oBAAoB;IAEpB,IAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;IAEjC,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,CAAC,OAAO,CACpD,kCAA2B,kBAAkB,CAC3C,iBAAS,CACV,mDAAgD,CAClD,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CACjC,WAAI,sBAAc,uCAAgC,CACnD,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,CAAC,OAAO,CACpD,yBAAyB,CAC1B,CAAC;IACJ,CAAC;AACH,CAAC;AApBD,oEAoBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expect-exit-iframe.js","sourceRoot":"","sources":["../../../../src/server/__test-helpers/expect-exit-iframe.ts"],"names":[],"mappings":";;;AAAA,iCAAwD;AAQxD,SAAgB,wBAAwB,CACtC,QAAkB,EAClB,EAIuC;QAJvC,qBAIqC,EAAE,KAAA,EAHrC,YAAgB,EAAhB,IAAI,mBAAG,iBAAS,KAAA,EAChB,YAAkB,EAAlB,IAAI,mBAAG,mBAAW,KAAA,EAClB,mBAAkC,EAAlC,WAAW,mBAAG,qBAAc,IAAI,CAAE,KAAA;IAGpC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE5B,IAAA,KAA2B,IAAI,GAAG,CACtC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAE,EACjC,eAAO,CACR,EAHM,QAAQ,cAAA,EAAE,YAAY,kBAG5B,CAAC;IACF,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAE3C,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5C,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAEzD,IAAI,IAAI,EAAE;
|
|
1
|
+
{"version":3,"file":"expect-exit-iframe.js","sourceRoot":"","sources":["../../../../src/server/__test-helpers/expect-exit-iframe.ts"],"names":[],"mappings":";;;AAAA,iCAAwD;AAQxD,SAAgB,wBAAwB,CACtC,QAAkB,EAClB,EAIuC;QAJvC,qBAIqC,EAAE,KAAA,EAHrC,YAAgB,EAAhB,IAAI,mBAAG,iBAAS,KAAA,EAChB,YAAkB,EAAlB,IAAI,mBAAG,mBAAW,KAAA,EAClB,mBAAkC,EAAlC,WAAW,mBAAG,qBAAc,IAAI,CAAE,KAAA;IAGpC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE5B,IAAA,KAA2B,IAAI,GAAG,CACtC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAE,EACjC,eAAO,CACR,EAHM,QAAQ,cAAA,EAAE,YAAY,kBAG5B,CAAC;IACF,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAE3C,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5C,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAEzD,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;AACH,CAAC;AAtBD,4DAsBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-thrown-response.js","sourceRoot":"","sources":["../../../../src/server/__test-helpers/get-thrown-response.ts"],"names":[],"mappings":";;;;AAAA,SAAsB,iBAAiB,CACrC,QAA4C,EAC5C,OAAgB;;;;;;;oBAGd,qBAAM,QAAQ,CAAC,OAAO,CAAC,EAAA;;oBAAvB,SAAuB,CAAC;;;;oBAExB,IAAI,CAAC,CAAC,UAAQ,YAAY,QAAQ,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"get-thrown-response.js","sourceRoot":"","sources":["../../../../src/server/__test-helpers/get-thrown-response.ts"],"names":[],"mappings":";;;;AAAA,SAAsB,iBAAiB,CACrC,QAA4C,EAC5C,OAAgB;;;;;;;oBAGd,qBAAM,QAAQ,CAAC,OAAO,CAAC,EAAA;;oBAAvB,SAAuB,CAAC;;;;oBAExB,IAAI,CAAC,CAAC,UAAQ,YAAY,QAAQ,CAAC,EAAE,CAAC;wBACpC,MAAM,IAAI,KAAK,CACb,UAAG,OAAO,CAAC,MAAM,yBAAe,OAAO,CAAC,GAAG,oDAA0C,UAAQ,CAAE,CAChG,CAAC;oBACJ,CAAC;oBACD,sBAAO,UAAQ,EAAC;wBAGlB,MAAM,IAAI,KAAK,CAAC,UAAG,OAAO,CAAC,MAAM,yBAAe,OAAO,CAAC,GAAG,mBAAgB,CAAC,CAAC;;;;CAC9E;AAhBD,8CAgBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-mock.js","sourceRoot":"","sources":["../../../../src/server/__test-helpers/request-mock.ts"],"names":[],"mappings":";;;;AAAA,4EAAsD;AAYtD,IAAI,YAAY,GAA6B,EAAE,CAAC;AAEhD,IAAI,kBAAkB,GAAG,KAAK,CAAC;AAE/B,SAAsB,mBAAmB,CAAC,EAGjB;QAFvB,OAAO,aAAA,EACP,QAAQ,cAAA;;;;;;oBAER,YAAY,CAAC,IAAI,CAAC,EAAC,OAAO,SAAA,EAAE,QAAQ,UAAA,EAAC,CAAC,CAAC;oBAElB,qBAAM,UAAU,CAAC,QAAQ,CAAC,EAAA;;oBAAzC,KAAe,SAA0B,EAAxC,IAAI,UAAA,EAAE,IAAI,UAAA;oBACjB,yBAAS,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;;;;;CACpC;AARD,kDAQC;AAED,SAAsB,oBAAoB;IAAC,eAAkC;SAAlC,UAAkC,EAAlC,qBAAkC,EAAlC,IAAkC;QAAlC,0BAAkC;;;;;;;;oBACrE,eAAe,GAA2B,EAAE,CAAC;;;;oBAChC,UAAA,iBAAA,KAAK,CAAA;;;;oBAAb,IAAI;oBACN,OAAO,GAAc,IAAI,QAAlB,EAAE,QAAQ,GAAI,IAAI,SAAR,CAAS;oBAEjC,YAAY,CAAC,IAAI,CAAC,EAAC,OAAO,SAAA,EAAE,QAAQ,UAAA,EAAC,CAAC,CAAC;oBAElB,qBAAM,UAAU,CAAC,QAAQ,CAAC,EAAA;;oBAAzC,KAAe,SAA0B,EAAxC,IAAI,UAAA,EAAE,IAAI,UAAA;oBACjB,eAAe,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;;;;;;;;;;;;;;;;;oBAGrC,yBAAS,CAAC,aAAa,OAAvB,yBAAS,2CAAkB,eAAe,WAAE;;;;;CAC7C;AAZD,oDAYC;AAED,SAAe,UAAU,CAAC,QAAkB;;;;;;;oBAElC,qBAAM,QAAQ,CAAC,IAAI,EAAE,EAAA;wBAD7B,uBACE,OAAI,GAAE,SAAqB;wBAC3B,OAAI,GAAE;4BACJ,MAAM,EAAE,QAAQ,CAAC,MAAM;4BACvB,UAAU,EAAE,QAAQ,CAAC,UAAU;4BAC/B,GAAG,EAAE,QAAQ,CAAC,GAAG;4BACjB,OAAO,wCACF,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,KACjD,cAAc,EAAE,kBAAkB,GACnC;yBACF;6BACD;;;;CACH;AAED,SAAsB,aAAa;;;;;;YACjC,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,IAAI,yBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"request-mock.js","sourceRoot":"","sources":["../../../../src/server/__test-helpers/request-mock.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { SessionStorage } from '@shopify/shopify-app-session-storage';
|
|
2
2
|
import { Session } from '@shopify/shopify-api';
|
|
3
|
-
export declare function setUpValidSession(sessionStorage: SessionStorage,
|
|
3
|
+
export declare function setUpValidSession(sessionStorage: SessionStorage, sessionParams?: Partial<Session>): Promise<Session>;
|
|
4
4
|
//# sourceMappingURL=setup-valid-session.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-valid-session.d.ts","sourceRoot":"","sources":["../../../../src/server/__test-helpers/setup-valid-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,sCAAsC,CAAC;AACpE,OAAO,EAAC,OAAO,EAAC,MAAM,sBAAsB,CAAC;AAI7C,wBAAsB,iBAAiB,CACrC,cAAc,EAAE,cAAc,EAC9B,
|
|
1
|
+
{"version":3,"file":"setup-valid-session.d.ts","sourceRoot":"","sources":["../../../../src/server/__test-helpers/setup-valid-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,sCAAsC,CAAC;AACpE,OAAO,EAAC,OAAO,EAAC,MAAM,sBAAsB,CAAC;AAI7C,wBAAsB,iBAAiB,CACrC,cAAc,EAAE,cAAc,EAC9B,aAAa,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAC/B,OAAO,CAAC,OAAO,CAAC,CAoClB"}
|
|
@@ -4,8 +4,7 @@ exports.setUpValidSession = void 0;
|
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var shopify_api_1 = require("@shopify/shopify-api");
|
|
6
6
|
var const_1 = require("./const");
|
|
7
|
-
function setUpValidSession(sessionStorage,
|
|
8
|
-
if (isOnline === void 0) { isOnline = false; }
|
|
7
|
+
function setUpValidSession(sessionStorage, sessionParams) {
|
|
9
8
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
10
9
|
var overrides, id, session;
|
|
11
10
|
return tslib_1.__generator(this, function (_a) {
|
|
@@ -13,10 +12,11 @@ function setUpValidSession(sessionStorage, isOnline) {
|
|
|
13
12
|
case 0:
|
|
14
13
|
overrides = {};
|
|
15
14
|
id = "offline_".concat(const_1.TEST_SHOP);
|
|
16
|
-
if (isOnline) {
|
|
15
|
+
if (sessionParams === null || sessionParams === void 0 ? void 0 : sessionParams.isOnline) {
|
|
17
16
|
id = "".concat(const_1.TEST_SHOP, "_").concat(const_1.USER_ID);
|
|
18
17
|
// Expires one day from now
|
|
19
|
-
overrides.expires =
|
|
18
|
+
overrides.expires =
|
|
19
|
+
sessionParams.expires || new Date(Date.now() + 1000 * 3600 * 24);
|
|
20
20
|
overrides.onlineAccessInfo = {
|
|
21
21
|
associated_user_scope: 'testScope',
|
|
22
22
|
expires_in: 3600 * 24,
|
|
@@ -32,7 +32,7 @@ function setUpValidSession(sessionStorage, isOnline) {
|
|
|
32
32
|
},
|
|
33
33
|
};
|
|
34
34
|
}
|
|
35
|
-
session = new shopify_api_1.Session(tslib_1.__assign({ id: id, shop: const_1.TEST_SHOP, isOnline: isOnline, state: 'test', accessToken: 'totally_real_token', scope: 'testScope' }, overrides));
|
|
35
|
+
session = new shopify_api_1.Session(tslib_1.__assign({ id: id, shop: const_1.TEST_SHOP, isOnline: Boolean(sessionParams === null || sessionParams === void 0 ? void 0 : sessionParams.isOnline), state: 'test', accessToken: 'totally_real_token', scope: 'testScope' }, overrides));
|
|
36
36
|
return [4 /*yield*/, sessionStorage.storeSession(session)];
|
|
37
37
|
case 1:
|
|
38
38
|
_a.sent();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-valid-session.js","sourceRoot":"","sources":["../../../../src/server/__test-helpers/setup-valid-session.ts"],"names":[],"mappings":";;;;AACA,oDAA6C;AAE7C,iCAA2C;AAE3C,SAAsB,iBAAiB,CACrC,cAA8B,EAC9B,
|
|
1
|
+
{"version":3,"file":"setup-valid-session.js","sourceRoot":"","sources":["../../../../src/server/__test-helpers/setup-valid-session.ts"],"names":[],"mappings":";;;;AACA,oDAA6C;AAE7C,iCAA2C;AAE3C,SAAsB,iBAAiB,CACrC,cAA8B,EAC9B,aAAgC;;;;;;oBAE1B,SAAS,GAAqB,EAAE,CAAC;oBACnC,EAAE,GAAG,kBAAW,iBAAS,CAAE,CAAC;oBAChC,IAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ,EAAE,CAAC;wBAC5B,EAAE,GAAG,UAAG,iBAAS,cAAI,eAAO,CAAE,CAAC;wBAC/B,2BAA2B;wBAC3B,SAAS,CAAC,OAAO;4BACf,aAAa,CAAC,OAAO,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC,CAAC;wBACnE,SAAS,CAAC,gBAAgB,GAAG;4BAC3B,qBAAqB,EAAE,WAAW;4BAClC,UAAU,EAAE,IAAI,GAAG,EAAE;4BACrB,eAAe,EAAE;gCACf,EAAE,EAAE,eAAO;gCACX,aAAa,EAAE,IAAI;gCACnB,YAAY,EAAE,IAAI;gCAClB,KAAK,EAAE,gBAAgB;gCACvB,cAAc,EAAE,IAAI;gCACpB,UAAU,EAAE,MAAM;gCAClB,SAAS,EAAE,MAAM;gCACjB,MAAM,EAAE,OAAO;6BAChB;yBACF,CAAC;oBACJ,CAAC;oBAEK,OAAO,GAAG,IAAI,qBAAO,oBACzB,EAAE,IAAA,EACF,IAAI,EAAE,iBAAS,EACf,QAAQ,EAAE,OAAO,CAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ,CAAC,EAC1C,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,oBAAoB,EACjC,KAAK,EAAE,WAAW,IACf,SAAS,EACZ,CAAC;oBACH,qBAAM,cAAc,CAAC,YAAY,CAAC,OAAO,CAAC,EAAA;;oBAA1C,SAA0C,CAAC;oBAE3C,sBAAO,OAAO,EAAC;;;;CAChB;AAvCD,8CAuCC"}
|
|
@@ -19,6 +19,7 @@ declare const TEST_CONFIG: {
|
|
|
19
19
|
readonly future: Required<{
|
|
20
20
|
v3_webhookAdminContext?: true | undefined;
|
|
21
21
|
v3_authenticatePublic?: true | undefined;
|
|
22
|
+
unstable_newEmbeddedAuthStrategy?: true | undefined;
|
|
22
23
|
}>;
|
|
23
24
|
};
|
|
24
25
|
export declare function testConfig<Overrides extends TestOverridesArg<Future>, Future extends FutureFlagOptions>({ future, ...overrides }?: Overrides & {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-config.d.ts","sourceRoot":"","sources":["../../../../src/server/__test-helpers/test-config.ts"],"names":[],"mappings":";AAAA,OAAO,EAEL,WAAW,EACX,oBAAoB,EACrB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAC,cAAc,EAAC,MAAM,sCAAsC,CAAC;AACpE,OAAO,EAAC,oBAAoB,EAAC,MAAM,6CAA6C,CAAC;AAEjF,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAC,iBAAiB,EAAc,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"test-config.d.ts","sourceRoot":"","sources":["../../../../src/server/__test-helpers/test-config.ts"],"names":[],"mappings":";AAAA,OAAO,EAEL,WAAW,EACX,oBAAoB,EACrB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAC,cAAc,EAAC,MAAM,sCAAsC,CAAC;AACpE,OAAO,EAAC,oBAAoB,EAAC,MAAM,6CAA6C,CAAC;AAEjF,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAC,iBAAiB,EAAc,MAAM,iBAAiB,CAAC;AAiBpE,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;CAaP,CAAC;AAQX,wBAAgB,UAAU,CACxB,SAAS,SAAS,gBAAgB,CAAC,MAAM,CAAC,EAC1C,MAAM,SAAS,iBAAiB,EAEhC,EAAC,MAAM,EAAE,GAAG,SAAS,EAAC,GAAE,SAAS,GAAG;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAEnD,GACA,UAAU,CAAC,SAAS,EAAE,MAAM,CAAC,CAa/B;AASD,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,IAAI;KACzB,GAAG,IAAI,MAAM,KAAK,IAAI,KAAK,CAAC,GAAG,CAAC,SAAS,SAAS,GAC/C,KAAK,GACL,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC;CACrB,GAAG;KACD,GAAG,IAAI,MAAM,KAAK,IAAI,GAAG,SAAS,MAAM,KAAK,GAAG,KAAK,GAAG,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC;CAC1E,CAAC;AAEF,KAAK,oBAAoB,CAAC,MAAM,IAAI,MAAM,CAAC,OAAO,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAM9E,KAAK,aAAa,CAAC,MAAM,IAAI,OAAO,CAClC,IAAI,CACF,YAAY,CACV,oBAAoB,EACpB,cAAc,EACd,oBAAoB,CAAC,MAAM,CAAC,CAC7B,EACD,QAAQ,CACT,GAAG;IACF,MAAM,EAAE,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC;CAC/C,CACF,CAAC;AAEF,KAAK,gBAAgB,CAAC,MAAM,IAAI,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;AAElE,KAAK,UAAU,CAAC,SAAS,SAAS,gBAAgB,CAAC,MAAM,CAAC,EAAE,MAAM,IAAI,MAAM,CAC1E,OAAO,WAAW,EAClB,SAAS,CACV,GAAG;IACF,MAAM,EAAE,MAAM,CAAC,OAAO,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-config.js","sourceRoot":"","sources":["../../../../src/server/__test-helpers/test-config.ts"],"names":[],"mappings":";;;;AAAA,oDAI8B;AAE9B,kGAAiF;AAKjF,iCAAyD;AAEzD;;;;;;GAMG;AACH,IAAM,iBAAiB,GAAiD;IACtE,qBAAqB,EAAE,IAAI;IAC3B,sBAAsB,EAAE,IAAI;
|
|
1
|
+
{"version":3,"file":"test-config.js","sourceRoot":"","sources":["../../../../src/server/__test-helpers/test-config.ts"],"names":[],"mappings":";;;;AAAA,oDAI8B;AAE9B,kGAAiF;AAKjF,iCAAyD;AAEzD;;;;;;GAMG;AACH,IAAM,iBAAiB,GAAiD;IACtE,qBAAqB,EAAE,IAAI;IAC3B,sBAAsB,EAAE,IAAI;IAC5B,gCAAgC,EAAE,IAAI;CAC9B,CAAC;AAEX,IAAM,WAAW,GAAG;IAClB,MAAM,EAAE,eAAO;IACf,YAAY,EAAE,sBAAc;IAC5B,MAAM,EAAE,CAAC,WAAW,CAAQ;IAC5B,UAAU,EAAE,gCAAkB;IAC9B,MAAM,EAAE,eAAO;IACf,MAAM,EAAE;QACN,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE;QACd,KAAK,EAAE,yBAAW,CAAC,KAAK;KACzB;IACD,aAAa,EAAE,IAAI;IACnB,cAAc,EAAE,IAAI,yDAAoB,EAAE;IAC1C,MAAM,EAAE,iBAAiB;CACjB,CAAC;AAEX,2CAA2C;AAC3C,UAAU,CAAC;IACT,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;IAClC,WAAmB,CAAC,cAAc,GAAG,IAAI,yDAAoB,EAAE,CAAC;AACnE,CAAC,CAAC,CAAC;AAEH,SAAgB,UAAU,CAIxB,EAEC;IAFD,mBAAA,EAAA,KAAwD,EAEvD;IAFA,IAAA,MAAM,YAAA,EAAK,SAAS,sBAArB,UAAsB,CAAD;IAIrB,OAAO,uDACF,WAAW,GACX,SAAS,KACZ,MAAM,wCACD,WAAW,CAAC,MAAM,GACjB,SAAoC,CAAC,MAAM,GAEjD,MAAM,wCACD,WAAW,CAAC,MAAM,GAClB,MAAM,IAEL,CAAC;AACX,CAAC;AApBD,gCAoBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/server/adapters/node/index.ts"],"names":[],"mappings":";;;AAAA,0DAA4B;AAE5B,wDAGsC;AAEtC,sDAAmE;AAEnE,IAAA,mBAAS,EAAC,gBAAa,CAAC,CAAC;AAEzB,IAAA,kCAAwB,EAAC;IACvB,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC,CAAC;AAEH,mCAAmC;AACnC,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/server/adapters/node/index.ts"],"names":[],"mappings":";;;AAAA,0DAA4B;AAE5B,wDAGsC;AAEtC,sDAAmE;AAEnE,IAAA,mBAAS,EAAC,gBAAa,CAAC,CAAC;AAEzB,IAAA,kCAAwB,EAAC;IACvB,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC,CAAC;AAEH,mCAAmC;AACnC,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;IAC/B,IAAA,iCAAuB,EAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;AACtD,CAAC;AACD,kCAAkC"}
|
|
@@ -1,8 +1,14 @@
|
|
|
1
|
-
import { ShopifyRestResources } from '@shopify/shopify-api';
|
|
1
|
+
import { JwtPayload, ShopifyRestResources } from '@shopify/shopify-api';
|
|
2
2
|
import type { BasicParams } from '../../types';
|
|
3
3
|
import type { AppConfigArg } from '../../config-types';
|
|
4
4
|
import type { AuthenticateAdmin } from './types';
|
|
5
5
|
import { AuthorizationStrategy } from './strategies/types';
|
|
6
|
+
export interface SessionTokenContext {
|
|
7
|
+
shop: string;
|
|
8
|
+
sessionId?: string;
|
|
9
|
+
sessionToken?: string;
|
|
10
|
+
payload?: JwtPayload;
|
|
11
|
+
}
|
|
6
12
|
interface AuthStrategyParams extends BasicParams {
|
|
7
13
|
strategy: AuthorizationStrategy;
|
|
8
14
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authenticate.d.ts","sourceRoot":"","sources":["../../../../../src/server/authenticate/admin/authenticate.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"authenticate.d.ts","sourceRoot":"","sources":["../../../../../src/server/authenticate/admin/authenticate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAW,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAE/E,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAerD,OAAO,KAAK,EAEV,iBAAiB,EAGlB,MAAM,SAAS,CAAC;AASjB,OAAO,EAAC,qBAAqB,EAAC,MAAM,oBAAoB,CAAC;AAEzD,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,UAAU,CAAC;CACtB;AAED,UAAU,kBAAmB,SAAQ,WAAW;IAC9C,QAAQ,EAAE,qBAAqB,CAAC;CACjC;AAED,wBAAgB,mBAAmB,CACjC,SAAS,SAAS,YAAY,EAC9B,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,EAC7D,EACA,QAAQ,EACR,GAAG,MAAM,EACV,EAAE,kBAAkB,GAAG,iBAAiB,CAAC,SAAS,EAAE,SAAS,CAAC,CAuG9D"}
|
|
@@ -35,13 +35,9 @@ function authStrategyFactory(_a) {
|
|
|
35
35
|
});
|
|
36
36
|
});
|
|
37
37
|
}
|
|
38
|
-
function createContext(request, session, sessionToken) {
|
|
38
|
+
function createContext(request, session, authStrategy, sessionToken) {
|
|
39
39
|
var context = {
|
|
40
|
-
admin: (0, helpers_2.createAdminApiContext)(
|
|
41
|
-
api: api,
|
|
42
|
-
logger: logger,
|
|
43
|
-
config: config,
|
|
44
|
-
}),
|
|
40
|
+
admin: (0, helpers_2.createAdminApiContext)(session, params, authStrategy.handleClientError(request)),
|
|
45
41
|
billing: {
|
|
46
42
|
require: (0, billing_1.requireBillingFactory)(params, request, session),
|
|
47
43
|
request: (0, billing_1.requestBillingFactory)(params, request, session),
|
|
@@ -59,7 +55,7 @@ function authStrategyFactory(_a) {
|
|
|
59
55
|
}
|
|
60
56
|
return function authenticateAdmin(request) {
|
|
61
57
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
62
|
-
var _a, payload, shop, sessionId, existingSession, _b, session, errorOrResponse_1;
|
|
58
|
+
var _a, payload, shop, sessionId, sessionToken, existingSession, _b, session, errorOrResponse_1;
|
|
63
59
|
return tslib_1.__generator(this, function (_c) {
|
|
64
60
|
switch (_c.label) {
|
|
65
61
|
case 0:
|
|
@@ -88,7 +84,7 @@ function authStrategyFactory(_a) {
|
|
|
88
84
|
logger.info('Authenticating admin request');
|
|
89
85
|
return [4 /*yield*/, getSessionTokenContext(params, request)];
|
|
90
86
|
case 7:
|
|
91
|
-
_a = _c.sent(), payload = _a.payload, shop = _a.shop, sessionId = _a.sessionId;
|
|
87
|
+
_a = _c.sent(), payload = _a.payload, shop = _a.shop, sessionId = _a.sessionId, sessionToken = _a.sessionToken;
|
|
92
88
|
logger.debug('Loading session from storage', { sessionId: sessionId });
|
|
93
89
|
if (!sessionId) return [3 /*break*/, 9];
|
|
94
90
|
return [4 /*yield*/, config.sessionStorage.loadSession(sessionId)];
|
|
@@ -100,14 +96,18 @@ function authStrategyFactory(_a) {
|
|
|
100
96
|
_c.label = 10;
|
|
101
97
|
case 10:
|
|
102
98
|
existingSession = _b;
|
|
103
|
-
return [4 /*yield*/, strategy.authenticate(request,
|
|
99
|
+
return [4 /*yield*/, strategy.authenticate(request, {
|
|
100
|
+
session: existingSession,
|
|
101
|
+
sessionToken: sessionToken,
|
|
102
|
+
shop: shop,
|
|
103
|
+
})];
|
|
104
104
|
case 11:
|
|
105
105
|
session = _c.sent();
|
|
106
106
|
logger.debug('Request is valid, loaded session from session token', {
|
|
107
107
|
shop: session.shop,
|
|
108
108
|
isOnline: session.isOnline,
|
|
109
109
|
});
|
|
110
|
-
return [2 /*return*/, createContext(request, session, payload)];
|
|
110
|
+
return [2 /*return*/, createContext(request, session, strategy, payload)];
|
|
111
111
|
case 12:
|
|
112
112
|
errorOrResponse_1 = _c.sent();
|
|
113
113
|
if (errorOrResponse_1 instanceof Response) {
|
|
@@ -132,10 +132,10 @@ function getSessionTokenContext(params, request) {
|
|
|
132
132
|
searchParamSessionToken = (0, helpers_1.getSessionTokenFromUrlParam)(request);
|
|
133
133
|
sessionToken = (headerSessionToken || searchParamSessionToken);
|
|
134
134
|
logger.debug('Attempting to authenticate session token', {
|
|
135
|
-
sessionToken: {
|
|
135
|
+
sessionToken: JSON.stringify({
|
|
136
136
|
header: headerSessionToken,
|
|
137
137
|
search: searchParamSessionToken,
|
|
138
|
-
},
|
|
138
|
+
}),
|
|
139
139
|
});
|
|
140
140
|
if (!config.isEmbeddedApp) return [3 /*break*/, 2];
|
|
141
141
|
return [4 /*yield*/, (0, helpers_1.validateSessionToken)({ config: config, logger: logger, api: api }, sessionToken)];
|
|
@@ -147,7 +147,7 @@ function getSessionTokenContext(params, request) {
|
|
|
147
147
|
sessionId_1 = config.useOnlineTokens
|
|
148
148
|
? api.session.getJwtSessionId(shop_1, payload.sub)
|
|
149
149
|
: api.session.getOfflineId(shop_1);
|
|
150
|
-
return [2 /*return*/, { shop: shop_1, payload: payload, sessionId: sessionId_1 }];
|
|
150
|
+
return [2 /*return*/, { shop: shop_1, payload: payload, sessionId: sessionId_1, sessionToken: sessionToken }];
|
|
151
151
|
case 2:
|
|
152
152
|
url = new URL(request.url);
|
|
153
153
|
shop = url.searchParams.get('shop');
|
|
@@ -157,7 +157,7 @@ function getSessionTokenContext(params, request) {
|
|
|
157
157
|
})];
|
|
158
158
|
case 3:
|
|
159
159
|
sessionId = _a.sent();
|
|
160
|
-
return [2 /*return*/, { shop: shop, sessionId: sessionId, payload: undefined }];
|
|
160
|
+
return [2 /*return*/, { shop: shop, sessionId: sessionId, payload: undefined, sessionToken: sessionToken }];
|
|
161
161
|
}
|
|
162
162
|
});
|
|
163
163
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authenticate.js","sourceRoot":"","sources":["../../../../../src/server/authenticate/admin/authenticate.ts"],"names":[],"mappings":";;;;AAIA,sCAOoB;AAEpB,qCAImB;AAOnB,qCAOmB;
|
|
1
|
+
{"version":3,"file":"authenticate.js","sourceRoot":"","sources":["../../../../../src/server/authenticate/admin/authenticate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/billing/request.ts"],"names":[],"mappings":";;;;AAAA,oDAI8B;AAC9B,4DAAmD;AAInD,sCAAmE;AAInE,SAAgB,qBAAqB,CACnC,MAAmB,EACnB,OAAgB,EAChB,OAAgB;IAEhB,OAAO,SAAe,cAAc,CAAC,EAKL;QAJ9B,IAAA,IAAI,UAAA,EACJ,MAAM,YAAA,EACN,SAAS,eAAA,EACN,SAAS,sBAJuB,+BAKpC,CADa;;;;;;wBAEL,GAAG,GAAY,MAAM,IAAlB,EAAE,MAAM,GAAI,MAAM,OAAV,CAAW;wBAE7B,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE;4BAChC,IAAI,EAAE,OAAO,CAAC,IAAI;4BAClB,IAAI,MAAA;4BACJ,MAAM,QAAA;4BACN,SAAS,WAAA;yBACV,CAAC,CAAC;;;;wBAIQ,qBAAM,GAAG,CAAC,OAAO,CAAC,OAAO,oBAChC,IAAI,EAAE,IAAc,EACpB,OAAO,SAAA,EACP,MAAM,QAAA,EACN,SAAS,WAAA,EACT,YAAY,EAAE,IAAI,IACf,SAAS,EACZ,EAAA;;wBAPF,MAAM,GAAG,SAOP,CAAC;;;;6BAEC,CAAA,OAAK,YAAY,+BAAiB,IAAI,OAAK,CAAC,QAAQ,CAAC,IAAI,KAAK,GAAG,CAAA,EAAjE,wBAAiE;wBACnE,MAAM,CAAC,KAAK,CAAC,6CAA6C,EAAE;4BAC1D,IAAI,EAAE,OAAO,CAAC,IAAI;yBACnB,CAAC,CAAC;wBACG,qBAAM,IAAA,4BAAkB,EAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,EAAA;4BAA7D,MAAM,SAAuD,CAAC;4BAE9D,MAAM,OAAK,CAAC;;4BAIhB,MAAM,gBAAgB,CACpB,MAAM,EACN,OAAO,EACP,MAAM,CAAC,eAAe,EACtB,OAAO,CAAC,IAAI,CACb,CAAC;;;;KACH,CAAC;AACJ,CAAC;AAhDD,sDAgDC;AAED,SAAS,gBAAgB,CACvB,MAAmB,EACnB,OAAgB,EAChB,GAAW,EACX,IAAY;IAEL,IAAA,MAAM,GAAY,MAAM,OAAlB,EAAE,MAAM,GAAI,MAAM,OAAV,CAAW;IAEhC,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,EAAC,GAAG,KAAA,EAAC,CAAC,CAAC;IAE9C,IAAM,UAAU,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACxC,IAAM,iBAAiB,GAAG,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,GAAG,CAAC;IAC1E,IAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAE1D,IAAI,YAAY,EAAE;
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/billing/request.ts"],"names":[],"mappings":";;;;AAAA,oDAI8B;AAC9B,4DAAmD;AAInD,sCAAmE;AAInE,SAAgB,qBAAqB,CACnC,MAAmB,EACnB,OAAgB,EAChB,OAAgB;IAEhB,OAAO,SAAe,cAAc,CAAC,EAKL;QAJ9B,IAAA,IAAI,UAAA,EACJ,MAAM,YAAA,EACN,SAAS,eAAA,EACN,SAAS,sBAJuB,+BAKpC,CADa;;;;;;wBAEL,GAAG,GAAY,MAAM,IAAlB,EAAE,MAAM,GAAI,MAAM,OAAV,CAAW;wBAE7B,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE;4BAChC,IAAI,EAAE,OAAO,CAAC,IAAI;4BAClB,IAAI,MAAA;4BACJ,MAAM,QAAA;4BACN,SAAS,WAAA;yBACV,CAAC,CAAC;;;;wBAIQ,qBAAM,GAAG,CAAC,OAAO,CAAC,OAAO,oBAChC,IAAI,EAAE,IAAc,EACpB,OAAO,SAAA,EACP,MAAM,QAAA,EACN,SAAS,WAAA,EACT,YAAY,EAAE,IAAI,IACf,SAAS,EACZ,EAAA;;wBAPF,MAAM,GAAG,SAOP,CAAC;;;;6BAEC,CAAA,OAAK,YAAY,+BAAiB,IAAI,OAAK,CAAC,QAAQ,CAAC,IAAI,KAAK,GAAG,CAAA,EAAjE,wBAAiE;wBACnE,MAAM,CAAC,KAAK,CAAC,6CAA6C,EAAE;4BAC1D,IAAI,EAAE,OAAO,CAAC,IAAI;yBACnB,CAAC,CAAC;wBACG,qBAAM,IAAA,4BAAkB,EAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,EAAA;4BAA7D,MAAM,SAAuD,CAAC;4BAE9D,MAAM,OAAK,CAAC;;4BAIhB,MAAM,gBAAgB,CACpB,MAAM,EACN,OAAO,EACP,MAAM,CAAC,eAAe,EACtB,OAAO,CAAC,IAAI,CACb,CAAC;;;;KACH,CAAC;AACJ,CAAC;AAhDD,sDAgDC;AAED,SAAS,gBAAgB,CACvB,MAAmB,EACnB,OAAgB,EAChB,GAAW,EACX,IAAY;IAEL,IAAA,MAAM,GAAY,MAAM,OAAlB,EAAE,MAAM,GAAI,MAAM,OAAV,CAAW;IAEhC,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,EAAC,GAAG,KAAA,EAAC,CAAC,CAAC;IAE9C,IAAM,UAAU,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACxC,IAAM,iBAAiB,GAAG,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,GAAG,CAAC;IAC1E,IAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAE1D,IAAI,YAAY,EAAE,CAAC;QACjB,+CAA+C;QAC/C,qEAAqE;QACrE,oGAAoG;QACpG,iDAAiD;QACjD,MAAM,IAAI,QAAQ,CAAC,SAAS,EAAE;YAC5B,MAAM,EAAE,GAAG;YACX,UAAU,EAAE,cAAc;YAC1B,OAAO,EAAE,IAAA,6BAAmB,EAAC,GAAG,CAAC;SAClC,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,iBAAiB,EAAE,CAAC;QAC7B,IAAM,QAAM,GAAG,IAAI,eAAe,CAAC;YACjC,IAAI,MAAA;YACJ,IAAI,EAAE,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAE;YAC1C,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;QAEH,MAAM,IAAA,yBAAQ,EAAC,UAAG,MAAM,CAAC,IAAI,CAAC,cAAc,cAAI,QAAM,CAAC,QAAQ,EAAE,CAAE,CAAC,CAAC;IACvE,CAAC;SAAM,CAAC;QACN,mHAAmH;QACnH,MAAM,IAAA,yBAAQ,EAAC,GAAG,CAAC,CAAC;IACtB,CAAC;AACH,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Session, ShopifyRestResources } from '@shopify/shopify-api';
|
|
2
2
|
import type { BasicParams } from '../../../types';
|
|
3
|
-
import { AdminApiContext } from '../../../clients/admin';
|
|
4
|
-
export declare function createAdminApiContext<Resources extends ShopifyRestResources = ShopifyRestResources>(
|
|
3
|
+
import { AdminApiContext, HandleAdminClientError } from '../../../clients/admin';
|
|
4
|
+
export declare function createAdminApiContext<Resources extends ShopifyRestResources = ShopifyRestResources>(session: Session, params: BasicParams, handleClientError: HandleAdminClientError): AdminApiContext<Resources>;
|
|
5
5
|
//# sourceMappingURL=create-admin-api-context.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-admin-api-context.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/create-admin-api-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAEnE,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAChD,OAAO,
|
|
1
|
+
{"version":3,"file":"create-admin-api-context.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/create-admin-api-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAEnE,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAChD,OAAO,EACL,eAAe,EACf,sBAAsB,EAEvB,MAAM,wBAAwB,CAAC;AAEhC,wBAAgB,qBAAqB,CACnC,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,EAE7D,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,WAAW,EACnB,iBAAiB,EAAE,sBAAsB,GACxC,eAAe,CAAC,SAAS,CAAC,CAM5B"}
|
|
@@ -2,14 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createAdminApiContext = void 0;
|
|
4
4
|
var admin_1 = require("../../../clients/admin");
|
|
5
|
-
|
|
6
|
-
function createAdminApiContext(request, session, params) {
|
|
5
|
+
function createAdminApiContext(session, params, handleClientError) {
|
|
7
6
|
return (0, admin_1.adminClientFactory)({
|
|
8
7
|
session: session,
|
|
9
8
|
params: params,
|
|
10
|
-
handleClientError:
|
|
11
|
-
request: request,
|
|
12
|
-
}),
|
|
9
|
+
handleClientError: handleClientError,
|
|
13
10
|
});
|
|
14
11
|
}
|
|
15
12
|
exports.createAdminApiContext = createAdminApiContext;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-admin-api-context.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/create-admin-api-context.ts"],"names":[],"mappings":";;;AAGA,
|
|
1
|
+
{"version":3,"file":"create-admin-api-context.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/create-admin-api-context.ts"],"names":[],"mappings":";;;AAGA,gDAIgC;AAEhC,SAAgB,qBAAqB,CAGnC,OAAgB,EAChB,MAAmB,EACnB,iBAAyC;IAEzC,OAAO,IAAA,0BAAkB,EAAY;QACnC,OAAO,SAAA;QACP,MAAM,QAAA;QACN,iBAAiB,mBAAA;KAClB,CAAC,CAAC;AACL,CAAC;AAZD,sDAYC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensure-session-token-search-param-if-required.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/ensure-session-token-search-param-if-required.ts"],"names":[],"mappings":";;;;AAEA,qEAA+D;AAE/D,IAAM,mBAAmB,GAAG,UAAU,CAAC;AAEhC,IAAM,uCAAuC,GAAG,UACrD,MAAmB,EACnB,OAAgB;;;QAET,GAAG,GAAY,MAAM,IAAlB,EAAE,MAAM,GAAI,MAAM,OAAV,CAAW;QACvB,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAE3B,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC;QACrC,uBAAuB,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QACpE,UAAU,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,GAAG,CAAC;QAE5D,IAAI,GAAG,CAAC,MAAM,CAAC,aAAa,IAAI,UAAU,IAAI,CAAC,uBAAuB,EAAE;
|
|
1
|
+
{"version":3,"file":"ensure-session-token-search-param-if-required.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/ensure-session-token-search-param-if-required.ts"],"names":[],"mappings":";;;;AAEA,qEAA+D;AAE/D,IAAM,mBAAmB,GAAG,UAAU,CAAC;AAEhC,IAAM,uCAAuC,GAAG,UACrD,MAAmB,EACnB,OAAgB;;;QAET,GAAG,GAAY,MAAM,IAAlB,EAAE,MAAM,GAAI,MAAM,OAAV,CAAW;QACvB,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAE3B,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC;QACrC,uBAAuB,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QACpE,UAAU,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,GAAG,CAAC;QAE5D,IAAI,GAAG,CAAC,MAAM,CAAC,aAAa,IAAI,UAAU,IAAI,CAAC,uBAAuB,EAAE,CAAC;YACvE,MAAM,CAAC,KAAK,CACV,8DAA8D,EAC9D,EAAC,IAAI,MAAA,EAAC,CACP,CAAC;YACF,IAAA,8CAAoB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACpC,CAAC;;;KACF,CAAC;AAlBW,QAAA,uCAAuC,2CAkBlD"}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
import type { HandleAdminClientError } from '../../../clients/admin/types';
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
}
|
|
5
|
-
export declare function handleClientErrorFactory({ request, }: HandleClientErrorOptions): HandleAdminClientError;
|
|
6
|
-
export {};
|
|
2
|
+
import { HandleClientErrorOptions } from '../strategies/types';
|
|
3
|
+
export declare function handleClientErrorFactory({ request, onError, }: HandleClientErrorOptions): HandleAdminClientError;
|
|
7
4
|
//# sourceMappingURL=handle-client-error.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handle-client-error.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/handle-client-error.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,sBAAsB,EAAC,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"handle-client-error.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/handle-client-error.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,sBAAsB,EAAC,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAC,wBAAwB,EAAC,MAAM,qBAAqB,CAAC;AAE7D,wBAAgB,wBAAwB,CAAC,EACvC,OAAO,EACP,OAAO,GACR,EAAE,wBAAwB,GAAG,sBAAsB,CAkCnD"}
|
|
@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.handleClientErrorFactory = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var shopify_api_1 = require("@shopify/shopify-api");
|
|
6
|
-
var redirect_to_auth_page_1 = require("./redirect-to-auth-page");
|
|
7
6
|
function handleClientErrorFactory(_a) {
|
|
8
|
-
var request = _a.request;
|
|
7
|
+
var request = _a.request, onError = _a.onError;
|
|
9
8
|
return function handleClientError(_a) {
|
|
10
9
|
var error = _a.error, params = _a.params, session = _a.session;
|
|
11
10
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
@@ -21,9 +20,11 @@ function handleClientErrorFactory(_a) {
|
|
|
21
20
|
statusText: error.response.statusText,
|
|
22
21
|
body: JSON.stringify(error.response.body),
|
|
23
22
|
});
|
|
24
|
-
if (!
|
|
25
|
-
return [4 /*yield*/, (
|
|
26
|
-
case 1:
|
|
23
|
+
if (!onError) return [3 /*break*/, 2];
|
|
24
|
+
return [4 /*yield*/, onError({ request: request, session: session, error: error })];
|
|
25
|
+
case 1:
|
|
26
|
+
_b.sent();
|
|
27
|
+
_b.label = 2;
|
|
27
28
|
case 2:
|
|
28
29
|
// forward a minimal copy of the upstream HTTP response instead of an Error:
|
|
29
30
|
throw new Response(JSON.stringify(error.response.body), {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handle-client-error.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/handle-client-error.ts"],"names":[],"mappings":";;;;AAAA,oDAAuD;
|
|
1
|
+
{"version":3,"file":"handle-client-error.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/handle-client-error.ts"],"names":[],"mappings":";;;;AAAA,oDAAuD;AAKvD,SAAgB,wBAAwB,CAAC,EAGd;QAFzB,OAAO,aAAA,EACP,OAAO,aAAA;IAEP,OAAO,SAAe,iBAAiB,CAAC,EAIvC;YAHC,KAAK,WAAA,EACL,MAAM,YAAA,EACN,OAAO,aAAA;;;;;wBAEP,IAAI,KAAK,YAAY,+BAAiB,KAAK,IAAI,EAAE,CAAC;4BAChD,MAAM,CAAC,MAAM,CAAC,KAAK,CACjB,6CAAsC,KAAK,CAAC,OAAO,CAAE,CACtD,CAAC;4BACF,MAAM,KAAK,CAAC;wBACd,CAAC;wBAED,MAAM,CAAC,MAAM,CAAC,KAAK,CACjB,mDAA4C,KAAK,CAAC,OAAO,CAAE,EAC3D;4BACE,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI;4BACzB,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,UAAU;4BACrC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;yBAC1C,CACF,CAAC;6BAEE,OAAO,EAAP,wBAAO;wBACT,qBAAM,OAAO,CAAC,EAAC,OAAO,SAAA,EAAE,OAAO,SAAA,EAAE,KAAK,OAAA,EAAC,CAAC,EAAA;;wBAAxC,SAAwC,CAAC;;;oBAG3C,4EAA4E;oBAC5E,MAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;wBACtD,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI;wBAC3B,OAAO,EAAE;4BACP,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,OAAQ,CAAC,cAAc,CAAW;yBAClE;qBACF,CAAC,CAAC;;;;KACJ,CAAC;AACJ,CAAC;AArCD,4DAqCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redirect-to-bounce-page.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/redirect-to-bounce-page.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAE3C,eAAO,MAAM,oBAAoB,WAAY,WAAW,OAAO,GAAG,KAAG,
|
|
1
|
+
{"version":3,"file":"redirect-to-bounce-page.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/redirect-to-bounce-page.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAE3C,eAAO,MAAM,oBAAoB,WAAY,WAAW,OAAO,GAAG,KAAG,KAkBpE,CAAC"}
|
|
@@ -6,11 +6,13 @@ var redirectToBouncePage = function (params, url) {
|
|
|
6
6
|
var config = params.config;
|
|
7
7
|
// Make sure we always point to the configured app URL so it also works behind reverse proxies (that alter the Host
|
|
8
8
|
// header).
|
|
9
|
-
|
|
9
|
+
var searchParams = url.searchParams;
|
|
10
|
+
searchParams.delete('id_token');
|
|
11
|
+
searchParams.set('shopify-reload', "".concat(config.appUrl).concat(url.pathname, "?").concat(searchParams.toString()));
|
|
10
12
|
// eslint-disable-next-line no-warning-comments
|
|
11
13
|
// TODO Make sure this works on chrome without a tunnel (weird HTTPS redirect issue)
|
|
12
14
|
// https://github.com/orgs/Shopify/projects/6899/views/1?pane=issue&itemId=28376650
|
|
13
|
-
throw (0, server_runtime_1.redirect)("".concat(config.auth.patchSessionTokenPath).concat(
|
|
15
|
+
throw (0, server_runtime_1.redirect)("".concat(config.auth.patchSessionTokenPath, "?").concat(searchParams.toString()));
|
|
14
16
|
};
|
|
15
17
|
exports.redirectToBouncePage = redirectToBouncePage;
|
|
16
18
|
//# sourceMappingURL=redirect-to-bounce-page.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redirect-to-bounce-page.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/redirect-to-bounce-page.ts"],"names":[],"mappings":";;;AAAA,4DAAmD;AAI5C,IAAM,oBAAoB,GAAG,UAAC,MAAmB,EAAE,GAAQ;IACzD,IAAA,MAAM,GAAI,MAAM,OAAV,CAAW;IAExB,mHAAmH;IACnH,WAAW;IACX,GAAG,CAAC,YAAY,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"redirect-to-bounce-page.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/redirect-to-bounce-page.ts"],"names":[],"mappings":";;;AAAA,4DAAmD;AAI5C,IAAM,oBAAoB,GAAG,UAAC,MAAmB,EAAE,GAAQ;IACzD,IAAA,MAAM,GAAI,MAAM,OAAV,CAAW;IAExB,mHAAmH;IACnH,WAAW;IACX,IAAM,YAAY,GAAG,GAAG,CAAC,YAAY,CAAC;IACtC,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAChC,YAAY,CAAC,GAAG,CACd,gBAAgB,EAChB,UAAG,MAAM,CAAC,MAAM,SAAG,GAAG,CAAC,QAAQ,cAAI,YAAY,CAAC,QAAQ,EAAE,CAAE,CAC7D,CAAC;IAEF,+CAA+C;IAC/C,oFAAoF;IACpF,mFAAmF;IACnF,MAAM,IAAA,yBAAQ,EACZ,UAAG,MAAM,CAAC,IAAI,CAAC,qBAAqB,cAAI,YAAY,CAAC,QAAQ,EAAE,CAAE,CAClE,CAAC;AACJ,CAAC,CAAC;AAlBW,QAAA,oBAAoB,wBAkB/B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redirect-with-exitiframe.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/redirect-with-exitiframe.ts"],"names":[],"mappings":";;;AAAA,4DAAmD;AAInD,SAAgB,sBAAsB,CACpC,MAAmB,EACnB,OAAgB,EAChB,IAAY;IAEL,IAAA,GAAG,GAAY,MAAM,IAAlB,EAAE,MAAM,GAAI,MAAM,OAAV,CAAW;IAC7B,IAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAEjC,IAAM,WAAW,GAAG,GAAG,CAAC,YAAY,CAAC;IACrC,IAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC,CAAC;IAE9D,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC9B,WAAW,CAAC,GAAG,CAAC,YAAY,EAAE,UAAG,MAAM,CAAC,IAAI,CAAC,IAAI,mBAAS,IAAI,CAAE,CAAC,CAAC;IAElE,IAAI,IAAI,EAAE;
|
|
1
|
+
{"version":3,"file":"redirect-with-exitiframe.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/redirect-with-exitiframe.ts"],"names":[],"mappings":";;;AAAA,4DAAmD;AAInD,SAAgB,sBAAsB,CACpC,MAAmB,EACnB,OAAgB,EAChB,IAAY;IAEL,IAAA,GAAG,GAAY,MAAM,IAAlB,EAAE,MAAM,GAAI,MAAM,OAAV,CAAW;IAC7B,IAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAEjC,IAAM,WAAW,GAAG,GAAG,CAAC,YAAY,CAAC;IACrC,IAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC,CAAC;IAE9D,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC9B,WAAW,CAAC,GAAG,CAAC,YAAY,EAAE,UAAG,MAAM,CAAC,IAAI,CAAC,IAAI,mBAAS,IAAI,CAAE,CAAC,CAAC;IAElE,IAAI,IAAI,EAAE,CAAC;QACT,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAChC,CAAC;IAED,MAAM,IAAA,yBAAQ,EAAC,UAAG,MAAM,CAAC,IAAI,CAAC,cAAc,cAAI,WAAW,CAAC,QAAQ,EAAE,CAAE,CAAC,CAAC;AAC5E,CAAC;AAnBD,wDAmBC"}
|
|
@@ -48,12 +48,9 @@ function isBounceRequest(request) {
|
|
|
48
48
|
request.headers.has('X-Shopify-Bounce'));
|
|
49
49
|
}
|
|
50
50
|
function isDataRequest(request) {
|
|
51
|
-
var searchParams = new URL(request.url).searchParams;
|
|
52
51
|
var isGet = request.method === 'GET';
|
|
53
52
|
var sessionTokenHeader = Boolean((0, get_session_token_header_1.getSessionTokenHeader)(request));
|
|
54
|
-
var sessionTokenSearchParam = searchParams.has('id_token');
|
|
55
53
|
return (sessionTokenHeader &&
|
|
56
|
-
!sessionTokenSearchParam &&
|
|
57
54
|
!isBounceRequest(request) &&
|
|
58
55
|
(!isEmbeddedRequest(request) || !isGet));
|
|
59
56
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redirect.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/redirect.ts"],"names":[],"mappings":";;;AAAA,4DAGmC;AAGnC,mFAA6E;AAE7E,yDAAoD;AACpD,uFAAgF;AAShF,SAAgB,eAAe,CAC7B,MAAmB,EACnB,OAAgB;IAET,IAAA,MAAM,GAAI,MAAM,OAAV,CAAW;IAExB,OAAO,SAAS,QAAQ,CAAC,GAAG,EAAE,IAAkB;QACvC,IAAA,YAAY,GAAI,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,aAAxB,CAAyB;QAC5C,IAAM,SAAS,GAAG,IAAI,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAE9C,IAAM,YAAY,GAAG,SAAS,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC;QACxD,IAAI,YAAY,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"redirect.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/redirect.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-app-bridge.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/render-app-bridge.ts"],"names":[],"mappings":";;;AACA,+DAA0D;AAC1D,2EAA8E;AAS9E,SAAgB,eAAe,CAC7B,EAAqB,EACrB,OAAgB,EAChB,UAA8B;;QAF7B,MAAM,YAAA;IAIP,IAAI,gBAAgB,GAAG,EAAE,CAAC;IAC1B,IAAI,UAAU,EAAE;
|
|
1
|
+
{"version":3,"file":"render-app-bridge.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/render-app-bridge.ts"],"names":[],"mappings":";;;AACA,+DAA0D;AAC1D,2EAA8E;AAS9E,SAAgB,eAAe,CAC7B,EAAqB,EACrB,OAAgB,EAChB,UAA8B;;QAF7B,MAAM,YAAA;IAIP,IAAI,gBAAgB,GAAG,EAAE,CAAC;IAC1B,IAAI,UAAU,EAAE,CAAC;QACf,IAAM,WAAW,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAC3D,IAAM,MAAM,GAAG,MAAA,UAAU,CAAC,MAAM,mCAAI,MAAM,CAAC;QAE3C,gBAAgB,GAAG,8BAAuB,IAAI,CAAC,SAAS,CACtD,WAAW,CAAC,QAAQ,EAAE,CACvB,eAAK,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,eAAY,CAAC;IAC3C,CAAC;IAED,IAAM,eAAe,GAAG,IAAI,OAAO,CAAC;QAClC,cAAc,EAAE,yBAAyB;KAC1C,CAAC,CAAC;IACH,IAAA,iDAA0B,EACxB,eAAe,EACf,MAAM,CAAC,aAAa,EACpB,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAC9C,CAAC;IAEF,MAAM,IAAI,QAAQ,CAChB,yCAC0B,MAAM,CAAC,MAAM,sBAAU,IAAA,6BAAY,GAAE,iCAC3D,gBAAgB,WACnB,EACD,EAAC,OAAO,EAAE,eAAe,EAAC,CAC3B,CAAC;AACJ,CAAC;AA/BD,0CA+BC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Session, ShopifyRestResources } from '@shopify/shopify-api';
|
|
2
2
|
import type { BasicParams } from '../../../types';
|
|
3
|
-
|
|
3
|
+
import { AuthorizationStrategy } from '../strategies/types';
|
|
4
|
+
export declare function triggerAfterAuthHook<Resources extends ShopifyRestResources = ShopifyRestResources>(params: BasicParams, session: Session, request: Request, authStrategy: AuthorizationStrategy): Promise<void>;
|
|
4
5
|
//# sourceMappingURL=trigger-after-auth-hook.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trigger-after-auth-hook.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/trigger-after-auth-hook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAEnE,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"trigger-after-auth-hook.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/trigger-after-auth-hook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAEnE,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAC,qBAAqB,EAAC,MAAM,qBAAqB,CAAC;AAI1D,wBAAsB,oBAAoB,CACxC,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,EAE7D,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,qBAAqB,iBAcpC"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.triggerAfterAuthHook = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var create_admin_api_context_1 = require("./create-admin-api-context");
|
|
6
|
-
function triggerAfterAuthHook(params, session, request) {
|
|
6
|
+
function triggerAfterAuthHook(params, session, request, authStrategy) {
|
|
7
7
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
8
8
|
var config, logger;
|
|
9
9
|
return tslib_1.__generator(this, function (_a) {
|
|
@@ -14,7 +14,7 @@ function triggerAfterAuthHook(params, session, request) {
|
|
|
14
14
|
logger.info('Running afterAuth hook');
|
|
15
15
|
return [4 /*yield*/, config.hooks.afterAuth({
|
|
16
16
|
session: session,
|
|
17
|
-
admin: (0, create_admin_api_context_1.createAdminApiContext)(
|
|
17
|
+
admin: (0, create_admin_api_context_1.createAdminApiContext)(session, params, authStrategy.handleClientError(request)),
|
|
18
18
|
})];
|
|
19
19
|
case 1:
|
|
20
20
|
_a.sent();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trigger-after-auth-hook.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/trigger-after-auth-hook.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"trigger-after-auth-hook.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/trigger-after-auth-hook.ts"],"names":[],"mappings":";;;;AAKA,uEAAiE;AAEjE,SAAsB,oBAAoB,CAGxC,MAAmB,EACnB,OAAgB,EAChB,OAAgB,EAChB,YAAmC;;;;;;oBAE5B,MAAM,GAAY,MAAM,OAAlB,EAAE,MAAM,GAAI,MAAM,OAAV,CAAW;yBAC5B,MAAM,CAAC,KAAK,CAAC,SAAS,EAAtB,wBAAsB;oBACxB,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;oBACtC,qBAAM,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC;4BAC3B,OAAO,SAAA;4BACP,KAAK,EAAE,IAAA,gDAAqB,EAC1B,OAAO,EACP,MAAM,EACN,YAAY,CAAC,iBAAiB,CAAC,OAAO,CAAC,CACxC;yBACF,CAAC,EAAA;;oBAPF,SAOE,CAAC;;;;;;CAEN;AApBD,oDAoBC"}
|