@shopify/shopify-app-remix 2.2.0 → 2.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (154) hide show
  1. package/build/cjs/server/adapters/node/index.js +1 -0
  2. package/build/cjs/server/authenticate/admin/authenticate.js +17 -14
  3. package/build/cjs/server/authenticate/admin/billing/cancel.js +1 -2
  4. package/build/cjs/server/authenticate/admin/billing/request.js +0 -1
  5. package/build/cjs/server/authenticate/admin/billing/require.js +1 -2
  6. package/build/cjs/server/authenticate/admin/helpers/create-admin-api-context.js +2 -5
  7. package/build/cjs/server/authenticate/admin/helpers/handle-client-error.js +8 -4
  8. package/build/cjs/server/authenticate/admin/helpers/redirect-to-bounce-page.js +4 -2
  9. package/build/cjs/server/authenticate/admin/helpers/redirect.js +1 -5
  10. package/build/cjs/server/authenticate/admin/helpers/trigger-after-auth-hook.js +2 -2
  11. package/build/cjs/server/authenticate/admin/strategies/auth-code-flow.js +37 -13
  12. package/build/cjs/server/authenticate/admin/strategies/token-exchange.js +155 -0
  13. package/build/cjs/server/authenticate/const.js +4 -0
  14. package/build/cjs/server/authenticate/helpers/idempotent-promise-handler.js +40 -0
  15. package/build/cjs/server/authenticate/helpers/respond-to-invalid-session-token.js +33 -0
  16. package/build/cjs/server/authenticate/login/login.js +5 -1
  17. package/build/cjs/server/authenticate/public/checkout/authenticate.js +1 -0
  18. package/build/cjs/server/authenticate/webhooks/authenticate.js +1 -2
  19. package/build/cjs/server/authenticate/webhooks/register.js +16 -0
  20. package/build/cjs/server/clients/admin/graphql.js +5 -12
  21. package/build/cjs/server/clients/storefront/factory.js +5 -12
  22. package/build/cjs/server/shopify-app.js +12 -6
  23. package/build/cjs/server/version.js +1 -1
  24. package/build/ts/react/components/AppProvider/AppProvider.js +1 -1
  25. package/build/ts/react/components/AppProvider/AppProvider.js.map +1 -1
  26. package/build/ts/server/__test-helpers/const.d.ts +2 -1
  27. package/build/ts/server/__test-helpers/const.d.ts.map +1 -1
  28. package/build/ts/server/__test-helpers/const.js +3 -2
  29. package/build/ts/server/__test-helpers/const.js.map +1 -1
  30. package/build/ts/server/__test-helpers/expect-admin-api-client.d.ts.map +1 -1
  31. package/build/ts/server/__test-helpers/expect-admin-api-client.js +2 -2
  32. package/build/ts/server/__test-helpers/expect-admin-api-client.js.map +1 -1
  33. package/build/ts/server/__test-helpers/expect-document-request-headers.js.map +1 -1
  34. package/build/ts/server/__test-helpers/expect-exit-iframe.js.map +1 -1
  35. package/build/ts/server/__test-helpers/expect-storefront-api-client.js +1 -1
  36. package/build/ts/server/__test-helpers/expect-storefront-api-client.js.map +1 -1
  37. package/build/ts/server/__test-helpers/get-thrown-response.js.map +1 -1
  38. package/build/ts/server/__test-helpers/request-mock.d.ts.map +1 -1
  39. package/build/ts/server/__test-helpers/request-mock.js +1 -1
  40. package/build/ts/server/__test-helpers/request-mock.js.map +1 -1
  41. package/build/ts/server/__test-helpers/setup-valid-session.d.ts +1 -1
  42. package/build/ts/server/__test-helpers/setup-valid-session.d.ts.map +1 -1
  43. package/build/ts/server/__test-helpers/setup-valid-session.js +5 -5
  44. package/build/ts/server/__test-helpers/setup-valid-session.js.map +1 -1
  45. package/build/ts/server/__test-helpers/test-config.d.ts +2 -1
  46. package/build/ts/server/__test-helpers/test-config.d.ts.map +1 -1
  47. package/build/ts/server/__test-helpers/test-config.js +1 -0
  48. package/build/ts/server/__test-helpers/test-config.js.map +1 -1
  49. package/build/ts/server/adapters/node/index.js.map +1 -1
  50. package/build/ts/server/authenticate/admin/authenticate.d.ts +7 -1
  51. package/build/ts/server/authenticate/admin/authenticate.d.ts.map +1 -1
  52. package/build/ts/server/authenticate/admin/authenticate.js +14 -14
  53. package/build/ts/server/authenticate/admin/authenticate.js.map +1 -1
  54. package/build/ts/server/authenticate/admin/billing/request.js.map +1 -1
  55. package/build/ts/server/authenticate/admin/helpers/create-admin-api-context.d.ts +2 -2
  56. package/build/ts/server/authenticate/admin/helpers/create-admin-api-context.d.ts.map +1 -1
  57. package/build/ts/server/authenticate/admin/helpers/create-admin-api-context.js +2 -5
  58. package/build/ts/server/authenticate/admin/helpers/create-admin-api-context.js.map +1 -1
  59. package/build/ts/server/authenticate/admin/helpers/ensure-session-token-search-param-if-required.js.map +1 -1
  60. package/build/ts/server/authenticate/admin/helpers/handle-client-error.d.ts +2 -5
  61. package/build/ts/server/authenticate/admin/helpers/handle-client-error.d.ts.map +1 -1
  62. package/build/ts/server/authenticate/admin/helpers/handle-client-error.js +6 -5
  63. package/build/ts/server/authenticate/admin/helpers/handle-client-error.js.map +1 -1
  64. package/build/ts/server/authenticate/admin/helpers/redirect-to-bounce-page.d.ts.map +1 -1
  65. package/build/ts/server/authenticate/admin/helpers/redirect-to-bounce-page.js +4 -2
  66. package/build/ts/server/authenticate/admin/helpers/redirect-to-bounce-page.js.map +1 -1
  67. package/build/ts/server/authenticate/admin/helpers/redirect-with-exitiframe.js.map +1 -1
  68. package/build/ts/server/authenticate/admin/helpers/redirect.js +0 -3
  69. package/build/ts/server/authenticate/admin/helpers/redirect.js.map +1 -1
  70. package/build/ts/server/authenticate/admin/helpers/render-app-bridge.js.map +1 -1
  71. package/build/ts/server/authenticate/admin/helpers/trigger-after-auth-hook.d.ts +2 -1
  72. package/build/ts/server/authenticate/admin/helpers/trigger-after-auth-hook.d.ts.map +1 -1
  73. package/build/ts/server/authenticate/admin/helpers/trigger-after-auth-hook.js +2 -2
  74. package/build/ts/server/authenticate/admin/helpers/trigger-after-auth-hook.js.map +1 -1
  75. package/build/ts/server/authenticate/admin/helpers/validate-shop-and-host-params.js.map +1 -1
  76. package/build/ts/server/authenticate/admin/strategies/auth-code-flow.d.ts +4 -2
  77. package/build/ts/server/authenticate/admin/strategies/auth-code-flow.d.ts.map +1 -1
  78. package/build/ts/server/authenticate/admin/strategies/auth-code-flow.js +27 -7
  79. package/build/ts/server/authenticate/admin/strategies/auth-code-flow.js.map +1 -1
  80. package/build/ts/server/authenticate/admin/strategies/token-exchange.d.ts +17 -0
  81. package/build/ts/server/authenticate/admin/strategies/token-exchange.d.ts.map +1 -0
  82. package/build/ts/server/authenticate/admin/strategies/token-exchange.js +163 -0
  83. package/build/ts/server/authenticate/admin/strategies/token-exchange.js.map +1 -0
  84. package/build/ts/server/authenticate/admin/strategies/types.d.ts +16 -5
  85. package/build/ts/server/authenticate/admin/strategies/types.d.ts.map +1 -1
  86. package/build/ts/server/authenticate/admin/types.d.ts +0 -4
  87. package/build/ts/server/authenticate/admin/types.d.ts.map +1 -1
  88. package/build/ts/server/authenticate/const.d.ts +3 -0
  89. package/build/ts/server/authenticate/const.d.ts.map +1 -1
  90. package/build/ts/server/authenticate/const.js +4 -1
  91. package/build/ts/server/authenticate/const.js.map +1 -1
  92. package/build/ts/server/authenticate/helpers/add-response-headers.js.map +1 -1
  93. package/build/ts/server/authenticate/helpers/ensure-cors-headers.js.map +1 -1
  94. package/build/ts/server/authenticate/helpers/idempotent-promise-handler.d.ts +12 -0
  95. package/build/ts/server/authenticate/helpers/idempotent-promise-handler.d.ts.map +1 -0
  96. package/build/ts/server/authenticate/helpers/idempotent-promise-handler.js +53 -0
  97. package/build/ts/server/authenticate/helpers/idempotent-promise-handler.js.map +1 -0
  98. package/build/ts/server/authenticate/helpers/index.d.ts +1 -0
  99. package/build/ts/server/authenticate/helpers/index.d.ts.map +1 -1
  100. package/build/ts/server/authenticate/helpers/index.js +1 -0
  101. package/build/ts/server/authenticate/helpers/index.js.map +1 -1
  102. package/build/ts/server/authenticate/helpers/reject-bot-request.js.map +1 -1
  103. package/build/ts/server/authenticate/helpers/respond-to-invalid-session-token.d.ts +9 -0
  104. package/build/ts/server/authenticate/helpers/respond-to-invalid-session-token.d.ts.map +1 -0
  105. package/build/ts/server/authenticate/helpers/respond-to-invalid-session-token.js +20 -0
  106. package/build/ts/server/authenticate/helpers/respond-to-invalid-session-token.js.map +1 -0
  107. package/build/ts/server/authenticate/helpers/respond-to-options-request.js.map +1 -1
  108. package/build/ts/server/authenticate/login/login.d.ts.map +1 -1
  109. package/build/ts/server/authenticate/login/login.js +6 -2
  110. package/build/ts/server/authenticate/login/login.js.map +1 -1
  111. package/build/ts/server/authenticate/public/appProxy/authenticate.js.map +1 -1
  112. package/build/ts/server/authenticate/public/checkout/authenticate.js.map +1 -1
  113. package/build/ts/server/authenticate/public/factory.js.map +1 -1
  114. package/build/ts/server/authenticate/webhooks/authenticate.js.map +1 -1
  115. package/build/ts/server/authenticate/webhooks/register.d.ts +1 -1
  116. package/build/ts/server/authenticate/webhooks/register.d.ts.map +1 -1
  117. package/build/ts/server/authenticate/webhooks/register.js +20 -1
  118. package/build/ts/server/authenticate/webhooks/register.js.map +1 -1
  119. package/build/ts/server/authenticate/webhooks/types.d.ts +12 -5
  120. package/build/ts/server/authenticate/webhooks/types.d.ts.map +1 -1
  121. package/build/ts/server/boundary/error.js.map +1 -1
  122. package/build/ts/server/boundary/headers.js.map +1 -1
  123. package/build/ts/server/clients/admin/graphql.d.ts +3 -3
  124. package/build/ts/server/clients/admin/graphql.d.ts.map +1 -1
  125. package/build/ts/server/clients/admin/graphql.js +5 -8
  126. package/build/ts/server/clients/admin/graphql.js.map +1 -1
  127. package/build/ts/server/clients/admin/rest.js.map +1 -1
  128. package/build/ts/server/clients/admin/types.d.ts +2 -1
  129. package/build/ts/server/clients/admin/types.d.ts.map +1 -1
  130. package/build/ts/server/clients/storefront/factory.d.ts.map +1 -1
  131. package/build/ts/server/clients/storefront/factory.js +5 -8
  132. package/build/ts/server/clients/storefront/factory.js.map +1 -1
  133. package/build/ts/server/clients/storefront/types.d.ts +2 -1
  134. package/build/ts/server/clients/storefront/types.d.ts.map +1 -1
  135. package/build/ts/server/clients/types.d.ts +4 -7
  136. package/build/ts/server/clients/types.d.ts.map +1 -1
  137. package/build/ts/server/config-types.d.ts +2 -0
  138. package/build/ts/server/config-types.d.ts.map +1 -1
  139. package/build/ts/server/future/flags.d.ts +6 -0
  140. package/build/ts/server/future/flags.d.ts.map +1 -1
  141. package/build/ts/server/override-logger.js.map +1 -1
  142. package/build/ts/server/shopify-app.d.ts +1 -0
  143. package/build/ts/server/shopify-app.d.ts.map +1 -1
  144. package/build/ts/server/shopify-app.js +11 -5
  145. package/build/ts/server/shopify-app.js.map +1 -1
  146. package/build/ts/server/types.d.ts +10 -4
  147. package/build/ts/server/types.d.ts.map +1 -1
  148. package/build/ts/server/types.js +2 -2
  149. package/build/ts/server/types.js.map +1 -1
  150. package/build/ts/server/unauthenticated/admin/factory.js.map +1 -1
  151. package/build/ts/server/unauthenticated/storefront/factory.js.map +1 -1
  152. package/build/ts/server/version.d.ts +1 -1
  153. package/build/ts/server/version.js +1 -1
  154. package/package.json +14 -16
