@etohq/framework 1.0.0 → 1.2.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 (132) hide show
  1. package/dist/build-tools/compiler.d.ts.map +1 -1
  2. package/dist/build-tools/compiler.js +38 -32
  3. package/dist/build-tools/compiler.js.map +1 -1
  4. package/dist/config/config.d.ts.map +1 -1
  5. package/dist/config/config.js +1 -0
  6. package/dist/config/config.js.map +1 -1
  7. package/dist/config/loader.d.ts +7 -2
  8. package/dist/config/loader.d.ts.map +1 -1
  9. package/dist/config/loader.js +28 -6
  10. package/dist/config/loader.js.map +1 -1
  11. package/dist/config/types.d.ts +4 -166
  12. package/dist/config/types.d.ts.map +1 -1
  13. package/dist/context/index.d.ts +6 -0
  14. package/dist/context/index.d.ts.map +1 -0
  15. package/dist/context/index.js +50 -0
  16. package/dist/context/index.js.map +1 -0
  17. package/dist/error/index.d.ts +205 -0
  18. package/dist/error/index.d.ts.map +1 -0
  19. package/dist/error/index.js +273 -0
  20. package/dist/error/index.js.map +1 -0
  21. package/dist/eto-app-loader.d.ts +6 -4
  22. package/dist/eto-app-loader.d.ts.map +1 -1
  23. package/dist/eto-app-loader.js +53 -11
  24. package/dist/eto-app-loader.js.map +1 -1
  25. package/dist/eto.d.ts +39 -0
  26. package/dist/eto.d.ts.map +1 -0
  27. package/dist/eto.js +148 -0
  28. package/dist/eto.js.map +1 -0
  29. package/dist/feature-flags/feature-flag-loader.d.ts +4 -3
  30. package/dist/feature-flags/feature-flag-loader.d.ts.map +1 -1
  31. package/dist/feature-flags/feature-flag-loader.js +36 -25
  32. package/dist/feature-flags/feature-flag-loader.js.map +1 -1
  33. package/dist/http/encore.d.ts +191 -0
  34. package/dist/http/encore.d.ts.map +1 -0
  35. package/dist/http/encore.js +3 -0
  36. package/dist/http/encore.js.map +1 -0
  37. package/dist/http/index.d.ts +1 -3
  38. package/dist/http/index.d.ts.map +1 -1
  39. package/dist/http/index.js +1 -3
  40. package/dist/http/index.js.map +1 -1
  41. package/dist/http/middlewares/apply-default-filters.d.ts +2 -2
  42. package/dist/http/middlewares/apply-default-filters.d.ts.map +1 -1
  43. package/dist/http/middlewares/apply-default-filters.js +8 -6
  44. package/dist/http/middlewares/apply-default-filters.js.map +1 -1
  45. package/dist/http/middlewares/apply-params-as-filters.d.ts +2 -2
  46. package/dist/http/middlewares/apply-params-as-filters.d.ts.map +1 -1
  47. package/dist/http/middlewares/apply-params-as-filters.js +7 -4
  48. package/dist/http/middlewares/apply-params-as-filters.js.map +1 -1
  49. package/dist/http/middlewares/authenticate-middleware.d.ts +2 -2
  50. package/dist/http/middlewares/authenticate-middleware.d.ts.map +1 -1
  51. package/dist/http/middlewares/authenticate-middleware.js +25 -22
  52. package/dist/http/middlewares/authenticate-middleware.js.map +1 -1
  53. package/dist/http/middlewares/clear-filters-by-key.d.ts +2 -2
  54. package/dist/http/middlewares/clear-filters-by-key.d.ts.map +1 -1
  55. package/dist/http/middlewares/clear-filters-by-key.js +2 -2
  56. package/dist/http/middlewares/clear-filters-by-key.js.map +1 -1
  57. package/dist/http/middlewares/ensure-publishable-api-key.d.ts +2 -2
  58. package/dist/http/middlewares/ensure-publishable-api-key.d.ts.map +1 -1
  59. package/dist/http/middlewares/ensure-publishable-api-key.js +7 -5
  60. package/dist/http/middlewares/ensure-publishable-api-key.js.map +1 -1
  61. package/dist/http/middlewares/error-handler.d.ts +2 -3
  62. package/dist/http/middlewares/error-handler.d.ts.map +1 -1
  63. package/dist/http/middlewares/error-handler.js +6 -3
  64. package/dist/http/middlewares/error-handler.js.map +1 -1
  65. package/dist/http/middlewares/set-context.d.ts +2 -2
  66. package/dist/http/middlewares/set-context.d.ts.map +1 -1
  67. package/dist/http/middlewares/set-context.js +4 -4
  68. package/dist/http/middlewares/set-context.js.map +1 -1
  69. package/dist/http/types.d.ts +41 -31
  70. package/dist/http/types.d.ts.map +1 -1
  71. package/dist/http/types.js.map +1 -1
  72. package/dist/http/utils/http-compression.d.ts +1 -4
  73. package/dist/http/utils/http-compression.d.ts.map +1 -1
  74. package/dist/http/utils/http-compression.js +35 -30
  75. package/dist/http/utils/http-compression.js.map +1 -1
  76. package/dist/http/utils/maybe-apply-link-filter.d.ts +2 -2
  77. package/dist/http/utils/maybe-apply-link-filter.d.ts.map +1 -1
  78. package/dist/http/utils/maybe-apply-link-filter.js +7 -6
  79. package/dist/http/utils/maybe-apply-link-filter.js.map +1 -1
  80. package/dist/http/utils/refetch-entities.d.ts +2 -2
  81. package/dist/http/utils/refetch-entities.d.ts.map +1 -1
  82. package/dist/http/utils/refetch-entities.js.map +1 -1
  83. package/dist/http/utils/unless-path.d.ts +4 -4
  84. package/dist/http/utils/unless-path.d.ts.map +1 -1
  85. package/dist/http/utils/unless-path.js +20 -11
  86. package/dist/http/utils/unless-path.js.map +1 -1
  87. package/dist/http/utils/validate-body.d.ts +1 -4
  88. package/dist/http/utils/validate-body.d.ts.map +1 -1
  89. package/dist/http/utils/validate-body.js +31 -20
  90. package/dist/http/utils/validate-body.js.map +1 -1
  91. package/dist/http/utils/validate-query.d.ts +9 -4
  92. package/dist/http/utils/validate-query.d.ts.map +1 -1
  93. package/dist/http/utils/validate-query.js +63 -20
  94. package/dist/http/utils/validate-query.js.map +1 -1
  95. package/dist/index.d.ts +4 -0
  96. package/dist/index.d.ts.map +1 -1
  97. package/dist/index.js +4 -0
  98. package/dist/index.js.map +1 -1
  99. package/dist/jobs/job-loader.d.ts +12 -4
  100. package/dist/jobs/job-loader.d.ts.map +1 -1
  101. package/dist/jobs/job-loader.js +56 -38
  102. package/dist/jobs/job-loader.js.map +1 -1
  103. package/dist/link-modules-sdk/index.d.ts +2 -0
  104. package/dist/link-modules-sdk/index.d.ts.map +1 -0
  105. package/dist/link-modules-sdk/index.js +18 -0
  106. package/dist/link-modules-sdk/index.js.map +1 -0
  107. package/dist/loader.d.ts +24 -0
  108. package/dist/loader.d.ts.map +1 -0
  109. package/dist/loader.js +104 -0
  110. package/dist/loader.js.map +1 -0
  111. package/dist/mikro-orm-cli/bin.js +0 -0
  112. package/dist/subscribers/subscriber-loader.d.ts +15 -1
  113. package/dist/subscribers/subscriber-loader.d.ts.map +1 -1
  114. package/dist/subscribers/subscriber-loader.js +44 -17
  115. package/dist/subscribers/subscriber-loader.js.map +1 -1
  116. package/dist/types/container.d.ts +2 -23
  117. package/dist/types/container.d.ts.map +1 -1
  118. package/dist/zod/zod-helpers.js +1 -1
  119. package/dist/zod/zod-helpers.js.map +1 -1
  120. package/package.json +12 -9
  121. package/dist/http/express-loader.d.ts +0 -8
  122. package/dist/http/express-loader.d.ts.map +0 -1
  123. package/dist/http/express-loader.js +0 -85
  124. package/dist/http/express-loader.js.map +0 -1
  125. package/dist/http/router.d.ts +0 -100
  126. package/dist/http/router.d.ts.map +0 -1
  127. package/dist/http/router.js +0 -764
  128. package/dist/http/router.js.map +0 -1
  129. package/dist/http/utils/define-middlewares.d.ts +0 -18
  130. package/dist/http/utils/define-middlewares.d.ts.map +0 -1
  131. package/dist/http/utils/define-middlewares.js +0 -40
  132. package/dist/http/utils/define-middlewares.js.map +0 -1
