@shopify/shopify-app-remix 2.5.1 → 2.6.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/vercel/index.js +12 -0
- package/build/cjs/server/authenticate/admin/billing/cancel.js +3 -1
- package/build/cjs/server/authenticate/admin/billing/check.js +3 -1
- package/build/cjs/server/authenticate/admin/billing/request.js +3 -1
- package/build/cjs/server/authenticate/admin/billing/require.js +3 -1
- package/build/cjs/server/authenticate/admin/helpers/redirect-with-exitiframe.js +3 -1
- package/build/cjs/server/authenticate/webhooks/authenticate.js +1 -0
- package/build/cjs/server/shopify-app.js +6 -4
- package/build/cjs/server/version.js +1 -1
- package/build/ts/server/__test-helpers/expect-exit-iframe.d.ts +2 -1
- package/build/ts/server/__test-helpers/expect-exit-iframe.d.ts.map +1 -1
- package/build/ts/server/__test-helpers/expect-exit-iframe.js +7 -3
- package/build/ts/server/__test-helpers/expect-exit-iframe.js.map +1 -1
- package/build/ts/server/__test-helpers/index.d.ts +0 -2
- package/build/ts/server/__test-helpers/index.d.ts.map +1 -1
- package/build/ts/server/__test-helpers/index.js +0 -2
- package/build/ts/server/__test-helpers/index.js.map +1 -1
- package/build/ts/server/__test-helpers/request-mock.d.ts.map +1 -1
- package/build/ts/server/__test-helpers/request-mock.js +143 -64
- package/build/ts/server/__test-helpers/request-mock.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/vercel/index.d.ts +2 -0
- package/build/ts/server/adapters/vercel/index.d.ts.map +1 -0
- package/build/ts/server/adapters/vercel/index.js +26 -0
- package/build/ts/server/adapters/vercel/index.js.map +1 -0
- package/build/ts/server/authenticate/admin/billing/cancel.d.ts.map +1 -1
- package/build/ts/server/authenticate/admin/billing/cancel.js +11 -8
- package/build/ts/server/authenticate/admin/billing/cancel.js.map +1 -1
- package/build/ts/server/authenticate/admin/billing/check.d.ts.map +1 -1
- package/build/ts/server/authenticate/admin/billing/check.js +11 -8
- package/build/ts/server/authenticate/admin/billing/check.js.map +1 -1
- package/build/ts/server/authenticate/admin/billing/request.d.ts.map +1 -1
- package/build/ts/server/authenticate/admin/billing/request.js +12 -9
- package/build/ts/server/authenticate/admin/billing/request.js.map +1 -1
- package/build/ts/server/authenticate/admin/billing/require.d.ts.map +1 -1
- package/build/ts/server/authenticate/admin/billing/require.js +14 -11
- package/build/ts/server/authenticate/admin/billing/require.js.map +1 -1
- package/build/ts/server/authenticate/admin/billing/types.d.ts +50 -0
- package/build/ts/server/authenticate/admin/billing/types.d.ts.map +1 -1
- package/build/ts/server/authenticate/admin/helpers/redirect-with-exitiframe.d.ts.map +1 -1
- package/build/ts/server/authenticate/admin/helpers/redirect-with-exitiframe.js +3 -1
- package/build/ts/server/authenticate/admin/helpers/redirect-with-exitiframe.js.map +1 -1
- package/build/ts/server/authenticate/admin/strategies/auth-code-flow.d.ts +4 -3
- 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.map +1 -1
- package/build/ts/server/authenticate/admin/strategies/token-exchange.d.ts +2 -1
- package/build/ts/server/authenticate/admin/strategies/token-exchange.d.ts.map +1 -1
- package/build/ts/server/authenticate/admin/strategies/token-exchange.js.map +1 -1
- package/build/ts/server/authenticate/public/appProxy/authenticate.public.app-proxy.doc.d.ts.map +1 -1
- package/build/ts/server/authenticate/public/appProxy/authenticate.public.app-proxy.doc.js +3 -1
- package/build/ts/server/authenticate/public/appProxy/authenticate.public.app-proxy.doc.js.map +1 -1
- package/build/ts/server/authenticate/public/appProxy/types.d.ts +21 -2
- package/build/ts/server/authenticate/public/appProxy/types.d.ts.map +1 -1
- package/build/ts/server/authenticate/webhooks/authenticate.d.ts.map +1 -1
- package/build/ts/server/authenticate/webhooks/authenticate.js +1 -0
- package/build/ts/server/authenticate/webhooks/authenticate.js.map +1 -1
- package/build/ts/server/authenticate/webhooks/types.d.ts +19 -0
- package/build/ts/server/authenticate/webhooks/types.d.ts.map +1 -1
- package/build/ts/server/config-types.d.ts +2 -2
- package/build/ts/server/config-types.d.ts.map +1 -1
- package/build/ts/server/future/flags.d.ts +9 -0
- package/build/ts/server/future/flags.d.ts.map +1 -1
- package/build/ts/server/future/flags.js +1 -0
- package/build/ts/server/future/flags.js.map +1 -1
- package/build/ts/server/shopify-app.d.ts +2 -1
- package/build/ts/server/shopify-app.d.ts.map +1 -1
- package/build/ts/server/shopify-app.js +4 -2
- package/build/ts/server/shopify-app.js.map +1 -1
- package/build/ts/server/types.d.ts +2 -5
- package/build/ts/server/types.d.ts.map +1 -1
- package/build/ts/server/types.js.map +1 -1
- package/build/ts/server/version.d.ts +1 -1
- package/build/ts/server/version.js +1 -1
- package/package.json +6 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cancel.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/billing/cancel.ts"],"names":[],"mappings":";;;;AAAA,oDAAgE;AAGhE,sCAA8C;AAI9C,SAAgB,oBAAoB,CAClC,MAAmB,EACnB,OAAgB,EAChB,OAAgB;IAEhB,OAAO,SAAe,aAAa,CAAC,OAA6B;;;;;;wBACxD,GAAG,GAAY,MAAM,
|
|
1
|
+
{"version":3,"file":"cancel.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/billing/cancel.ts"],"names":[],"mappings":";;;;AAAA,oDAAgE;AAGhE,sCAA8C;AAI9C,SAAgB,oBAAoB,CAClC,MAAmB,EACnB,OAAgB,EAChB,OAAgB;IAEhB,OAAO,SAAe,aAAa,CAAC,OAA6B;;;;;;wBACxD,GAAG,GAAoB,MAAM,IAA1B,EAAE,MAAM,GAAY,MAAM,OAAlB,EAAE,MAAM,GAAI,MAAM,OAAV,CAAW;wBAErC,MAAM,CAAC,KAAK,CAAC,oBAAoB,qBAAG,IAAI,EAAE,OAAO,CAAC,IAAI,IAAK,OAAO,EAAE,CAAC;;;;wBAG5D,qBAAM,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;gCAC9B,OAAO,SAAA;gCACP,cAAc,EAAE,OAAO,CAAC,cAAc;gCACtC,MAAM,EAAE,OAAO,CAAC,MAAM;gCACtB,OAAO,EAAE,OAAO,CAAC,OAAO;6BACzB,CAAC,EAAA;4BALF,sBAAO,SAKL,EAAC;;;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;wBACH,qBAAM,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,EAAA;;wBAArD,SAAqD,CAAC;wBAChD,qBAAM,IAAA,4BAAkB,EAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,EAAA;4BAA7D,MAAM,SAAuD,CAAC;4BAE9D,MAAM,OAAK,CAAC;;;;;;KAGjB,CAAC;AACJ,CAAC;AA7BD,oDA6BC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/billing/check.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,OAAO,EAAC,MAAM,sBAAsB,CAAC;AAEhE,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAEhD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AAExD,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,SAAS,CAAC;AAEjD,wBAAgB,mBAAmB,CAAC,MAAM,SAAS,YAAY,EAC7D,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,aAE4B,oBAAoB,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/billing/check.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,OAAO,EAAC,MAAM,sBAAsB,CAAC;AAEhE,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAEhD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AAExD,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,SAAS,CAAC;AAEjD,wBAAgB,mBAAmB,CAAC,MAAM,SAAS,YAAY,EAC7D,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,aAE4B,oBAAoB,MAAM,CAAC,wEAwBxE"}
|
|
@@ -7,15 +7,15 @@ var helpers_1 = require("../helpers");
|
|
|
7
7
|
function checkBillingFactory(params, request, session) {
|
|
8
8
|
return function checkBilling(options) {
|
|
9
9
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
10
|
-
var api, logger, error_1;
|
|
10
|
+
var api, logger, config, error_1;
|
|
11
11
|
return tslib_1.__generator(this, function (_a) {
|
|
12
12
|
switch (_a.label) {
|
|
13
13
|
case 0:
|
|
14
|
-
api = params.api, logger = params.logger;
|
|
14
|
+
api = params.api, logger = params.logger, config = params.config;
|
|
15
15
|
logger.debug('Checking billing plans', tslib_1.__assign({ shop: session.shop }, options));
|
|
16
16
|
_a.label = 1;
|
|
17
17
|
case 1:
|
|
18
|
-
_a.trys.push([1, 3, ,
|
|
18
|
+
_a.trys.push([1, 3, , 8]);
|
|
19
19
|
return [4 /*yield*/, api.billing.check({
|
|
20
20
|
session: session,
|
|
21
21
|
plans: options.plans,
|
|
@@ -25,15 +25,18 @@ function checkBillingFactory(params, request, session) {
|
|
|
25
25
|
case 2: return [2 /*return*/, _a.sent()];
|
|
26
26
|
case 3:
|
|
27
27
|
error_1 = _a.sent();
|
|
28
|
-
if (!(error_1 instanceof shopify_api_1.HttpResponseError && error_1.response.code === 401)) return [3 /*break*/,
|
|
28
|
+
if (!(error_1 instanceof shopify_api_1.HttpResponseError && error_1.response.code === 401)) return [3 /*break*/, 6];
|
|
29
29
|
logger.debug('API token was invalid, redirecting to OAuth', {
|
|
30
30
|
shop: session.shop,
|
|
31
31
|
});
|
|
32
|
+
return [4 /*yield*/, config.sessionStorage.deleteSession(session.id)];
|
|
33
|
+
case 4:
|
|
34
|
+
_a.sent();
|
|
32
35
|
return [4 /*yield*/, (0, helpers_1.redirectToAuthPage)(params, request, session.shop)];
|
|
33
|
-
case
|
|
34
|
-
case
|
|
35
|
-
case
|
|
36
|
-
case
|
|
36
|
+
case 5: throw _a.sent();
|
|
37
|
+
case 6: throw error_1;
|
|
38
|
+
case 7: return [3 /*break*/, 8];
|
|
39
|
+
case 8: return [2 /*return*/];
|
|
37
40
|
}
|
|
38
41
|
});
|
|
39
42
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/billing/check.ts"],"names":[],"mappings":";;;;AAAA,oDAAgE;AAGhE,sCAA8C;AAK9C,SAAgB,mBAAmB,CACjC,MAAmB,EACnB,OAAgB,EAChB,OAAgB;IAEhB,OAAO,SAAe,YAAY,CAAC,OAAoC;;;;;;wBAC9D,GAAG,GAAY,MAAM,
|
|
1
|
+
{"version":3,"file":"check.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/billing/check.ts"],"names":[],"mappings":";;;;AAAA,oDAAgE;AAGhE,sCAA8C;AAK9C,SAAgB,mBAAmB,CACjC,MAAmB,EACnB,OAAgB,EAChB,OAAgB;IAEhB,OAAO,SAAe,YAAY,CAAC,OAAoC;;;;;;wBAC9D,GAAG,GAAoB,MAAM,IAA1B,EAAE,MAAM,GAAY,MAAM,OAAlB,EAAE,MAAM,GAAI,MAAM,OAAV,CAAW;wBAErC,MAAM,CAAC,KAAK,CAAC,wBAAwB,qBAAG,IAAI,EAAE,OAAO,CAAC,IAAI,IAAK,OAAO,EAAE,CAAC;;;;wBAGhE,qBAAM,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC;gCAC7B,OAAO,SAAA;gCACP,KAAK,EAAE,OAAO,CAAC,KAAiB;gCAChC,MAAM,EAAE,OAAO,CAAC,MAAM;gCACtB,YAAY,EAAE,IAAI;6BACnB,CAAC,EAAA;4BALF,sBAAO,SAKL,EAAC;;;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;wBACH,qBAAM,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,EAAA;;wBAArD,SAAqD,CAAC;wBAChD,qBAAM,IAAA,4BAAkB,EAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,EAAA;4BAA7D,MAAM,SAAuD,CAAC;4BAE9D,MAAM,OAAK,CAAC;;;;;;KAGjB,CAAC;AACJ,CAAC;AA7BD,kDA6BC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/billing/request.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,OAAO,EACR,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAG3C,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,SAAS,CAAC;AAEnD,wBAAgB,qBAAqB,CAAC,MAAM,SAAS,YAAY,EAC/D,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,+CAOb,sBAAsB,MAAM,CAAC,KAAG,QAAQ,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/billing/request.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,OAAO,EACR,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAG3C,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,SAAS,CAAC;AAEnD,wBAAgB,qBAAqB,CAAC,MAAM,SAAS,YAAY,EAC/D,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,+CAOb,sBAAsB,MAAM,CAAC,KAAG,QAAQ,KAAK,CAAC,CAuClD"}
|
|
@@ -9,11 +9,11 @@ function requestBillingFactory(params, request, session) {
|
|
|
9
9
|
return function requestBilling(_a) {
|
|
10
10
|
var plan = _a.plan, isTest = _a.isTest, returnUrl = _a.returnUrl, overrides = tslib_1.__rest(_a, ["plan", "isTest", "returnUrl"]);
|
|
11
11
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
12
|
-
var api, logger, result, error_1;
|
|
12
|
+
var api, logger, config, result, error_1;
|
|
13
13
|
return tslib_1.__generator(this, function (_b) {
|
|
14
14
|
switch (_b.label) {
|
|
15
15
|
case 0:
|
|
16
|
-
api = params.api, logger = params.logger;
|
|
16
|
+
api = params.api, logger = params.logger, config = params.config;
|
|
17
17
|
logger.info('Requesting billing', {
|
|
18
18
|
shop: session.shop,
|
|
19
19
|
plan: plan,
|
|
@@ -22,22 +22,25 @@ function requestBillingFactory(params, request, session) {
|
|
|
22
22
|
});
|
|
23
23
|
_b.label = 1;
|
|
24
24
|
case 1:
|
|
25
|
-
_b.trys.push([1, 3, ,
|
|
25
|
+
_b.trys.push([1, 3, , 8]);
|
|
26
26
|
return [4 /*yield*/, api.billing.request(tslib_1.__assign({ plan: plan, session: session, isTest: isTest, returnUrl: returnUrl, returnObject: true }, overrides))];
|
|
27
27
|
case 2:
|
|
28
28
|
result = _b.sent();
|
|
29
|
-
return [3 /*break*/,
|
|
29
|
+
return [3 /*break*/, 8];
|
|
30
30
|
case 3:
|
|
31
31
|
error_1 = _b.sent();
|
|
32
|
-
if (!(error_1 instanceof shopify_api_1.HttpResponseError && error_1.response.code === 401)) return [3 /*break*/,
|
|
32
|
+
if (!(error_1 instanceof shopify_api_1.HttpResponseError && error_1.response.code === 401)) return [3 /*break*/, 6];
|
|
33
33
|
logger.debug('API token was invalid, redirecting to OAuth', {
|
|
34
34
|
shop: session.shop,
|
|
35
35
|
});
|
|
36
|
+
return [4 /*yield*/, config.sessionStorage.deleteSession(session.id)];
|
|
37
|
+
case 4:
|
|
38
|
+
_b.sent();
|
|
36
39
|
return [4 /*yield*/, (0, helpers_1.redirectToAuthPage)(params, request, session.shop)];
|
|
37
|
-
case
|
|
38
|
-
case
|
|
39
|
-
case
|
|
40
|
-
case
|
|
40
|
+
case 5: throw _b.sent();
|
|
41
|
+
case 6: throw error_1;
|
|
42
|
+
case 7: return [3 /*break*/, 8];
|
|
43
|
+
case 8: throw redirectOutOfApp(params, request, result.confirmationUrl, session.shop);
|
|
41
44
|
}
|
|
42
45
|
});
|
|
43
46
|
});
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/billing/request.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"require.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/billing/require.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,EAE1B,OAAO,EACR,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AAGxD,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,SAAS,CAAC;AAEnD,wBAAgB,qBAAqB,CAAC,MAAM,SAAS,YAAY,EAC/D,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,aAI8B,sBAAsB,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"require.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/billing/require.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,EAE1B,OAAO,EACR,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AAGxD,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,SAAS,CAAC;AAEnD,wBAAgB,qBAAqB,CAAC,MAAM,SAAS,YAAY,EAC/D,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,aAI8B,sBAAsB,MAAM,CAAC,yCAoC5E"}
|
|
@@ -5,7 +5,7 @@ var tslib_1 = require("tslib");
|
|
|
5
5
|
var shopify_api_1 = require("@shopify/shopify-api");
|
|
6
6
|
var helpers_1 = require("../helpers");
|
|
7
7
|
function requireBillingFactory(params, request, session) {
|
|
8
|
-
var api = params.api, logger = params.logger;
|
|
8
|
+
var api = params.api, logger = params.logger, config = params.config;
|
|
9
9
|
return function requireBilling(options) {
|
|
10
10
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
11
11
|
var logContext, data, error_1;
|
|
@@ -20,7 +20,7 @@ function requireBillingFactory(params, request, session) {
|
|
|
20
20
|
logger.debug('Checking billing for the shop', logContext);
|
|
21
21
|
_a.label = 1;
|
|
22
22
|
case 1:
|
|
23
|
-
_a.trys.push([1, 3, ,
|
|
23
|
+
_a.trys.push([1, 3, , 8]);
|
|
24
24
|
return [4 /*yield*/, api.billing.check({
|
|
25
25
|
session: session,
|
|
26
26
|
plans: options.plans,
|
|
@@ -29,21 +29,24 @@ function requireBillingFactory(params, request, session) {
|
|
|
29
29
|
})];
|
|
30
30
|
case 2:
|
|
31
31
|
data = _a.sent();
|
|
32
|
-
return [3 /*break*/,
|
|
32
|
+
return [3 /*break*/, 8];
|
|
33
33
|
case 3:
|
|
34
34
|
error_1 = _a.sent();
|
|
35
|
-
if (!(error_1 instanceof shopify_api_1.HttpResponseError && error_1.response.code === 401)) return [3 /*break*/,
|
|
35
|
+
if (!(error_1 instanceof shopify_api_1.HttpResponseError && error_1.response.code === 401)) return [3 /*break*/, 6];
|
|
36
36
|
logger.debug('API token was invalid, redirecting to OAuth', logContext);
|
|
37
|
+
return [4 /*yield*/, config.sessionStorage.deleteSession(session.id)];
|
|
38
|
+
case 4:
|
|
39
|
+
_a.sent();
|
|
37
40
|
return [4 /*yield*/, (0, helpers_1.redirectToAuthPage)(params, request, session.shop)];
|
|
38
|
-
case
|
|
39
|
-
case
|
|
40
|
-
case
|
|
41
|
-
case
|
|
42
|
-
if (!!data.hasActivePayment) return [3 /*break*/,
|
|
41
|
+
case 5: throw _a.sent();
|
|
42
|
+
case 6: throw error_1;
|
|
43
|
+
case 7: return [3 /*break*/, 8];
|
|
44
|
+
case 8:
|
|
45
|
+
if (!!data.hasActivePayment) return [3 /*break*/, 10];
|
|
43
46
|
logger.debug('Billing check failed', logContext);
|
|
44
47
|
return [4 /*yield*/, options.onFailure(new Error('Billing check failed'))];
|
|
45
|
-
case
|
|
46
|
-
case
|
|
48
|
+
case 9: throw _a.sent();
|
|
49
|
+
case 10:
|
|
47
50
|
logger.debug('Billing check succeeded', logContext);
|
|
48
51
|
return [2 /*return*/, data];
|
|
49
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"require.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/billing/require.ts"],"names":[],"mappings":";;;;AAAA,oDAI8B;AAI9B,sCAA8C;AAI9C,SAAgB,qBAAqB,CACnC,MAAmB,EACnB,OAAgB,EAChB,OAAgB;IAET,IAAA,GAAG,GAAY,MAAM,
|
|
1
|
+
{"version":3,"file":"require.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/billing/require.ts"],"names":[],"mappings":";;;;AAAA,oDAI8B;AAI9B,sCAA8C;AAI9C,SAAgB,qBAAqB,CACnC,MAAmB,EACnB,OAAgB,EAChB,OAAgB;IAET,IAAA,GAAG,GAAoB,MAAM,IAA1B,EAAE,MAAM,GAAY,MAAM,OAAlB,EAAE,MAAM,GAAI,MAAM,OAAV,CAAW;IAErC,OAAO,SAAe,cAAc,CAAC,OAAsC;;;;;;wBACnE,UAAU,GAAG;4BACjB,IAAI,EAAE,OAAO,CAAC,IAAI;4BAClB,KAAK,EAAE,OAAO,CAAC,KAAK;4BACpB,MAAM,EAAE,OAAO,CAAC,MAAM;yBACvB,CAAC;wBAEF,MAAM,CAAC,KAAK,CAAC,+BAA+B,EAAE,UAAU,CAAC,CAAC;;;;wBAIjD,qBAAM,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC;gCAC7B,OAAO,SAAA;gCACP,KAAK,EAAE,OAAO,CAAC,KAAiB;gCAChC,MAAM,EAAE,OAAO,CAAC,MAAM;gCACtB,YAAY,EAAE,IAAI;6BACnB,CAAC,EAAA;;wBALF,IAAI,GAAG,SAKL,CAAC;;;;6BAEC,CAAA,OAAK,YAAY,+BAAiB,IAAI,OAAK,CAAC,QAAQ,CAAC,IAAI,KAAK,GAAG,CAAA,EAAjE,wBAAiE;wBACnE,MAAM,CAAC,KAAK,CAAC,6CAA6C,EAAE,UAAU,CAAC,CAAC;wBACxE,qBAAM,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,EAAA;;wBAArD,SAAqD,CAAC;wBAChD,qBAAM,IAAA,4BAAkB,EAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,EAAA;4BAA7D,MAAM,SAAuD,CAAC;4BAE9D,MAAM,OAAK,CAAC;;;6BAIZ,CAAC,IAAI,CAAC,gBAAgB,EAAtB,yBAAsB;wBACxB,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,UAAU,CAAC,CAAC;wBAC3C,qBAAM,OAAO,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,EAAA;4BAAhE,MAAM,SAA0D,CAAC;;wBAGnE,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,UAAU,CAAC,CAAC;wBAEpD,sBAAO,IAAI,EAAC;;;;KACb,CAAC;AACJ,CAAC;AA3CD,sDA2CC"}
|
|
@@ -141,6 +141,56 @@ export interface BillingContext<Config extends AppConfigArg> {
|
|
|
141
141
|
* export default shopify;
|
|
142
142
|
* export const authenticate = shopify.authenticate;
|
|
143
143
|
* ```
|
|
144
|
+
* @example
|
|
145
|
+
* <caption>Requesting billing with line items</caption>
|
|
146
|
+
* <description>Call `billing.request` with the `v3_lineItemBilling` future flag enabled</description>
|
|
147
|
+
* ```ts
|
|
148
|
+
* // /app/routes/**\/*.ts
|
|
149
|
+
* import { LoaderFunctionArgs } from "@remix-run/node";
|
|
150
|
+
* import { authenticate, MONTHLY_PLAN } from "../shopify.server";
|
|
151
|
+
*
|
|
152
|
+
* export const loader = async ({ request }: LoaderFunctionArgs) => {
|
|
153
|
+
* const { billing } = await authenticate.admin(request);
|
|
154
|
+
* await billing.require({
|
|
155
|
+
* plans: [MONTHLY_PLAN],
|
|
156
|
+
* isTest: true,
|
|
157
|
+
* onFailure: async () => billing.request({ plan: MONTHLY_PLAN }),
|
|
158
|
+
* });
|
|
159
|
+
*
|
|
160
|
+
* // App logic
|
|
161
|
+
* };
|
|
162
|
+
* ```
|
|
163
|
+
* ```ts
|
|
164
|
+
* // shopify.server.ts
|
|
165
|
+
* import { shopifyApp, BillingInterval } from "@shopify/shopify-app-remix/server";
|
|
166
|
+
*
|
|
167
|
+
* export const MONTHLY_PLAN = 'Monthly subscription';
|
|
168
|
+
* export const ANNUAL_PLAN = 'Annual subscription';
|
|
169
|
+
*
|
|
170
|
+
* const shopify = shopifyApp({
|
|
171
|
+
* // ...etc
|
|
172
|
+
* billing: {
|
|
173
|
+
* [MONTHLY_PLAN]: {
|
|
174
|
+
* lineItems: [
|
|
175
|
+
* {
|
|
176
|
+
* amount: 5,
|
|
177
|
+
* currencyCode: 'USD',
|
|
178
|
+
* interval: BillingInterval.Every30Days,
|
|
179
|
+
* },
|
|
180
|
+
* {
|
|
181
|
+
* amount: 1,
|
|
182
|
+
* currencyCode: 'USD',
|
|
183
|
+
* interval: BillingInterval.Usage.
|
|
184
|
+
* terms: '1 dollar per 1000 emails',
|
|
185
|
+
* },
|
|
186
|
+
* ],
|
|
187
|
+
* },
|
|
188
|
+
* }
|
|
189
|
+
* future: {v3_lineItemBilling: true}
|
|
190
|
+
* });
|
|
191
|
+
* export default shopify;
|
|
192
|
+
* export const authenticate = shopify.authenticate;
|
|
193
|
+
* ```
|
|
144
194
|
*/
|
|
145
195
|
require: (options: RequireBillingOptions<Config>) => Promise<BillingCheckResponseObject>;
|
|
146
196
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/billing/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,0BAA0B,EAC1B,oBAAoB,EACrB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AAExD,MAAM,WAAW,qBAAqB,CAAC,MAAM,SAAS,YAAY,CAChE,SAAQ,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,OAAO,GAAG,cAAc,CAAC;IACtE;;OAEG;IACH,KAAK,EAAE,CAAC,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;IACnC;;OAEG;IACH,SAAS,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;CAC9C;AAED,MAAM,WAAW,mBAAmB,CAAC,MAAM,SAAS,YAAY,CAC9D,SAAQ,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,OAAO,GAAG,cAAc,CAAC;IACtE;;OAEG;IACH,KAAK,EAAE,CAAC,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;CACpC;AAED,MAAM,WAAW,qBAAqB,CAAC,MAAM,SAAS,YAAY,CAChE,SAAQ,IAAI,CAAC,oBAAoB,EAAE,SAAS,GAAG,MAAM,GAAG,cAAc,CAAC;IACvE;;OAEG;IACH,IAAI,EAAE,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC;IAC9B;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAIlB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,cAAc,CAAC,MAAM,SAAS,YAAY;IACzD
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/billing/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,0BAA0B,EAC1B,oBAAoB,EACrB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AAExD,MAAM,WAAW,qBAAqB,CAAC,MAAM,SAAS,YAAY,CAChE,SAAQ,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,OAAO,GAAG,cAAc,CAAC;IACtE;;OAEG;IACH,KAAK,EAAE,CAAC,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;IACnC;;OAEG;IACH,SAAS,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;CAC9C;AAED,MAAM,WAAW,mBAAmB,CAAC,MAAM,SAAS,YAAY,CAC9D,SAAQ,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,OAAO,GAAG,cAAc,CAAC;IACtE;;OAEG;IACH,KAAK,EAAE,CAAC,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;CACpC;AAED,MAAM,WAAW,qBAAqB,CAAC,MAAM,SAAS,YAAY,CAChE,SAAQ,IAAI,CAAC,oBAAoB,EAAE,SAAS,GAAG,MAAM,GAAG,cAAc,CAAC;IACvE;;OAEG;IACH,IAAI,EAAE,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC;IAC9B;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAIlB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,cAAc,CAAC,MAAM,SAAS,YAAY;IACzD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAmJG;IACH,OAAO,EAAE,CACP,OAAO,EAAE,qBAAqB,CAAC,MAAM,CAAC,KACnC,OAAO,CAAC,0BAA0B,CAAC,CAAC;IAEzC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAkDG;IACH,KAAK,EAAE,CACL,OAAO,EAAE,mBAAmB,CAAC,MAAM,CAAC,KACjC,OAAO,CAAC,0BAA0B,CAAC,CAAC;IAEzC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAoDG;IACH,OAAO,EAAE,CAAC,OAAO,EAAE,qBAAqB,CAAC,MAAM,CAAC,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC;IAEpE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAuDG;IACH,MAAM,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,OAAO,CAAC,eAAe,CAAC,CAAC;CACrE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redirect-with-exitiframe.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/redirect-with-exitiframe.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAEhD,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,GACX,KAAK,
|
|
1
|
+
{"version":3,"file":"redirect-with-exitiframe.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/redirect-with-exitiframe.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAEhD,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,GACX,KAAK,CAmBP"}
|
|
@@ -8,10 +8,12 @@ function redirectWithExitIframe(params, request, shop) {
|
|
|
8
8
|
var queryParams = url.searchParams;
|
|
9
9
|
var host = api.utils.sanitizeHost(queryParams.get('host'));
|
|
10
10
|
queryParams.set('shop', shop);
|
|
11
|
-
|
|
11
|
+
var destination = "".concat(config.auth.path, "?shop=").concat(shop);
|
|
12
12
|
if (host) {
|
|
13
13
|
queryParams.set('host', host);
|
|
14
|
+
destination = "".concat(destination, "&host=").concat(host);
|
|
14
15
|
}
|
|
16
|
+
queryParams.set('exitIframe', destination);
|
|
15
17
|
throw (0, server_runtime_1.redirect)("".concat(config.auth.exitIframePath, "?").concat(queryParams.toString()));
|
|
16
18
|
}
|
|
17
19
|
exports.redirectWithExitIframe = redirectWithExitIframe;
|
|
@@ -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;
|
|
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;IAErC,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;IAE9B,IAAI,WAAW,GAAG,UAAG,MAAM,CAAC,IAAI,CAAC,IAAI,mBAAS,IAAI,CAAE,CAAC;IAErD,IAAI,IAAI,EAAE,CAAC;QACT,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC9B,WAAW,GAAG,UAAG,WAAW,mBAAS,IAAI,CAAE,CAAC;IAC9C,CAAC;IACD,WAAW,CAAC,GAAG,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IAE3C,MAAM,IAAA,yBAAQ,EAAC,UAAG,MAAM,CAAC,IAAI,CAAC,cAAc,cAAI,WAAW,CAAC,QAAQ,EAAE,CAAE,CAAC,CAAC;AAC5E,CAAC;AAvBD,wDAuBC"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { Session, Shopify, ShopifyRestResources } from '@shopify/shopify-api';
|
|
2
2
|
import type { BasicParams } from '../../../types';
|
|
3
|
-
import { AppConfig } from '../../../config-types';
|
|
3
|
+
import { AppConfig, AppConfigArg } from '../../../config-types';
|
|
4
4
|
import { HandleAdminClientError } from '../../../clients';
|
|
5
|
+
import type { ApiConfigWithFutureFlags, ApiFutureFlags } from '../../../future/flags';
|
|
5
6
|
import { AuthorizationStrategy, SessionContext } from './types';
|
|
6
|
-
export declare class AuthCodeFlowStrategy<Resources extends ShopifyRestResources = ShopifyRestResources> implements AuthorizationStrategy {
|
|
7
|
-
protected api: Shopify
|
|
7
|
+
export declare class AuthCodeFlowStrategy<Config extends AppConfigArg, Resources extends ShopifyRestResources = ShopifyRestResources> implements AuthorizationStrategy {
|
|
8
|
+
protected api: Shopify<ApiConfigWithFutureFlags<Config['future']>, ShopifyRestResources, ApiFutureFlags<Config['future']>>;
|
|
8
9
|
protected config: AppConfig;
|
|
9
10
|
protected logger: Shopify['logger'];
|
|
10
11
|
constructor({ api, config, logger }: BasicParams);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-code-flow.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/strategies/auth-code-flow.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,OAAO,EACP,OAAO,EACP,oBAAoB,EACrB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAUhD,OAAO,EAAC,SAAS,EAAC,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"auth-code-flow.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/strategies/auth-code-flow.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,OAAO,EACP,OAAO,EACP,oBAAoB,EACrB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAUhD,OAAO,EAAC,SAAS,EAAE,YAAY,EAAC,MAAM,uBAAuB,CAAC;AAE9D,OAAO,EAAC,sBAAsB,EAAC,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,EACV,wBAAwB,EACxB,cAAc,EACf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAC,qBAAqB,EAAE,cAAc,EAAiB,MAAM,SAAS,CAAC;AAE9E,qBAAa,oBAAoB,CAC/B,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,CAC7D,YAAW,qBAAqB;IAEhC,SAAS,CAAC,GAAG,EAAE,OAAO,CACpB,wBAAwB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAC1C,oBAAoB,EACpB,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CACjC,CAAC;IAEF,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC;IAC5B,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;gBAEjB,EAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAC,EAAE,WAAW;IAMxC,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC;IA0B/D,YAAY,CACvB,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,cAAc,GAC7B,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC;IAqBpB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,sBAAsB;YAgBpD,qBAAqB;YAiDrB,sBAAsB;YAoBtB,yBAAyB;YAuCzB,iBAAiB;YAOjB,iBAAiB;YAIjB,mBAAmB;YAYnB,WAAW;YAgBX,kBAAkB;YA4BlB,2BAA2B;CAwC1C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-code-flow.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/strategies/auth-code-flow.ts"],"names":[],"mappings":";;;;AAAA,oDAS8B;AAG9B,sCAQoB;AAEpB,yCAAoD;
|
|
1
|
+
{"version":3,"file":"auth-code-flow.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/strategies/auth-code-flow.ts"],"names":[],"mappings":";;;;AAAA,oDAS8B;AAG9B,sCAQoB;AAEpB,yCAAoD;AASpD;IAcE,8BAAmB,EAAkC;YAAjC,GAAG,SAAA,EAAE,MAAM,YAAA,EAAE,MAAM,YAAA;QACrC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAEY,qDAAsB,GAAnC,UAAoC,OAAgB;;;;;;wBAC5C,KAAgB,IAAI,EAAnB,GAAG,SAAA,EAAE,MAAM,YAAA,CAAS;wBAErB,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;wBAC3B,aAAa,GAAG,GAAG,CAAC,QAAQ,KAAK,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;wBAClD,qBAAqB,GAAG,GAAG,CAAC,QAAQ,KAAK,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC;6BAEpE,CAAA,aAAa,IAAI,qBAAqB,CAAA,EAAtC,wBAAsC;wBAClC,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC,CAAC;wBACnE,IAAI,CAAC,IAAI;4BAAE,MAAM,IAAI,QAAQ,CAAC,uBAAuB,EAAE,EAAC,MAAM,EAAE,GAAG,EAAC,CAAC,CAAC;6BAElE,aAAa,EAAb,wBAAa;wBACT,qBAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,IAAI,CAAC,EAAA;4BAAtD,MAAM,SAAgD,CAAC;4BAEjD,qBAAM,IAAI,CAAC,yBAAyB,CAAC,OAAO,EAAE,IAAI,CAAC,EAAA;4BAAzD,MAAM,SAAmD,CAAC;;6BAI1D,CAAC,IAAA,+BAAqB,EAAC,OAAO,CAAC,EAA/B,wBAA+B;wBACjC,qGAAqG;wBACrG,oEAAoE;wBACpE,qEAAqE;wBACrE,qBAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,EAAA;;wBAHzC,qGAAqG;wBACrG,oEAAoE;wBACpE,qEAAqE;wBACrE,SAAyC,CAAC;;;;;;KAE7C;IAEY,2CAAY,GAAzB,UACE,OAAgB,EAChB,cAA8B;;;;;;wBAExB,KAAwB,IAAI,EAA3B,GAAG,SAAA,EAAE,MAAM,YAAA,EAAE,MAAM,YAAA,CAAS;wBAE5B,IAAI,GAAa,cAAc,KAA3B,EAAE,OAAO,GAAI,cAAc,QAAlB,CAAmB;6BAEnC,CAAC,OAAO,EAAR,wBAAQ;wBACV,MAAM,CAAC,KAAK,CAAC,wCAAwC,EAAE,EAAC,IAAI,MAAA,EAAC,CAAC,CAAC;wBAC/D,qBAAM,IAAA,4BAAkB,EAAC,EAAC,MAAM,QAAA,EAAE,MAAM,QAAA,EAAE,GAAG,KAAA,EAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAA;;wBAA9D,SAA8D,CAAC;;;6BACtD,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,EAAhC,wBAAgC;wBACzC,MAAM,CAAC,KAAK,CACV,2DAA2D,EAC3D,EAAC,IAAI,MAAA,EAAC,CACP,CAAC;wBACF,qBAAM,IAAA,4BAAkB,EAAC,EAAC,MAAM,QAAA,EAAE,MAAM,QAAA,EAAE,GAAG,KAAA,EAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAA;;wBAA9D,SAA8D,CAAC;;;wBAGjE,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,EAAC,IAAI,MAAA,EAAC,CAAC,CAAC;wBAE9C,sBAAO,OAAQ,EAAC;;;;KACjB;IAEM,gDAAiB,GAAxB,UAAyB,OAAgB;QAAzC,iBAcC;QAbO,IAAA,KAAwB,IAAI,EAA3B,GAAG,SAAA,EAAE,MAAM,YAAA,EAAE,MAAM,YAAQ,CAAC;QACnC,OAAO,IAAA,kCAAwB,EAAC;YAC9B,OAAO,SAAA;YACP,OAAO,EAAE,UAAO,EAAgC;oBAA/B,OAAO,aAAA,EAAE,KAAK,WAAA;;;;;qCACzB,CAAA,KAAK,CAAC,QAAQ,CAAC,IAAI,KAAK,GAAG,CAAA,EAA3B,wBAA2B;gCACvB,qBAAM,IAAA,4BAAkB,EAC5B,EAAC,GAAG,KAAA,EAAE,MAAM,QAAA,EAAE,MAAM,QAAA,EAAC,EACrB,OAAO,EACP,OAAO,CAAC,IAAI,CACb,EAAA;oCAJD,MAAM,SAIL,CAAC;;;;;aAEL;SACF,CAAC,CAAC;IACL,CAAC;IAEa,oDAAqB,GAAnC,UAAoC,OAAgB;;;;;;wBAC5C,KAAwB,IAAI,EAA3B,GAAG,SAAA,EAAE,MAAM,YAAA,EAAE,MAAM,YAAA,CAAS;wBAEnC,IAAA,mCAAyB,EAAC,EAAC,GAAG,KAAA,EAAE,MAAM,QAAA,EAAE,MAAM,QAAA,EAAC,EAAE,OAAO,CAAC,CAAC;wBAEpD,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;wBAC7B,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;wBAExC,0BAA0B;wBAC1B,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,EAAC,IAAI,MAAA,EAAC,CAAC,CAAC;wBAEpD,qBAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAA;;wBAA3C,IAAI,CAAC,CAAC,SAAqC,CAAC,EAAE,CAAC;4BAC7C,MAAM,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;4BACjE,MAAM,IAAI,QAAQ,CAAC,SAAS,EAAE;gCAC5B,MAAM,EAAE,GAAG;gCACX,UAAU,EAAE,aAAa;6BAC1B,CAAC,CAAC;wBACL,CAAC;wBAEsB,qBAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAA;;wBAAtD,cAAc,GAAG,SAAqC;wBACtD,UAAU,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,GAAG,CAAC;6BAExD,CAAC,cAAc,EAAf,wBAAe;wBACjB,MAAM,CAAC,IAAI,CAAC,qDAAqD,EAAE;4BACjE,IAAI,MAAA;yBACL,CAAC,CAAC;6BACC,UAAU,EAAV,wBAAU;wBACZ,IAAA,gCAAsB,EAAC,EAAC,GAAG,KAAA,EAAE,MAAM,QAAA,EAAE,MAAM,QAAA,EAAC,EAAE,OAAO,EAAE,IAAK,CAAC,CAAC;;4BAExD,qBAAM,IAAA,mBAAS,EAAC,EAAC,GAAG,KAAA,EAAE,MAAM,QAAA,EAAE,MAAM,QAAA,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAK,CAAC,EAAA;4BAAnE,MAAM,SAA6D,CAAC;;wBAIxE,IAAI,GAAG,IAAI,IAAI,cAAc,CAAC,IAAI,CAAC;6BAE/B,CAAA,MAAM,CAAC,aAAa,IAAI,CAAC,UAAU,CAAA,EAAnC,yBAAmC;;;;wBAEnC,MAAM,CAAC,KAAK,CAAC,oDAAoD,EAAE;4BACjE,IAAI,MAAA;yBACL,CAAC,CAAC;wBACH,qBAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,EAAA;;wBAAtC,SAAsC,CAAC;wBAEvC,MAAM,CAAC,KAAK,CAAC,+CAA+C,EAAE,EAAC,IAAI,MAAA,EAAC,CAAC,CAAC;;;;wBAEtE,qBAAM,IAAI,CAAC,2BAA2B,CAAC,OAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAA;;wBAA5D,SAA4D,CAAC;;;;;;KAGlE;IAEa,qDAAsB,GAApC,UACE,OAAgB,EAChB,IAAY;;;;;;wBAEN,KAAwB,IAAI,EAA3B,GAAG,SAAA,EAAE,MAAM,YAAA,EAAE,MAAM,YAAA,CAAS;wBAEnC,MAAM,CAAC,IAAI,CAAC,8BAA8B,EAAE,EAAC,IAAI,MAAA,EAAC,CAAC,CAAC;6BAIlD,CAAA,MAAM,CAAC,aAAa;4BACpB,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,KAAK,QAAQ,CAAA,EADlD,wBACkD;wBAElD,MAAM,CAAC,KAAK,CAAC,iDAAiD,EAAE,EAAC,IAAI,MAAA,EAAC,CAAC,CAAC;wBACxE,MAAM,IAAA,gCAAsB,EAAC,EAAC,GAAG,KAAA,EAAE,MAAM,QAAA,EAAE,MAAM,QAAA,EAAC,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;4BAE7D,qBAAM,IAAA,mBAAS,EAAC,EAAC,GAAG,KAAA,EAAE,MAAM,QAAA,EAAE,MAAM,QAAA,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,EAAA;4BAAlE,MAAM,SAA4D,CAAC;;;;KAEtE;IAEa,wDAAyB,GAAvC,UACE,OAAgB,EAChB,IAAY;;;;;;wBAEN,KAAwB,IAAI,EAA3B,GAAG,SAAA,EAAE,MAAM,YAAA,EAAE,MAAM,YAAA,CAAS;wBAEnC,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;;;;wBAGD,qBAAM,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;gCAClE,UAAU,EAAE,OAAO;6BACpB,CAAC,EAAA;;wBAFI,KAAsC,SAE1C,EAFK,OAAO,aAAA,EAAW,eAAe,aAAA;wBAIxC,qBAAM,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,OAAO,CAAC,EAAA;;wBAAjD,SAAiD,CAAC;6BAE9C,CAAA,MAAM,CAAC,eAAe,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAA,EAA3C,wBAA2C;wBAC7C,MAAM,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;wBAClE,qBAAM,IAAA,mBAAS,EAAC,EAAC,GAAG,KAAA,EAAE,MAAM,QAAA,EAAE,MAAM,QAAA,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,EAAA;;wBAA3D,SAA2D,CAAC;;4BAG9D,qBAAM,IAAA,8BAAoB,EACxB,EAAC,GAAG,KAAA,EAAE,MAAM,QAAA,EAAE,MAAM,QAAA,EAAC,EACrB,OAAO,EACP,OAAO,EACP,IAAI,CACL,EAAA;;wBALD,SAKC,CAAC;wBAEI,qBAAM,IAAA,oCAA0B,EACpC,OAAO,EACP,EAAC,GAAG,KAAA,EAAE,MAAM,QAAA,EAAE,MAAM,QAAA,EAAC,EACrB,eAAe,CAChB,EAAA;4BAJD,MAAM,SAIL,CAAC;;;wBAEF,IAAI,OAAK,YAAY,QAAQ;4BAAE,MAAM,OAAK,CAAC;wBAErC,qBAAM,IAAI,CAAC,kBAAkB,CAAC,OAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAA;4BAAzD,MAAM,SAAmD,CAAC;;;;;KAE7D;IAEa,gDAAiB,GAA/B,UACE,OAAgB;;;;;4BAEE,qBAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAA;;wBAAnD,SAAS,GAAG,SAAuC;wBACzD,sBAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,SAAU,CAAC,EAAC;;;;KAC3D;IAEa,gDAAiB,GAA/B,UAAgC,OAAgB;;;;;;wBACvC,KAAA,OAAO,CAAA;wBAAC,qBAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAA;4BAAtD,sBAAO,kBAAQ,SAAuC,EAAC,EAAC;;;;KACzD;IAEa,kDAAmB,GAAjC,UACE,OAAgB;;;;gBAET,GAAG,GAAI,IAAI,IAAR,CAAS;gBACb,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAC3B,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAE1C,sBAAO,IAAI;wBACT,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC;wBAChC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,EAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAC,CAAC,EAAC;;;KACtE;IAEa,0CAAW,GAAzB,UAA0B,OAAgB;;;;;;wBACjC,GAAG,GAAI,IAAI,IAAR,CAAS;wBAEb,MAAM,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC;4BACrC,OAAO,SAAA;yBACR,CAAC,CAAC;wBAEH,qBAAM,MAAM,CAAC,OAAO,CAAC,sGAMpB,CAAC,EAAA;;wBANF,SAME,CAAC;;;;;KACJ;IAEa,iDAAkB,GAAhC,UACE,KAAY,EACZ,OAAgB,EAChB,IAAY;;;;gBAEL,MAAM,GAAI,IAAI,OAAR,CAAS;gBACtB,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,EAAC,KAAK,EAAE,KAAK,CAAC,OAAO,EAAC,CAAC,CAAC;gBAEpE,IAAI,KAAK,YAAY,4BAAc,EAAE,CAAC;oBACpC,sBAAO,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,IAAI,CAAC,EAAC;gBACpD,CAAC;gBAED,IACE,KAAK,YAAY,8BAAgB;oBACjC,KAAK,YAAY,+BAAiB,EAClC,CAAC;oBACD,sBAAO,IAAI,QAAQ,CAAC,SAAS,EAAE;4BAC7B,MAAM,EAAE,GAAG;4BACX,UAAU,EAAE,uBAAuB;yBACpC,CAAC,EAAC;gBACL,CAAC;gBAED,sBAAO,IAAI,QAAQ,CAAC,SAAS,EAAE;wBAC7B,MAAM,EAAE,GAAG;wBACX,UAAU,EAAE,uBAAuB;qBACpC,CAAC,EAAC;;;KACJ;IAEa,0DAA2B,GAAzC,UACE,KAAY,EACZ,OAAgB,EAChB,IAAY;;;;;;wBAEN,KAAwB,IAAI,EAA3B,GAAG,SAAA,EAAE,MAAM,YAAA,EAAE,MAAM,YAAA,CAAS;6BAC/B,CAAA,KAAK,YAAY,+BAAiB,CAAA,EAAlC,wBAAkC;6BAChC,CAAA,KAAK,CAAC,QAAQ,CAAC,IAAI,KAAK,GAAG,CAAA,EAA3B,wBAA2B;wBAC7B,MAAM,CAAC,IAAI,CAAC,uDAAuD,EAAE;4BACnE,IAAI,MAAA;yBACL,CAAC,CAAC;wBACG,qBAAM,IAAA,mBAAS,EAAC,EAAC,GAAG,KAAA,EAAE,MAAM,QAAA,EAAE,MAAM,QAAA,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,EAAA;4BAAlE,MAAM,SAA4D,CAAC;;wBAE7D,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;wBAC7D,MAAM,CAAC,KAAK,CAAC,sDAA+C,OAAO,CAAE,EAAE;4BACrE,IAAI,MAAA;yBACL,CAAC,CAAC;wBAEH,MAAM,IAAI,QAAQ,CAAC,SAAS,EAAE;4BAC5B,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI;4BAC3B,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,UAAU;yBACtC,CAAC,CAAC;;;wBAEA,IAAI,KAAK,YAAY,+BAAiB,EAAE,CAAC;4BACxC,OAAO,GAA2B,EAAC,IAAI,MAAA,EAAC,CAAC;4BAC/C,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;gCACnB,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;4BAChD,CAAC;4BAED,MAAM,CAAC,KAAK,CACV,sDAA+C,KAAK,CAAC,OAAO,CAAE,EAC9D,OAAO,CACR,CAAC;4BAEF,MAAM,IAAI,QAAQ,CAAC,SAAS,EAAE;gCAC5B,MAAM,EAAE,GAAG;gCACX,UAAU,EAAE,uBAAuB;6BACpC,CAAC,CAAC;wBACL,CAAC;;;;;;KACF;IACH,2BAAC;AAAD,CAAC,AA7SD,IA6SC;AA7SY,oDAAoB"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { Session, Shopify, ShopifyRestResources } from '@shopify/shopify-api';
|
|
2
2
|
import { AppConfig, AppConfigArg } from '../../../config-types';
|
|
3
|
-
import { BasicParams
|
|
3
|
+
import { BasicParams } from '../../../types';
|
|
4
4
|
import { HandleAdminClientError } from '../../../clients';
|
|
5
|
+
import type { ApiConfigWithFutureFlags, ApiFutureFlags } from '../../../future/flags';
|
|
5
6
|
import { AuthorizationStrategy, SessionContext } from './types';
|
|
6
7
|
export declare class TokenExchangeStrategy<Config extends AppConfigArg> implements AuthorizationStrategy {
|
|
7
8
|
protected api: Shopify<ApiConfigWithFutureFlags<Config['future']>, ShopifyRestResources, ApiFutureFlags<Config['future']>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-exchange.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/strategies/token-exchange.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,OAAO,EACP,OAAO,EACP,oBAAoB,EACrB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAC,SAAS,EAAE,YAAY,EAAC,MAAM,uBAAuB,CAAC;AAC9D,OAAO,
|
|
1
|
+
{"version":3,"file":"token-exchange.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/strategies/token-exchange.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,OAAO,EACP,OAAO,EACP,oBAAoB,EACrB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAC,SAAS,EAAE,YAAY,EAAC,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAG3C,OAAO,EAAC,sBAAsB,EAAC,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,EACV,wBAAwB,EACxB,cAAc,EACf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAC,qBAAqB,EAAE,cAAc,EAAiB,MAAM,SAAS,CAAC;AAE9E,qBAAa,qBAAqB,CAAC,MAAM,SAAS,YAAY,CAC5D,YAAW,qBAAqB;IAEhC,SAAS,CAAC,GAAG,EAAE,OAAO,CACpB,wBAAwB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAC1C,oBAAoB,EACpB,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CACjC,CAAC;IAEF,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC;IAC5B,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;gBAEjB,EAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAC,EAAE,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAM1D,sBAAsB,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAExD,YAAY,CACvB,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,cAAc,GAC7B,OAAO,CAAC,OAAO,CAAC;IAqDZ,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,sBAAsB;YAiBpD,aAAa;YAwCb,mBAAmB;CAclC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-exchange.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/strategies/token-exchange.ts"],"names":[],"mappings":";;;;AAAA,oDAO8B;
|
|
1
|
+
{"version":3,"file":"token-exchange.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/strategies/token-exchange.ts"],"names":[],"mappings":"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"}
|
package/build/ts/server/authenticate/public/appProxy/authenticate.public.app-proxy.doc.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authenticate.public.app-proxy.doc.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/public/appProxy/authenticate.public.app-proxy.doc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,6BAA6B,EAAC,MAAM,wBAAwB,CAAC;AAErE,QAAA,MAAM,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"authenticate.public.app-proxy.doc.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/public/appProxy/authenticate.public.app-proxy.doc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,6BAA6B,EAAC,MAAM,wBAAwB,CAAC;AAErE,QAAA,MAAM,IAAI,EAAE,6BA+BX,CAAC;AAEF,eAAe,IAAI,CAAC"}
|
|
@@ -2,7 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
var data = {
|
|
4
4
|
name: 'App proxy',
|
|
5
|
-
description: '[App proxies](/docs/apps/online-store/app-proxies) take requests to Shopify links, and redirect them to external links.
|
|
5
|
+
description: '[App proxies](/docs/apps/online-store/app-proxies) take requests to Shopify links, and redirect them to external links.' +
|
|
6
|
+
'\nThe `authenticate.public.appProxy` function validates requests made to app proxies, and returns a context to enable querying Shopify APIs.' +
|
|
7
|
+
'\n\n> Note: If the store has not installed the app, store-related properties such as `admin` or `storefront` will be `undefined`',
|
|
6
8
|
category: 'Authenticate',
|
|
7
9
|
subCategory: 'Public',
|
|
8
10
|
type: 'object',
|
package/build/ts/server/authenticate/public/appProxy/authenticate.public.app-proxy.doc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authenticate.public.app-proxy.doc.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/public/appProxy/authenticate.public.app-proxy.doc.ts"],"names":[],"mappings":";;AAEA,IAAM,IAAI,GAAkC;IAC1C,IAAI,EAAE,WAAW;IACjB,WAAW,EACT,
|
|
1
|
+
{"version":3,"file":"authenticate.public.app-proxy.doc.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/public/appProxy/authenticate.public.app-proxy.doc.ts"],"names":[],"mappings":";;AAEA,IAAM,IAAI,GAAkC;IAC1C,IAAI,EAAE,WAAW;IACjB,WAAW,EACT,yHAAyH;QACzH,8IAA8I;QAC9I,kIAAkI;IACpI,QAAQ,EAAE,cAAc;IACxB,WAAW,EAAE,QAAQ;IACrB,IAAI,EAAE,QAAQ;IACd,iBAAiB,EAAE,KAAK;IACxB,WAAW,EAAE;QACX;YACE,KAAK,EAAE,8BAA8B;YACrC,WAAW,EACT,oEAAoE;YACtE,IAAI,EAAE,sBAAsB;SAC7B;KACF;IACD,iBAAiB,EAAE,CAAC,4BAA4B,CAAC;IACjD,OAAO,EAAE;QACP;YACE,IAAI,EAAE,mBAAmB;YACzB,QAAQ,EAAE,8BAA8B;YACxC,GAAG,EAAE,4CAA4C;SAClD;QACD;YACE,IAAI,EAAE,wBAAwB;YAC9B,QAAQ,EAAE,mCAAmC;YAC7C,GAAG,EAAE,iDAAiD;SACvD;KACF;CACF,CAAC;AAEF,kBAAe,IAAI,CAAC"}
|
|
@@ -2,6 +2,9 @@ import { Session, ShopifyRestResources } from '@shopify/shopify-api';
|
|
|
2
2
|
import { AdminApiContext, StorefrontContext } from '../../../clients';
|
|
3
3
|
export type AuthenticateAppProxy = (request: Request) => Promise<AppProxyContext | AppProxyContextWithSession>;
|
|
4
4
|
interface Options {
|
|
5
|
+
/**
|
|
6
|
+
* Whether to use the shop's theme layout around the Liquid content.
|
|
7
|
+
*/
|
|
5
8
|
layout?: boolean;
|
|
6
9
|
}
|
|
7
10
|
export type LiquidResponseFunction = (body: string, initAndOptions?: number | (ResponseInit & Options)) => Response;
|
|
@@ -11,7 +14,7 @@ interface Context {
|
|
|
11
14
|
*
|
|
12
15
|
* @example
|
|
13
16
|
* <caption>Rendering liquid content.</caption>
|
|
14
|
-
* <description>Use the `liquid` helper to render a `Response` with Liquid content.</description>
|
|
17
|
+
* <description>Use the `liquid` helper to render a `Response` with Liquid content using the shop's theme.</description>
|
|
15
18
|
* ```ts
|
|
16
19
|
* // app/routes/**\/.ts
|
|
17
20
|
* import {authenticate} from "~/shopify.server"
|
|
@@ -19,9 +22,25 @@ interface Context {
|
|
|
19
22
|
* export async function loader({ request }) {
|
|
20
23
|
* const {liquid} = await authenticate.public.appProxy(request);
|
|
21
24
|
*
|
|
22
|
-
* return liquid("Hello {{shop.name}}")
|
|
25
|
+
* return liquid("Hello {{shop.name}}");
|
|
23
26
|
* }
|
|
27
|
+
* ```
|
|
24
28
|
*
|
|
29
|
+
* @example
|
|
30
|
+
* <caption>Rendering liquid content without a layout.</caption>
|
|
31
|
+
* <description>Set the `layout` option to `false` to render the Liquid content without a theme.</description>
|
|
32
|
+
* ```ts
|
|
33
|
+
* // app/routes/**\/.ts
|
|
34
|
+
* import {authenticate} from "~/shopify.server"
|
|
35
|
+
*
|
|
36
|
+
* export async function loader({ request }) {
|
|
37
|
+
* const {liquid} = await authenticate.public.appProxy(request);
|
|
38
|
+
*
|
|
39
|
+
* return liquid(
|
|
40
|
+
* "Hello {{shop.name}}",
|
|
41
|
+
* { layout: false }
|
|
42
|
+
* );
|
|
43
|
+
* }
|
|
25
44
|
* ```
|
|
26
45
|
*/
|
|
27
46
|
liquid: LiquidResponseFunction;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/public/appProxy/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAEnE,OAAO,EAAC,eAAe,EAAE,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AAEpE,MAAM,MAAM,oBAAoB,GAAG,CACjC,OAAO,EAAE,OAAO,KACb,OAAO,CAAC,eAAe,GAAG,0BAA0B,CAAC,CAAC;AAE3D,UAAU,OAAO;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,MAAM,sBAAsB,GAAG,CACnC,IAAI,EAAE,MAAM,EACZ,cAAc,CAAC,EAAE,MAAM,GAAG,CAAC,YAAY,GAAG,OAAO,CAAC,KAC/C,QAAQ,CAAC;AAEd,UAAU,OAAO;IACf
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/public/appProxy/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAEnE,OAAO,EAAC,eAAe,EAAE,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AAEpE,MAAM,MAAM,oBAAoB,GAAG,CACjC,OAAO,EAAE,OAAO,KACb,OAAO,CAAC,eAAe,GAAG,0BAA0B,CAAC,CAAC;AAE3D,UAAU,OAAO;IACf;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,MAAM,sBAAsB,GAAG,CACnC,IAAI,EAAE,MAAM,EACZ,cAAc,CAAC,EAAE,MAAM,GAAG,CAAC,YAAY,GAAG,OAAO,CAAC,KAC/C,QAAQ,CAAC;AAEd,UAAU,OAAO;IACf;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAiCG;IACH,MAAM,EAAE,sBAAsB,CAAC;CAChC;AAED,MAAM,WAAW,eAAgB,SAAQ,OAAO;IAC9C;;;;OAIG;IACH,OAAO,EAAE,SAAS,CAAC;IAEnB;;;OAGG;IACH,KAAK,EAAE,SAAS,CAAC;IAEjB;;;OAGG;IACH,UAAU,EAAE,SAAS,CAAC;CACvB;AAED,MAAM,WAAW,0BAA0B,CACzC,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,CAC7D,SAAQ,OAAO;IACf;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8BG;IACH,KAAK,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;IAElC;;;;;;;;;;;;;;;;;;;OAmBG;IACH,UAAU,EAAE,iBAAiB,CAAC;CAC/B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authenticate.d.ts","sourceRoot":"","sources":["../../../../../src/server/authenticate/webhooks/authenticate.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,oBAAoB,EAErB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAC,WAAW,EAAE,eAAe,EAAC,MAAM,aAAa,CAAC;AAG9D,OAAO,EAAC,iBAAiB,EAAC,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EACV,mBAAmB,EAKpB,MAAM,SAAS,CAAC;AAEjB,wBAAgB,0BAA0B,CACxC,MAAM,SAAS,iBAAiB,EAChC,SAAS,SAAS,oBAAoB,EACtC,MAAM,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,eAAe,EACzD,MAAM,EAAE,WAAW,GAAG,mBAAmB,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"authenticate.d.ts","sourceRoot":"","sources":["../../../../../src/server/authenticate/webhooks/authenticate.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,oBAAoB,EAErB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAC,WAAW,EAAE,eAAe,EAAC,MAAM,aAAa,CAAC;AAG9D,OAAO,EAAC,iBAAiB,EAAC,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EACV,mBAAmB,EAKpB,MAAM,SAAS,CAAC;AAEjB,wBAAgB,0BAA0B,CACxC,MAAM,SAAS,iBAAiB,EAChC,SAAS,SAAS,oBAAoB,EACtC,MAAM,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,eAAe,EACzD,MAAM,EAAE,WAAW,GAAG,mBAAmB,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,CAyFrE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authenticate.js","sourceRoot":"","sources":["../../../../../src/server/authenticate/webhooks/authenticate.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"authenticate.js","sourceRoot":"","sources":["../../../../../src/server/authenticate/webhooks/authenticate.ts"],"names":[],"mappings":"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"}
|
|
@@ -106,6 +106,25 @@ interface Context<Topics = string | number | symbol> {
|
|
|
106
106
|
* ```
|
|
107
107
|
*/
|
|
108
108
|
payload: JSONValue;
|
|
109
|
+
/**
|
|
110
|
+
* The sub-topic of the webhook. This is only available for certain webhooks.
|
|
111
|
+
*
|
|
112
|
+
* @example
|
|
113
|
+
* <caption>Webhook sub-topic.</caption>
|
|
114
|
+
* <description>Get the webhook sub-topic.</description>
|
|
115
|
+
* ```ts
|
|
116
|
+
* // /app/routes/webhooks.tsx
|
|
117
|
+
* import { ActionFunction } from "@remix-run/node";
|
|
118
|
+
* import { authenticate } from "../shopify.server";
|
|
119
|
+
*
|
|
120
|
+
* export const action: ActionFunction = async ({ request }) => {
|
|
121
|
+
* const { subTopic } = await authenticate.webhook(request);
|
|
122
|
+
* return new Response();
|
|
123
|
+
* };
|
|
124
|
+
* ```
|
|
125
|
+
*
|
|
126
|
+
*/
|
|
127
|
+
subTopic?: string;
|
|
109
128
|
}
|
|
110
129
|
export interface WebhookContextWithoutSession<Topics = string | number | symbol> extends Context<Topics> {
|
|
111
130
|
session: undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/server/authenticate/webhooks/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAE5E,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC;AACnD,OAAO,KAAK,EAAC,cAAc,EAAE,iBAAiB,EAAC,MAAM,oBAAoB,CAAC;AAE1E,MAAM,WAAW,uBAAuB;IACtC;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,UAAU,OAAO,CAAC,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM;IACjD;;;;;;;;;;;;;;;;OAgBG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;;;;;;;;;;;;OAgBG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;;;;;;;;;;;OAgBG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;;;;;;;;;;;;;;;OAgBG;IACH,OAAO,EAAE,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/server/authenticate/webhooks/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAE5E,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC;AACnD,OAAO,KAAK,EAAC,cAAc,EAAE,iBAAiB,EAAC,MAAM,oBAAoB,CAAC;AAE1E,MAAM,WAAW,uBAAuB;IACtC;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,UAAU,OAAO,CAAC,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM;IACjD;;;;;;;;;;;;;;;;OAgBG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;;;;;;;;;;;;OAgBG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;;;;;;;;;;;OAgBG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;;;;;;;;;;;;;;;OAgBG;IACH,OAAO,EAAE,SAAS,CAAC;IACnB;;;;;;;;;;;;;;;;;OAiBG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,4BAA4B,CAAC,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAC7E,SAAQ,OAAO,CAAC,MAAM,CAAC;IACvB,OAAO,EAAE,SAAS,CAAC;IACnB,KAAK,EAAE,SAAS,CAAC;CAClB;AAED,MAAM,WAAW,4BAA4B,CAC3C,SAAS,SAAS,oBAAoB;IAEtC,qBAAqB;IACrB,IAAI,EAAE,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC;IAC3D,wBAAwB;IACxB,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;CACtD;AAED,MAAM,MAAM,mBAAmB,CAC7B,MAAM,SAAS,iBAAiB,EAChC,SAAS,SAAS,oBAAoB,IAEtC,cAAc,CAAC,MAAM,EAAE,wBAAwB,CAAC,SAAS,IAAI,GACzD,eAAe,CAAC,SAAS,CAAC,GAC1B,4BAA4B,CAAC,SAAS,CAAC,CAAC;AAE9C,MAAM,WAAW,yBAAyB,CACxC,MAAM,SAAS,iBAAiB,EAChC,SAAS,SAAS,oBAAoB,EACtC,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CACjC,SAAQ,OAAO,CAAC,MAAM,CAAC;IACvB;;;;OAIG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8DG;IACH,KAAK,EAAE,mBAAmB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAC/C;AAED,MAAM,MAAM,cAAc,CACxB,MAAM,SAAS,iBAAiB,EAChC,SAAS,SAAS,oBAAoB,EACtC,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,IAE/B,4BAA4B,CAAC,MAAM,CAAC,GACpC,yBAAyB,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;AAEzD,MAAM,MAAM,mBAAmB,CAC7B,MAAM,SAAS,iBAAiB,EAChC,SAAS,SAAS,oBAAoB,EACtC,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,IAC/B,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { ConfigParams as ApiConfigArg, ConfigInterface as ApiConfig, ShopifyRestResources, Session, ApiVersion, WebhookHandler } from '@shopify/shopify-api';
|
|
2
2
|
import { SessionStorage } from '@shopify/shopify-app-session-storage';
|
|
3
|
-
import type { FutureFlagOptions, FutureFlags } from './future/flags';
|
|
3
|
+
import type { ApiFutureFlags, FutureFlagOptions, FutureFlags } from './future/flags';
|
|
4
4
|
import type { AppDistribution } from './types';
|
|
5
5
|
import type { AdminApiContext } from './clients';
|
|
6
6
|
import { IdempotentPromiseHandler } from './authenticate/helpers/idempotent-promise-handler';
|
|
7
|
-
export interface AppConfigArg<Resources extends ShopifyRestResources = ShopifyRestResources, Storage extends SessionStorage = SessionStorage, Future extends FutureFlagOptions = FutureFlagOptions> extends Omit<ApiConfigArg<Resources
|
|
7
|
+
export interface AppConfigArg<Resources extends ShopifyRestResources = ShopifyRestResources, Storage extends SessionStorage = SessionStorage, Future extends FutureFlagOptions = FutureFlagOptions> extends Omit<ApiConfigArg<Resources, ApiFutureFlags<Future>>, 'hostName' | 'hostScheme' | 'isEmbeddedApp' | 'apiVersion' | 'isCustomStoreApp' | 'future'> {
|
|
8
8
|
/**
|
|
9
9
|
* The URL your app is running on.
|
|
10
10
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-types.d.ts","sourceRoot":"","sources":["../../../src/server/config-types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,IAAI,YAAY,EAC5B,eAAe,IAAI,SAAS,EAC5B,oBAAoB,EACpB,OAAO,EACP,UAAU,EACV,cAAc,EACf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAC,cAAc,EAAC,MAAM,sCAAsC,CAAC;AAEpE,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"config-types.d.ts","sourceRoot":"","sources":["../../../src/server/config-types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,IAAI,YAAY,EAC5B,eAAe,IAAI,SAAS,EAC5B,oBAAoB,EACpB,OAAO,EACP,UAAU,EACV,cAAc,EACf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAC,cAAc,EAAC,MAAM,sCAAsC,CAAC;AAEpE,OAAO,KAAK,EACV,cAAc,EACd,iBAAiB,EACjB,WAAW,EACZ,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,SAAS,CAAC;AAC7C,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAC,wBAAwB,EAAC,MAAM,mDAAmD,CAAC;AAE3F,MAAM,WAAW,YAAY,CAC3B,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,EAC7D,OAAO,SAAS,cAAc,GAAG,cAAc,EAC/C,MAAM,SAAS,iBAAiB,GAAG,iBAAiB,CACpD,SAAQ,IAAI,CACV,YAAY,CAAC,SAAS,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC,EAC7C,UAAU,GACV,YAAY,GACZ,eAAe,GACf,YAAY,GACZ,kBAAkB,GAClB,QAAQ,CACX;IACD;;;;OAIG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,cAAc,EAAE,OAAO,CAAC;IAExB;;;;;;;;OAQG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAoDG;IACH,QAAQ,CAAC,EAAE,aAAa,CAAC;IAEzB;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IAEpB;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;OAIG;IACH,YAAY,CAAC,EAAE,eAAe,CAAC;IAE/B;;;;;;;;;;;;;;;;;OAiBG;IACH,UAAU,CAAC,EAAE,UAAU,CAAC;IAExB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8BG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,SAAS,CAAC,OAAO,SAAS,cAAc,GAAG,cAAc,CACxE,SAAQ,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC;IACjC,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,UAAU,CAAC;IACjB,cAAc,EAAE,OAAO,CAAC;IACxB,eAAe,EAAE,OAAO,CAAC;IACzB,KAAK,EAAE,WAAW,CAAC;IACnB,MAAM,EAAE,WAAW,CAAC;IACpB,wBAAwB,EAAE,wBAAwB,CAAC;CACpD;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,cAAc,EAAE,CAAC,CAAC;AAE9E,UAAU,WAAW;IACnB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6BG;IACH,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACjE;AAED,MAAM,WAAW,gBAAgB,CAC/B,CAAC,SAAS,oBAAoB,GAAG,oBAAoB;IAErD,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;CAC3B"}
|