@@ -1 +1 @@
1
- {"version":3,"file":"create-admin-api-context.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/create-admin-api-context.ts"],"names":[],"mappings":";;;AAGA,gDAA2E;AAE3E,6DAA+D;AAE/D,SAAgB,qBAAqB,CAGnC,OAAgB,EAChB,OAAgB,EAChB,MAAmB;IAEnB,OAAO,IAAA,0BAAkB,EAAY;QACnC,OAAO,SAAA;QACP,MAAM,QAAA;QACN,iBAAiB,EAAE,IAAA,8CAAwB,EAAC;YAC1C,OAAO,SAAA;SACR,CAAC;KACH,CAAC,CAAC;AACL,CAAC;AAdD,sDAcC"}
1
+ {"version":3,"file":"create-admin-api-context.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/create-admin-api-context.ts"],"names":[],"mappings":";;;AAGA,gDAIgC;AAEhC,SAAgB,qBAAqB,CAGnC,OAAgB,EAChB,MAAmB,EACnB,iBAAyC;IAEzC,OAAO,IAAA,0BAAkB,EAAY;QACnC,OAAO,SAAA;QACP,MAAM,QAAA;QACN,iBAAiB,mBAAA;KAClB,CAAC,CAAC;AACL,CAAC;AAZD,sDAYC"}
@@ -1 +1 @@
1
- {"version":3,"file":"ensure-session-token-search-param-if-required.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/ensure-session-token-search-param-if-required.ts"],"names":[],"mappings":";;;;AAEA,qEAA+D;AAE/D,IAAM,mBAAmB,GAAG,UAAU,CAAC;AAEhC,IAAM,uCAAuC,GAAG,UACrD,MAAmB,EACnB,OAAgB;;;QAET,GAAG,GAAY,MAAM,IAAlB,EAAE,MAAM,GAAI,MAAM,OAAV,CAAW;QACvB,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAE3B,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC;QACrC,uBAAuB,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QACpE,UAAU,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,GAAG,CAAC;QAE5D,IAAI,GAAG,CAAC,MAAM,CAAC,aAAa,IAAI,UAAU,IAAI,CAAC,uBAAuB,EAAE;YACtE,MAAM,CAAC,KAAK,CACV,8DAA8D,EAC9D,EAAC,IAAI,MAAA,EAAC,CACP,CAAC;YACF,IAAA,8CAAoB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAC;SACnC;;;KACF,CAAC;AAlBW,QAAA,uCAAuC,2CAkBlD"}
1
+ {"version":3,"file":"ensure-session-token-search-param-if-required.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/ensure-session-token-search-param-if-required.ts"],"names":[],"mappings":";;;;AAEA,qEAA+D;AAE/D,IAAM,mBAAmB,GAAG,UAAU,CAAC;AAEhC,IAAM,uCAAuC,GAAG,UACrD,MAAmB,EACnB,OAAgB;;;QAET,GAAG,GAAY,MAAM,IAAlB,EAAE,MAAM,GAAI,MAAM,OAAV,CAAW;QACvB,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAE3B,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC;QACrC,uBAAuB,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QACpE,UAAU,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,GAAG,CAAC;QAE5D,IAAI,GAAG,CAAC,MAAM,CAAC,aAAa,IAAI,UAAU,IAAI,CAAC,uBAAuB,EAAE,CAAC;YACvE,MAAM,CAAC,KAAK,CACV,8DAA8D,EAC9D,EAAC,IAAI,MAAA,EAAC,CACP,CAAC;YACF,IAAA,8CAAoB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACpC,CAAC;;;KACF,CAAC;AAlBW,QAAA,uCAAuC,2CAkBlD"}
@@ -1,7 +1,4 @@
1
1
  import type { HandleAdminClientError } from '../../../clients/admin/types';