@@ -2,9 +2,11 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.applyDefaultFilters = applyDefaultFilters;
4
4
  const utils_1 = require("@etohq/utils");
5
+ const context_1 = require("../../context");
5
6
  function applyDefaultFilters(filtersToApply) {
6
- return async (req, _, next) => {
7
+ return async (req, next) => {
7
8
  for (const [filter, filterValue] of Object.entries(filtersToApply)) {
9
+ const reqCtx = (0, context_1.reqContext)(req.requestMeta);
8
10
  let valueToApply = filterValue;
9
11
  // If certain manipulations need to be done on a middleware level, we can provide a simple
10
12
  // function that mutates the data based on any custom requirement
@@ -13,20 +15,20 @@ function applyDefaultFilters(filtersToApply) {
13
15
  // Currently we only need it to delete filter keys from the request filter object, but this could
14
16
  // be used for other purposes. If we can't find other purposes, we can refactor to accept an array
15
17
  // of strings to delete after filters have been applied.
16
- valueToApply = filterValue(req.filterableFields, req.queryConfig.fields);
18
+ valueToApply = filterValue(reqCtx.filterableFields, reqCtx.queryConfig.fields);
17
19
  }
18
20
  // If the value to apply is an object, we add it to any existing filters thats already applied
19
21
  if ((0, utils_1.isObject)(valueToApply)) {
20
- req.filterableFields[filter] = {
21
- ...(req.filterableFields[filter] || {}),
22
+ req.data.filterableFields[filter] = {
23
+ ...(reqCtx.filterableFields[filter] || {}),
22
24
  ...valueToApply,
23
25
  };
24
26
  }
25
27
  else if ((0, utils_1.isPresent)(valueToApply)) {
26
- req.filterableFields[filter] = valueToApply;
28
+ req.data.filterableFields[filter] = valueToApply;
27
29
  }
28
30
  }
29
- return next();
31
+ return next(req);
30
32
  };
31
33
  }
32
34
  //# sourceMappingURL=apply-default-filters.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"apply-default-filters.js","sourceRoot":"","sources":["../../../src/http/middlewares/apply-default-filters.ts"],"names":[],"mappings":";;AAGA,kDA8BC;AAjCD,wCAAkD;AAGlD,SAAgB,mBAAmB,CACjC,cAAuB;IAEvB,OAAO,KAAK,EAAE,GAAe,EAAE,CAAC,EAAE,IAAqB,EAAE,EAAE;QACzD,KAAK,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;YACnE,IAAI,YAAY,GAAG,WAAW,CAAA;YAE9B,0FAA0F;YAC1F,iEAAiE;YACjE,IAAI,OAAO,WAAW,KAAK,UAAU,EAAE,CAAC;gBACtC,yFAAyF;gBACzF,iGAAiG;gBACjG,kGAAkG;gBAClG,wDAAwD;gBACxD,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,gBAAgB,EAAE,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;YAC1E,CAAC;YAED,8FAA8F;YAC9F,IAAI,IAAA,gBAAQ,EAAC,YAAY,CAAC,EAAE,CAAC;gBAC3B,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG;oBAC7B,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;oBACvC,GAAG,YAAY;iBAChB,CAAA;YACH,CAAC;iBAAM,IAAI,IAAA,iBAAS,EAAC,YAAY,CAAC,EAAE,CAAC;gBACnC,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG,YAAY,CAAA;YAC7C,CAAC;QACH,CAAC;QAED,OAAO,IAAI,EAAE,CAAA;IACf,CAAC,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"apply-default-filters.js","sourceRoot":"","sources":["../../../src/http/middlewares/apply-default-filters.ts"],"names":[],"mappings":";;AAIA,kDAmCC;AAvCD,wCAAkD;AAElD,2CAA0C;AAE1C,SAAgB,mBAAmB,CACjC,cAAuB;IAEvB,OAAO,KAAK,EAAE,GAAyB,EAAE,IAAuB,EAAE,EAAE;QAClE,KAAK,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;YAEnE,MAAM,MAAM,GAAG,IAAA,oBAAU,EAAC,GAAG,CAAC,WAAW,CAAC,CAAA;YAC1C,IAAI,YAAY,GAAG,WAAW,CAAA;YAE9B,0FAA0F;YAC1F,iEAAiE;YACjE,IAAI,OAAO,WAAW,KAAK,UAAU,EAAE,CAAC;gBACtC,yFAAyF;gBACzF,iGAAiG;gBACjG,kGAAkG;gBAClG,wDAAwD;gBACxD,YAAY,GAAG,WAAW,CACxB,MAAM,CAAC,gBAAgB,EACvB,MAAM,CAAC,WAAW,CAAC,MAAM,CAC1B,CAAA;YACH,CAAC;YAED,8FAA8F;YAC9F,IAAI,IAAA,gBAAQ,EAAC,YAAY,CAAC,EAAE,CAAC;gBAC3B,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG;oBAClC,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;oBAC1C,GAAG,YAAY;iBAChB,CAAA;YACH,CAAC;iBAAM,IAAI,IAAA,iBAAS,EAAC,YAAY,CAAC,EAAE,CAAC;gBACnC,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG,YAAY,CAAA;YAClD,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC,GAAG,CAAC,CAAA;IAClB,CAAC,CAAA;AACH,CAAC"}
@@ -1,5 +1,5 @@
1
- import { EtoNextFunction, EtoRequest } from "../types";
1
+ import { EtoMiddlewareNext, EtoMiddlewareRequest } from "../types";
2
2
  export declare function applyParamsAsFilters(mappings: {
3
3
  [param: string]: string;
4
- }): (req: EtoRequest, _: any, next: EtoNextFunction) => Promise<void>;
4
+ }): (req: EtoMiddlewareRequest, next: EtoMiddlewareNext) => Promise<import("..").HandlerResponse>;
5
5
  //# sourceMappingURL=apply-params-as-filters.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"apply-params-as-filters.d.ts","sourceRoot":"","sources":["../../../src/http/middlewares/apply-params-as-filters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAEtD,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,SACrD,UAAU,gBAAW,eAAe,mBASxD"}
