@shopify/shopify-app-remix 2.8.1 → 3.0.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/dist/cjs/server/authenticate/admin/billing/cancel.js +4 -2
- package/dist/cjs/server/authenticate/admin/billing/cancel.js.map +1 -1
- package/dist/cjs/server/authenticate/admin/billing/check.js +4 -2
- package/dist/cjs/server/authenticate/admin/billing/check.js.map +1 -1
- package/dist/cjs/server/authenticate/admin/billing/request.js +4 -2
- package/dist/cjs/server/authenticate/admin/billing/request.js.map +1 -1
- package/dist/cjs/server/authenticate/admin/billing/require.js +4 -2
- package/dist/cjs/server/authenticate/admin/billing/require.js.map +1 -1
- package/dist/cjs/server/authenticate/admin/strategies/auth-code-flow.js +3 -0
- package/dist/cjs/server/authenticate/admin/strategies/auth-code-flow.js.map +1 -1
- package/dist/cjs/server/authenticate/admin/strategies/token-exchange.js +7 -2
- package/dist/cjs/server/authenticate/admin/strategies/token-exchange.js.map +1 -1
- package/dist/cjs/server/authenticate/helpers/idempotent-promise-handler.js +1 -0
- package/dist/cjs/server/authenticate/helpers/idempotent-promise-handler.js.map +1 -1
- package/dist/cjs/server/authenticate/helpers/invalidate-access-token.js +11 -0
- package/dist/cjs/server/authenticate/helpers/invalidate-access-token.js.map +1 -0
- package/dist/cjs/server/authenticate/helpers/reject-bot-request.js +11 -1
- package/dist/cjs/server/authenticate/helpers/reject-bot-request.js.map +1 -1
- package/dist/cjs/server/authenticate/public/appProxy/authenticate.js +4 -0
- package/dist/cjs/server/authenticate/public/appProxy/authenticate.js.map +1 -1
- package/dist/cjs/server/authenticate/public/checkout/authenticate.js +2 -25
- package/dist/cjs/server/authenticate/public/checkout/authenticate.js.map +1 -1
- package/dist/cjs/server/authenticate/public/customer-account/authenticate.js +10 -0
- package/dist/cjs/server/authenticate/public/customer-account/authenticate.js.map +1 -0
- package/dist/cjs/server/authenticate/public/extension/authenticate.js +33 -0
- package/dist/cjs/server/authenticate/public/extension/authenticate.js.map +1 -0
- package/dist/cjs/server/authenticate/public/factory.js +7 -14
- package/dist/cjs/server/authenticate/public/factory.js.map +1 -1
- package/dist/cjs/server/authenticate/webhooks/authenticate.js +6 -26
- package/dist/cjs/server/authenticate/webhooks/authenticate.js.map +1 -1
- package/dist/cjs/server/clients/admin/rest.js +4 -1
- package/dist/cjs/server/clients/admin/rest.js.map +1 -1
- package/dist/cjs/server/future/flags.js +0 -10
- package/dist/cjs/server/future/flags.js.map +1 -1
- package/dist/cjs/server/index.js +4 -0
- package/dist/cjs/server/index.js.map +1 -1
- package/dist/cjs/server/shopify-app.js +7 -1
- package/dist/cjs/server/shopify-app.js.map +1 -1
- package/dist/cjs/server/version.js +1 -1
- package/dist/esm/react/components/AppProvider/AppProvider.mjs +1 -1
- package/dist/esm/server/authenticate/admin/billing/cancel.mjs +4 -2
- package/dist/esm/server/authenticate/admin/billing/cancel.mjs.map +1 -1
- package/dist/esm/server/authenticate/admin/billing/check.mjs +4 -2
- package/dist/esm/server/authenticate/admin/billing/check.mjs.map +1 -1
- package/dist/esm/server/authenticate/admin/billing/request.mjs +4 -2
- package/dist/esm/server/authenticate/admin/billing/request.mjs.map +1 -1
- package/dist/esm/server/authenticate/admin/billing/require.mjs +4 -2
- package/dist/esm/server/authenticate/admin/billing/require.mjs.map +1 -1
- package/dist/esm/server/authenticate/admin/strategies/auth-code-flow.mjs +3 -0
- package/dist/esm/server/authenticate/admin/strategies/auth-code-flow.mjs.map +1 -1
- package/dist/esm/server/authenticate/admin/strategies/token-exchange.mjs +7 -2
- package/dist/esm/server/authenticate/admin/strategies/token-exchange.mjs.map +1 -1
- package/dist/esm/server/authenticate/helpers/idempotent-promise-handler.mjs +1 -0
- package/dist/esm/server/authenticate/helpers/idempotent-promise-handler.mjs.map +1 -1
- package/dist/esm/server/authenticate/helpers/invalidate-access-token.mjs +9 -0
- package/dist/esm/server/authenticate/helpers/invalidate-access-token.mjs.map +1 -0
- package/dist/esm/server/authenticate/helpers/reject-bot-request.mjs +11 -1
- package/dist/esm/server/authenticate/helpers/reject-bot-request.mjs.map +1 -1
- package/dist/esm/server/authenticate/public/appProxy/authenticate.mjs +4 -0
- package/dist/esm/server/authenticate/public/appProxy/authenticate.mjs.map +1 -1
- package/dist/esm/server/authenticate/public/checkout/authenticate.mjs +2 -25
- package/dist/esm/server/authenticate/public/checkout/authenticate.mjs.map +1 -1
- package/dist/esm/server/authenticate/public/customer-account/authenticate.mjs +8 -0
- package/dist/esm/server/authenticate/public/customer-account/authenticate.mjs.map +1 -0
- package/dist/esm/server/authenticate/public/extension/authenticate.mjs +31 -0
- package/dist/esm/server/authenticate/public/extension/authenticate.mjs.map +1 -0
- package/dist/esm/server/authenticate/public/factory.mjs +7 -14
- package/dist/esm/server/authenticate/public/factory.mjs.map +1 -1
- package/dist/esm/server/authenticate/webhooks/authenticate.mjs +6 -26
- package/dist/esm/server/authenticate/webhooks/authenticate.mjs.map +1 -1
- package/dist/esm/server/clients/admin/rest.mjs +4 -1
- package/dist/esm/server/clients/admin/rest.mjs.map +1 -1
- package/dist/esm/server/future/flags.mjs +0 -10
- package/dist/esm/server/future/flags.mjs.map +1 -1
- package/dist/esm/server/index.mjs +1 -1
- package/dist/esm/server/shopify-app.mjs +7 -2
- package/dist/esm/server/shopify-app.mjs.map +1 -1
- package/dist/esm/server/version.mjs +1 -1
- package/dist/ts/react/components/AppProvider/AppProvider.doc.d.ts.map +1 -1
- package/dist/ts/server/authenticate/admin/billing/cancel.d.ts.map +1 -1
- package/dist/ts/server/authenticate/admin/billing/check.d.ts.map +1 -1
- package/dist/ts/server/authenticate/admin/billing/request.d.ts.map +1 -1
- package/dist/ts/server/authenticate/admin/billing/require.d.ts.map +1 -1
- package/dist/ts/server/authenticate/admin/billing/types.d.ts +44 -82
- package/dist/ts/server/authenticate/admin/billing/types.d.ts.map +1 -1
- package/dist/ts/server/authenticate/admin/strategies/token-exchange.d.ts.map +1 -1
- package/dist/ts/server/authenticate/fulfillment-service/types.d.ts +4 -3
- package/dist/ts/server/authenticate/fulfillment-service/types.d.ts.map +1 -1
- package/dist/ts/server/authenticate/helpers/index.d.ts +1 -0
- package/dist/ts/server/authenticate/helpers/index.d.ts.map +1 -1
- package/dist/ts/server/authenticate/helpers/invalidate-access-token.d.ts +4 -0
- package/dist/ts/server/authenticate/helpers/invalidate-access-token.d.ts.map +1 -0
- package/dist/ts/server/authenticate/helpers/reject-bot-request.d.ts.map +1 -1
- package/dist/ts/server/authenticate/public/appProxy/authenticate.d.ts.map +1 -1
- package/dist/ts/server/authenticate/public/checkout/authenticate.d.ts.map +1 -1
- package/dist/ts/server/authenticate/public/checkout/authenticate.public.checkout.doc.d.ts.map +1 -1
- package/dist/ts/server/authenticate/public/customer-account/authenticate.d.ts +4 -0
- package/dist/ts/server/authenticate/public/customer-account/authenticate.d.ts.map +1 -0
- package/dist/ts/server/authenticate/public/customer-account/authenticate.public.customerAccount.doc.d.ts +4 -0
- package/dist/ts/server/authenticate/public/customer-account/authenticate.public.customerAccount.doc.d.ts.map +1 -0
- package/dist/ts/server/authenticate/public/customer-account/types.d.ts +58 -0
- package/dist/ts/server/authenticate/public/customer-account/types.d.ts.map +1 -0
- package/dist/ts/server/authenticate/public/extension/authenticate.d.ts +4 -0
- package/dist/ts/server/authenticate/public/extension/authenticate.d.ts.map +1 -0
- package/dist/ts/server/authenticate/public/extension/types.d.ts +7 -0
- package/dist/ts/server/authenticate/public/extension/types.d.ts.map +1 -0
- package/dist/ts/server/authenticate/public/factory.d.ts +1 -2
- package/dist/ts/server/authenticate/public/factory.d.ts.map +1 -1
- package/dist/ts/server/authenticate/public/types.d.ts +21 -17
- package/dist/ts/server/authenticate/public/types.d.ts.map +1 -1
- package/dist/ts/server/authenticate/webhooks/authenticate.d.ts +1 -2
- package/dist/ts/server/authenticate/webhooks/authenticate.d.ts.map +1 -1
- package/dist/ts/server/authenticate/webhooks/authenticate.webhooks.doc.d.ts.map +1 -1
- package/dist/ts/server/authenticate/webhooks/types.d.ts +7 -45
- package/dist/ts/server/authenticate/webhooks/types.d.ts.map +1 -1
- package/dist/ts/server/future/flags.d.ts +2 -18
- package/dist/ts/server/future/flags.d.ts.map +1 -1
- package/dist/ts/server/index.d.ts +2 -1
- package/dist/ts/server/index.d.ts.map +1 -1
- package/dist/ts/server/shopify-app.d.ts +2 -1
- package/dist/ts/server/shopify-app.d.ts.map +1 -1
- package/dist/ts/server/types-contexts.d.ts +35 -0
- package/dist/ts/server/types-contexts.d.ts.map +1 -0
- package/dist/ts/server/types.d.ts +2 -2
- package/dist/ts/server/types.d.ts.map +1 -1
- package/dist/ts/server/unauthenticated/storefront/types.d.ts +66 -0
- package/dist/ts/server/unauthenticated/storefront/types.d.ts.map +1 -1
- package/dist/ts/server/version.d.ts +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +19 -21
|
@@ -3,10 +3,12 @@
|
|
|
3
3
|
var shopifyApi = require('@shopify/shopify-api');
|
|
4
4
|
require('@remix-run/server-runtime');
|
|
5
5
|
var redirectToAuthPage = require('../helpers/redirect-to-auth-page.js');
|
|
6
|
+
var invalidateAccessToken = require('../../helpers/invalidate-access-token.js');
|
|
7
|
+
require('isbot');
|
|
6
8
|
|
|
7
9
|
function cancelBillingFactory(params, request, session) {
|
|
8
10
|
return async function cancelBilling(options) {
|
|
9
|
-
const { api, logger
|
|
11
|
+
const { api, logger } = params;
|
|
10
12
|
logger.debug('Cancelling billing', { shop: session.shop, ...options });
|
|
11
13
|
try {
|
|
12
14
|
return await api.billing.cancel({
|
|
@@ -21,7 +23,7 @@ function cancelBillingFactory(params, request, session) {
|
|
|
21
23
|
logger.debug('API token was invalid, redirecting to OAuth', {
|
|
22
24
|
shop: session.shop,
|
|
23
25
|
});
|
|
24
|
-
await
|
|
26
|
+
await invalidateAccessToken.invalidateAccessToken(params, session);
|
|
25
27
|
throw await redirectToAuthPage.redirectToAuthPage(params, request, session.shop);
|
|
26
28
|
}
|
|
27
29
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cancel.js","sources":["../../../../../../../src/server/authenticate/admin/billing/cancel.ts"],"sourcesContent":[null],"names":["HttpResponseError","redirectToAuthPage"],"mappings":"
|
|
1
|
+
{"version":3,"file":"cancel.js","sources":["../../../../../../../src/server/authenticate/admin/billing/cancel.ts"],"sourcesContent":[null],"names":["HttpResponseError","invalidateAccessToken","redirectToAuthPage"],"mappings":";;;;;;;;SAQgB,oBAAoB,CAClC,MAAmB,EACnB,OAAgB,EAChB,OAAgB,EAAA;AAEhB,IAAA,OAAO,eAAe,aAAa,CAAC,OAA6B,EAAA;AAC/D,QAAA,MAAM,EAAC,GAAG,EAAE,MAAM,EAAC,GAAG,MAAM,CAAC;AAE7B,QAAA,MAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,GAAG,OAAO,EAAC,CAAC,CAAC;AAErE,QAAA,IAAI;AACF,YAAA,OAAO,MAAM,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;gBAC9B,OAAO;gBACP,cAAc,EAAE,OAAO,CAAC,cAAc;gBACtC,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,OAAO,EAAE,OAAO,CAAC,OAAO;AACzB,aAAA,CAAC,CAAC;SACJ;QAAC,OAAO,KAAK,EAAE;AACd,YAAA,IAAI,KAAK,YAAYA,4BAAiB,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,KAAK,GAAG,EAAE;AACrE,gBAAA,MAAM,CAAC,KAAK,CAAC,6CAA6C,EAAE;oBAC1D,IAAI,EAAE,OAAO,CAAC,IAAI;AACnB,iBAAA,CAAC,CAAC;AACH,gBAAA,MAAMC,2CAAqB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBAC7C,MAAM,MAAMC,qCAAkB,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;aAC/D;iBAAM;AACL,gBAAA,MAAM,KAAK,CAAC;aACb;SACF;AACH,KAAC,CAAC;AACJ;;;;"}
|
|
@@ -3,10 +3,12 @@
|
|
|
3
3
|
var shopifyApi = require('@shopify/shopify-api');
|
|
4
4
|
require('@remix-run/server-runtime');
|
|
5
5
|
var redirectToAuthPage = require('../helpers/redirect-to-auth-page.js');
|
|
6
|
+
var invalidateAccessToken = require('../../helpers/invalidate-access-token.js');
|
|
7
|
+
require('isbot');
|
|
6
8
|
|
|
7
9
|
function checkBillingFactory(params, request, session) {
|
|
8
10
|
return async function checkBilling(options) {
|
|
9
|
-
const { api, logger
|
|
11
|
+
const { api, logger } = params;
|
|
10
12
|
logger.debug('Checking billing plans', { shop: session.shop, ...options });
|
|
11
13
|
try {
|
|
12
14
|
return await api.billing.check({
|
|
@@ -21,7 +23,7 @@ function checkBillingFactory(params, request, session) {
|
|
|
21
23
|
logger.debug('API token was invalid, redirecting to OAuth', {
|
|
22
24
|
shop: session.shop,
|
|
23
25
|
});
|
|
24
|
-
await
|
|
26
|
+
await invalidateAccessToken.invalidateAccessToken(params, session);
|
|
25
27
|
throw await redirectToAuthPage.redirectToAuthPage(params, request, session.shop);
|
|
26
28
|
}
|
|
27
29
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check.js","sources":["../../../../../../../src/server/authenticate/admin/billing/check.ts"],"sourcesContent":[null],"names":["HttpResponseError","redirectToAuthPage"],"mappings":"
|
|
1
|
+
{"version":3,"file":"check.js","sources":["../../../../../../../src/server/authenticate/admin/billing/check.ts"],"sourcesContent":[null],"names":["HttpResponseError","invalidateAccessToken","redirectToAuthPage"],"mappings":";;;;;;;;SASgB,mBAAmB,CACjC,MAAmB,EACnB,OAAgB,EAChB,OAAgB,EAAA;AAEhB,IAAA,OAAO,eAAe,YAAY,CAAC,OAAoC,EAAA;AACrE,QAAA,MAAM,EAAC,GAAG,EAAE,MAAM,EAAC,GAAG,MAAM,CAAC;AAE7B,QAAA,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,GAAG,OAAO,EAAC,CAAC,CAAC;AAEzE,QAAA,IAAI;AACF,YAAA,OAAO,MAAM,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC;gBAC7B,OAAO;gBACP,KAAK,EAAE,OAAO,CAAC,KAAiB;gBAChC,MAAM,EAAE,OAAO,CAAC,MAAM;AACtB,gBAAA,YAAY,EAAE,IAAI;AACnB,aAAA,CAAC,CAAC;SACJ;QAAC,OAAO,KAAK,EAAE;AACd,YAAA,IAAI,KAAK,YAAYA,4BAAiB,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,KAAK,GAAG,EAAE;AACrE,gBAAA,MAAM,CAAC,KAAK,CAAC,6CAA6C,EAAE;oBAC1D,IAAI,EAAE,OAAO,CAAC,IAAI;AACnB,iBAAA,CAAC,CAAC;AACH,gBAAA,MAAMC,2CAAqB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBAC7C,MAAM,MAAMC,qCAAkB,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;aAC/D;iBAAM;AACL,gBAAA,MAAM,KAAK,CAAC;aACb;SACF;AACH,KAAC,CAAC;AACJ;;;;"}
|
|
@@ -4,10 +4,12 @@ var shopifyApi = require('@shopify/shopify-api');
|
|
|
4
4
|
var serverRuntime = require('@remix-run/server-runtime');
|
|
5
5
|
var redirectToAuthPage = require('../helpers/redirect-to-auth-page.js');
|
|
6
6
|
var redirectWithAppBridgeHeaders = require('../helpers/redirect-with-app-bridge-headers.js');
|
|
7
|
+
var invalidateAccessToken = require('../../helpers/invalidate-access-token.js');
|
|
8
|
+
require('isbot');
|
|
7
9
|
|
|
8
10
|
function requestBillingFactory(params, request, session) {
|
|
9
11
|
return async function requestBilling({ plan, isTest, returnUrl, ...overrides }) {
|
|
10
|
-
const { api, logger
|
|
12
|
+
const { api, logger } = params;
|
|
11
13
|
logger.info('Requesting billing', {
|
|
12
14
|
shop: session.shop,
|
|
13
15
|
plan,
|
|
@@ -30,7 +32,7 @@ function requestBillingFactory(params, request, session) {
|
|
|
30
32
|
logger.debug('API token was invalid, redirecting to OAuth', {
|
|
31
33
|
shop: session.shop,
|
|
32
34
|
});
|
|
33
|
-
await
|
|
35
|
+
await invalidateAccessToken.invalidateAccessToken(params, session);
|
|
34
36
|
throw await redirectToAuthPage.redirectToAuthPage(params, request, session.shop);
|
|
35
37
|
}
|
|
36
38
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.js","sources":["../../../../../../../src/server/authenticate/admin/billing/request.ts"],"sourcesContent":[null],"names":["HttpResponseError","redirectToAuthPage","getAppBridgeHeaders","redirect"],"mappings":"
|
|
1
|
+
{"version":3,"file":"request.js","sources":["../../../../../../../src/server/authenticate/admin/billing/request.ts"],"sourcesContent":[null],"names":["HttpResponseError","invalidateAccessToken","redirectToAuthPage","getAppBridgeHeaders","redirect"],"mappings":";;;;;;;;;SAcgB,qBAAqB,CACnC,MAAmB,EACnB,OAAgB,EAChB,OAAgB,EAAA;AAEhB,IAAA,OAAO,eAAe,cAAc,CAAC,EACnC,IAAI,EACJ,MAAM,EACN,SAAS,EACT,GAAG,SAAS,EACkB,EAAA;AAC9B,QAAA,MAAM,EAAC,GAAG,EAAE,MAAM,EAAC,GAAG,MAAM,CAAC;AAE7B,QAAA,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE;YAChC,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,IAAI;YACJ,MAAM;YACN,SAAS;AACV,SAAA,CAAC,CAAC;AAEH,QAAA,IAAI,MAAoC,CAAC;AACzC,QAAA,IAAI;AACF,YAAA,MAAM,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC;AACjC,gBAAA,IAAI,EAAE,IAAc;gBACpB,OAAO;gBACP,MAAM;gBACN,SAAS;AACT,gBAAA,YAAY,EAAE,IAAI;AAClB,gBAAA,GAAG,SAAS;AACb,aAAA,CAAC,CAAC;SACJ;QAAC,OAAO,KAAK,EAAE;AACd,YAAA,IAAI,KAAK,YAAYA,4BAAiB,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,KAAK,GAAG,EAAE;AACrE,gBAAA,MAAM,CAAC,KAAK,CAAC,6CAA6C,EAAE;oBAC1D,IAAI,EAAE,OAAO,CAAC,IAAI;AACnB,iBAAA,CAAC,CAAC;AACH,gBAAA,MAAMC,2CAAqB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBAC7C,MAAM,MAAMC,qCAAkB,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;aAC/D;iBAAM;AACL,gBAAA,MAAM,KAAK,CAAC;aACb;SACF;AAED,QAAA,MAAM,gBAAgB,CACpB,MAAM,EACN,OAAO,EACP,MAAM,CAAC,eAAe,EACtB,OAAO,CAAC,IAAI,CACb,CAAC;AACJ,KAAC,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CACvB,MAAmB,EACnB,OAAgB,EAChB,GAAW,EACX,IAAY,EAAA;AAEZ,IAAA,MAAM,EAAC,MAAM,EAAE,MAAM,EAAC,GAAG,MAAM,CAAC;IAEhC,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,EAAC,GAAG,EAAC,CAAC,CAAC;IAE9C,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;AACxC,IAAA,MAAM,iBAAiB,GAAG,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,GAAG,CAAC;IAC1E,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAE1D,IAAI,YAAY,EAAE;;;;;AAKhB,QAAA,MAAM,IAAI,QAAQ,CAAC,SAAS,EAAE;AAC5B,YAAA,MAAM,EAAE,GAAG;AACX,YAAA,UAAU,EAAE,cAAc;AAC1B,YAAA,OAAO,EAAEC,gDAAmB,CAAC,GAAG,CAAC;AAClC,SAAA,CAAC,CAAC;KACJ;SAAM,IAAI,iBAAiB,EAAE;AAC5B,QAAA,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC;YACjC,IAAI;YACJ,IAAI,EAAE,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAE;AAC1C,YAAA,UAAU,EAAE,GAAG;AAChB,SAAA,CAAC,CAAC;AAEH,QAAA,MAAMC,sBAAQ,CAAC,CAAG,EAAA,MAAM,CAAC,IAAI,CAAC,cAAc,CAAA,CAAA,EAAI,MAAM,CAAC,QAAQ,EAAE,CAAA,CAAE,CAAC,CAAC;KACtE;SAAM;;AAEL,QAAA,MAAMA,sBAAQ,CAAC,GAAG,CAAC,CAAC;KACrB;AACH;;;;"}
|
|
@@ -3,9 +3,11 @@
|
|
|
3
3
|
var shopifyApi = require('@shopify/shopify-api');
|
|
4
4
|
require('@remix-run/server-runtime');
|
|
5
5
|
var redirectToAuthPage = require('../helpers/redirect-to-auth-page.js');
|
|
6
|
+
var invalidateAccessToken = require('../../helpers/invalidate-access-token.js');
|
|
7
|
+
require('isbot');
|
|
6
8
|
|
|
7
9
|
function requireBillingFactory(params, request, session) {
|
|
8
|
-
const { api, logger
|
|
10
|
+
const { api, logger } = params;
|
|
9
11
|
return async function requireBilling(options) {
|
|
10
12
|
const logContext = {
|
|
11
13
|
shop: session.shop,
|
|
@@ -25,7 +27,7 @@ function requireBillingFactory(params, request, session) {
|
|
|
25
27
|
catch (error) {
|
|
26
28
|
if (error instanceof shopifyApi.HttpResponseError && error.response.code === 401) {
|
|
27
29
|
logger.debug('API token was invalid, redirecting to OAuth', logContext);
|
|
28
|
-
await
|
|
30
|
+
await invalidateAccessToken.invalidateAccessToken(params, session);
|
|
29
31
|
throw await redirectToAuthPage.redirectToAuthPage(params, request, session.shop);
|
|
30
32
|
}
|
|
31
33
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"require.js","sources":["../../../../../../../src/server/authenticate/admin/billing/require.ts"],"sourcesContent":[null],"names":["HttpResponseError","redirectToAuthPage"],"mappings":"
|
|
1
|
+
{"version":3,"file":"require.js","sources":["../../../../../../../src/server/authenticate/admin/billing/require.ts"],"sourcesContent":[null],"names":["HttpResponseError","invalidateAccessToken","redirectToAuthPage"],"mappings":";;;;;;;;SAagB,qBAAqB,CACnC,MAAmB,EACnB,OAAgB,EAChB,OAAgB,EAAA;AAEhB,IAAA,MAAM,EAAC,GAAG,EAAE,MAAM,EAAC,GAAG,MAAM,CAAC;AAE7B,IAAA,OAAO,eAAe,cAAc,CAAC,OAAsC,EAAA;AACzE,QAAA,MAAM,UAAU,GAAG;YACjB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,MAAM,EAAE,OAAO,CAAC,MAAM;SACvB,CAAC;AAEF,QAAA,MAAM,CAAC,KAAK,CAAC,+BAA+B,EAAE,UAAU,CAAC,CAAC;AAE1D,QAAA,IAAI,IAAgC,CAAC;AACrC,QAAA,IAAI;AACF,YAAA,IAAI,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC;gBAC7B,OAAO;gBACP,KAAK,EAAE,OAAO,CAAC,KAAiB;gBAChC,MAAM,EAAE,OAAO,CAAC,MAAM;AACtB,gBAAA,YAAY,EAAE,IAAI;AACnB,aAAA,CAAC,CAAC;SACJ;QAAC,OAAO,KAAK,EAAE;AACd,YAAA,IAAI,KAAK,YAAYA,4BAAiB,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,KAAK,GAAG,EAAE;AACrE,gBAAA,MAAM,CAAC,KAAK,CAAC,6CAA6C,EAAE,UAAU,CAAC,CAAC;AAExE,gBAAA,MAAMC,2CAAqB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBAC7C,MAAM,MAAMC,qCAAkB,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;aAC/D;iBAAM;AACL,gBAAA,MAAM,KAAK,CAAC;aACb;SACF;AAED,QAAA,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;AAC1B,YAAA,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,UAAU,CAAC,CAAC;YACjD,MAAM,MAAM,OAAO,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC;SAClE;AAED,QAAA,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,UAAU,CAAC,CAAC;AAEpD,QAAA,OAAO,IAAI,CAAC;AACd,KAAC,CAAC;AACJ;;;;"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-code-flow.js","sources":["../../../../../../../src/server/authenticate/admin/strategies/auth-code-flow.ts"],"sourcesContent":[null],"names":["getSessionTokenHeader","redirectToAuthPage","handleClientErrorFactory","validateShopAndHostParams","redirectWithExitIframe","beginAuth","triggerAfterAuthHook","redirectToShopifyOrAppRoot","CookieNotFound","InvalidHmacError","InvalidOAuthError","HttpResponseError","GraphqlQueryError"],"mappings":";;;;;;;;;;;;;;MA+Ba,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"auth-code-flow.js","sources":["../../../../../../../src/server/authenticate/admin/strategies/auth-code-flow.ts"],"sourcesContent":[null],"names":["getSessionTokenHeader","redirectToAuthPage","handleClientErrorFactory","validateShopAndHostParams","redirectWithExitIframe","beginAuth","triggerAfterAuthHook","redirectToShopifyOrAppRoot","CookieNotFound","InvalidHmacError","InvalidOAuthError","HttpResponseError","GraphqlQueryError"],"mappings":"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"}
|
|
@@ -2,12 +2,16 @@
|
|
|
2
2
|
|
|
3
3
|
var shopifyApi = require('@shopify/shopify-api');
|
|
4
4
|
var respondToInvalidSessionToken = require('../../helpers/respond-to-invalid-session-token.js');
|
|
5
|
+
var invalidateAccessToken = require('../../helpers/invalidate-access-token.js');
|
|
5
6
|
require('isbot');
|
|
6
7
|
require('@remix-run/server-runtime');
|
|
7
8
|
var handleClientError = require('../helpers/handle-client-error.js');
|
|
8
9
|
var triggerAfterAuthHook = require('../helpers/trigger-after-auth-hook.js');
|
|
9
10
|
|
|
10
11
|
class TokenExchangeStrategy {
|
|
12
|
+
api;
|
|
13
|
+
config;
|
|
14
|
+
logger;
|
|
11
15
|
constructor({ api, config, logger }) {
|
|
12
16
|
this.api = api;
|
|
13
17
|
this.config = config;
|
|
@@ -19,7 +23,7 @@ class TokenExchangeStrategy {
|
|
|
19
23
|
const { shop, session, sessionToken } = sessionContext;
|
|
20
24
|
if (!sessionToken)
|
|
21
25
|
throw new shopifyApi.InvalidJwtError();
|
|
22
|
-
if (!session || session.
|
|
26
|
+
if (!session || !session.isActive(undefined)) {
|
|
23
27
|
logger.info('No valid session found');
|
|
24
28
|
logger.info('Requesting offline access token');
|
|
25
29
|
const { session: offlineSession } = await this.exchangeToken({
|
|
@@ -60,7 +64,8 @@ class TokenExchangeStrategy {
|
|
|
60
64
|
request,
|
|
61
65
|
onError: async ({ session, error }) => {
|
|
62
66
|
if (error.response.code === 401) {
|
|
63
|
-
|
|
67
|
+
logger.debug('Responding to invalid access token');
|
|
68
|
+
await invalidateAccessToken.invalidateAccessToken({ config, api, logger }, session);
|
|
64
69
|
respondToInvalidSessionToken.respondToInvalidSessionToken({
|
|
65
70
|
params: { config, api, logger },
|
|
66
71
|
request,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-exchange.js","sources":["../../../../../../../src/server/authenticate/admin/strategies/token-exchange.ts"],"sourcesContent":[null],"names":["InvalidJwtError","RequestedTokenType","handleClientErrorFactory","respondToInvalidSessionToken","HttpResponseError","triggerAfterAuthHook"],"mappings":"
|
|
1
|
+
{"version":3,"file":"token-exchange.js","sources":["../../../../../../../src/server/authenticate/admin/strategies/token-exchange.ts"],"sourcesContent":[null],"names":["InvalidJwtError","RequestedTokenType","handleClientErrorFactory","invalidateAccessToken","respondToInvalidSessionToken","HttpResponseError","triggerAfterAuthHook"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"idempotent-promise-handler.js","sources":["../../../../../../src/server/authenticate/helpers/idempotent-promise-handler.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAKA,MAAM,iBAAiB,GAAG,KAAK,CAAC;MAEnB,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"idempotent-promise-handler.js","sources":["../../../../../../src/server/authenticate/helpers/idempotent-promise-handler.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAKA,MAAM,iBAAiB,GAAG,KAAK,CAAC;MAEnB,wBAAwB,CAAA;AACzB,IAAA,WAAW,CAAsB;AAE3C,IAAA,WAAA,GAAA;AACE,QAAA,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,EAAkB,CAAC;KAC9C;AAED,IAAA,MAAM,aAAa,CAAC,EAClB,eAAe,EACf,UAAU,GACoB,EAAA;AAC9B,QAAA,IAAI;AACF,YAAA,IAAI,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,EAAE;gBACtC,MAAM,eAAe,EAAE,CAAC;aACzB;SACF;gBAAS;YACR,IAAI,CAAC,qBAAqB,EAAE,CAAC;SAC9B;AAED,QAAA,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;KAC1B;AAEO,IAAA,iBAAiB,CAAC,UAAkB,EAAA;QAC1C,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;AACrC,YAAA,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;AAC7C,YAAA,OAAO,IAAI,CAAC;SACb;AACD,QAAA,OAAO,KAAK,CAAC;KACd;AAEO,IAAA,MAAM,qBAAqB,GAAA;AACjC,QAAA,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,KAAI;YACjD,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,iBAAiB,EAAE;AACzC,gBAAA,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;aACxB;AACH,SAAC,CAAC,CAAC;KACJ;AACF;;;;"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
async function invalidateAccessToken(params, session) {
|
|
4
|
+
const { logger, config } = params;
|
|
5
|
+
logger.debug(`Invalidating access token for session - ${session.id}`);
|
|
6
|
+
session.accessToken = undefined;
|
|
7
|
+
await config.sessionStorage.storeSession(session);
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
exports.invalidateAccessToken = invalidateAccessToken;
|
|
11
|
+
//# sourceMappingURL=invalidate-access-token.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"invalidate-access-token.js","sources":["../../../../../../src/server/authenticate/helpers/invalidate-access-token.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAIO,eAAe,qBAAqB,CACzC,MAAmB,EACnB,OAAgB,EAAA;AAEhB,IAAA,MAAM,EAAC,MAAM,EAAE,MAAM,EAAC,GAAG,MAAM,CAAC;IAEhC,MAAM,CAAC,KAAK,CAAC,CAAA,wCAAA,EAA2C,OAAO,CAAC,EAAE,CAAE,CAAA,CAAC,CAAC;AAEtE,IAAA,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAChC,MAAM,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;AACpD;;;;"}
|
|
@@ -2,8 +2,18 @@
|
|
|
2
2
|
|
|
3
3
|
var isbot = require('isbot');
|
|
4
4
|
|
|
5
|
+
const SHOPIFY_POS_USER_AGENT = /Shopify POS\//;
|
|
6
|
+
const SHOPIFY_MOBILE_USER_AGENT = /Shopify Mobile\//;
|
|
7
|
+
const SHOPIFY_USER_AGENTS = [SHOPIFY_POS_USER_AGENT, SHOPIFY_MOBILE_USER_AGENT];
|
|
5
8
|
function respondToBotRequest({ logger }, request) {
|
|
6
|
-
|
|
9
|
+
const userAgent = request.headers.get('User-Agent') ?? '';
|
|
10
|
+
// We call isbot below to prevent good (self-identifying) bots from triggering auth requests, but there are some
|
|
11
|
+
// Shopify-specific cases we want to allow that are identified as bots by isbot.
|
|
12
|
+
if (SHOPIFY_USER_AGENTS.some((agent) => agent.test(userAgent))) {
|
|
13
|
+
logger.debug('Request is from a Shopify agent, allow');
|
|
14
|
+
return;
|
|
15
|
+
}
|
|
16
|
+
if (isbot.isbot(userAgent)) {
|
|
7
17
|
logger.debug('Request is from a bot, skipping auth');
|
|
8
18
|
throw new Response(undefined, { status: 410, statusText: 'Gone' });
|
|
9
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reject-bot-request.js","sources":["../../../../../../src/server/authenticate/helpers/reject-bot-request.ts"],"sourcesContent":[null],"names":["isbot"],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"reject-bot-request.js","sources":["../../../../../../src/server/authenticate/helpers/reject-bot-request.ts"],"sourcesContent":[null],"names":["isbot"],"mappings":";;;;AAIA,MAAM,sBAAsB,GAAG,eAAe,CAAC;AAC/C,MAAM,yBAAyB,GAAG,kBAAkB,CAAC;AAErD,MAAM,mBAAmB,GAAG,CAAC,sBAAsB,EAAE,yBAAyB,CAAC,CAAC;SAEhE,mBAAmB,CACjC,EAAC,MAAM,EAAc,EACrB,OAAgB,EAAA;AAEhB,IAAA,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;;;AAI1D,IAAA,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE;AAC9D,QAAA,MAAM,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;QACvD,OAAO;KACR;AAED,IAAA,IAAIA,WAAK,CAAC,SAAS,CAAC,EAAE;AACpB,QAAA,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;AACrD,QAAA,MAAM,IAAI,QAAQ,CAAC,SAAS,EAAE,EAAC,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAC,CAAC,CAAC;KAClE;AACH;;;;"}
|
|
@@ -19,6 +19,10 @@ function authenticateAppProxyFactory(params) {
|
|
|
19
19
|
const sessionId = api.session.getOfflineId(shop);
|
|
20
20
|
const session = await config.sessionStorage.loadSession(sessionId);
|
|
21
21
|
if (!session) {
|
|
22
|
+
logger.debug('Could not find offline session, returning empty context', {
|
|
23
|
+
shop,
|
|
24
|
+
...Object.fromEntries(url.searchParams.entries()),
|
|
25
|
+
});
|
|
22
26
|
const context = {
|
|
23
27
|
liquid,
|
|
24
28
|
session: undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authenticate.js","sources":["../../../../../../../src/server/authenticate/public/appProxy/authenticate.ts"],"sourcesContent":[null],"names":["adminClientFactory","storefrontClientFactory"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"authenticate.js","sources":["../../../../../../../src/server/authenticate/public/appProxy/authenticate.ts"],"sourcesContent":[null],"names":["adminClientFactory","storefrontClientFactory"],"mappings":"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"}
|
|
@@ -1,32 +1,9 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var
|
|
4
|
-
var validateSessionToken = require('../../helpers/validate-session-token.js');
|
|
5
|
-
var getSessionTokenHeader = require('../../helpers/get-session-token-header.js');
|
|
6
|
-
var rejectBotRequest = require('../../helpers/reject-bot-request.js');
|
|
7
|
-
var respondToOptionsRequest = require('../../helpers/respond-to-options-request.js');
|
|
8
|
-
require('@remix-run/server-runtime');
|
|
3
|
+
var authenticate = require('../extension/authenticate.js');
|
|
9
4
|
|
|
10
5
|
function authenticateCheckoutFactory(params) {
|
|
11
|
-
return
|
|
12
|
-
const { logger } = params;
|
|
13
|
-
const corsHeaders = options.corsHeaders ?? [];
|
|
14
|
-
rejectBotRequest.respondToBotRequest(params, request);
|
|
15
|
-
respondToOptionsRequest.respondToOptionsRequest(params, request, corsHeaders);
|
|
16
|
-
const sessionTokenHeader = getSessionTokenHeader.getSessionTokenHeader(request);
|
|
17
|
-
logger.info('Authenticating checkout request');
|
|
18
|
-
if (!sessionTokenHeader) {
|
|
19
|
-
logger.debug('Request did not contain a session token');
|
|
20
|
-
throw new Response(undefined, {
|
|
21
|
-
status: 401,
|
|
22
|
-
statusText: 'Unauthorized',
|
|
23
|
-
});
|
|
24
|
-
}
|
|
25
|
-
return {
|
|
26
|
-
sessionToken: await validateSessionToken.validateSessionToken(params, request, sessionTokenHeader, { checkAudience: false }),
|
|
27
|
-
cors: ensureCorsHeaders.ensureCORSHeadersFactory(params, request, corsHeaders),
|
|
28
|
-
};
|
|
29
|
-
};
|
|
6
|
+
return authenticate.authenticateExtensionFactory(params, 'checkout');
|
|
30
7
|
}
|
|
31
8
|
|
|
32
9
|
exports.authenticateCheckoutFactory = authenticateCheckoutFactory;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authenticate.js","sources":["../../../../../../../src/server/authenticate/public/checkout/authenticate.ts"],"sourcesContent":[null],"names":["
|
|
1
|
+
{"version":3,"file":"authenticate.js","sources":["../../../../../../../src/server/authenticate/public/checkout/authenticate.ts"],"sourcesContent":[null],"names":["authenticateExtensionFactory"],"mappings":";;;;AAKM,SAAU,2BAA2B,CACzC,MAAmB,EAAA;AAEnB,IAAA,OAAOA,yCAA4B,CACjC,MAAM,EACN,UAAU,CACa,CAAC;AAC5B;;;;"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
var authenticate = require('../extension/authenticate.js');
|
|
4
|
+
|
|
5
|
+
function authenticateCustomerAccountFactory(params) {
|
|
6
|
+
return authenticate.authenticateExtensionFactory(params, 'customer account');
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
exports.authenticateCustomerAccountFactory = authenticateCustomerAccountFactory;
|
|
10
|
+
//# sourceMappingURL=authenticate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"authenticate.js","sources":["../../../../../../../src/server/authenticate/public/customer-account/authenticate.ts"],"sourcesContent":[null],"names":["authenticateExtensionFactory"],"mappings":";;;;AAMM,SAAU,kCAAkC,CAChD,MAAmB,EAAA;AAEnB,IAAA,OAAOA,yCAA4B,CACjC,MAAM,EACN,kBAAkB,CACY,CAAC;AACnC;;;;"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
var ensureCorsHeaders = require('../../helpers/ensure-cors-headers.js');
|
|
4
|
+
var validateSessionToken = require('../../helpers/validate-session-token.js');
|
|
5
|
+
var getSessionTokenHeader = require('../../helpers/get-session-token-header.js');
|
|
6
|
+
var rejectBotRequest = require('../../helpers/reject-bot-request.js');
|
|
7
|
+
var respondToOptionsRequest = require('../../helpers/respond-to-options-request.js');
|
|
8
|
+
require('@remix-run/server-runtime');
|
|
9
|
+
|
|
10
|
+
function authenticateExtensionFactory(params, requestType) {
|
|
11
|
+
return async function authenticateExtension(request, options = {}) {
|
|
12
|
+
const { logger } = params;
|
|
13
|
+
const corsHeaders = options.corsHeaders ?? [];
|
|
14
|
+
rejectBotRequest.respondToBotRequest(params, request);
|
|
15
|
+
respondToOptionsRequest.respondToOptionsRequest(params, request, corsHeaders);
|
|
16
|
+
const sessionTokenHeader = getSessionTokenHeader.getSessionTokenHeader(request);
|
|
17
|
+
logger.info(`Authenticating ${requestType} request`);
|
|
18
|
+
if (!sessionTokenHeader) {
|
|
19
|
+
logger.debug('Request did not contain a session token');
|
|
20
|
+
throw new Response(undefined, {
|
|
21
|
+
status: 401,
|
|
22
|
+
statusText: 'Unauthorized',
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
return {
|
|
26
|
+
sessionToken: await validateSessionToken.validateSessionToken(params, request, sessionTokenHeader, { checkAudience: false }),
|
|
27
|
+
cors: ensureCorsHeaders.ensureCORSHeadersFactory(params, request, corsHeaders),
|
|
28
|
+
};
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
exports.authenticateExtensionFactory = authenticateExtensionFactory;
|
|
33
|
+
//# sourceMappingURL=authenticate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"authenticate.js","sources":["../../../../../../../src/server/authenticate/public/extension/authenticate.ts"],"sourcesContent":[null],"names":["respondToBotRequest","respondToOptionsRequest","getSessionTokenHeader","validateSessionToken","ensureCORSHeadersFactory"],"mappings":";;;;;;;;;AAYgB,SAAA,4BAA4B,CAC1C,MAAmB,EACnB,WAAmB,EAAA;IAEnB,OAAO,eAAe,qBAAqB,CACzC,OAAO,EACP,OAAO,GAAG,EAAE,EAAA;AAEZ,QAAA,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,CAAC;AAExB,QAAA,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC;AAE9C,QAAAA,oCAAmB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AACrC,QAAAC,+CAAuB,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;AAEtD,QAAA,MAAM,kBAAkB,GAAGC,2CAAqB,CAAC,OAAO,CAAC,CAAC;AAE1D,QAAA,MAAM,CAAC,IAAI,CAAC,kBAAkB,WAAW,CAAA,QAAA,CAAU,CAAC,CAAC;QAErD,IAAI,CAAC,kBAAkB,EAAE;AACvB,YAAA,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;AACxD,YAAA,MAAM,IAAI,QAAQ,CAAC,SAAS,EAAE;AAC5B,gBAAA,MAAM,EAAE,GAAG;AACX,gBAAA,UAAU,EAAE,cAAc;AAC3B,aAAA,CAAC,CAAC;SACJ;QAED,OAAO;AACL,YAAA,YAAY,EAAE,MAAMC,yCAAoB,CACtC,MAAM,EACN,OAAO,EACP,kBAAkB,EAClB,EAAC,aAAa,EAAE,KAAK,EAAC,CACvB;YACD,IAAI,EAAEC,0CAAwB,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC;SAC7D,CAAC;AACJ,KAAC,CAAC;AACJ;;;;"}
|
|
@@ -2,25 +2,18 @@
|
|
|
2
2
|
|
|
3
3
|
var authenticate = require('./checkout/authenticate.js');
|
|
4
4
|
var authenticate$1 = require('./appProxy/authenticate.js');
|
|
5
|
+
var authenticate$2 = require('./customer-account/authenticate.js');
|
|
5
6
|
|
|
6
7
|
function authenticatePublicFactory(params) {
|
|
7
|
-
const { logger, config } = params;
|
|
8
8
|
const authenticateCheckout = authenticate.authenticateCheckoutFactory(params);
|
|
9
9
|
const authenticateAppProxy = authenticate$1.authenticateAppProxyFactory(params);
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
return context;
|
|
16
|
-
}
|
|
17
|
-
const authenticatePublic = (request, options) => {
|
|
18
|
-
logger.deprecated('3.0.0', 'authenticate.public() will be deprecated in v3. Use authenticate.public.checkout() instead.');
|
|
19
|
-
return authenticateCheckout(request, options);
|
|
10
|
+
const authenticateCustomerAccount = authenticate$2.authenticateCustomerAccountFactory(params);
|
|
11
|
+
const context = {
|
|
12
|
+
checkout: authenticateCheckout,
|
|
13
|
+
appProxy: authenticateAppProxy,
|
|
14
|
+
customerAccount: authenticateCustomerAccount,
|
|
20
15
|
};
|
|
21
|
-
|
|
22
|
-
authenticatePublic.appProxy = authenticateAppProxy;
|
|
23
|
-
return authenticatePublic;
|
|
16
|
+
return context;
|
|
24
17
|
}
|
|
25
18
|
|
|
26
19
|
exports.authenticatePublicFactory = authenticatePublicFactory;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.js","sources":["../../../../../../src/server/authenticate/public/factory.ts"],"sourcesContent":[null],"names":["authenticateCheckoutFactory","authenticateAppProxyFactory"],"mappings":"
|
|
1
|
+
{"version":3,"file":"factory.js","sources":["../../../../../../src/server/authenticate/public/factory.ts"],"sourcesContent":[null],"names":["authenticateCheckoutFactory","authenticateAppProxyFactory","authenticateCustomerAccountFactory"],"mappings":";;;;;;AASM,SAAU,yBAAyB,CAEvC,MAAmB,EAAA;AACnB,IAAA,MAAM,oBAAoB,GAAGA,wCAA2B,CAAC,MAAM,CAAC,CAAC;AACjE,IAAA,MAAM,oBAAoB,GAAGC,0CAA2B,CAAY,MAAM,CAAC,CAAC;AAC5E,IAAA,MAAM,2BAA2B,GAC/BC,iDAAkC,CAAC,MAAM,CAAC,CAAC;AAE7C,IAAA,MAAM,OAAO,GAAuB;AAClC,QAAA,QAAQ,EAAE,oBAAoB;AAC9B,QAAA,QAAQ,EAAE,oBAAoB;AAC9B,QAAA,eAAe,EAAE,2BAA2B;KAC7C,CAAC;AAEF,IAAA,OAAO,OAAO,CAAC;AACjB;;;;"}
|
|
@@ -48,35 +48,15 @@ function authenticateWebhookFactory(params) {
|
|
|
48
48
|
if (!session) {
|
|
49
49
|
return webhookContext;
|
|
50
50
|
}
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
handleClientError: handleClientError.handleClientErrorFactory({ request }),
|
|
57
|
-
});
|
|
58
|
-
}
|
|
59
|
-
else {
|
|
60
|
-
const restClient = new api.clients.Rest({
|
|
61
|
-
session,
|
|
62
|
-
apiVersion: check.apiVersion,
|
|
63
|
-
});
|
|
64
|
-
const graphqlClient = new api.clients.Graphql({
|
|
65
|
-
session,
|
|
66
|
-
apiVersion: check.apiVersion,
|
|
67
|
-
});
|
|
68
|
-
Object.entries(api.rest).forEach(([name, resource]) => {
|
|
69
|
-
Reflect.set(restClient, name, resource);
|
|
70
|
-
});
|
|
71
|
-
admin = {
|
|
72
|
-
rest: restClient,
|
|
73
|
-
graphql: graphqlClient,
|
|
74
|
-
};
|
|
75
|
-
}
|
|
51
|
+
const admin = factory.adminClientFactory({
|
|
52
|
+
params,
|
|
53
|
+
session,
|
|
54
|
+
handleClientError: handleClientError.handleClientErrorFactory({ request }),
|
|
55
|
+
});
|
|
76
56
|
return {
|
|
77
57
|
...webhookContext,
|
|
78
58
|
session,
|
|
79
|
-
admin
|
|
59
|
+
admin,
|
|
80
60
|
};
|
|
81
61
|
};
|
|
82
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authenticate.js","sources":["../../../../../../src/server/authenticate/webhooks/authenticate.ts"],"sourcesContent":[null],"names":["WebhookValidationErrorReason","adminClientFactory","handleClientErrorFactory"],"mappings":";;;;;;;
|
|
1
|
+
{"version":3,"file":"authenticate.js","sources":["../../../../../../src/server/authenticate/webhooks/authenticate.ts"],"sourcesContent":[null],"names":["WebhookValidationErrorReason","adminClientFactory","handleClientErrorFactory"],"mappings":";;;;;;;AAeM,SAAU,0BAA0B,CAGxC,MAAmB,EAAA;IACnB,MAAM,EAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAC,GAAG,MAAM,CAAC;AAErC,IAAA,OAAO,eAAe,YAAY,CAChC,OAAgB,EAAA;AAEhB,QAAA,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE;AAC7B,YAAA,MAAM,CAAC,KAAK,CACV,4EAA4E,EAC5E,EAAC,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAC,CAC3C,CAAC;AACF,YAAA,MAAM,IAAI,QAAQ,CAAC,SAAS,EAAE;AAC5B,gBAAA,MAAM,EAAE,GAAG;AACX,gBAAA,UAAU,EAAE,oBAAoB;AACjC,aAAA,CAAC,CAAC;SACJ;AAED,QAAA,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;QAErC,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACxC,OAAO;AACP,YAAA,UAAU,EAAE,OAAO;AACpB,SAAA,CAAC,CAAC;AAEH,QAAA,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE;YAChB,IAAI,KAAK,CAAC,MAAM,KAAKA,uCAA4B,CAAC,WAAW,EAAE;AAC7D,gBAAA,MAAM,CAAC,KAAK,CAAC,gCAAgC,EAAE,KAAK,CAAC,CAAC;AACtD,gBAAA,MAAM,IAAI,QAAQ,CAAC,SAAS,EAAE;AAC5B,oBAAA,MAAM,EAAE,GAAG;AACX,oBAAA,UAAU,EAAE,cAAc;AAC3B,iBAAA,CAAC,CAAC;aACJ;iBAAM;AACL,gBAAA,MAAM,CAAC,KAAK,CAAC,2BAA2B,EAAE,KAAK,CAAC,CAAC;AACjD,gBAAA,MAAM,IAAI,QAAQ,CAAC,SAAS,EAAE,EAAC,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,aAAa,EAAC,CAAC,CAAC;aACzE;SACF;AAED,QAAA,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACzD,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;AACnE,QAAA,MAAM,cAAc,GAAyC;YAC3D,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,IAAI,EAAE,KAAK,CAAC,MAAM;YAClB,KAAK,EAAE,KAAK,CAAC,KAAe;YAC5B,SAAS,EAAE,KAAK,CAAC,SAAS;AAC1B,YAAA,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;AAC5B,YAAA,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,SAAS;AACrC,YAAA,OAAO,EAAE,SAAS;AAClB,YAAA,KAAK,EAAE,SAAS;SACjB,CAAC;QAEF,IAAI,CAAC,OAAO,EAAE;AACZ,YAAA,OAAO,cAAc,CAAC;SACvB;QAED,MAAM,KAAK,GAAGC,0BAAkB,CAAY;YAC1C,MAAM;YACN,OAAO;AACP,YAAA,iBAAiB,EAAEC,0CAAwB,CAAC,EAAC,OAAO,EAAC,CAAC;AACvD,SAAA,CAAC,CAAC;QAEH,OAAO;AACL,YAAA,GAAG,cAAc;YACjB,OAAO;YACP,KAAK;SACN,CAAC;AACJ,KAAC,CAAC;AACJ;;;;"}
|
|
@@ -16,8 +16,8 @@ function restClientFactory({ params, handleClientError, session, }) {
|
|
|
16
16
|
});
|
|
17
17
|
Object.entries(api.rest).forEach(([name, resource]) => {
|
|
18
18
|
class RemixResource extends resource {
|
|
19
|
+
static Client = RestResourceClient;
|
|
19
20
|
}
|
|
20
|
-
RemixResource.Client = RestResourceClient;
|
|
21
21
|
Reflect.defineProperty(RemixResource, 'name', {
|
|
22
22
|
value: name,
|
|
23
23
|
});
|
|
@@ -27,6 +27,9 @@ function restClientFactory({ params, handleClientError, session, }) {
|
|
|
27
27
|
return client;
|
|
28
28
|
}
|
|
29
29
|
class RemixRestClient {
|
|
30
|
+
session;
|
|
31
|
+
params;
|
|
32
|
+
handleClientError;
|
|
30
33
|
constructor({ params, session, handleClientError }) {
|
|
31
34
|
this.params = params;
|
|
32
35
|
this.handleClientError = handleClientError;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rest.js","sources":["../../../../../../src/server/clients/admin/rest.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAgBM,SAAU,iBAAiB,CAE/B,EACA,MAAM,EACN,iBAAiB,EACjB,OAAO,GACY,EAAA;AACnB,IAAA,MAAM,EAAC,GAAG,EAAC,GAAG,MAAM,CAAC;AACrB,IAAA,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC;QACjC,MAAM;QACN,iBAAiB;QACjB,OAAO;AACR,KAAA,CAAuC,CAAC;AAEzC,IAAA,IAAI,GAAG,CAAC,IAAI,EAAE;AACZ,QAAA,MAAM,CAAC,SAAS,GAAG,EAAe,CAAC;QAEnC,MAAM,kBAAkB,GAAG,yBAAyB,CAAC;YACnD,MAAM;YACN,iBAAiB;YACjB,OAAO;AACR,SAAA,CAAC,CAAC;AAEH,QAAA,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,KAAI;YACpD,MAAM,aAAc,SAAQ,QAAQ,CAAA
|
|
1
|
+
{"version":3,"file":"rest.js","sources":["../../../../../../src/server/clients/admin/rest.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,7 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
// When adding new flags, you should also add them to the `TEST_FUTURE_FLAGS` object in `test-config.ts` to ensure that
|
|
4
3
|
function logDisabledFutureFlags(config, logger) {
|
|
5
4
|
const logFlag = (flag, message) => logger.info(`Future flag ${flag} is disabled.\n\n ${message}\n`);
|
|
6
|
-
if (!config.future.v3_authenticatePublic) {
|
|
7
|
-
logFlag('v3_authenticatePublic', 'Enable this flag to allow appProxy and checkout in `shopify.authenticate.public`.');
|
|
8
|
-
}
|
|
9
|
-
if (!config.future.v3_lineItemBilling) {
|
|
10
|
-
logFlag('v3_lineItemBilling', 'Enable this flag to allow billing plans with multiple line items.');
|
|
11
|
-
}
|
|
12
|
-
if (!config.future.v3_webhookAdminContext) {
|
|
13
|
-
logFlag('v3_webhookAdminContext', 'Enable this flag to use the standard Admin context when calling `shopify.authenticate.webhook`.');
|
|
14
|
-
}
|
|
15
5
|
if (!config.future.unstable_newEmbeddedAuthStrategy) {
|
|
16
6
|
logFlag('unstable_newEmbeddedAuthStrategy', 'Enable this to use OAuth token exchange instead of auth code to generate API access tokens.' +
|
|
17
7
|
'\n Your app must be using Shopify managed install: https://shopify.dev/docs/apps/auth/installation');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flags.js","sources":["../../../../../src/server/future/flags.ts"],"sourcesContent":[null],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"flags.js","sources":["../../../../../src/server/future/flags.ts"],"sourcesContent":[null],"names":[],"mappings":";;AA2CgB,SAAA,sBAAsB,CACpC,MAAiB,EACjB,MAAyB,EAAA;AAEzB,IAAA,MAAM,OAAO,GAAG,CAAC,IAAY,EAAE,OAAe,KAC5C,MAAM,CAAC,IAAI,CAAC,CAAe,YAAA,EAAA,IAAI,sBAAsB,OAAO,CAAA,EAAA,CAAI,CAAC,CAAC;AAEpE,IAAA,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,gCAAgC,EAAE;QACnD,OAAO,CACL,kCAAkC,EAClC,6FAA6F;AAC3F,YAAA,qGAAqG,CACxG,CAAC;KACH;AACH;;;;"}
|