2
- interface HandleClientErrorOptions {
3
- request: Request;
4
- }
5
- export declare function handleClientErrorFactory({ request, }: HandleClientErrorOptions): HandleAdminClientError;
6
- export {};
2
+ import { HandleClientErrorOptions } from '../strategies/types';
3
+ export declare function handleClientErrorFactory({ request, onError, }: HandleClientErrorOptions): HandleAdminClientError;
7
4
  //# sourceMappingURL=handle-client-error.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"handle-client-error.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/handle-client-error.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,sBAAsB,EAAC,MAAM,8BAA8B,CAAC;AAIzE,UAAU,wBAAwB;IAChC,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,wBAAgB,wBAAwB,CAAC,EACvC,OAAO,GACR,EAAE,wBAAwB,GAAG,sBAAsB,CAkCnD"}
1
+ {"version":3,"file":"handle-client-error.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/handle-client-error.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,sBAAsB,EAAC,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAC,wBAAwB,EAAC,MAAM,qBAAqB,CAAC;AAE7D,wBAAgB,wBAAwB,CAAC,EACvC,OAAO,EACP,OAAO,GACR,EAAE,wBAAwB,GAAG,sBAAsB,CAkCnD"}
@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.handleClientErrorFactory = void 0;
4
4
  var tslib_1 = require("tslib");
5
5
  var shopify_api_1 = require("@shopify/shopify-api");
6
- var redirect_to_auth_page_1 = require("./redirect-to-auth-page");
7
6
  function handleClientErrorFactory(_a) {
8
- var request = _a.request;
7
+ var request = _a.request, onError = _a.onError;
9
8
  return function handleClientError(_a) {
10
9
  var error = _a.error, params = _a.params, session = _a.session;
11
10
  return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -21,9 +20,11 @@ function handleClientErrorFactory(_a) {
21
20
  statusText: error.response.statusText,
22
21
  body: JSON.stringify(error.response.body),
23
22
  });
24
- if (!(error.response.code === 401)) return [3 /*break*/, 2];
25
- return [4 /*yield*/, (0, redirect_to_auth_page_1.redirectToAuthPage)(params, request, session.shop)];
26
- case 1: throw _b.sent();
23
+ if (!onError) return [3 /*break*/, 2];
24
+ return [4 /*yield*/, onError({ request: request, session: session, error: error })];
25
+ case 1:
26
+ _b.sent();
27
+ _b.label = 2;
27
28
  case 2:
28
29
  // forward a minimal copy of the upstream HTTP response instead of an Error:
29
30
  throw new Response(JSON.stringify(error.response.body), {
@@ -1 +1 @@
1
- {"version":3,"file":"handle-client-error.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/handle-client-error.ts"],"names":[],"mappings":";;;;AAAA,oDAAuD;AAIvD,iEAA2D;AAM3D,SAAgB,wBAAwB,CAAC,EAEd;QADzB,OAAO,aAAA;IAEP,OAAO,SAAe,iBAAiB,CAAC,EAIvC;YAHC,KAAK,WAAA,EACL,MAAM,YAAA,EACN,OAAO,aAAA;;;;;wBAEP,IAAI,KAAK,YAAY,+BAAiB,KAAK,IAAI,EAAE;4BAC/C,MAAM,CAAC,MAAM,CAAC,KAAK,CACjB,6CAAsC,KAAK,CAAC,OAAO,CAAE,CACtD,CAAC;4BACF,MAAM,KAAK,CAAC;yBACb;wBAED,MAAM,CAAC,MAAM,CAAC,KAAK,CACjB,mDAA4C,KAAK,CAAC,OAAO,CAAE,EAC3D;4BACE,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI;4BACzB,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,UAAU;4BACrC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;yBAC1C,CACF,CAAC;6BAEE,CAAA,KAAK,CAAC,QAAQ,CAAC,IAAI,KAAK,GAAG,CAAA,EAA3B,wBAA2B;wBACvB,qBAAM,IAAA,0CAAkB,EAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,EAAA;4BAA7D,MAAM,SAAuD,CAAC;;oBAGhE,4EAA4E;oBAC5E,MAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;wBACtD,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI;wBAC3B,OAAO,EAAE;4BACP,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,OAAQ,CAAC,cAAc,CAAW;yBAClE;qBACF,CAAC,CAAC;;;;KACJ,CAAC;AACJ,CAAC;AApCD,4DAoCC"}
1
+ {"version":3,"file":"handle-client-error.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/handle-client-error.ts"],"names":[],"mappings":";;;;AAAA,oDAAuD;AAKvD,SAAgB,wBAAwB,CAAC,EAGd;QAFzB,OAAO,aAAA,EACP,OAAO,aAAA;IAEP,OAAO,SAAe,iBAAiB,CAAC,EAIvC;YAHC,KAAK,WAAA,EACL,MAAM,YAAA,EACN,OAAO,aAAA;;;;;wBAEP,IAAI,KAAK,YAAY,+BAAiB,KAAK,IAAI,EAAE,CAAC;4BAChD,MAAM,CAAC,MAAM,CAAC,KAAK,CACjB,6CAAsC,KAAK,CAAC,OAAO,CAAE,CACtD,CAAC;4BACF,MAAM,KAAK,CAAC;wBACd,CAAC;wBAED,MAAM,CAAC,MAAM,CAAC,KAAK,CACjB,mDAA4C,KAAK,CAAC,OAAO,CAAE,EAC3D;4BACE,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI;4BACzB,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,UAAU;4BACrC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;yBAC1C,CACF,CAAC;6BAEE,OAAO,EAAP,wBAAO;wBACT,qBAAM,OAAO,CAAC,EAAC,OAAO,SAAA,EAAE,OAAO,SAAA,EAAE,KAAK,OAAA,EAAC,CAAC,EAAA;;wBAAxC,SAAwC,CAAC;;;oBAG3C,4EAA4E;oBAC5E,MAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;wBACtD,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI;wBAC3B,OAAO,EAAE;4BACP,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,OAAQ,CAAC,cAAc,CAAW;yBAClE;qBACF,CAAC,CAAC;;;;KACJ,CAAC;AACJ,CAAC;AArCD,4DAqCC"}
@@ -1 +1 @@
1
- {"version":3,"file":"redirect-to-bounce-page.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/redirect-to-bounce-page.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAE3C,eAAO,MAAM,oBAAoB,WAAY,WAAW,OAAO,GAAG,KAAG,KAcpE,CAAC"}
1
+ {"version":3,"file":"redirect-to-bounce-page.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/redirect-to-bounce-page.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAE3C,eAAO,MAAM,oBAAoB,WAAY,WAAW,OAAO,GAAG,KAAG,KAkBpE,CAAC"}
@@ -6,11 +6,13 @@ var redirectToBouncePage = function (params, url) {
6
6
  var config = params.config;
7
7
  // Make sure we always point to the configured app URL so it also works behind reverse proxies (that alter the Host
8
8
  // header).
9
- url.searchParams.set('shopify-reload', "".concat(config.appUrl).concat(url.pathname).concat(url.search));
9
+ var searchParams = url.searchParams;
10
+ searchParams.delete('id_token');
11
+ searchParams.set('shopify-reload', "".concat(config.appUrl).concat(url.pathname, "?").concat(searchParams.toString()));
10
12
  // eslint-disable-next-line no-warning-comments
11
13
  // TODO Make sure this works on chrome without a tunnel (weird HTTPS redirect issue)
12
14
  // https://github.com/orgs/Shopify/projects/6899/views/1?pane=issue&itemId=28376650
13
- throw (0, server_runtime_1.redirect)("".concat(config.auth.patchSessionTokenPath).concat(url.search));
15
+ throw (0, server_runtime_1.redirect)("".concat(config.auth.patchSessionTokenPath, "?").concat(searchParams.toString()));
14
16
  };
15
17
  exports.redirectToBouncePage = redirectToBouncePage;
16
18
  //# sourceMappingURL=redirect-to-bounce-page.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"redirect-to-bounce-page.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/redirect-to-bounce-page.ts"],"names":[],"mappings":";;;AAAA,4DAAmD;AAI5C,IAAM,oBAAoB,GAAG,UAAC,MAAmB,EAAE,GAAQ;IACzD,IAAA,MAAM,GAAI,MAAM,OAAV,CAAW;IAExB,mHAAmH;IACnH,WAAW;IACX,GAAG,CAAC,YAAY,CAAC,GAAG,CAClB,gBAAgB,EAChB,UAAG,MAAM,CAAC,MAAM,SAAG,GAAG,CAAC,QAAQ,SAAG,GAAG,CAAC,MAAM,CAAE,CAC/C,CAAC;IAEF,+CAA+C;IAC/C,oFAAoF;IACpF,mFAAmF;IACnF,MAAM,IAAA,yBAAQ,EAAC,UAAG,MAAM,CAAC,IAAI,CAAC,qBAAqB,SAAG,GAAG,CAAC,MAAM,CAAE,CAAC,CAAC;AACtE,CAAC,CAAC;AAdW,QAAA,oBAAoB,wBAc/B"}
1
+ {"version":3,"file":"redirect-to-bounce-page.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/redirect-to-bounce-page.ts"],"names":[],"mappings":";;;AAAA,4DAAmD;AAI5C,IAAM,oBAAoB,GAAG,UAAC,MAAmB,EAAE,GAAQ;IACzD,IAAA,MAAM,GAAI,MAAM,OAAV,CAAW;IAExB,mHAAmH;IACnH,WAAW;IACX,IAAM,YAAY,GAAG,GAAG,CAAC,YAAY,CAAC;IACtC,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAChC,YAAY,CAAC,GAAG,CACd,gBAAgB,EAChB,UAAG,MAAM,CAAC,MAAM,SAAG,GAAG,CAAC,QAAQ,cAAI,YAAY,CAAC,QAAQ,EAAE,CAAE,CAC7D,CAAC;IAEF,+CAA+C;IAC/C,oFAAoF;IACpF,mFAAmF;IACnF,MAAM,IAAA,yBAAQ,EACZ,UAAG,MAAM,CAAC,IAAI,CAAC,qBAAqB,cAAI,YAAY,CAAC,QAAQ,EAAE,CAAE,CAClE,CAAC;AACJ,CAAC,CAAC;AAlBW,QAAA,oBAAoB,wBAkB/B"}
@@ -1 +1 @@
1
- {"version":3,"file":"redirect-with-exitiframe.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/redirect-with-exitiframe.ts"],"names":[],"mappings":";;;AAAA,4DAAmD;AAInD,SAAgB,sBAAsB,CACpC,MAAmB,EACnB,OAAgB,EAChB,IAAY;IAEL,IAAA,GAAG,GAAY,MAAM,IAAlB,EAAE,MAAM,GAAI,MAAM,OAAV,CAAW;IAC7B,IAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAEjC,IAAM,WAAW,GAAG,GAAG,CAAC,YAAY,CAAC;IACrC,IAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC,CAAC;IAE9D,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC9B,WAAW,CAAC,GAAG,CAAC,YAAY,EAAE,UAAG,MAAM,CAAC,IAAI,CAAC,IAAI,mBAAS,IAAI,CAAE,CAAC,CAAC;IAElE,IAAI,IAAI,EAAE;QACR,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;KAC/B;IAED,MAAM,IAAA,yBAAQ,EAAC,UAAG,MAAM,CAAC,IAAI,CAAC,cAAc,cAAI,WAAW,CAAC,QAAQ,EAAE,CAAE,CAAC,CAAC;AAC5E,CAAC;AAnBD,wDAmBC"}
1
+ {"version":3,"file":"redirect-with-exitiframe.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/redirect-with-exitiframe.ts"],"names":[],"mappings":";;;AAAA,4DAAmD;AAInD,SAAgB,sBAAsB,CACpC,MAAmB,EACnB,OAAgB,EAChB,IAAY;IAEL,IAAA,GAAG,GAAY,MAAM,IAAlB,EAAE,MAAM,GAAI,MAAM,OAAV,CAAW;IAC7B,IAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAEjC,IAAM,WAAW,GAAG,GAAG,CAAC,YAAY,CAAC;IACrC,IAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC,CAAC;IAE9D,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC9B,WAAW,CAAC,GAAG,CAAC,YAAY,EAAE,UAAG,MAAM,CAAC,IAAI,CAAC,IAAI,mBAAS,IAAI,CAAE,CAAC,CAAC;IAElE,IAAI,IAAI,EAAE,CAAC;QACT,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAChC,CAAC;IAED,MAAM,IAAA,yBAAQ,EAAC,UAAG,MAAM,CAAC,IAAI,CAAC,cAAc,cAAI,WAAW,CAAC,QAAQ,EAAE,CAAE,CAAC,CAAC;AAC5E,CAAC;AAnBD,wDAmBC"}
@@ -48,12 +48,9 @@ function isBounceRequest(request) {
48
48
  request.headers.has('X-Shopify-Bounce'));