1
+ {"version":3,"file":"apply-params-as-filters.d.ts","sourceRoot":"","sources":["../../../src/http/middlewares/apply-params-as-filters.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAElE,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,SACrD,oBAAoB,QAAQ,iBAAiB,2CAWjE"}
@@ -1,14 +1,17 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.applyParamsAsFilters = applyParamsAsFilters;
4
+ const context_1 = require("../../context");
4
5
  function applyParamsAsFilters(mappings) {
5
- return async (req, _, next) => {
6
- for (const [param, paramValue] of Object.entries(req.params)) {
6
+ return async (req, next) => {
7
+ // todo fetch params from passedPayload.
8
+ const reqCtx = (0, context_1.reqContext)(req.requestMeta);
9
+ for (const [param, paramValue] of Object.entries(reqCtx.params)) {
7
10
  if (mappings[param]) {
8
- req.filterableFields[mappings[param]] = paramValue;
11
+ req.data.filterableFields[mappings[param]] = paramValue;
9
12
  }
10
13
  }
11
- return next();
14
+ return next(req);
12
15
  };
13
16
  }
14
17
  //# sourceMappingURL=apply-params-as-filters.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"apply-params-as-filters.js","sourceRoot":"","sources":["../../../src/http/middlewares/apply-params-as-filters.ts"],"names":[],"mappings":";;AAEA,oDAUC;AAVD,SAAgB,oBAAoB,CAAC,QAAqC;IACxE,OAAO,KAAK,EAAE,GAAe,EAAE,CAAC,EAAE,IAAqB,EAAE,EAAE;QACzD,KAAK,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7D,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBACpB,GAAG,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CAAA;YACpD,CAAC;QACH,CAAC;QAED,OAAO,IAAI,EAAE,CAAA;IACf,CAAC,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"apply-params-as-filters.js","sourceRoot":"","sources":["../../../src/http/middlewares/apply-params-as-filters.ts"],"names":[],"mappings":";;AAGA,oDAYC;AAfD,2CAA0C;AAG1C,SAAgB,oBAAoB,CAAC,QAAqC;IACxE,OAAO,KAAK,EAAE,GAAyB,EAAE,IAAuB,EAAE,EAAE;QAClE,wCAAwC;QACxC,MAAM,MAAM,GAAG,IAAA,oBAAU,EAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC3C,KAAK,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YAChE,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBACpB,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CAAA;YACzD,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC,GAAG,CAAC,CAAA;IAClB,CAAC,CAAA;AACH,CAAC"}
@@ -1,4 +1,4 @@
1
- import { RequestHandler } from "express";
1
+ import { EtoRequestHandler } from "../types";
2
2
  declare const SESSION_AUTH = "session";
3
3
  declare const BEARER_AUTH = "bearer";
4
4
  declare const API_KEY_AUTH = "api-key";
@@ -6,6 +6,6 @@ export type AuthType = typeof SESSION_AUTH | typeof BEARER_AUTH | typeof API_KEY
6
6
  export declare const authenticate: (actorType: string | string[], authType: AuthType | AuthType[], options?: {
7
7
  allowUnauthenticated?: boolean;
8
8
  allowUnregistered?: boolean;
9
- }) => RequestHandler;
9
+ }) => EtoRequestHandler;
10
10
  export {};
11
11
  //# sourceMappingURL=authenticate-middleware.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"authenticate-middleware.d.ts","sourceRoot":"","sources":["../../../src/http/middlewares/authenticate-middleware.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,cAAc,EAAE,MAAM,SAAS,CAAA;AAUtD,QAAA,MAAM,YAAY,YAAY,CAAA;AAC9B,QAAA,MAAM,WAAW,WAAW,CAAA;AAC5B,QAAA,MAAM,YAAY,YAAY,CAAA;AAK9B,MAAM,MAAM,QAAQ,GAChB,OAAO,YAAY,GACnB,OAAO,WAAW,GAClB,OAAO,YAAY,CAAA;AAMvB,eAAO,MAAM,YAAY,cACZ,MAAM,GAAG,MAAM,EAAE,YAClB,QAAQ,GAAG,QAAQ,EAAE,YACtB;IAAE,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAAC,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAAE,KACvE,cA4EF,CAAA"}
1
+ {"version":3,"file":"authenticate-middleware.d.ts","sourceRoot":"","sources":["../../../src/http/middlewares/authenticate-middleware.ts"],"names":[],"mappings":"AAIA,OAAO,EAKL,iBAAiB,EAElB,MAAM,UAAU,CAAA;AAGjB,QAAA,MAAM,YAAY,YAAY,CAAA;AAC9B,QAAA,MAAM,WAAW,WAAW,CAAA;AAC5B,QAAA,MAAM,YAAY,YAAY,CAAA;AAM9B,MAAM,MAAM,QAAQ,GAChB,OAAO,YAAY,GACnB,OAAO,WAAW,GAClB,OAAO,YAAY,CAAA;AAEvB,eAAO,MAAM,YAAY,cACZ,MAAM,GAAG,MAAM,EAAE,YAClB,QAAQ,GAAG,QAAQ,EAAE,YACtB;IAAE,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAAC,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAAE,KACvE,iBA8EF,CAAA"}
@@ -3,60 +3,63 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.authenticate = void 0;
4
4
  const utils_1 = require("@etohq/utils");
5
5
  const jsonwebtoken_1 = require("jsonwebtoken");
6
+ const context_1 = require("../../context");
6
7
  const SESSION_AUTH = "session";
7
8
  const BEARER_AUTH = "bearer";
8
9
  const API_KEY_AUTH = "api-key";
9
10
  // This is the only hard-coded actor type, as API keys have special handling for now. We could also generalize API keys to carry the actor type with them.
10
11
  const ADMIN_ACTOR_TYPE = "user";
11
12
  const authenticate = (actorType, authType, options = {}) => {
12
- const authenticateMiddleware = async (req, res, next) => {
13
+ const authenticateMiddleware = async (req, next) => {
13
14
  const authTypes = Array.isArray(authType) ? authType : [authType];
14
15
  const actorTypes = Array.isArray(actorType) ? actorType : [actorType];
15
- const req_ = req;
16
+ const reqCtx = (0, context_1.reqContext)(req.requestMeta);
16
17
  // We only allow authenticating using a secret API key on the admin
17
18
  const isExclusivelyUser = actorTypes.length === 1 && actorTypes[0] === ADMIN_ACTOR_TYPE;
18
19
  if (authTypes.includes(API_KEY_AUTH) && isExclusivelyUser) {
19
- const apiKey = await getApiKeyInfo(req);
20
+ const apiKey = await getApiKeyInfo(reqCtx);
20
21
  if (apiKey) {
21
- req_.auth_context = {
22
+ req.data.authContext = {
22
23
  actor_id: apiKey.id,
23
24
  actor_type: "api-key",
24
25
  auth_identity_id: "",
25
26
  app_metadata: {},
26
27
  };
27
- return next();
28
+ return next(req);
28
29
  }
29
30
  }
30
31
  // We try to extract the auth context either from the session or from a JWT token
31
- let authContext = getAuthContextFromSession(req.session, authTypes, actorTypes);
32
- if (!authContext) {
33
- const { projectConfig: { http }, } = req.scope.resolve(utils_1.ContainerRegistrationKeys.CONFIG_MODULE);
34
- authContext = getAuthContextFromJwtToken(req.headers.authorization, http.jwtSecret, authTypes, actorTypes);
32
+ let authCtxFromSession = getAuthContextFromSession(req.data.session, authTypes, actorTypes);
33
+ if (!authCtxFromSession) {
34
+ const { projectConfig: { http }, } = (0, context_1.reqContext)(req).scope.resolve(utils_1.ContainerRegistrationKeys.CONFIG_MODULE);
35
+ authCtxFromSession = getAuthContextFromJwtToken(reqCtx.req.headers.get("authorization"), http.jwtSecret, authTypes, actorTypes);
35
36
  }
36
37
  // If the entity is authenticated, and it is a registered actor we can continue
37
- if (authContext?.actor_id) {
38
- req_.auth_context = authContext;
39
- return next();
38
+ if (authCtxFromSession?.actor_id) {
39
+ reqCtx.req.authContext = authCtxFromSession;
40
+ return next(req);
40
41
  }
42
+ const authCtx = (0, context_1.authContext)(req);
41
43
  // If the entity is authenticated, but there is no registered actor yet, we can continue (eg. in the case of a user invite) if allow unregistered is set
42
44
  // We also don't want to allow creating eg. a customer with a token created for a `user` provider.
43
- if (authContext?.auth_identity_id &&
45
+ if (req.data?.auth_identity_id &&
44
46
  options.allowUnregistered &&
45
- isActorTypePermitted(actorTypes, authContext.actor_type)) {
46
- req_.auth_context = authContext;
47
- return next();
47
+ isActorTypePermitted(actorTypes, authCtx.authContext.actor_type)) {
48
+ req.data.authContext = authCtxFromSession;
49
+ return next(req);
48
50
  }
49
51
  // If we allow unauthenticated requests (i.e public endpoints), just continue
50
52
  if (options.allowUnauthenticated) {
51
- return next();
53
+ return next(req);
52
54
  }
53
- res.status(401).json({ message: "Unauthorized" });
55
+ return next(req); // temporary type fix, tdo remove
56
+ // res.status(401).json({ message: "Unauthorized" })
54
57
  };
55
58
  return authenticateMiddleware;
56
59
  };
57
60
  exports.authenticate = authenticate;
58
61
  const getApiKeyInfo = async (req) => {
59
- const authHeader = req.headers.authorization;
62
+ const authHeader = req.req.headers.get("authorization");
60
63
  if (!authHeader) {
61
64
  return null;
62
65
  }
@@ -94,9 +97,9 @@ const getAuthContextFromSession = (session = {}, authTypes, actorTypes) => {
94
97
  if (!authTypes.includes(SESSION_AUTH)) {
95
98
  return null;
96
99
  }
97
- if (session.auth_context &&
98
- isActorTypePermitted(actorTypes, session.auth_context?.actor_type)) {
99
- return session.auth_context;
100
+ if (session.authContext &&
101
+ isActorTypePermitted(actorTypes, session.authContext?.actor_type)) {
102
+ return session.authContext;
100
103
  }
101
104
  return null;
102
105
  };
@@ -1 +1 @@
1
- {"version":3,"file":"authenticate-middleware.js","sourceRoot":"","sources":["../../../src/http/middlewares/authenticate-middleware.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"authenticate-middleware.js","sourceRoot":"","sources":["../../../src/http/middlewares/authenticate-middleware.ts"],"names":[],"mappings":";;;AACA,wCAAiE;AACjE,+CAAiD;AAUjD,2CAAuD;AAEvD,MAAM,YAAY,GAAG,SAAS,CAAA;AAC9B,MAAM,WAAW,GAAG,QAAQ,CAAA;AAC5B,MAAM,YAAY,GAAG,SAAS,CAAA;AAE9B,0JAA0J;AAE1J,MAAM,gBAAgB,GAAG,MAAM,CAAA;AAOxB,MAAM,YAAY,GAAG,CAC1B,SAA4B,EAC5B,QAA+B,EAC/B,UAA2E,EAAE,EAC1D,EAAE;IAErB,MAAM,sBAAsB,GAAsB,KAAK,EACrD,GAAyB,EACzB,IAAuB,EACvB,EAAE;QACF,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;QACjE,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;QAErE,MAAM,MAAM,GAAG,IAAA,oBAAU,EAAC,GAAG,CAAC,WAAW,CAAC,CAAA;QAC1C,mEAAmE;QACnE,MAAM,iBAAiB,GACrB,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,KAAK,gBAAgB,CAAA;QAE/D,IAAI,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,iBAAiB,EAAE,CAAC;YAC1D,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,CAAA;YAC1C,IAAI,MAAM,EAAE,CAAC;gBACX,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG;oBACrB,QAAQ,EAAE,MAAM,CAAC,EAAE;oBACnB,UAAU,EAAE,SAAS;oBACrB,gBAAgB,EAAE,EAAE;oBACpB,YAAY,EAAE,EAAE;iBACjB,CAAA;gBAED,OAAO,IAAI,CAAC,GAAG,CAAC,CAAA;YAClB,CAAC;QACH,CAAC;QAED,iFAAiF;QACjF,IAAI,kBAAkB,GAAuB,yBAAyB,CACpE,GAAG,CAAC,IAAI,CAAC,OAAO,EAChB,SAAS,EACT,UAAU,CACX,CAAA;QAED,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACxB,MAAM,EACJ,aAAa,EAAE,EAAE,IAAI,EAAE,GACxB,GAAG,IAAA,oBAAU,EAAC,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,CAC/B,iCAAyB,CAAC,aAAa,CACxC,CAAA;YAED,kBAAkB,GAAG,0BAA0B,CAC7C,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,EACvC,IAAI,CAAC,SAAU,EACf,SAAS,EACT,UAAU,CACX,CAAA;QACH,CAAC;QAED,+EAA+E;QAC/E,IAAI,kBAAkB,EAAE,QAAQ,EAAE,CAAC;YACjC,MAAM,CAAC,GAAG,CAAC,WAAW,GAAG,kBAAkB,CAAA;YAC3C,OAAO,IAAI,CAAC,GAAG,CAAC,CAAA;QAClB,CAAC;QAED,MAAM,OAAO,GAAG,IAAA,qBAAW,EAAC,GAAG,CAAC,CAAA;QAChC,wJAAwJ;QACxJ,kGAAkG;QAClG,IACE,GAAG,CAAC,IAAI,EAAE,gBAAgB;YAC1B,OAAO,CAAC,iBAAiB;YACzB,oBAAoB,CAAC,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,EAChE,CAAC;YACD,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG,kBAAkB,CAAA;YACzC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAA;QAClB,CAAC;QAED,6EAA6E;QAC7E,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAA;QAClB,CAAC;QAED,OAAO,IAAI,CAAC,GAAG,CAAC,CAAA,CAAC,kCAAkC;QACnD,oDAAoD;IACtD,CAAC,CAAA;IAED,OAAO,sBAAsD,CAAA;AAC/D,CAAC,CAAA;AAlFY,QAAA,YAAY,gBAkFxB;AAED,MAAM,aAAa,GAAG,KAAK,EAAE,GAAsB,EAA6B,EAAE;IAChF,MAAM,UAAU,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;IACvD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAChD,IAAI,SAAS,CAAC,WAAW,EAAE,KAAK,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC;QAClD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,wEAAwE;IACxE,IAAI,eAAe,GAAG,KAAK,CAAA;IAC3B,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7B,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;IAClE,CAAC;IAED,yHAAyH;IACzH,IAAI,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAClC,eAAe,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAChD,CAAC;IAED,gGAAgG;IAChG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QACvC,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CACpC,eAAO,CAAC,OAAO,CACQ,CAAA;IACzB,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,YAAY,CAAC,eAAe,CAAC,CAAA;QAC/D,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,IAAI,CAAA;QACb,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QACpB,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC,CAAA;AAED,MAAM,yBAAyB,GAAG,CAChC,UAA+B,EAAE,EACjC,SAAqB,EACrB,UAAoB,EACA,EAAE;IACtB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QACtC,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IACE,OAAO,CAAC,WAAW;QACnB,oBAAoB,CAAC,UAAU,EAAE,OAAO,CAAC,WAAW,EAAE,UAAU,CAAC,EACjE,CAAC;QACD,OAAO,OAAO,CAAC,WAAW,CAAA;IAC5B,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,MAAM,0BAA0B,GAAG,CACjC,UAA8B,EAC9B,SAAiB,EACjB,SAAqB,EACrB,UAAoB,EACA,EAAE;IACtB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QACrC,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,EAAE,GAAG,eAAe,CAAA;IAC1B,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IAEpC,yEAAyE;IACzE,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,SAAS,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;QAC5B,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;QACxB,IAAI,SAAS,CAAC,WAAW,EAAE,KAAK,WAAW,EAAE,CAAC;YAC5C,wBAAwB;YACxB,gCAAgC;YAChC,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,KAAK,EAAE,SAAS,CAAe,CAAA;gBACvD,IAAI,oBAAoB,CAAC,UAAU,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC1D,OAAO,QAAuB,CAAA;gBAChC,CAAC;YACH,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,IAAI,CAAA;YACb,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,MAAM,oBAAoB,GAAG,CAC3B,UAA6B,EAC7B,gBAAwB,EACxB,EAAE;IACF,OAAO,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAA;AAC1E,CAAC,CAAA"}
@@ -1,3 +1,3 @@
1
- import { EtoNextFunction, EtoRequest } from "../types";
2
- export declare function clearFiltersByKey(keys: string[]): (req: EtoRequest, _: any, next: EtoNextFunction) => Promise<void>;
1
+ import { EtoMiddlewareNext, EtoMiddlewareRequest } from "../types";
2
+ export declare function clearFiltersByKey(keys: string[]): (req: EtoMiddlewareRequest, _: any, next: EtoMiddlewareNext) => Promise<import("..").HandlerResponse>;
3
3
  //# sourceMappingURL=clear-filters-by-key.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"clear-filters-by-key.d.ts","sourceRoot":"","sources":["../../../src/http/middlewares/clear-filters-by-key.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAEtD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,SAC3B,UAAU,gBAAW,eAAe,mBAOxD"}
1
+ {"version":3,"file":"clear-filters-by-key.d.ts","sourceRoot":"","sources":["../../../src/http/middlewares/clear-filters-by-key.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAElE,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,SAC3B,oBAAoB,gBAAW,iBAAiB,2CAOpE"}
@@ -4,9 +4,9 @@ exports.clearFiltersByKey = clearFiltersByKey;
4
4
  function clearFiltersByKey(keys) {
5
5
  return async (req, _, next) => {
6
6
  keys.forEach((key) => {
7
- delete req.filterableFields[key];
7
+ delete req.data.filterableFields[key];
8
8
  });
9
- return next();
9
+ return next(req);
10
10
  };
11
11
  }
12
12
  //# sourceMappingURL=clear-filters-by-key.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"clear-filters-by-key.js","sourceRoot":"","sources":["../../../src/http/middlewares/clear-filters-by-key.ts"],"names":[],"mappings":";;AAEA,8CAQC;AARD,SAAgB,iBAAiB,CAAC,IAAc;IAC9C,OAAO,KAAK,EAAE,GAAe,EAAE,CAAC,EAAE,IAAqB,EAAE,EAAE;QACzD,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACnB,OAAO,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAA;QAClC,CAAC,CAAC,CAAA;QAEF,OAAO,IAAI,EAAE,CAAA;IACf,CAAC,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"clear-filters-by-key.js","sourceRoot":"","sources":["../../../src/http/middlewares/clear-filters-by-key.ts"],"names":[],"mappings":";;AAEA,8CAQC;AARD,SAAgB,iBAAiB,CAAC,IAAc;IAC9C,OAAO,KAAK,EAAE,GAAyB,EAAE,CAAC,EAAE,IAAuB,EAAE,EAAE;QACrE,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACnB,OAAO,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAA;QACvC,CAAC,CAAC,CAAA;QAEF,OAAO,IAAI,CAAC,GAAG,CAAC,CAAA;IAClB,CAAC,CAAA;AACH,CAAC"}
@@ -1,3 +1,3 @@
1
- import { EtoNextFunction, EtoResponse, EtoStoreRequest } from "../../http";
2
- export declare function ensurePublishableApiKeyMiddleware(req: EtoStoreRequest, _res: EtoResponse, next: EtoNextFunction): Promise<void>;
1
+ import { EtoMiddlewareNext, EtoMiddlewareRequest } from "../../http";
2
+ export declare function ensurePublishableApiKeyMiddleware(req: EtoMiddlewareRequest, next: EtoMiddlewareNext): Promise<import("../encore").HandlerResponse>;
3
3
  //# sourceMappingURL=ensure-publishable-api-key.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"ensure-publishable-api-key.d.ts","sourceRoot":"","sources":["../../../src/http/middlewares/ensure-publishable-api-key.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,eAAe,EACf,WAAW,EACX,eAAe,EAChB,MAAM,YAAY,CAAA;AAEnB,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,WAAW,EACjB,IAAI,EAAE,eAAe,iBA2DtB"}
1
+ {"version":3,"file":"ensure-publishable-api-key.d.ts","sourceRoot":"","sources":["../../../src/http/middlewares/ensure-publishable-api-key.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,YAAY,CAAA;AAInB,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,oBAAoB,EACzB,IAAI,EAAE,iBAAiB,gDA6DxB"}
@@ -2,8 +2,10 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ensurePublishableApiKeyMiddleware = ensurePublishableApiKeyMiddleware;
4
4
  const utils_1 = require("@etohq/utils");
5
- async function ensurePublishableApiKeyMiddleware(req, _res, next) {
6
- const publishableApiKey = req.get(utils_1.PUBLISHABLE_KEY_HEADER);
5
+ const context_1 = require("../../context");
6
+ async function ensurePublishableApiKeyMiddleware(req, next) {
7
+ const storeReqCtx = (0, context_1.storeReqContext)(req.requestMeta);
8
+ const publishableApiKey = storeReqCtx.req.headers(utils_1.PUBLISHABLE_KEY_HEADER);
7
9
  if (!(0, utils_1.isPresent)(publishableApiKey)) {
8
10
  try {
9
11
  throw new utils_1.EtoError(utils_1.EtoError.Types.NOT_ALLOWED, `Publishable API key required in the request header: ${utils_1.PUBLISHABLE_KEY_HEADER}. You can manage your keys in settings in the dashboard.`);
@@ -13,7 +15,7 @@ async function ensurePublishableApiKeyMiddleware(req, _res, next) {
13
15
  }
14
16
  }
15
17
  let apiKey;
16
- const query = req.scope.resolve(utils_1.ContainerRegistrationKeys.QUERY);
18
+ const query = storeReqCtx.scope.resolve(utils_1.ContainerRegistrationKeys.QUERY);
17
19
  try {
18
20
  const { data } = await query.graph({
19
21
  entity: "api_key",
@@ -40,10 +42,10 @@ async function ensurePublishableApiKeyMiddleware(req, _res, next) {
40
42
  return next(e);
41
43
  }
42
44
  }
43
- req.publishable_key_context = {
45
+ req.data.publishableKeyContext = {
44
46
  key: apiKey.token,
45
47
  sales_channel_ids: apiKey.sales_channels_link.map((link) => link.sales_channel_id),
46
48
  };
47
- return next();
49
+ return next(req);
48
50
  }
49
51
  //# sourceMappingURL=ensure-publishable-api-key.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ensure-publishable-api-key.js","sourceRoot":"","sources":["../../../src/http/middlewares/ensure-publishable-api-key.ts"],"names":[],"mappings":";;AAaA,8EA8DC;AA3ED,wCAMqB;AAOd,KAAK,UAAU,iCAAiC,CACrD,GAAoB,EACpB,IAAiB,EACjB,IAAqB;IAErB,MAAM,iBAAiB,GAAG,GAAG,CAAC,GAAG,CAAC,8BAAsB,CAAC,CAAA;IAEzD,IAAI,CAAC,IAAA,iBAAS,EAAC,iBAAiB,CAAC,EAAE,CAAC;QAClC,IAAI,CAAC;YACH,MAAM,IAAI,gBAAQ,CAChB,gBAAQ,CAAC,KAAK,CAAC,WAAW,EAC1B,uDAAuD,8BAAsB,0DAA0D,CACxI,CAAA;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,IAAI,CAAC,CAAC,CAAC,CAAA;QAChB,CAAC;IACH,CAAC;IAED,IAAI,MAAM,CAAA;IACV,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,iCAAyB,CAAC,KAAK,CAAC,CAAA;IAEhE,IAAI,CAAC;QACH,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,KAAK,CAAC,KAAK,CAChC;YACE,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,sCAAsC,CAAC;YAC/D,OAAO,EAAE;gBACP,KAAK,EAAE,iBAAiB;gBACxB,IAAI,EAAE,kBAAU,CAAC,WAAW;gBAC5B,GAAG,EAAE;oBACH,EAAE,UAAU,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;oBAC7B,EAAE,UAAU,EAAE,EAAE,GAAG,EAAE,IAAI,IAAI,EAAE,EAAE,EAAE;iBACpC;aACF;SACF,EACD,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAC7B,CAAA;QAED,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;IAClB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,IAAI,CAAC,CAAC,CAAC,CAAA;IAChB,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,IAAI,CAAC;YACH,MAAM,IAAI,gBAAQ,CAChB,gBAAQ,CAAC,KAAK,CAAC,WAAW,EAC1B,iEAAiE,CAClE,CAAA;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,IAAI,CAAC,CAAC,CAAC,CAAA;QAChB,CAAC;IACH,CAAC;IAED,GAAG,CAAC,uBAAuB,GAAG;QAC5B,GAAG,EAAE,MAAM,CAAC,KAAK;QACjB,iBAAiB,EAAE,MAAM,CAAC,mBAAmB,CAAC,GAAG,CAC/C,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAChC;KACF,CAAA;IAED,OAAO,IAAI,EAAE,CAAA;AACf,CAAC"}
1
+ {"version":3,"file":"ensure-publishable-api-key.js","sourceRoot":"","sources":["../../../src/http/middlewares/ensure-publishable-api-key.ts"],"names":[],"mappings":";;AAcA,8EA+DC;AA7ED,wCAMqB;AAMrB,2CAA+C;AAExC,KAAK,UAAU,iCAAiC,CACrD,GAAyB,EACzB,IAAuB;IAEvB,MAAM,WAAW,GAAG,IAAA,yBAAe,EAAC,GAAG,CAAC,WAAW,CAAC,CAAA;IACpD,MAAM,iBAAiB,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,8BAAsB,CAAC,CAAA;IAGzE,IAAI,CAAC,IAAA,iBAAS,EAAC,iBAAiB,CAAC,EAAE,CAAC;QAClC,IAAI,CAAC;YACH,MAAM,IAAI,gBAAQ,CAChB,gBAAQ,CAAC,KAAK,CAAC,WAAW,EAC1B,uDAAuD,8BAAsB,0DAA0D,CACxI,CAAA;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,IAAI,CAAC,CAAC,CAAC,CAAA;QAChB,CAAC;IACH,CAAC;IAED,IAAI,MAAM,CAAA;IACV,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,iCAAyB,CAAC,KAAK,CAAC,CAAA;IAExE,IAAI,CAAC;QACH,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,KAAK,CAAC,KAAK,CAChC;YACE,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,sCAAsC,CAAC;YAC/D,OAAO,EAAE;gBACP,KAAK,EAAE,iBAAiB;gBACxB,IAAI,EAAE,kBAAU,CAAC,WAAW;gBAC5B,GAAG,EAAE;oBACH,EAAE,UAAU,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;oBAC7B,EAAE,UAAU,EAAE,EAAE,GAAG,EAAE,IAAI,IAAI,EAAE,EAAE,EAAE;iBACpC;aACF;SACF,EACD,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAC7B,CAAA;QAED,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;IAClB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,IAAI,CAAC,CAAC,CAAC,CAAA;IAChB,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,IAAI,CAAC;YACH,MAAM,IAAI,gBAAQ,CAChB,gBAAQ,CAAC,KAAK,CAAC,WAAW,EAC1B,iEAAiE,CAClE,CAAA;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,IAAI,CAAC,CAAC,CAAC,CAAA;QAChB,CAAC;IACH,CAAC;IAED,GAAG,CAAC,IAAI,CAAC,qBAAqB,GAAG;QAC/B,GAAG,EAAE,MAAM,CAAC,KAAK;QACjB,iBAAiB,EAAE,MAAM,CAAC,mBAAmB,CAAC,GAAG,CAC/C,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAChC;KACF,CAAA;IAED,OAAO,IAAI,CAAC,GAAG,CAAC,CAAA;AAClB,CAAC"}
@@ -1,7 +1,6 @@
1
- import { NextFunction, Response } from "express";
2
1
  import { EtoError } from "@etohq/utils";
3
- import { EtoRequest } from "../types";
4
- export declare function errorHandler(): (err: EtoError, req: EtoRequest, res: Response, next: NextFunction) => void;
2
+ import { EtoMiddlewareNext, EtoMiddlewareRequest, EtoResponse } from "../types";
3
+ export declare function errorHandler(): (err: EtoError, req: EtoMiddlewareRequest, res: EtoResponse, next: EtoMiddlewareNext) => Promise<import("..").HandlerResponse>;
5
4
  /**
6
5
  * @schema Error
7
6
  * title: "Response Error"
@@ -1 +1 @@
1
- {"version":3,"file":"error-handler.d.ts","sourceRoot":"","sources":["../../../src/http/middlewares/error-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAEhD,OAAO,EAA6B,QAAQ,EAAE,MAAM,cAAc,CAAA;AAElE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAUrC,wBAAgB,YAAY,UAEnB,QAAQ,OACR,UAAU,OACV,QAAQ,QACP,YAAY,UA4DrB;AAED;;;;;;;;;;;;;;;;;GAiBG"}
1
+ {"version":3,"file":"error-handler.d.ts","sourceRoot":"","sources":["../../../src/http/middlewares/error-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAA6B,QAAQ,EAAE,MAAM,cAAc,CAAA;AAElE,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAY/E,wBAAgB,YAAY,UAEnB,QAAQ,OACR,oBAAoB,OACpB,WAAW,QACV,iBAAiB,2CAiE1B;AAED;;;;;;;;;;;;;;;;;GAiBG"}
@@ -9,9 +9,10 @@ const TRANSACTION_NOT_STARTED = "TransactionNotStartedError";
9
9
  const API_ERROR = "api_error";
10
10
  const INVALID_REQUEST_ERROR = "invalid_request_error";
11
11
  const INVALID_STATE_ERROR = "invalid_state_error";
12
+ // to add to Etomiddleware.
12
13
  function errorHandler() {
13
- return (err, req, res, next) => {
14
- const logger = req.scope.resolve(utils_1.ContainerRegistrationKeys.LOGGER);
14
+ return async (err, req, res, next) => {
15
+ const logger = req.data.resolve(utils_1.ContainerRegistrationKeys.LOGGER);
15
16
  err = (0, exception_formatter_1.formatException)(err);
16
17
  logger.error(err);
17
18
  const errorType = err.type || err.name;
@@ -61,7 +62,9 @@ function errorHandler() {
61
62
  errObj.type = "unknown_error";
62
63
  break;
63
64
  }
64
- res.status(statusCode).json(errObj);
65
+ const response = await next(req);
66
+ response.status = statusCode;
67
+ return response;
65
68
  };
66
69
  }
67
70
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"error-handler.js","sourceRoot":"","sources":["../../../src/http/middlewares/error-handler.ts"],"names":[],"mappings":";;AAcA,oCAiEC;AA7ED,wCAAkE;AAClE,+DAAuD;AAGvD,MAAM,qBAAqB,GAAG,iCAAiC,CAAA;AAC/D,MAAM,mBAAmB,GAAG,gCAAgC,CAAA;AAC5D,MAAM,uBAAuB,GAAG,4BAA4B,CAAA;AAE5D,MAAM,SAAS,GAAG,WAAW,CAAA;AAC7B,MAAM,qBAAqB,GAAG,uBAAuB,CAAA;AACrD,MAAM,mBAAmB,GAAG,qBAAqB,CAAA;AAEjD,SAAgB,YAAY;IAC1B,OAAO,CACL,GAAa,EACb,GAAe,EACf,GAAa,EACb,IAAkB,EAClB,EAAE;QACF,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,iCAAyB,CAAC,MAAM,CAAC,CAAA;QAElE,GAAG,GAAG,IAAA,qCAAe,EAAC,GAAG,CAAC,CAAA;QAE1B,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAEjB,MAAM,SAAS,GAAG,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAA;QAEtC,MAAM,MAAM,GAAG;YACb,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,OAAO,EAAE,GAAG,CAAC,OAAO;SACrB,CAAA;QAED,IAAI,UAAU,GAAG,GAAG,CAAA;QACpB,QAAQ,SAAS,EAAE,CAAC;YAClB,KAAK,qBAAqB,CAAC;YAC3B,KAAK,mBAAmB,CAAC;YACzB,KAAK,uBAAuB,CAAC;YAC7B,KAAK,gBAAQ,CAAC,KAAK,CAAC,QAAQ;gBAC1B,UAAU,GAAG,GAAG,CAAA;gBAChB,MAAM,CAAC,IAAI,GAAG,mBAAmB,CAAA;gBACjC,MAAM,CAAC,OAAO;oBACZ,2GAA2G,CAAA;gBAC7G,MAAK;YACP,KAAK,gBAAQ,CAAC,KAAK,CAAC,YAAY;gBAC9B,UAAU,GAAG,GAAG,CAAA;gBAChB,MAAK;YACP,KAAK,gBAAQ,CAAC,KAAK,CAAC,2BAA2B;gBAC7C,UAAU,GAAG,GAAG,CAAA;gBAChB,MAAK;YACP,KAAK,gBAAQ,CAAC,KAAK,CAAC,eAAe;gBACjC,UAAU,GAAG,GAAG,CAAA;gBAChB,MAAM,CAAC,IAAI,GAAG,qBAAqB,CAAA;gBACnC,MAAK;YACP,KAAK,gBAAQ,CAAC,KAAK,CAAC,WAAW,CAAC;YAChC,KAAK,gBAAQ,CAAC,KAAK,CAAC,YAAY;gBAC9B,UAAU,GAAG,GAAG,CAAA;gBAChB,MAAK;YACP,KAAK,gBAAQ,CAAC,KAAK,CAAC,SAAS;gBAC3B,UAAU,GAAG,GAAG,CAAA;gBAChB,MAAK;YACP,KAAK,gBAAQ,CAAC,KAAK,CAAC,QAAQ;gBAC1B,UAAU,GAAG,GAAG,CAAA;gBAChB,MAAM,CAAC,IAAI,GAAG,SAAS,CAAA;gBACvB,MAAK;YACP,KAAK,gBAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC;YACrC,KAAK,gBAAQ,CAAC,KAAK,CAAC,gBAAgB;gBAClC,MAAK;YACP;gBACE,MAAM,CAAC,IAAI,GAAG,eAAe,CAAA;gBAC7B,MAAM,CAAC,OAAO,GAAG,4BAA4B,CAAA;gBAC7C,MAAM,CAAC,IAAI,GAAG,eAAe,CAAA;gBAC7B,MAAK;QACT,CAAC;QAED,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACrC,CAAC,CAAA;AACH,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG"}
1
+ {"version":3,"file":"error-handler.js","sourceRoot":"","sources":["../../../src/http/middlewares/error-handler.ts"],"names":[],"mappings":";;AAeA,oCAsEC;AApFD,wCAAkE;AAClE,+DAAuD;AAGvD,MAAM,qBAAqB,GAAG,iCAAiC,CAAA;AAC/D,MAAM,mBAAmB,GAAG,gCAAgC,CAAA;AAC5D,MAAM,uBAAuB,GAAG,4BAA4B,CAAA;AAE5D,MAAM,SAAS,GAAG,WAAW,CAAA;AAC7B,MAAM,qBAAqB,GAAG,uBAAuB,CAAA;AACrD,MAAM,mBAAmB,GAAG,qBAAqB,CAAA;AAEjD,2BAA2B;AAE3B,SAAgB,YAAY;IAC1B,OAAO,KAAK,EACV,GAAa,EACb,GAAyB,EACzB,GAAgB,EAChB,IAAuB,EACvB,EAAE;QAEF,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,iCAAyB,CAAC,MAAM,CAAC,CAAA;QAEjE,GAAG,GAAG,IAAA,qCAAe,EAAC,GAAG,CAAC,CAAA;QAE1B,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAEjB,MAAM,SAAS,GAAG,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAA;QAEtC,MAAM,MAAM,GAAG;YACb,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,OAAO,EAAE,GAAG,CAAC,OAAO;SACrB,CAAA;QAED,IAAI,UAAU,GAAG,GAAG,CAAA;QACpB,QAAQ,SAAS,EAAE,CAAC;YAClB,KAAK,qBAAqB,CAAC;YAC3B,KAAK,mBAAmB,CAAC;YACzB,KAAK,uBAAuB,CAAC;YAC7B,KAAK,gBAAQ,CAAC,KAAK,CAAC,QAAQ;gBAC1B,UAAU,GAAG,GAAG,CAAA;gBAChB,MAAM,CAAC,IAAI,GAAG,mBAAmB,CAAA;gBACjC,MAAM,CAAC,OAAO;oBACZ,2GAA2G,CAAA;gBAC7G,MAAK;YACP,KAAK,gBAAQ,CAAC,KAAK,CAAC,YAAY;gBAC9B,UAAU,GAAG,GAAG,CAAA;gBAChB,MAAK;YACP,KAAK,gBAAQ,CAAC,KAAK,CAAC,2BAA2B;gBAC7C,UAAU,GAAG,GAAG,CAAA;gBAChB,MAAK;YACP,KAAK,gBAAQ,CAAC,KAAK,CAAC,eAAe;gBACjC,UAAU,GAAG,GAAG,CAAA;gBAChB,MAAM,CAAC,IAAI,GAAG,qBAAqB,CAAA;gBACnC,MAAK;YACP,KAAK,gBAAQ,CAAC,KAAK,CAAC,WAAW,CAAC;YAChC,KAAK,gBAAQ,CAAC,KAAK,CAAC,YAAY;gBAC9B,UAAU,GAAG,GAAG,CAAA;gBAChB,MAAK;YACP,KAAK,gBAAQ,CAAC,KAAK,CAAC,SAAS;gBAC3B,UAAU,GAAG,GAAG,CAAA;gBAChB,MAAK;YACP,KAAK,gBAAQ,CAAC,KAAK,CAAC,QAAQ;gBAC1B,UAAU,GAAG,GAAG,CAAA;gBAChB,MAAM,CAAC,IAAI,GAAG,SAAS,CAAA;gBACvB,MAAK;YACP,KAAK,gBAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC;YACrC,KAAK,gBAAQ,CAAC,KAAK,CAAC,gBAAgB;gBAClC,MAAK;YACP;gBACE,MAAM,CAAC,IAAI,GAAG,eAAe,CAAA;gBAC7B,MAAM,CAAC,OAAO,GAAG,4BAA4B,CAAA;gBAC7C,MAAM,CAAC,IAAI,GAAG,eAAe,CAAA;gBAC7B,MAAK;QACT,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,CAAA;QAEhC,QAAQ,CAAC,MAAM,GAAG,UAAU,CAAA;QAE5B,OAAO,QAAQ,CAAA;IACjB,CAAC,CAAA;AACH,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG"}
@@ -1,3 +1,3 @@
1
- import { EtoNextFunction, EtoRequest } from "../types";
2
- export declare function setContext(context: Record<string, any>): (req: EtoRequest, _: any, next: EtoNextFunction) => Promise<void>;
1
+ import { EtoMiddlewareNext, EtoMiddlewareRequest } from "../types";
2
+ export declare function setContext(context: Record<string, any>): (req: EtoMiddlewareRequest, next: EtoMiddlewareNext) => Promise<import("..").HandlerResponse>;
3
3
  //# sourceMappingURL=set-context.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"set-context.d.ts","sourceRoot":"","sources":["../../../src/http/middlewares/set-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAEtD,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,SAClC,UAAU,gBAAW,eAAe,mBAiBxD"}
1
+ {"version":3,"file":"set-context.d.ts","sourceRoot":"","sources":["../../../src/http/middlewares/set-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAElE,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,SAClC,oBAAoB,QAAQ,iBAAiB,2CAiBjE"}
@@ -2,8 +2,8 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.setContext = setContext;
4
4
  function setContext(context) {
5
- return async (req, _, next) => {
6
- const ctx = { ...(req.context || {}) };
5
+ return async (req, next) => {
6
+ const ctx = { ...(req.data.context || {}) };
7
7
  for (const [contextKey, contextValue] of Object.entries(context || {})) {
8
8
  let valueToApply = contextValue;
9
9
  if (typeof contextValue === "function") {
@@ -11,8 +11,8 @@ function setContext(context) {
11
11
  }
12
12
  ctx[contextKey] = valueToApply;
13
13
  }
14
- req.context = ctx;
15
- return next();
14
+ req.data.context = ctx;
15
+ return next(req);
16
16
  };
17
17
  }
18
18
  //# sourceMappingURL=set-context.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"set-context.js","sourceRoot":"","sources":["../../../src/http/middlewares/set-context.ts"],"names":[],"mappings":";;AAEA,gCAkBC;AAlBD,SAAgB,UAAU,CAAC,OAA4B;IACrD,OAAO,KAAK,EAAE,GAAe,EAAE,CAAC,EAAE,IAAqB,EAAE,EAAE;QACzD,MAAM,GAAG,GAAwB,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,CAAA;QAE3D,KAAK,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC;YACvE,IAAI,YAAY,GAAG,YAAY,CAAA;YAE/B,IAAI,OAAO,YAAY,KAAK,UAAU,EAAE,CAAC;gBACvC,YAAY,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;YAC7C,CAAC;YAED,GAAG,CAAC,UAAU,CAAC,GAAG,YAAY,CAAA;QAChC,CAAC;QAED,GAAG,CAAC,OAAO,GAAG,GAAG,CAAA;QAEjB,OAAO,IAAI,EAAE,CAAA;IACf,CAAC,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"set-context.js","sourceRoot":"","sources":["../../../src/http/middlewares/set-context.ts"],"names":[],"mappings":";;AAEA,gCAkBC;AAlBD,SAAgB,UAAU,CAAC,OAA4B;IACrD,OAAO,KAAK,EAAE,GAAyB,EAAE,IAAuB,EAAE,EAAE;QAClE,MAAM,GAAG,GAAwB,EAAE,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,CAAA;QAEhE,KAAK,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC;YACvE,IAAI,YAAY,GAAG,YAAY,CAAA;YAE/B,IAAI,OAAO,YAAY,KAAK,UAAU,EAAE,CAAC;gBACvC,YAAY,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;YAC7C,CAAC;YAED,GAAG,CAAC,UAAU,CAAC,GAAG,YAAY,CAAA;QAChC,CAAC;QAED,GAAG,CAAC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAA;QAEtB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAA;IAClB,CAAC,CAAA;AACH,CAAC"}
@@ -1,8 +1,9 @@
1
- import type { NextFunction, Request, Response } from "express";
2
1
  import { ZodNullable, ZodObject, ZodOptional } from "zod";
3
- import { FindConfig, EtoPricingContext, RequestQueryFields } from "@etohq/types";
4
- import { EtoContainer } from "../container";
5
- import { RestrictedFields } from "./utils/restricted-fields";
2
+ import { FindConfig } from "@etohq/types";
3
+ import type { Middleware, MiddlewareFn, MiddlewareOptions, MiddlewareRequest, HandlerResponse, Next } from "./encore";
4
+ import type { APICallMeta } from "encore.dev";
5
+ import { RestrictedFields } from "./utils/restricted-fields.js";
6
+ import { EtoContainer } from '../container.js';
6
7
  /**
7
8
  * List of all the supported HTTP methods
8
9
  */
@@ -25,7 +26,7 @@ export type RouteConfig = {
25
26
  routes?: RouteImplementation[];
26
27
  };
27
28
  export type MiddlewareFunction = EtoRequestHandler | ((...args: any[]) => any);
28
- export type EtoErrorHandlerFunction = (error: any, req: EtoRequest, res: EtoResponse, next: EtoNextFunction) => Promise<void> | void;
29
+ export type EtoErrorHandlerFunction = (error: any, req: EtoRequest, res: EtoResponse, next: EtoMiddlewareNext) => Promise<void> | void;
29
30
  export type ParserConfigArgs = {
30
31
  sizeLimit?: string | number | undefined;
31
32
  preserveRawBody?: boolean;
@@ -51,11 +52,23 @@ export type RouteDescriptor = {
51
52
  export type GlobalMiddlewareDescriptor = {
52
53
  config?: MiddlewaresConfig;
53
54
  };
54
- export interface EtoRequest<Body = unknown, QueryFields = Record<string, unknown>> extends Request<{
55
- [key: string]: string;
56
- }, any, Body> {
57
- validatedBody: Body;
58
- validatedQuery: RequestQueryFields & QueryFields;
55
+ export type EtoRequest<Body = unknown, QueryFields = Record<string, unknown>> = Body & QueryFields;
56
+ export type EtoMiddlewareRequest = MiddlewareRequest;
57
+ export type EtoMiddlewareNext = Next;
58
+ export type EtoMiddlewareOptions = MiddlewareOptions & {
59
+ onPath?: RegExp;
60
+ matcher?: string;
61
+ method: RouteVerb[];
62
+ };
63
+ export type EtoEncoreMiddleware = Middleware;
64
+ export type EtoMiddlewareFn = MiddlewareFn;
65
+ export type EtoHandlerResponse = HandlerResponse;
66
+ export interface EtoRequestContext {
67
+ req: APICallMeta;
68
+ requestContext: {
69
+ ip_address: string;
70
+ };
71
+ params: any;
59
72
  /**
60
73
  * TODO: shouldn't this correspond to returnable fields instead of allowed fields? also it is used by the cleanResponseData util
61
74
  */
@@ -81,14 +94,10 @@ export interface EtoRequest<Body = unknown, QueryFields = Record<string, unknown
81
94
  take?: number;
82
95
  };
83
96
  };
84
- /**
85
- * @deprecated Use {@link queryConfig} instead.
86
- */
87
- remoteQueryConfig: EtoRequest["queryConfig"];
88
97
  /**
89
98
  * An object containing the fields that are filterable e.g `{ id: Any<String> }`
90
99
  */
91
- filterableFields: QueryFields;
100
+ filterableFields: Record<string, any>;
92
101
  includes?: Record<string, boolean>;
93
102
  /**
94
103
  * An array of fields and relations that are allowed to be queried, this can be set by the
@@ -98,14 +107,12 @@ export interface EtoRequest<Body = unknown, QueryFields = Record<string, unknown
98
107
  allowed?: string[];
99
108
  errors: string[];
100
109
  scope: EtoContainer;
101
- session?: any;
102
- rawBody?: any;
103
110
  requestId?: string;
104
111
  restrictedFields?: RestrictedFields;
105
112
  /**
106
113
  * An object that carries the context that is used to calculate prices for variants
107
114
  */
108
- pricingContext?: EtoPricingContext;
115
+ pricingContext?: Record<string, any>;
109
116
  /**
110
117
  * A generic context object that can be used across the request lifecycle
111
118
  */
@@ -116,26 +123,29 @@ export interface EtoRequest<Body = unknown, QueryFields = Record<string, unknown
116
123
  */
117
124
  additionalDataValidator?: ZodOptional<ZodNullable<ZodObject<any, any>>>;
118
125
  }
119
- export interface AuthContext {
126
+ export type AuthContext = EtoRequestContext & {
120
127
  actor_id: string;
121
128
  actor_type: string;
122
129
  auth_identity_id: string;
123
130
  app_metadata: Record<string, unknown>;
124
- }
131
+ };
132
+ export type EtoSession = {
133
+ authContext: AuthContext;
134
+ scope: EtoContainer;
135
+ };
125
136
  export interface PublishableKeyContext {
126
137
  key: string;
127
138
  sales_channel_ids: string[];
128
139
  }
129
- export interface AuthenticatedEtoRequest<Body = unknown, QueryFields = Record<string, unknown>> extends EtoRequest<Body, QueryFields> {
130
- auth_context: AuthContext;
131
- publishable_key_context?: PublishableKeyContext;
132
- }
133
- export interface EtoStoreRequest<Body = unknown, QueryFields = Record<string, unknown>> extends EtoRequest<Body, QueryFields> {
134
- auth_context?: AuthContext;
135
- publishable_key_context: PublishableKeyContext;
136
- }
137
- export type EtoResponse<Body = unknown> = Response<Body>;
138
- export type EtoNextFunction = NextFunction;
139
- export type EtoRequestHandler<Body = unknown, Res = unknown> = (req: EtoRequest<Body>, res: EtoResponse<Res>, next: EtoNextFunction) => Promise<void> | void;
140
+ export type AuthEtoRequestContext = EtoRequestContext & {
141
+ authContext: AuthContext;
142
+ publishableKeyContext?: PublishableKeyContext;
143
+ };
144
+ export type EtoStoreRequestContext = EtoRequestContext & {
145
+ authContext?: AuthContext;
146
+ publishableKeyContext: PublishableKeyContext;
147
+ };
148
+ export type EtoResponse<Body = unknown> = Body;
149
+ export type EtoRequestHandler = (req: EtoMiddlewareRequest, next: EtoMiddlewareNext) => Promise<EtoHandlerResponse>;
140
150
  export {};
141
151
  //# sourceMappingURL=types.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/http/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/http/types.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/http/types.ts"],"names":[],"mappings":";;;AAWA;;GAEG;AACU,QAAA,YAAY,GAAG;IAC1B,KAAK;IACL,MAAM;IACN,KAAK;IACL,OAAO;IACP,QAAQ;IACR,SAAS;IACT,MAAM;CACE,CAAA"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/http/types.ts"],"names":[],"mappings":";;;AAyBA;;GAEG;AACU,QAAA,YAAY,GAAG;IAC1B,KAAK;IACL,MAAM;IACN,KAAK;IACL,OAAO;IACP,QAAQ;IACR,SAAS;IACT,MAAM;CACE,CAAA"}
@@ -1,5 +1,2 @@
1
- import { HttpCompressionOptions, ProjectConfigOptions } from "../../config";
2
- import type { EtoRequest, EtoResponse } from "../types";
3
- export declare function shouldCompressResponse(req: EtoRequest, res: EtoResponse): any;
4
- export declare function compressionOptions(config: ProjectConfigOptions): HttpCompressionOptions;
1
+ export {};
5
2
  //# sourceMappingURL=http-compression.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"http-compression.d.ts","sourceRoot":"","sources":["../../../src/http/utils/http-compression.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AAC3E,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAEvD,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,UAAU,EACf,GAAG,EAAE,WAAW,OAkBjB;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,oBAAoB,GAC3B,sBAAsB,CAWxB"}
1
+ {"version":3,"file":"http-compression.d.ts","sourceRoot":"","sources":["../../../src/http/utils/http-compression.ts"],"names":[],"mappings":""}