49
49
  }
50
50
  function isDataRequest(request) {
51
- var searchParams = new URL(request.url).searchParams;
52
51
  var isGet = request.method === 'GET';
53
52
  var sessionTokenHeader = Boolean((0, get_session_token_header_1.getSessionTokenHeader)(request));
54
- var sessionTokenSearchParam = searchParams.has('id_token');
55
53
  return (sessionTokenHeader &&
56
- !sessionTokenSearchParam &&
57
54
  !isBounceRequest(request) &&
58
55
  (!isEmbeddedRequest(request) || !isGet));
59
56
  }
@@ -1 +1 @@
1
- {"version":3,"file":"redirect.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/redirect.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"redirect.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/redirect.ts"],"names":[],"mappings":";;;AAAA,4DAGmC;AAGnC,mFAA6E;AAE7E,yDAAoD;AACpD,uFAAgF;AAShF,SAAgB,eAAe,CAC7B,MAAmB,EACnB,OAAgB;IAET,IAAA,MAAM,GAAI,MAAM,OAAV,CAAW;IAExB,OAAO,SAAS,QAAQ,CAAC,GAAG,EAAE,IAAkB;QACvC,IAAA,YAAY,GAAI,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,aAAxB,CAAyB;QAC5C,IAAM,SAAS,GAAG,IAAI,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAE9C,IAAM,YAAY,GAAG,SAAS,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC;QACxD,IAAI,YAAY,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACxC,YAAY,CAAC,OAAO,CAAC,UAAC,KAAK,EAAE,GAAG;gBAC9B,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;oBACrC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBACzC,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED,IAAM,MAAM,GAAG,CAAC,OAAO,IAAI,KAAK,QAAQ,KAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,CAAA,CAAC,IAAI,OAAO,CAAC;QACrE,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;YACvB,IAAI,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC7B,MAAM,IAAA,mCAAe,EAAC,MAAM,EAAE,OAAO,EAAE;oBACrC,GAAG,EAAE,SAAS,CAAC,QAAQ,EAAE;oBACzB,MAAM,QAAA;iBACP,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAA,yBAAa,EAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC;YACnD,CAAC;QACH,CAAC;aAAM,IAAI,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;YAClC,MAAM,IAAA,+DAA4B,EAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC3D,CAAC;aAAM,IAAI,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC;YACtC,MAAM,IAAA,mCAAe,EAAC,MAAM,EAAE,OAAO,EAAE;gBACrC,GAAG,EAAE,SAAS,CAAC,QAAQ,EAAE;gBACzB,MAAM,QAAA;aACP,CAAC,CAAC;QACL,CAAC;QAED,OAAO,IAAA,yBAAa,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAClC,CAAC,CAAC;AACJ,CAAC;AAxCD,0CAwCC;AAED,SAAS,eAAe,CAAC,OAAgB;IACvC,OAAO,CACL,OAAO,CAAC,IAAA,gDAAqB,EAAC,OAAO,CAAC,CAAC;QACvC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CACxC,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,OAAgB;IACrC,IAAM,KAAK,GAAG,OAAO,CAAC,MAAM,KAAK,KAAK,CAAC;IACvC,IAAM,kBAAkB,GAAG,OAAO,CAAC,IAAA,gDAAqB,EAAC,OAAO,CAAC,CAAC,CAAC;IAEnE,OAAO,CACL,kBAAkB;QAClB,CAAC,eAAe,CAAC,OAAO,CAAC;QACzB,CAAC,CAAC,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CACxC,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAgB;IAClC,IAAA,YAAY,GAAI,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,aAAxB,CAAyB;IAE5C,OAAO,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,GAAG,CAAC;AAC9C,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"render-app-bridge.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/render-app-bridge.ts"],"names":[],"mappings":";;;AACA,+DAA0D;AAC1D,2EAA8E;AAS9E,SAAgB,eAAe,CAC7B,EAAqB,EACrB,OAAgB,EAChB,UAA8B;;QAF7B,MAAM,YAAA;IAIP,IAAI,gBAAgB,GAAG,EAAE,CAAC;IAC1B,IAAI,UAAU,EAAE;QACd,IAAM,WAAW,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAC3D,IAAM,MAAM,GAAG,MAAA,UAAU,CAAC,MAAM,mCAAI,MAAM,CAAC;QAE3C,gBAAgB,GAAG,8BAAuB,IAAI,CAAC,SAAS,CACtD,WAAW,CAAC,QAAQ,EAAE,CACvB,eAAK,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,eAAY,CAAC;KAC1C;IAED,IAAM,eAAe,GAAG,IAAI,OAAO,CAAC;QAClC,cAAc,EAAE,yBAAyB;KAC1C,CAAC,CAAC;IACH,IAAA,iDAA0B,EACxB,eAAe,EACf,MAAM,CAAC,aAAa,EACpB,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAC9C,CAAC;IAEF,MAAM,IAAI,QAAQ,CAChB,yCAC0B,MAAM,CAAC,MAAM,sBAAU,IAAA,6BAAY,GAAE,iCAC3D,gBAAgB,WACnB,EACD,EAAC,OAAO,EAAE,eAAe,EAAC,CAC3B,CAAC;AACJ,CAAC;AA/BD,0CA+BC"}
1
+ {"version":3,"file":"render-app-bridge.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/render-app-bridge.ts"],"names":[],"mappings":";;;AACA,+DAA0D;AAC1D,2EAA8E;AAS9E,SAAgB,eAAe,CAC7B,EAAqB,EACrB,OAAgB,EAChB,UAA8B;;QAF7B,MAAM,YAAA;IAIP,IAAI,gBAAgB,GAAG,EAAE,CAAC;IAC1B,IAAI,UAAU,EAAE,CAAC;QACf,IAAM,WAAW,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAC3D,IAAM,MAAM,GAAG,MAAA,UAAU,CAAC,MAAM,mCAAI,MAAM,CAAC;QAE3C,gBAAgB,GAAG,8BAAuB,IAAI,CAAC,SAAS,CACtD,WAAW,CAAC,QAAQ,EAAE,CACvB,eAAK,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,eAAY,CAAC;IAC3C,CAAC;IAED,IAAM,eAAe,GAAG,IAAI,OAAO,CAAC;QAClC,cAAc,EAAE,yBAAyB;KAC1C,CAAC,CAAC;IACH,IAAA,iDAA0B,EACxB,eAAe,EACf,MAAM,CAAC,aAAa,EACpB,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAC9C,CAAC;IAEF,MAAM,IAAI,QAAQ,CAChB,yCAC0B,MAAM,CAAC,MAAM,sBAAU,IAAA,6BAAY,GAAE,iCAC3D,gBAAgB,WACnB,EACD,EAAC,OAAO,EAAE,eAAe,EAAC,CAC3B,CAAC;AACJ,CAAC;AA/BD,0CA+BC"}
@@ -1,4 +1,5 @@
1
1
  import { Session, ShopifyRestResources } from '@shopify/shopify-api';
2
2
  import type { BasicParams } from '../../../types';
3
- export declare function triggerAfterAuthHook<Resources extends ShopifyRestResources = ShopifyRestResources>(params: BasicParams, session: Session, request: Request): Promise<void>;
3
+ import { AuthorizationStrategy } from '../strategies/types';
4
+ export declare function triggerAfterAuthHook<Resources extends ShopifyRestResources = ShopifyRestResources>(params: BasicParams, session: Session, request: Request, authStrategy: AuthorizationStrategy): Promise<void>;
4
5
  //# sourceMappingURL=trigger-after-auth-hook.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"trigger-after-auth-hook.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/trigger-after-auth-hook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAEnE,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAIhD,wBAAsB,oBAAoB,CACxC,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,EAC7D,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,iBASxD"}
1
+ {"version":3,"file":"trigger-after-auth-hook.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/trigger-after-auth-hook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAEnE,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAC,qBAAqB,EAAC,MAAM,qBAAqB,CAAC;AAI1D,wBAAsB,oBAAoB,CACxC,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,EAE7D,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,qBAAqB,iBAcpC"}
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.triggerAfterAuthHook = void 0;
4
4
  var tslib_1 = require("tslib");
5
5
  var create_admin_api_context_1 = require("./create-admin-api-context");
6
- function triggerAfterAuthHook(params, session, request) {
6
+ function triggerAfterAuthHook(params, session, request, authStrategy) {
7
7
  return tslib_1.__awaiter(this, void 0, void 0, function () {
8
8
  var config, logger;
9
9
  return tslib_1.__generator(this, function (_a) {
@@ -14,7 +14,7 @@ function triggerAfterAuthHook(params, session, request) {
14
14
  logger.info('Running afterAuth hook');
15
15
  return [4 /*yield*/, config.hooks.afterAuth({
16
16
  session: session,
17
- admin: (0, create_admin_api_context_1.createAdminApiContext)(request, session, params),
17
+ admin: (0, create_admin_api_context_1.createAdminApiContext)(session, params, authStrategy.handleClientError(request)),
18
18
  })];
19
19
  case 1:
20
20
  _a.sent();
@@ -1 +1 @@
1
- {"version":3,"file":"trigger-after-auth-hook.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/trigger-after-auth-hook.ts"],"names":[],"mappings":";;;;AAIA,uEAAiE;AAEjE,SAAsB,oBAAoB,CAExC,MAAmB,EAAE,OAAgB,EAAE,OAAgB;;;;;;oBAChD,MAAM,GAAY,MAAM,OAAlB,EAAE,MAAM,GAAI,MAAM,OAAV,CAAW;yBAC5B,MAAM,CAAC,KAAK,CAAC,SAAS,EAAtB,wBAAsB;oBACxB,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;oBACtC,qBAAM,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC;4BAC3B,OAAO,SAAA;4BACP,KAAK,EAAE,IAAA,gDAAqB,EAAY,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC;yBAClE,CAAC,EAAA;;oBAHF,SAGE,CAAC;;;;;;CAEN;AAXD,oDAWC"}
1
+ {"version":3,"file":"trigger-after-auth-hook.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/trigger-after-auth-hook.ts"],"names":[],"mappings":";;;;AAKA,uEAAiE;AAEjE,SAAsB,oBAAoB,CAGxC,MAAmB,EACnB,OAAgB,EAChB,OAAgB,EAChB,YAAmC;;;;;;oBAE5B,MAAM,GAAY,MAAM,OAAlB,EAAE,MAAM,GAAI,MAAM,OAAV,CAAW;yBAC5B,MAAM,CAAC,KAAK,CAAC,SAAS,EAAtB,wBAAsB;oBACxB,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;oBACtC,qBAAM,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC;4BAC3B,OAAO,SAAA;4BACP,KAAK,EAAE,IAAA,gDAAqB,EAC1B,OAAO,EACP,MAAM,EACN,YAAY,CAAC,iBAAiB,CAAC,OAAO,CAAC,CACxC;yBACF,CAAC,EAAA;;oBAPF,SAOE,CAAC;;;;;;CAEN;AApBD,oDAoBC"}
@@ -1 +1 @@
1
- {"version":3,"file":"validate-shop-and-host-params.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/validate-shop-and-host-params.ts"],"names":[],"mappings":";;;AAAA,4DAAmD;AAGnD,SAAgB,yBAAyB,CACvC,MAAmB,EACnB,OAAgB;IAET,IAAA,GAAG,GAAoB,MAAM,IAA1B,EAAE,MAAM,GAAY,MAAM,OAAlB,EAAE,MAAM,GAAI,MAAM,OAAV,CAAW;IAErC,IAAI,MAAM,CAAC,aAAa,EAAE;QACxB,IAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACjC,IAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC,CAAC;QACnE,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,CAAC,KAAK,CAAC,oDAAoD,EAAE;gBACjE,IAAI,MAAA;aACL,CAAC,CAAC;YACH,MAAM,IAAA,yBAAQ,EAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACvC;QAED,IAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC,CAAC;QACnE,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,CAAC,KAAK,CAAC,yCAAyC,EAAE;gBACtD,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC;aACnC,CAAC,CAAC;YACH,MAAM,IAAA,yBAAQ,EAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACvC;KACF;AACH,CAAC;AAxBD,8DAwBC"}
1
+ {"version":3,"file":"validate-shop-and-host-params.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/helpers/validate-shop-and-host-params.ts"],"names":[],"mappings":";;;AAAA,4DAAmD;AAGnD,SAAgB,yBAAyB,CACvC,MAAmB,EACnB,OAAgB;IAET,IAAA,GAAG,GAAoB,MAAM,IAA1B,EAAE,MAAM,GAAY,MAAM,OAAlB,EAAE,MAAM,GAAI,MAAM,OAAV,CAAW;IAErC,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;QACzB,IAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACjC,IAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC,CAAC;QACnE,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,CAAC,KAAK,CAAC,oDAAoD,EAAE;gBACjE,IAAI,MAAA;aACL,CAAC,CAAC;YACH,MAAM,IAAA,yBAAQ,EAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACxC,CAAC;QAED,IAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC,CAAC;QACnE,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,CAAC,KAAK,CAAC,yCAAyC,EAAE;gBACtD,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC;aACnC,CAAC,CAAC;YACH,MAAM,IAAA,yBAAQ,EAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;AACH,CAAC;AAxBD,8DAwBC"}
@@ -1,14 +1,16 @@
1
1
  import { Session, Shopify, ShopifyRestResources } from '@shopify/shopify-api';
2
2
  import type { BasicParams } from '../../../types';
3
3
  import { AppConfig } from '../../../config-types';
4
- import { AuthorizationStrategy } from './types';
4
+ import { HandleAdminClientError } from '../../../clients';
5
+ import { AuthorizationStrategy, SessionContext } from './types';
5
6
  export declare class AuthCodeFlowStrategy<Resources extends ShopifyRestResources = ShopifyRestResources> implements AuthorizationStrategy {
6
7
  protected api: Shopify;
7
8
  protected config: AppConfig;
8
9
  protected logger: Shopify['logger'];
9
10
  constructor({ api, config, logger }: BasicParams);
10
11
  respondToOAuthRequests(request: Request): Promise<void | never>;
11
- authenticate(request: Request, session: Session | undefined, shop: string): Promise<Session | never>;
12
+ authenticate(request: Request, sessionContext: SessionContext): Promise<Session | never>;
13
+ handleClientError(request: Request): HandleAdminClientError;
12
14
  private ensureInstalledOnShop;
13
15
  private handleAuthBeginRequest;
14
16
  private handleAuthCallbackRequest;
@@ -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;AAShD,OAAO,EAAC,SAAS,EAAC,MAAM,uBAAuB,CAAC;AAGhD,OAAO,EAAC,qBAAqB,EAAC,MAAM,SAAS,CAAC;AAE9C,qBAAa,oBAAoB,CAC/B,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,CAC7D,YAAW,qBAAqB;IAEhC,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC;IACvB,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,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC;YAmBb,qBAAqB;YAiDrB,sBAAsB;YAoBtB,yBAAyB;YAsCzB,iBAAiB;YAOjB,iBAAiB;YAIjB,mBAAmB;YAYnB,WAAW;YAkBX,kBAAkB;YA4BlB,2BAA2B;CAwC1C"}
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;AAEhD,OAAO,EAAC,sBAAsB,EAAC,MAAM,kBAAkB,CAAC;AAExD,OAAO,EAAC,qBAAqB,EAAE,cAAc,EAAiB,MAAM,SAAS,CAAC;AAE9E,qBAAa,oBAAoB,CAC/B,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,CAC7D,YAAW,qBAAqB;IAEhC,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC;IACvB,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"}
@@ -48,13 +48,14 @@ var AuthCodeFlowStrategy = /** @class */ (function () {
48
48
  });
49
49
  });
50
50
  };
51
- AuthCodeFlowStrategy.prototype.authenticate = function (request, session, shop) {
51
+ AuthCodeFlowStrategy.prototype.authenticate = function (request, sessionContext) {
52
52
  return tslib_1.__awaiter(this, void 0, void 0, function () {
53
- var _a, api, config, logger;
53
+ var _a, api, config, logger, shop, session;
54
54
  return tslib_1.__generator(this, function (_b) {
55
55
  switch (_b.label) {
56
56
  case 0:
57
57
  _a = this, api = _a.api, config = _a.config, logger = _a.logger;
58
+ shop = sessionContext.shop, session = sessionContext.session;
58
59
  if (!!session) return [3 /*break*/, 2];
59
60
  logger.debug('No session found, redirecting to OAuth', { shop: shop });
60
61
  return [4 /*yield*/, (0, helpers_1.redirectToAuthPage)({ config: config, logger: logger, api: api }, request, shop)];
@@ -75,6 +76,27 @@ var AuthCodeFlowStrategy = /** @class */ (function () {
75
76
  });
76
77
  });
77
78
  };
79
+ AuthCodeFlowStrategy.prototype.handleClientError = function (request) {
80
+ var _this = this;
81
+ var _a = this, api = _a.api, config = _a.config, logger = _a.logger;
82
+ return (0, helpers_1.handleClientErrorFactory)({
83
+ request: request,
84
+ onError: function (_a) {
85
+ var session = _a.session, error = _a.error;
86
+ return tslib_1.__awaiter(_this, void 0, void 0, function () {
87
+ return tslib_1.__generator(this, function (_b) {
88
+ switch (_b.label) {
89
+ case 0:
90
+ if (!(error.response.code === 401)) return [3 /*break*/, 2];
91
+ return [4 /*yield*/, (0, helpers_1.redirectToAuthPage)({ api: api, config: config, logger: logger }, request, session.shop)];
92
+ case 1: throw _b.sent();
93
+ case 2: return [2 /*return*/];
94
+ }
95
+ });
96
+ });
97
+ },
98
+ });
99
+ };
78
100
  AuthCodeFlowStrategy.prototype.ensureInstalledOnShop = function (request) {
79
101
  return tslib_1.__awaiter(this, void 0, void 0, function () {
80
102
  var _a, api, config, logger, url, shop, offlineSession, isEmbedded, error_1;
@@ -177,7 +199,7 @@ var AuthCodeFlowStrategy = /** @class */ (function () {
177
199
  case 4:
178
200
  _c.sent();
179
201
  _c.label = 5;
180
- case 5: return [4 /*yield*/, (0, helpers_1.triggerAfterAuthHook)({ api: api, config: config, logger: logger }, session, request)];
202
+ case 5: return [4 /*yield*/, (0, helpers_1.triggerAfterAuthHook)({ api: api, config: config, logger: logger }, session, request, this)];
181
203
  case 6:
182
204
  _c.sent();
183
205
  return [4 /*yield*/, (0, helpers_1.redirectToShopifyOrAppRoot)(request, { api: api, config: config, logger: logger }, responseHeaders)];
@@ -242,9 +264,7 @@ var AuthCodeFlowStrategy = /** @class */ (function () {
242
264
  client = new api.clients.Graphql({
243
265
  session: session,
244
266
  });
245
- return [4 /*yield*/, client.query({
246
- data: "#graphql\n query shopifyAppShopName {\n shop {\n name\n }\n }\n ",
247
- })];
267
+ return [4 /*yield*/, client.request("#graphql\n query shopifyAppShopName {\n shop {\n name\n }\n }\n ")];
248
268
  case 1:
249
269
  _a.sent();
250
270
  return [2 /*return*/];
@@ -303,7 +323,7 @@ var AuthCodeFlowStrategy = /** @class */ (function () {
303
323
  if (error instanceof shopify_api_1.GraphqlQueryError) {
304
324
  context = { shop: shop };
305
325
  if (error.response) {
306
- context.response = JSON.stringify(error.response);
326
+ context.response = JSON.stringify(error.body);
307
327
  }
308
328
  logger.error("Unexpected error during session validation: ".concat(error.message), context);
309
329
  throw new Response(undefined, {
@@ -1 +1 @@
1
- {"version":3,"file":"auth-code-flow.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/strategies/auth-code-flow.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"auth-code-flow.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/strategies/auth-code-flow.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,17 @@
1
+ import { Session, Shopify, ShopifyRestResources } from '@shopify/shopify-api';
2
+ import { AppConfig, AppConfigArg } from '../../../config-types';
3
+ import { BasicParams, ApiConfigWithFutureFlags, ApiFutureFlags } from '../../../types';
4
+ import { HandleAdminClientError } from '../../../clients';
5
+ import { AuthorizationStrategy, SessionContext } from './types';
6
+ export declare class TokenExchangeStrategy<Config extends AppConfigArg> implements AuthorizationStrategy {
7
+ protected api: Shopify<ApiConfigWithFutureFlags<Config['future']>, ShopifyRestResources, ApiFutureFlags<Config['future']>>;
8
+ protected config: AppConfig;
9
+ protected logger: Shopify['logger'];
10
+ constructor({ api, config, logger }: BasicParams<Config['future']>);
11
+ respondToOAuthRequests(_request: Request): Promise<void>;
12
+ authenticate(request: Request, sessionContext: SessionContext): Promise<Session>;
13
+ handleClientError(request: Request): HandleAdminClientError;
14
+ private exchangeToken;
15
+ private handleAfterAuthHook;
16
+ }
17
+ //# sourceMappingURL=token-exchange.d.ts.map
@@ -0,0 +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,EACL,WAAW,EACX,wBAAwB,EACxB,cAAc,EACf,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAC,sBAAsB,EAAC,MAAM,kBAAkB,CAAC;AAExD,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"}
@@ -0,0 +1,163 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.TokenExchangeStrategy = void 0;
4
+ var tslib_1 = require("tslib");
5
+ var shopify_api_1 = require("@shopify/shopify-api");
6
+ var helpers_1 = require("../../helpers");
7
+ var helpers_2 = require("../helpers");
8
+ var TokenExchangeStrategy = /** @class */ (function () {
9
+ function TokenExchangeStrategy(_a) {
10
+ var api = _a.api, config = _a.config, logger = _a.logger;
11
+ this.api = api;
12
+ this.config = config;
13
+ this.logger = logger;
14
+ }
15
+ TokenExchangeStrategy.prototype.respondToOAuthRequests = function (_request) {
16
+ return tslib_1.__awaiter(this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
17
+ return [2 /*return*/];
18
+ }); });
19
+ };
20
+ TokenExchangeStrategy.prototype.authenticate = function (request, sessionContext) {
21
+ return tslib_1.__awaiter(this, void 0, void 0, function () {
22
+ var _a, api, config, logger, shop, session, sessionToken, offlineSession, newSession, onlineSession, error_1;
23
+ return tslib_1.__generator(this, function (_b) {
24
+ switch (_b.label) {
25
+ case 0:
26
+ _a = this, api = _a.api, config = _a.config, logger = _a.logger;
27
+ shop = sessionContext.shop, session = sessionContext.session, sessionToken = sessionContext.sessionToken;
28
+ if (!sessionToken)
29
+ throw new shopify_api_1.InvalidJwtError();
30
+ if (!(!session || session.isExpired())) return [3 /*break*/, 9];
31
+ logger.info('No valid session found');
32
+ logger.info('Requesting offline access token');
33
+ return [4 /*yield*/, this.exchangeToken({
34
+ request: request,
35
+ sessionToken: sessionToken,
36
+ shop: shop,
37
+ requestedTokenType: shopify_api_1.RequestedTokenType.OfflineAccessToken,
38
+ })];
39
+ case 1:
40
+ offlineSession = (_b.sent()).session;
41
+ return [4 /*yield*/, config.sessionStorage.storeSession(offlineSession)];
42
+ case 2:
43
+ _b.sent();
44
+ newSession = offlineSession;
45
+ if (!config.useOnlineTokens) return [3 /*break*/, 5];
46
+ logger.info('Requesting online access token');
47
+ return [4 /*yield*/, this.exchangeToken({
48
+ request: request,
49
+ sessionToken: sessionToken,
50
+ shop: shop,
51
+ requestedTokenType: shopify_api_1.RequestedTokenType.OnlineAccessToken,
52
+ })];
53
+ case 3:
54
+ onlineSession = (_b.sent()).session;
55
+ return [4 /*yield*/, config.sessionStorage.storeSession(onlineSession)];
56
+ case 4:
57
+ _b.sent();
58
+ newSession = onlineSession;
59
+ _b.label = 5;
60
+ case 5:
61
+ _b.trys.push([5, 7, , 8]);
62
+ return [4 /*yield*/, this.handleAfterAuthHook({ api: api, config: config, logger: logger }, newSession, request, sessionToken)];
63
+ case 6:
64
+ _b.sent();
65
+ return [3 /*break*/, 8];
66
+ case 7:
67
+ error_1 = _b.sent();
68
+ throw new Response(undefined, {
69
+ status: 500,
70
+ statusText: 'Internal Server Error',
71
+ });
72
+ case 8: return [2 /*return*/, newSession];
73
+ case 9: return [2 /*return*/, session];
74
+ }
75
+ });
76
+ });
77
+ };
78
+ TokenExchangeStrategy.prototype.handleClientError = function (request) {
79
+ var _this = this;
80
+ var _a = this, api = _a.api, config = _a.config, logger = _a.logger;
81
+ return (0, helpers_2.handleClientErrorFactory)({
82
+ request: request,
83
+ onError: function (_a) {
84
+ var session = _a.session, error = _a.error;
85
+ return tslib_1.__awaiter(_this, void 0, void 0, function () {
86
+ return tslib_1.__generator(this, function (_b) {
87
+ if (error.response.code === 401) {
88
+ config.sessionStorage.deleteSession(session.id);
89
+ (0, helpers_1.respondToInvalidSessionToken)({
90
+ params: { config: config, api: api, logger: logger },
91
+ request: request,
92
+ });
93
+ }
94
+ return [2 /*return*/];
95
+ });
96
+ });
97
+ },
98
+ });
99
+ };
100
+ TokenExchangeStrategy.prototype.exchangeToken = function (_a) {
101
+ var _b;
102
+ var request = _a.request, shop = _a.shop, sessionToken = _a.sessionToken, requestedTokenType = _a.requestedTokenType;
103
+ return tslib_1.__awaiter(this, void 0, void 0, function () {
104
+ var _c, api, config, logger, error_2;
105
+ return tslib_1.__generator(this, function (_d) {
106
+ switch (_d.label) {
107
+ case 0:
108
+ _c = this, api = _c.api, config = _c.config, logger = _c.logger;
109
+ _d.label = 1;
110
+ case 1:
111
+ _d.trys.push([1, 3, , 4]);
112
+ return [4 /*yield*/, api.auth.tokenExchange({
113
+ sessionToken: sessionToken,
114
+ shop: shop,
115
+ requestedTokenType: requestedTokenType,
116
+ })];
117
+ case 2: return [2 /*return*/, _d.sent()];
118
+ case 3:
119
+ error_2 = _d.sent();
120
+ if (error_2 instanceof shopify_api_1.InvalidJwtError ||
121
+ (error_2 instanceof shopify_api_1.HttpResponseError &&
122
+ error_2.response.code === 400 &&
123
+ ((_b = error_2.response.body) === null || _b === void 0 ? void 0 : _b.error) === 'invalid_subject_token')) {
124
+ throw (0, helpers_1.respondToInvalidSessionToken)({
125
+ params: { api: api, config: config, logger: logger },
126
+ request: request,
127
+ retryRequest: true,
128
+ });
129
+ }
130
+ throw new Response(undefined, {
131
+ status: 500,
132
+ statusText: 'Internal Server Error',
133
+ });
134
+ case 4: return [2 /*return*/];
135
+ }
136
+ });
137
+ });
138
+ };
139
+ TokenExchangeStrategy.prototype.handleAfterAuthHook = function (params, session, request, sessionToken) {
140
+ return tslib_1.__awaiter(this, void 0, void 0, function () {
141
+ var config;
142
+ var _this = this;
143
+ return tslib_1.__generator(this, function (_a) {
144
+ switch (_a.label) {
145
+ case 0:
146
+ config = params.config;
147
+ return [4 /*yield*/, config.idempotentPromiseHandler.handlePromise({
148
+ promiseFunction: function () {
149
+ return (0, helpers_2.triggerAfterAuthHook)(params, session, request, _this);
150
+ },
151
+ identifier: sessionToken,
152
+ })];
153
+ case 1:
154
+ _a.sent();
155
+ return [2 /*return*/];
156
+ }
157
+ });
158
+ });
159
+ };
160
+ return TokenExchangeStrategy;
161
+ }());
162
+ exports.TokenExchangeStrategy = TokenExchangeStrategy;
163
+ //# sourceMappingURL=token-exchange.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"token-exchange.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/strategies/token-exchange.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,22 @@
1
- import { JwtPayload, Session } from '@shopify/shopify-api';
2
- export interface SessionTokenContext {
1
+ import { HttpResponseError, Session } from '@shopify/shopify-api';
2
+ import { HandleAdminClientError } from '../../../clients';
3
+ export interface SessionContext {
3
4
  shop: string;
4
- sessionId?: string;
5
- payload?: JwtPayload;
5
+ session?: Session;
6
+ sessionToken?: string;
7
+ }
8
+ export interface OnErrorOptions {
9
+ request: Request;
10
+ session: Session;
11
+ error: HttpResponseError;
12
+ }
13
+ export interface HandleClientErrorOptions {
14
+ request: Request;
15
+ onError?: ({ session, error }: OnErrorOptions) => Promise<void | never>;
6
16
  }
7
17
  export interface AuthorizationStrategy {
8
18
  respondToOAuthRequests: (request: Request) => Promise<void | never>;
9
- authenticate: (request: Request, session: Session | undefined, shop: string) => Promise<Session | never>;
19
+ authenticate: (request: Request, sessionContext: SessionContext) => Promise<Session | never>;
20
+ handleClientError: (request: Request) => HandleAdminClientError;
10
21
  }
11
22
  //# sourceMappingURL=types.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/strategies/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,OAAO,EAAC,MAAM,sBAAsB,CAAC;AAEzD,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,UAAU,CAAC;CACtB;AAED,MAAM,WAAW,qBAAqB;IACpC,sBAAsB,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC;IACpE,YAAY,EAAE,CACZ,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,IAAI,EAAE,MAAM,KACT,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC;CAC/B"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/strategies/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAE,OAAO,EAAC,MAAM,sBAAsB,CAAC;AAEhE,OAAO,EAAC,sBAAsB,EAAC,MAAM,kBAAkB,CAAC;AAExD,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,iBAAiB,CAAC;CAC1B;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,CAAC,EAAC,OAAO,EAAE,KAAK,EAAC,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC;CACvE;AAED,MAAM,WAAW,qBAAqB;IACpC,sBAAsB,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC;IACpE,YAAY,EAAE,CACZ,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,cAAc,KAC3B,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC;IAC9B,iBAAiB,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,sBAAsB,CAAC;CACjE"}
@@ -171,9 +171,5 @@ export interface NonEmbeddedAdminContext<Config extends AppConfigArg, Resources
171
171
  }
172
172
  export type AdminContext<Config extends AppConfigArg, Resources extends ShopifyRestResources = ShopifyRestResources> = Config['isEmbeddedApp'] extends false ? NonEmbeddedAdminContext<Config, Resources> : EmbeddedAdminContext<Config, Resources>;
173
173
  export type AuthenticateAdmin<Config extends AppConfigArg, Resources extends ShopifyRestResources = ShopifyRestResources> = (request: Request) => Promise<AdminContext<Config, Resources>>;
174
- export interface SessionContext {
175
- session: Session;
176
- token?: JwtPayload;
177
- }
178
174
  export {};
179
175
  //# sourceMappingURL=types.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/server/authenticate/admin/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,OAAO,EAAE,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAE/E,OAAO,EAAC,kBAAkB,EAAC,MAAM,gCAAgC,CAAC;AAClE,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC;AAEnD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AAEpD,UAAU,oBAAoB,CAC5B,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,oBAAoB,GAAG,oBAAoB;IAE7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAyDG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,KAAK,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;IAElC;;;;OAIG;IACH,OAAO,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;IAEhC;;;;;;;;;;;;;;;;;OAiBG;IACH,IAAI,EAAE,kBAAkB,CAAC;CAC1B;AAED,MAAM,WAAW,oBAAoB,CACnC,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,CAC7D,SAAQ,oBAAoB,CAAC,MAAM,EAAE,SAAS,CAAC;IAC/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAkCG;IACH,YAAY,EAAE,UAAU,CAAC;IAEzB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAiCG;IACH,QAAQ,EAAE,gBAAgB,CAAC;CAC5B;AACD,MAAM,WAAW,uBAAuB,CACtC,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,CAC7D,SAAQ,oBAAoB,CAAC,MAAM,EAAE,SAAS,CAAC;CAAG;AAEpD,MAAM,MAAM,YAAY,CACtB,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,IAC3D,MAAM,CAAC,eAAe,CAAC,SAAS,KAAK,GACrC,uBAAuB,CAAC,MAAM,EAAE,SAAS,CAAC,GAC1C,oBAAoB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAE5C,MAAM,MAAM,iBAAiB,CAC3B,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,IAC3D,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;AAEnE,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/server/authenticate/admin/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,OAAO,EAAE,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAE/E,OAAO,EAAC,kBAAkB,EAAC,MAAM,gCAAgC,CAAC;AAClE,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC;AAEnD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AAEpD,UAAU,oBAAoB,CAC5B,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,oBAAoB,GAAG,oBAAoB;IAE7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAyDG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,KAAK,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;IAElC;;;;OAIG;IACH,OAAO,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;IAEhC;;;;;;;;;;;;;;;;;OAiBG;IACH,IAAI,EAAE,kBAAkB,CAAC;CAC1B;AAED,MAAM,WAAW,oBAAoB,CACnC,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,CAC7D,SAAQ,oBAAoB,CAAC,MAAM,EAAE,SAAS,CAAC;IAC/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAkCG;IACH,YAAY,EAAE,UAAU,CAAC;IAEzB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAiCG;IACH,QAAQ,EAAE,gBAAgB,CAAC;CAC5B;AACD,MAAM,WAAW,uBAAuB,CACtC,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,CAC7D,SAAQ,oBAAoB,CAAC,MAAM,EAAE,SAAS,CAAC;CAAG;AAEpD,MAAM,MAAM,YAAY,CACtB,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,IAC3D,MAAM,CAAC,eAAe,CAAC,SAAS,KAAK,GACrC,uBAAuB,CAAC,MAAM,EAAE,SAAS,CAAC,GAC1C,oBAAoB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAE5C,MAAM,MAAM,iBAAiB,CAC3B,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,IAC3D,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC"}
@@ -1,5 +1,8 @@
1
1
  export declare const APP_BRIDGE_URL = "https://cdn.shopify.com/shopifycloud/app-bridge.js";
2
2
  export declare const REAUTH_URL_HEADER = "X-Shopify-API-Request-Failure-Reauthorize-Url";
3
+ export declare const RETRY_INVALID_SESSION_HEADER: {
4
+ 'X-Shopify-Retry-Invalid-Session-Request': string;
5
+ };
3
6
  export declare const CORS_HEADERS: {
4
7
  'Access-Control-Allow-Origin': string;
5
8
  'Access-Control-Allow-Headers': string;