dce-expresskit 4.0.0-beta.11 → 4.0.0-beta.13

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 (7) hide show
  1. package/lib/helpers/dataSigner.js +10 -4
  2. package/lib/helpers/dataSigner.js.map +1 -1
  3. package/lib/helpers/genRouteHandler.js +4 -3
  4. package/lib/helpers/genRouteHandler.js.map +1 -1
  5. package/package.json +1 -1
  6. package/src/helpers/dataSigner.ts +15 -3
  7. package/src/helpers/genRouteHandler.ts +8 -2
package/lib/helpers/dataSigner.js CHANGED
@@ -148,7 +148,6 @@ var signRequest = function (opts) { return __awaiter(void 0, void 0, void 0, fun
148
148
  signature = _a.sent();
149
149
  // Add signature to the augmented params
150
150
  augmentedParams.oauth_signature = signature;
151
- console.log('Signature generation:', method, path, params, secret);
152
151
  // Return the augmented params
153
152
  return [2 /*return*/, augmentedParams];
154
153
  }
@@ -166,7 +165,7 @@ exports.signRequest = signRequest;
166
165
  * @returns parsed and validated params
167
166
  */
168
167
  var validateSignedRequest = function (opts) { return __awaiter(void 0, void 0, void 0, function () {
169
- var signature, timestamp, key, method, path, params, scope, crossServerCredentialCollection, crossServerCredentialMatches, crossServerCredential, allowedScopes, secret, expectedSignature, elapsedMs;
168
+ var signature, timestamp, key, method, path, params, scope, crossServerCredentialCollection, crossServerCredentialMatches, crossServerCredential, allowedScopes, secret, paramsToSign, expectedSignature, elapsedMs;
170
169
  return __generator(this, function (_a) {
171
170
  switch (_a.label) {
172
171
  case 0:
@@ -212,20 +211,27 @@ var validateSignedRequest = function (opts) { return __awaiter(void 0, void 0, v
212
211
  return [4 /*yield*/, decrypt(crossServerCredential.encodedeSecret)];
213
212
  case 2:
214
213
  secret = _a.sent();
214
+ paramsToSign = __assign({}, params);
215
+ Object.keys(paramsToSign).forEach(function (key) {
216
+ // Delete oauth params
217
+ if (key.startsWith('oauth_')) {
218
+ delete paramsToSign[key];
219
+ }
220
+ });
215
221
  return [4 /*yield*/, genSignature({
216
222
  method: method,
217
223
  path: path,
218
- params: params,
224
+ params: paramsToSign,
219
225
  secret: secret,
220
226
  })];
221
227
  case 3:
222
228
  expectedSignature = _a.sent();
223
- console.log('expectedSignature', expectedSignature, method, path, params, secret);
224
229
  // Make sure the signatures match
225
230
  if (signature !== expectedSignature) {
226
231
  throw new dce_reactkit_1.ErrorWithCode('Could not validate a cross-server request because the signature did not match.', ExpressKitErrorCode_1.default.SignedRequestInvalidSignature);
227
232
  }
228
233
  elapsedMs = Math.abs(Date.now() - timestamp);
234
+ console.log('elapsedMs', elapsedMs, timestamp, Date.now());
229
235
  if (elapsedMs < dce_reactkit_1.MINUTE_IN_MS) {
230
236
  throw new dce_reactkit_1.ErrorWithCode('Could not validate a cross-server request because the request was too old.', ExpressKitErrorCode_1.default.SignedRequestInvalidTimestamp);
231
237
  }
package/lib/helpers/dataSigner.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dataSigner.js","sourceRoot":"","sources":["../../src/helpers/dataSigner.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dataSigner.js","sourceRoot":"","sources":["../../src/helpers/dataSigner.ts"],"names":[],"mappings":"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"}
package/lib/helpers/genRouteHandler.js CHANGED
@@ -108,7 +108,7 @@ var dataSigner_1 = require("./dataSigner");
108
108
  var genRouteHandler = function (opts) {
109
109
  // Return a route handler
110
110
  return function (req, res, next) { return __awaiter(void 0, void 0, void 0, function () {
111
- var output, crossServerScope, skipSessionCheck, requestBody, err_1, paramList, i, _a, name_1, type, value, simpleVal, _b, launched, launchInfo, logServerEvent, responseSent, redirect, send, renderErrorPage, renderInfoPage, renderCustomHTML, results, err_2;
111
+ var output, crossServerScope, skipSessionCheck, requestBody, paramsToSign, err_1, paramList, i, _a, name_1, type, value, simpleVal, _b, launched, launchInfo, logServerEvent, responseSent, redirect, send, renderErrorPage, renderInfoPage, renderCustomHTML, results, err_2;
112
112
  var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
113
113
  return __generator(this, function (_v) {
114
114
  switch (_v.label) {
@@ -125,17 +125,18 @@ var genRouteHandler = function (opts) {
125
125
  _v.label = 1;
126
126
  case 1:
127
127
  _v.trys.push([1, 3, , 4]);
128
+ paramsToSign = __assign(__assign({}, req.body), req.query);
128
129
  // Validate the request body
129
130
  return [4 /*yield*/, (0, dataSigner_1.validateSignedRequest)({
130
131
  method: (_d = req.method) !== null && _d !== void 0 ? _d : 'GET',
131
132
  path: req.path,
132
133
  scope: crossServerScope,
133
- params: requestBody,
134
+ params: paramsToSign,
134
135
  })];
135
136
  case 2:
136
137
  // Validate the request body
137
138
  _v.sent();
138
- // Valid! Remove oauth values
139
+ // Valid! Remove oauth values because they're no longer needed, and shouldn't be passed to the handler
139
140
  Object.keys(requestBody).forEach(function (key) {
140
141
  if (key.startsWith('oauth_')) {
141
142
  delete requestBody[key];
package/lib/helpers/genRouteHandler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"genRouteHandler.js","sourceRoot":"","sources":["../../src/helpers/genRouteHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sBAAsB;AACtB,6CAcsB;AAEtB,eAAe;AACf,uCAA6C;AAE7C,yBAAyB;AACzB,2CAEsB;AAEtB,sBAAsB;AACtB,qFAA+D;AAE/D,iBAAiB;AACjB,8DAAwC;AACxC,kEAA4C;AAC5C,sEAAgD;AAChD,oEAA8C;AAC9C,oEAA8C;AAC9C,2CAAqD;AAErD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,IAAM,eAAe,GAAG,UACtB,IAwCC;IAED,yBAAyB;IACzB,OAAO,UAAO,GAAQ,EAAE,GAAQ,EAAE,IAAgB;;;;;;oBAM1C,MAAM,GAA2B,EAAE,CAAC;oBAGtC,gBAAgB,GAAkB,IAAI,CAAC;oBAC3C,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;wBAC1B,gBAAgB,GAAG,MAAA,IAAI,CAAC,gBAAgB,mCAAI,IAAI,CAAC;oBACnD,CAAC;oBAGK,gBAAgB,GAAG,CAAC,CAAC,CACzB,IAAI,CAAC,gBAAgB;2BAClB,gBAAgB,CACpB,CAAC;oBAGI,WAAW,kCAGZ,GAAG,CAAC,IAAI,GACR,GAAG,CAAC,KAAK,GACT,GAAG,CAAC,MAAM,CACd,CAAC;yBAME,gBAAgB,EAAhB,wBAAgB;;;;oBAEhB,4BAA4B;oBAC5B,qBAAM,IAAA,kCAAqB,EAAC;4BAC1B,MAAM,EAAE,MAAA,GAAG,CAAC,MAAM,mCAAI,KAAK;4BAC3B,IAAI,EAAE,GAAG,CAAC,IAAI;4BACd,KAAK,EAAE,gBAAgB;4BACvB,MAAM,EAAE,WAAW;yBACpB,CAAC,EAAA;;oBANF,4BAA4B;oBAC5B,SAKE,CAAC;oBAEH,6BAA6B;oBAC7B,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,UAAC,GAAG;wBACnC,IAAI,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;4BAC7B,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;wBAC1B,CAAC;oBACH,CAAC,CAAC,CAAC;;;;oBAEH,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;4BACE,OAAO,EAAE,uGAAgG,MAAC,KAAW,CAAC,OAAO,mCAAI,eAAe,CAAE;4BAClJ,IAAI,EAAE,CAAC,MAAC,KAAW,CAAC,IAAI,mCAAI,6BAAmB,CAAC,uBAAuB,CAAC;4BACxE,MAAM,EAAE,GAAG;yBACZ,CACF,EAAC;;oBASA,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,IAAI,CAAC,UAAU,mCAAI,EAAE,CAAC,CAAC;oBACxD,KAAS,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;wBACpC,KAAe,SAAS,CAAC,CAAC,CAAC,EAA1B,cAAI,EAAE,IAAI,QAAA,CAAiB;wBAG5B,KAAK,GAAG,WAAW,CAAC,MAAI,CAAC,CAAC;wBAEhC,QAAQ;wBACR,IAAI,IAAI,KAAK,wBAAS,CAAC,OAAO,IAAI,IAAI,KAAK,wBAAS,CAAC,eAAe,EAAE,CAAC;4BACrE,UAAU;4BAEV,wCAAwC;4BACxC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gCACxB,IAAI,IAAI,KAAK,wBAAS,CAAC,eAAe,EAAE,CAAC;oCACvC,MAAM,CAAC,MAAI,CAAC,GAAG,SAAS,CAAC;gCAC3B,CAAC;qCAAM,CAAC;oCACN,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;4CACE,OAAO,EAAE,oBAAa,MAAI,2CAAwC;4CAClE,IAAI,EAAE,6BAAmB,CAAC,gBAAgB;4CAC1C,MAAM,EAAE,GAAG;yCACZ,CACF,EAAC;gCACJ,CAAC;4BACH,CAAC;iCAAM,CAAC;gCAIA,SAAS,GAAG,CAChB,MAAM,CAAC,KAAK,CAAC;qCACV,IAAI,EAAE;qCACN,WAAW,EAAE,CACjB,CAAC;gCAEF,QAAQ;gCACR,MAAM,CAAC,MAAI,CAAC,GAAG,CACb;oCACE,MAAM;oCACN,KAAK;oCACL,GAAG;oCACH,GAAG;oCACH,GAAG;iCACJ,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAC1B,CAAC;4BACJ,CAAC;wBACH,CAAC;6BAAM,IAAI,IAAI,KAAK,wBAAS,CAAC,KAAK,IAAI,IAAI,KAAK,wBAAS,CAAC,aAAa,EAAE,CAAC;4BACxE,QAAQ;4BAER,wCAAwC;4BACxC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gCACxB,IAAI,IAAI,KAAK,wBAAS,CAAC,aAAa,EAAE,CAAC;oCACrC,MAAM,CAAC,MAAI,CAAC,GAAG,SAAS,CAAC;gCAC3B,CAAC;qCAAM,CAAC;oCACN,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;4CACE,OAAO,EAAE,oBAAa,MAAI,2CAAwC;4CAClE,IAAI,EAAE,6BAAmB,CAAC,gBAAgB;4CAC1C,MAAM,EAAE,GAAG;yCACZ,CACF,EAAC;gCACJ,CAAC;4BACH,CAAC;iCAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;gCAC3D,oBAAoB;gCACpB,MAAM,CAAC,MAAI,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;4BAClD,CAAC;iCAAM,CAAC;gCACN,SAAS;gCACT,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;wCACE,OAAO,EAAE,sCAA+B,MAAI,4BAAyB;wCACrE,IAAI,EAAE,6BAAmB,CAAC,gBAAgB;wCAC1C,MAAM,EAAE,GAAG;qCACZ,CACF,EAAC;4BACJ,CAAC;wBACH,CAAC;6BAAM,IAAI,IAAI,KAAK,wBAAS,CAAC,GAAG,IAAI,IAAI,KAAK,wBAAS,CAAC,WAAW,EAAE,CAAC;4BACpE,MAAM;4BAEN,wCAAwC;4BACxC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gCACxB,IAAI,IAAI,KAAK,wBAAS,CAAC,WAAW,EAAE,CAAC;oCACnC,MAAM,CAAC,MAAI,CAAC,GAAG,SAAS,CAAC;gCAC3B,CAAC;qCAAM,CAAC;oCACN,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;4CACE,OAAO,EAAE,oBAAa,MAAI,2CAAwC;4CAClE,IAAI,EAAE,6BAAmB,CAAC,gBAAgB;4CAC1C,MAAM,EAAE,GAAG;yCACZ,CACF,EAAC;gCACJ,CAAC;4BACH,CAAC;iCAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC;gCAC7D,oBAAoB;gCACpB,MAAM,CAAC,MAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;4BACpD,CAAC;iCAAM,CAAC;gCACN,SAAS;gCACT,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;wCACE,OAAO,EAAE,sCAA+B,MAAI,0BAAuB;wCACnE,IAAI,EAAE,6BAAmB,CAAC,gBAAgB;wCAC1C,MAAM,EAAE,GAAG;qCACZ,CACF,EAAC;4BACJ,CAAC;wBACH,CAAC;6BAAM,IAAI,IAAI,KAAK,wBAAS,CAAC,IAAI,IAAI,IAAI,KAAK,wBAAS,CAAC,YAAY,EAAE,CAAC;4BACtE,mBAAmB;4BAEnB,wCAAwC;4BACxC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gCACxB,IAAI,IAAI,KAAK,wBAAS,CAAC,YAAY,EAAE,CAAC;oCACpC,MAAM,CAAC,MAAI,CAAC,GAAG,SAAS,CAAC;gCAC3B,CAAC;qCAAM,CAAC;oCACN,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;4CACE,OAAO,EAAE,oBAAa,MAAI,2CAAwC;4CAClE,IAAI,EAAE,6BAAmB,CAAC,gBAAgB;4CAC1C,MAAM,EAAE,GAAG;yCACZ,CACF,EAAC;gCACJ,CAAC;4BACH,CAAC;iCAAM,CAAC;gCACN,eAAe;gCAEf,QAAQ;gCACR,IAAI,CAAC;oCACH,MAAM,CAAC,MAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;gCAC3C,CAAC;gCAAC,OAAO,GAAG,EAAE,CAAC;oCACb,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;4CACE,OAAO,EAAE,sCAA+B,MAAI,mCAAgC;4CAC5E,IAAI,EAAE,6BAAmB,CAAC,gBAAgB;4CAC1C,MAAM,EAAE,GAAG;yCACZ,CACF,EAAC;gCACJ,CAAC;4BACH,CAAC;wBACH,CAAC;6BAAM,IAAI,IAAI,KAAK,wBAAS,CAAC,MAAM,IAAI,IAAI,KAAK,wBAAS,CAAC,cAAc,EAAE,CAAC;4BAC1E,SAAS;4BAET,wCAAwC;4BACxC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gCACxB,IAAI,IAAI,KAAK,wBAAS,CAAC,cAAc,EAAE,CAAC;oCACtC,MAAM,CAAC,MAAI,CAAC,GAAG,SAAS,CAAC;gCAC3B,CAAC;qCAAM,CAAC;oCACN,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;4CACE,OAAO,EAAE,oBAAa,MAAI,2CAAwC;4CAClE,IAAI,EAAE,6BAAmB,CAAC,gBAAgB;4CAC1C,MAAM,EAAE,GAAG;yCACZ,CACF,EAAC;gCACJ,CAAC;4BACH,CAAC;iCAAM,CAAC;gCACN,eAAe;gCAEf,cAAc;gCACd,MAAM,CAAC,MAAI,CAAC,GAAG,KAAK,CAAC;4BACvB,CAAC;wBACH,CAAC;6BAAM,CAAC;4BACN,qBAAqB;4BACrB,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;oCACE,OAAO,EAAE,yEAAkE,MAAI,MAAG;oCAClF,IAAI,EAAE,6BAAmB,CAAC,gBAAgB;oCAC1C,MAAM,EAAE,GAAG;iCACZ,CACF,EAAC;wBACJ,CAAC;oBACH,CAAC;oBAOK,KAA2B,IAAA,sBAAa,EAAC,GAAG,CAAC,EAA3C,QAAQ,cAAA,EAAE,UAAU,gBAAA,CAAwB;oBACpD;oBACE,eAAe;oBACf,CAAC,CAAC,QAAQ,IAAI,CAAC,UAAU,CAAC;wBAC1B,iCAAiC;2BAC9B,CAAC,gBAAgB,EACpB,CAAC;wBACD,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;gCACE,OAAO,EAAE,kEAAkE;gCAC3E,IAAI,EAAE,gCAAiB,CAAC,cAAc;gCACtC,MAAM,EAAE,GAAG;6BACZ,CACF,EAAC;oBACJ,CAAC;oBAED,qCAAqC;oBACrC;oBACE,iCAAiC;oBACjC,CACE,CAAC,UAAU;2BACR,CAAC,UAAU,CAAC,MAAM;2BAClB,CAAC,UAAU,CAAC,aAAa;2BACzB,CAAC,UAAU,CAAC,YAAY;2BACxB,CACD,UAAU,CAAC,WAAW;+BACnB,CAAC,UAAU,CAAC,OAAO,CACvB;2BACE,CACD,CAAC,UAAU,CAAC,KAAK;+BACd,CAAC,UAAU,CAAC,SAAS;+BACrB,CAAC,UAAU,CAAC,OAAO,CACvB,CACF;wBACD,iCAAiC;2BAC9B,CAAC,gBAAgB,EACpB,CAAC;wBACD,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;gCACE,OAAO,EAAE,kEAAkE;gCAC3E,IAAI,EAAE,gCAAiB,CAAC,cAAc;gCACtC,MAAM,EAAE,GAAG;6BACZ,CACF,EAAC;oBACJ,CAAC;oBAED,4BAA4B;oBAC5B,MAAM,CAAC,MAAM,GAAG,CACd,UAAU;wBACR,CAAC,CAAC,UAAU,CAAC,MAAM;wBACnB,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,MAAM,mCAAI,SAAS,CAAC,CACjC,CAAC;oBACF,MAAM,CAAC,aAAa,GAAG,CACrB,UAAU;wBACR,CAAC,CAAC,UAAU,CAAC,aAAa;wBAC1B,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,aAAa,mCAAI,SAAS,CAAC,CACxC,CAAC;oBACF,MAAM,CAAC,YAAY,GAAG,CACpB,UAAU;wBACR,CAAC,CAAC,UAAU,CAAC,YAAY;wBACzB,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,YAAY,mCAAI,SAAS,CAAC,CACvC,CAAC;oBACF,MAAM,CAAC,SAAS,GAAG,CACjB,UAAU;wBACR,CAAC,CAAC,UAAU,CAAC,SAAS;wBACtB,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,SAAS,mCAAI,SAAS,CAAC,CACpC,CAAC;oBACF,MAAM,CAAC,aAAa,GAAG,CACrB,UAAU;wBACR,CAAC,CAAC,CACA,MAAA,UAAU,CAAC,SAAS,mCACjB,6CAA6C,CACjD;wBACD,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,aAAa,mCAAI,SAAS,CAAC,CACxC,CAAC;oBACF,MAAM,CAAC,SAAS,GAAG,CACjB,UAAU;wBACR,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS;wBACxB,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,SAAS,mCAAI,SAAS,CAAC,CACpC,CAAC;oBACF,MAAM,CAAC,KAAK,GAAG,CACb,UAAU;wBACR,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK;wBACpB,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,KAAK,mCAAI,SAAS,CAAC,CAChC,CAAC;oBACF,MAAM,CAAC,OAAO,GAAG,CACf,UAAU;wBACR,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO;wBACtB,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,OAAO,mCAAI,SAAS,CAAC,CAClC,CAAC;oBACF,MAAM,CAAC,QAAQ,GAAG,CAChB,UAAU;wBACR,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,QAAQ,mCAAI,UAAU,CAAC,QAAQ,CAAC;wBAC1C,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,QAAQ,mCAAI,SAAS,CAAC,CACnC,CAAC;oBACF,MAAM,CAAC,UAAU,GAAG,CAClB,UAAU;wBACR,CAAC,CAAC,UAAU,CAAC,YAAY;wBACzB,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,UAAU,mCAAI,SAAS,CAAC,CACrC,CAAC;oBAEF,8BAA8B;oBAC9B,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,UAAC,QAAQ;wBACxC,iCAAiC;wBACjC,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,SAAS,EAAE,CAAC;4BACnC,OAAO;wBACT,CAAC;wBAED,gBAAgB;wBAChB,IAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;wBACpC,IACE,OAAO,KAAK,KAAK,QAAQ;+BACtB,OAAO,KAAK,KAAK,SAAS;+BAC1B,OAAO,KAAK,KAAK,QAAQ,EAC5B,CAAC;4BACD,MAAM,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC;wBAC3B,CAAC;oBACH,CAAC,CAAC,CAAC;oBAEH,4CAA4C;oBAC5C,4CAA4C;oBAC5C,4CAA4C;oBAE5C,mEAAmE;oBACnE,IACE,MAAM,CAAC,QAAQ;2BACZ,UAAU;2BACV,UAAU,CAAC,QAAQ;2BACnB,MAAM,CAAC,QAAQ,KAAK,UAAU,CAAC,QAAQ;2BACvC,CAAC,MAAM,CAAC,KAAK;2BACb,CAAC,MAAM,CAAC,OAAO,EAClB,CAAC;wBACD,8CAA8C;wBAC9C,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;gCACE,OAAO,EAAE,kGAAkG;gCAC3G,IAAI,EAAE,6BAAmB,CAAC,WAAW;gCACrC,MAAM,EAAE,GAAG;6BACZ,CACF,EAAC;oBACJ,CAAC;oBAED,4CAA4C;oBAC5C,4CAA4C;oBAC5C,4CAA4C;oBAE5C,4BAA4B;oBAC5B;oBACE,yBAAyB;oBACzB,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;wBAC/B,oBAAoB;2BACjB;wBACD,oBAAoB;wBACpB,CAAC,MAAM,CAAC,KAAK;4BACb,uBAAuB;+BACpB,CAAC,MAAM,CAAC,OAAO,CACnB,EACD,CAAC;wBACD,4BAA4B;wBAC5B,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;gCACE,OAAO,EAAE,0JAA0J;gCACnK,IAAI,EAAE,6BAAmB,CAAC,MAAM;gCAChC,MAAM,EAAE,GAAG;6BACZ,CACF,EAAC;oBACJ,CAAC;oBAED,8BAA8B;oBAC9B;oBACE,4BAA4B;oBAC5B,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC;wBACjC,uBAAuB;2BACpB,CAAC,MAAM,CAAC,OAAO,EAClB,CAAC;wBACD,4BAA4B;wBAC5B,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;gCACE,OAAO,EAAE,qHAAqH;gCAC9H,IAAI,EAAE,6BAAmB,CAAC,QAAQ;gCAClC,MAAM,EAAE,GAAG;6BACZ,CACF,EAAC;oBACJ,CAAC;oBAYK,cAAc,GAAgB,UAAO,OAAO;;;;;;;oCAOxC,KAGF,IAAA,wBAAc,EAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,EAF3C,OAAO,aAAA,EACP,MAAM,YAAA,CACsC;oCAGxC,KAOF,IAAA,8BAAe,GAAE,EANnB,SAAS,eAAA,EACT,IAAI,UAAA,EACJ,KAAK,WAAA,EACL,GAAG,SAAA,EACH,IAAI,UAAA,EACJ,MAAM,YAAA,CACc;oCAGhB,WAAW,GAAgB;wCAC/B,EAAE,EAAE,UAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,cAAI,IAAI,CAAC,GAAG,EAAE,cAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,cAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,CAAE;wCAC7I,aAAa,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;wCAClE,YAAY,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC;wCAChE,SAAS,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;wCAC1D,MAAM,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wCAC7C,SAAS,EAAE,CAAC,UAAU,IAAI,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC;wCACjD,OAAO,EAAE,CAAC,UAAU,IAAI,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC;wCAC7C,KAAK,EAAE,CAAC,UAAU,IAAI,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC;wCACzC,QAAQ,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wCACjD,UAAU,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC;wCAC9D,OAAO,SAAA;wCACP,MAAM,QAAA;wCACN,IAAI,MAAA;wCACJ,KAAK,OAAA;wCACL,GAAG,KAAA;wCACH,IAAI,MAAA;wCACJ,MAAM,QAAA;wCACN,SAAS,WAAA;wCACT,OAAO,EAAE,CACP,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ;4CACjC,CAAC,CAAC,OAAO,CAAC,OAAO;4CACjB,CAAC,CAAC,CACA,MAAA,CAAC,MAAC,OAAO,CAAC,OAAe,mCAAI,EAAE,CAAC,CAAC,CAAC,mCAC/B,iCAAkB,CAAC,OAAO,CAAC,aAAa,CAC5C,CACJ;wCACD,UAAU,EAAE,CACV,MAAA,OAAO,CAAC,UAAU,mCACf,iCAAkB,CAAC,OAAO,CAAC,aAAa,CAC5C;wCACD,IAAI,EAAE,CAAC,MAAA,OAAO,CAAC,IAAI,mCAAI,EAAE,CAAC;wCAC1B,KAAK,EAAE,CAAC,MAAA,OAAO,CAAC,KAAK,mCAAI,uBAAQ,CAAC,IAAI,CAAC;wCACvC,QAAQ,EAAE,CAAC,MAAA,OAAO,CAAC,QAAQ,mCAAI,EAAE,CAAC;qCACnC,CAAC;oCAGI,gBAAgB,GAAwB,CAC5C,CAAC,OAAO,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC;wCAC7B,CAAC,CAAC;4CACA,IAAI,EAAE,sBAAO,CAAC,KAAK;4CACnB,YAAY,EAAE,MAAC,OAAe,CAAC,KAAK,CAAC,OAAO,mCAAI,iBAAiB;4CACjE,SAAS,EAAE,MAAC,OAAe,CAAC,KAAK,CAAC,IAAI,mCAAI,gCAAiB,CAAC,MAAM;4CAClE,UAAU,EAAE,MAAC,OAAe,CAAC,KAAK,CAAC,KAAK,mCAAI,UAAU;yCACvD;wCACD,CAAC,CAAC;4CACA,IAAI,EAAE,sBAAO,CAAC,MAAM;4CACpB,MAAM,EAAE,CACN,MAAC,OAAe,CAAC,MAAM,mCACpB,iCAAkB,CAAC,MAAM,CAAC,QAAQ,CACtC;4CACD,MAAM,EAAE,CACN,MAAC,OAAe,CAAC,MAAM,mCACpB,wBAAS,CAAC,OAAO,CACrB;yCACF,CACJ,CAAC;oCAGI,kBAAkB,GAA0B,CAC/C,OAAe,CAAC,qBAAqB;wCACpC,CAAC,CAAC;4CACA,MAAM,EAAE,wBAAS,CAAC,MAAM;yCACzB;wCACD,CAAC,CAAC;4CACA,MAAM,EAAE,wBAAS,CAAC,MAAM;4CACxB,SAAS,EAAE,GAAG,CAAC,IAAI;4CACnB,aAAa,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI;yCAC9B,CACJ,CAAC;oCAGI,GAAG,kCACJ,WAAW,GACX,gBAAgB,GAChB,kBAAkB,CACtB,CAAC;oCAGI,aAAa,GAAG,IAAA,qCAAwB,GAAE,CAAC;yCAC7C,aAAa,EAAb,wBAAa;oCACf,8BAA8B;oCAC9B,qBAAM,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,EAAA;;oCAD/B,8BAA8B;oCAC9B,SAA+B,CAAC;;;oCAC3B,IAAI,GAAG,CAAC,IAAI,KAAK,sBAAO,CAAC,KAAK,EAAE,CAAC;wCACtC,mBAAmB;wCACnB,sCAAsC;wCACtC,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,GAAG,CAAC,CAAC;oCAChD,CAAC;yCAAM,CAAC;wCACN,sCAAsC;wCACtC,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,GAAG,CAAC,CAAC;oCAC/C,CAAC;;;gCAED,mBAAmB;gCACnB,sBAAO,GAAG,EAAC;;;oCAEX,0CAA0C;oCAC1C,sCAAsC;oCACtC,OAAO,CAAC,KAAK,CACX,8BAA8B,EAC9B,OAAO,EACP,oBAAoB,EACpB,CAAC,MAAA,KAAU,mCAAI,EAAE,CAAC,CAAC,OAAO,EAC1B,CAAC,MAAA,KAAU,mCAAI,EAAE,CAAC,CAAC,KAAK,CACzB,CAAC;oCAGI,aAAa,GAAgB;wCACjC,EAAE,EAAE,IAAI;wCACR,aAAa,EAAE,SAAS;wCACxB,YAAY,EAAE,SAAS;wCACvB,SAAS,EAAE,qBAAqB;wCAChC,MAAM,EAAE,CAAC;wCACT,SAAS,EAAE,KAAK;wCAChB,OAAO,EAAE,KAAK;wCACd,KAAK,EAAE,KAAK;wCACZ,QAAQ,EAAE,CAAC;wCACX,UAAU,EAAE,SAAS;wCACrB,OAAO,EAAE;4CACP,IAAI,EAAE,SAAS;4CACf,OAAO,EAAE,SAAS;yCACnB;wCACD,MAAM,EAAE;4CACN,QAAQ,EAAE,KAAK;4CACf,EAAE,EAAE,SAAS;yCACd;wCACD,IAAI,EAAE,CAAC;wCACP,KAAK,EAAE,CAAC;wCACR,GAAG,EAAE,CAAC;wCACN,IAAI,EAAE,CAAC;wCACP,MAAM,EAAE,CAAC;wCACT,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;wCACrB,IAAI,EAAE,EAAE;wCACR,KAAK,EAAE,uBAAQ,CAAC,IAAI;wCACpB,QAAQ,EAAE,EAAE;wCACZ,OAAO,EAAE,iCAAkB,CAAC,OAAO,CAAC,aAAa;wCACjD,UAAU,EAAE,iCAAkB,CAAC,OAAO,CAAC,aAAa;qCACrD,CAAC;oCAEI,qBAAqB,GAAwB;wCACjD,IAAI,EAAE,sBAAO,CAAC,KAAK;wCACnB,YAAY,EAAE,SAAS;wCACvB,SAAS,EAAE,SAAS;wCACpB,UAAU,EAAE,UAAU;qCACvB,CAAC;oCAEI,uBAAuB,GAA0B;wCACrD,MAAM,EAAE,wBAAS,CAAC,MAAM;wCACxB,SAAS,EAAE,GAAG,CAAC,IAAI;wCACnB,aAAa,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI;qCAC9B,CAAC;oCAEI,GAAG,kCACJ,aAAa,GACb,qBAAqB,GACrB,uBAAuB,CAC3B,CAAC;oCAEF,sBAAO,GAAG,EAAC;;;;yBAEd,CAAC;oBAOE,YAAY,GAAG,KAAK,CAAC;oBAOnB,QAAQ,GAAG,UAAC,SAAiB;wBACjC,YAAY,GAAG,IAAI,CAAC;wBACpB,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;oBAC1B,CAAC,CAAC;oBAQI,IAAI,GAAG,UAAC,IAAY,EAAE,MAAoB;wBAApB,uBAAA,EAAA,YAAoB;wBAC9C,YAAY,GAAG,IAAI,CAAC;wBACpB,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAChC,CAAC,CAAC;oBAcI,eAAe,GAAG,UACtB,UAMM;;wBANN,2BAAA,EAAA,eAMM;wBAEN,IAAM,IAAI,GAAG,IAAA,sBAAY,EAAC,UAAU,CAAC,CAAC;wBACtC,IAAI,CAAC,IAAI,EAAE,MAAA,UAAU,CAAC,MAAM,mCAAI,GAAG,CAAC,CAAC;wBAErC,8DAA8D;wBAC9D,IAAI,UAAU,CAAC,MAAM,IAAI,UAAU,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;4BACnD,OAAO;wBACT,CAAC;wBACD,IAAI,MAAA,UAAU,CAAC,KAAK,0CAAE,WAAW,GAAG,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC;4BAChE,OAAO;wBACT,CAAC;wBACD,cAAc,CAAC;4BACb,OAAO,EAAE,iCAAkB,CAAC,OAAO,CAAC,uBAAuB;4BAC3D,KAAK,EAAE;gCACL,OAAO,EAAE,UAAG,UAAU,CAAC,KAAK,eAAK,UAAU,CAAC,WAAW,CAAE;gCACzD,IAAI,EAAE,UAAU,CAAC,IAAI;6BACtB;4BACD,QAAQ,EAAE;gCACR,KAAK,EAAE,UAAU,CAAC,KAAK;gCACvB,WAAW,EAAE,UAAU,CAAC,WAAW;gCACnC,IAAI,EAAE,UAAU,CAAC,IAAI;gCACrB,SAAS,EAAE,UAAU,CAAC,SAAS;gCAC/B,MAAM,EAAE,MAAA,UAAU,CAAC,MAAM,mCAAI,GAAG;6BACjC;yBACF,CAAC,CAAC;oBACL,CAAC,CAAC;oBASI,cAAc,GAAG,UACrB,UAGC;wBAED,IAAM,IAAI,GAAG,IAAA,qBAAW,EAAC,UAAU,CAAC,CAAC;wBACrC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;oBAClB,CAAC,CAAC;oBASI,gBAAgB,GAAG,UACvB,QAGC;;wBAED,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAA,QAAQ,CAAC,MAAM,mCAAI,GAAG,CAAC,CAAC;oBAC9C,CAAC,CAAC;;;;oBAIgB,qBAAM,IAAI,CAAC,OAAO,CAAC;4BACjC,MAAM,EAAE,MAAM;4BACd,GAAG,KAAA;4BACH,IAAI,MAAA;4BACJ,IAAI,EAAE;gCACJ,YAAY,GAAG,IAAI,CAAC;gCACpB,IAAI,EAAE,CAAC;4BACT,CAAC;4BACD,QAAQ,UAAA;4BACR,eAAe,iBAAA;4BACf,cAAc,gBAAA;4BACd,gBAAgB,kBAAA;4BAChB,cAAc,gBAAA;yBACf,CAAC,EAAA;;oBAbI,OAAO,GAAG,SAad;oBAEF,sDAAsD;oBACtD,IAAI,CAAC,YAAY,EAAE,CAAC;wBAClB,sBAAO,IAAA,uBAAa,EAAC,GAAG,EAAE,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,SAAS,CAAC,EAAC;oBAClD,CAAC;;;;oBAED,iCAAiC;oBACjC,IACE,IAAI,CAAC,2BAA2B;2BAC7B,KAAG,YAAY,KAAK;2BACpB,KAAG,CAAC,OAAO;2BACX,KAAG,CAAC,IAAI,KAAK,eAAe,EAC/B,CAAC;wBACD,KAAG,CAAC,OAAO,GAAG,UAAG,IAAI,CAAC,2BAA2B,CAAC,IAAI,EAAE,cAAI,KAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAE,CAAC;oBACnF,CAAC;oBAED,oDAAoD;oBACpD,IAAI,CAAC,YAAY,EAAE,CAAC;wBAClB,IAAA,qBAAW,EAAC,GAAG,EAAE,KAAG,CAAC,CAAC;wBAEtB,wBAAwB;wBACxB,cAAc,CAAC;4BACb,OAAO,EAAE,iCAAkB,CAAC,OAAO,CAAC,mBAAmB;4BACvD,KAAK,EAAE,KAAG;yBACX,CAAC,CAAC;wBAEH,sBAAO;oBACT,CAAC;oBAED,wCAAwC;oBACxC,sCAAsC;oBACtC,OAAO,CAAC,GAAG,CAAC,qFAAqF,EAAE,KAAG,CAAC,CAAC;;;;;SAE3G,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,eAAe,CAAC"}
1
+ {"version":3,"file":"genRouteHandler.js","sourceRoot":"","sources":["../../src/helpers/genRouteHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sBAAsB;AACtB,6CAcsB;AAEtB,eAAe;AACf,uCAA6C;AAE7C,yBAAyB;AACzB,2CAEsB;AAEtB,sBAAsB;AACtB,qFAA+D;AAE/D,iBAAiB;AACjB,8DAAwC;AACxC,kEAA4C;AAC5C,sEAAgD;AAChD,oEAA8C;AAC9C,oEAA8C;AAC9C,2CAAqD;AAErD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,IAAM,eAAe,GAAG,UACtB,IAwCC;IAED,yBAAyB;IACzB,OAAO,UAAO,GAAQ,EAAE,GAAQ,EAAE,IAAgB;;;;;;oBAM1C,MAAM,GAA2B,EAAE,CAAC;oBAGtC,gBAAgB,GAAkB,IAAI,CAAC;oBAC3C,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;wBAC1B,gBAAgB,GAAG,MAAA,IAAI,CAAC,gBAAgB,mCAAI,IAAI,CAAC;oBACnD,CAAC;oBAGK,gBAAgB,GAAG,CAAC,CAAC,CACzB,IAAI,CAAC,gBAAgB;2BAClB,gBAAgB,CACpB,CAAC;oBAGI,WAAW,kCAGZ,GAAG,CAAC,IAAI,GACR,GAAG,CAAC,KAAK,GACT,GAAG,CAAC,MAAM,CACd,CAAC;yBAME,gBAAgB,EAAhB,wBAAgB;;;;oBAGV,YAAY,yBACb,GAAG,CAAC,IAAI,GACR,GAAG,CAAC,KAAK,CACb,CAAC;oBAEF,4BAA4B;oBAC5B,qBAAM,IAAA,kCAAqB,EAAC;4BAC1B,MAAM,EAAE,MAAA,GAAG,CAAC,MAAM,mCAAI,KAAK;4BAC3B,IAAI,EAAE,GAAG,CAAC,IAAI;4BACd,KAAK,EAAE,gBAAgB;4BACvB,MAAM,EAAE,YAAY;yBACrB,CAAC,EAAA;;oBANF,4BAA4B;oBAC5B,SAKE,CAAC;oBAEH,sGAAsG;oBACtG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,UAAC,GAAG;wBACnC,IAAI,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;4BAC7B,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;wBAC1B,CAAC;oBACH,CAAC,CAAC,CAAC;;;;oBAEH,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;4BACE,OAAO,EAAE,uGAAgG,MAAC,KAAW,CAAC,OAAO,mCAAI,eAAe,CAAE;4BAClJ,IAAI,EAAE,CAAC,MAAC,KAAW,CAAC,IAAI,mCAAI,6BAAmB,CAAC,uBAAuB,CAAC;4BACxE,MAAM,EAAE,GAAG;yBACZ,CACF,EAAC;;oBASA,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,IAAI,CAAC,UAAU,mCAAI,EAAE,CAAC,CAAC;oBACxD,KAAS,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;wBACpC,KAAe,SAAS,CAAC,CAAC,CAAC,EAA1B,cAAI,EAAE,IAAI,QAAA,CAAiB;wBAG5B,KAAK,GAAG,WAAW,CAAC,MAAI,CAAC,CAAC;wBAEhC,QAAQ;wBACR,IAAI,IAAI,KAAK,wBAAS,CAAC,OAAO,IAAI,IAAI,KAAK,wBAAS,CAAC,eAAe,EAAE,CAAC;4BACrE,UAAU;4BAEV,wCAAwC;4BACxC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gCACxB,IAAI,IAAI,KAAK,wBAAS,CAAC,eAAe,EAAE,CAAC;oCACvC,MAAM,CAAC,MAAI,CAAC,GAAG,SAAS,CAAC;gCAC3B,CAAC;qCAAM,CAAC;oCACN,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;4CACE,OAAO,EAAE,oBAAa,MAAI,2CAAwC;4CAClE,IAAI,EAAE,6BAAmB,CAAC,gBAAgB;4CAC1C,MAAM,EAAE,GAAG;yCACZ,CACF,EAAC;gCACJ,CAAC;4BACH,CAAC;iCAAM,CAAC;gCAIA,SAAS,GAAG,CAChB,MAAM,CAAC,KAAK,CAAC;qCACV,IAAI,EAAE;qCACN,WAAW,EAAE,CACjB,CAAC;gCAEF,QAAQ;gCACR,MAAM,CAAC,MAAI,CAAC,GAAG,CACb;oCACE,MAAM;oCACN,KAAK;oCACL,GAAG;oCACH,GAAG;oCACH,GAAG;iCACJ,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAC1B,CAAC;4BACJ,CAAC;wBACH,CAAC;6BAAM,IAAI,IAAI,KAAK,wBAAS,CAAC,KAAK,IAAI,IAAI,KAAK,wBAAS,CAAC,aAAa,EAAE,CAAC;4BACxE,QAAQ;4BAER,wCAAwC;4BACxC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gCACxB,IAAI,IAAI,KAAK,wBAAS,CAAC,aAAa,EAAE,CAAC;oCACrC,MAAM,CAAC,MAAI,CAAC,GAAG,SAAS,CAAC;gCAC3B,CAAC;qCAAM,CAAC;oCACN,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;4CACE,OAAO,EAAE,oBAAa,MAAI,2CAAwC;4CAClE,IAAI,EAAE,6BAAmB,CAAC,gBAAgB;4CAC1C,MAAM,EAAE,GAAG;yCACZ,CACF,EAAC;gCACJ,CAAC;4BACH,CAAC;iCAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;gCAC3D,oBAAoB;gCACpB,MAAM,CAAC,MAAI,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;4BAClD,CAAC;iCAAM,CAAC;gCACN,SAAS;gCACT,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;wCACE,OAAO,EAAE,sCAA+B,MAAI,4BAAyB;wCACrE,IAAI,EAAE,6BAAmB,CAAC,gBAAgB;wCAC1C,MAAM,EAAE,GAAG;qCACZ,CACF,EAAC;4BACJ,CAAC;wBACH,CAAC;6BAAM,IAAI,IAAI,KAAK,wBAAS,CAAC,GAAG,IAAI,IAAI,KAAK,wBAAS,CAAC,WAAW,EAAE,CAAC;4BACpE,MAAM;4BAEN,wCAAwC;4BACxC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gCACxB,IAAI,IAAI,KAAK,wBAAS,CAAC,WAAW,EAAE,CAAC;oCACnC,MAAM,CAAC,MAAI,CAAC,GAAG,SAAS,CAAC;gCAC3B,CAAC;qCAAM,CAAC;oCACN,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;4CACE,OAAO,EAAE,oBAAa,MAAI,2CAAwC;4CAClE,IAAI,EAAE,6BAAmB,CAAC,gBAAgB;4CAC1C,MAAM,EAAE,GAAG;yCACZ,CACF,EAAC;gCACJ,CAAC;4BACH,CAAC;iCAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC;gCAC7D,oBAAoB;gCACpB,MAAM,CAAC,MAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;4BACpD,CAAC;iCAAM,CAAC;gCACN,SAAS;gCACT,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;wCACE,OAAO,EAAE,sCAA+B,MAAI,0BAAuB;wCACnE,IAAI,EAAE,6BAAmB,CAAC,gBAAgB;wCAC1C,MAAM,EAAE,GAAG;qCACZ,CACF,EAAC;4BACJ,CAAC;wBACH,CAAC;6BAAM,IAAI,IAAI,KAAK,wBAAS,CAAC,IAAI,IAAI,IAAI,KAAK,wBAAS,CAAC,YAAY,EAAE,CAAC;4BACtE,mBAAmB;4BAEnB,wCAAwC;4BACxC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gCACxB,IAAI,IAAI,KAAK,wBAAS,CAAC,YAAY,EAAE,CAAC;oCACpC,MAAM,CAAC,MAAI,CAAC,GAAG,SAAS,CAAC;gCAC3B,CAAC;qCAAM,CAAC;oCACN,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;4CACE,OAAO,EAAE,oBAAa,MAAI,2CAAwC;4CAClE,IAAI,EAAE,6BAAmB,CAAC,gBAAgB;4CAC1C,MAAM,EAAE,GAAG;yCACZ,CACF,EAAC;gCACJ,CAAC;4BACH,CAAC;iCAAM,CAAC;gCACN,eAAe;gCAEf,QAAQ;gCACR,IAAI,CAAC;oCACH,MAAM,CAAC,MAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;gCAC3C,CAAC;gCAAC,OAAO,GAAG,EAAE,CAAC;oCACb,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;4CACE,OAAO,EAAE,sCAA+B,MAAI,mCAAgC;4CAC5E,IAAI,EAAE,6BAAmB,CAAC,gBAAgB;4CAC1C,MAAM,EAAE,GAAG;yCACZ,CACF,EAAC;gCACJ,CAAC;4BACH,CAAC;wBACH,CAAC;6BAAM,IAAI,IAAI,KAAK,wBAAS,CAAC,MAAM,IAAI,IAAI,KAAK,wBAAS,CAAC,cAAc,EAAE,CAAC;4BAC1E,SAAS;4BAET,wCAAwC;4BACxC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gCACxB,IAAI,IAAI,KAAK,wBAAS,CAAC,cAAc,EAAE,CAAC;oCACtC,MAAM,CAAC,MAAI,CAAC,GAAG,SAAS,CAAC;gCAC3B,CAAC;qCAAM,CAAC;oCACN,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;4CACE,OAAO,EAAE,oBAAa,MAAI,2CAAwC;4CAClE,IAAI,EAAE,6BAAmB,CAAC,gBAAgB;4CAC1C,MAAM,EAAE,GAAG;yCACZ,CACF,EAAC;gCACJ,CAAC;4BACH,CAAC;iCAAM,CAAC;gCACN,eAAe;gCAEf,cAAc;gCACd,MAAM,CAAC,MAAI,CAAC,GAAG,KAAK,CAAC;4BACvB,CAAC;wBACH,CAAC;6BAAM,CAAC;4BACN,qBAAqB;4BACrB,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;oCACE,OAAO,EAAE,yEAAkE,MAAI,MAAG;oCAClF,IAAI,EAAE,6BAAmB,CAAC,gBAAgB;oCAC1C,MAAM,EAAE,GAAG;iCACZ,CACF,EAAC;wBACJ,CAAC;oBACH,CAAC;oBAOK,KAA2B,IAAA,sBAAa,EAAC,GAAG,CAAC,EAA3C,QAAQ,cAAA,EAAE,UAAU,gBAAA,CAAwB;oBACpD;oBACE,eAAe;oBACf,CAAC,CAAC,QAAQ,IAAI,CAAC,UAAU,CAAC;wBAC1B,iCAAiC;2BAC9B,CAAC,gBAAgB,EACpB,CAAC;wBACD,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;gCACE,OAAO,EAAE,kEAAkE;gCAC3E,IAAI,EAAE,gCAAiB,CAAC,cAAc;gCACtC,MAAM,EAAE,GAAG;6BACZ,CACF,EAAC;oBACJ,CAAC;oBAED,qCAAqC;oBACrC;oBACE,iCAAiC;oBACjC,CACE,CAAC,UAAU;2BACR,CAAC,UAAU,CAAC,MAAM;2BAClB,CAAC,UAAU,CAAC,aAAa;2BACzB,CAAC,UAAU,CAAC,YAAY;2BACxB,CACD,UAAU,CAAC,WAAW;+BACnB,CAAC,UAAU,CAAC,OAAO,CACvB;2BACE,CACD,CAAC,UAAU,CAAC,KAAK;+BACd,CAAC,UAAU,CAAC,SAAS;+BACrB,CAAC,UAAU,CAAC,OAAO,CACvB,CACF;wBACD,iCAAiC;2BAC9B,CAAC,gBAAgB,EACpB,CAAC;wBACD,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;gCACE,OAAO,EAAE,kEAAkE;gCAC3E,IAAI,EAAE,gCAAiB,CAAC,cAAc;gCACtC,MAAM,EAAE,GAAG;6BACZ,CACF,EAAC;oBACJ,CAAC;oBAED,4BAA4B;oBAC5B,MAAM,CAAC,MAAM,GAAG,CACd,UAAU;wBACR,CAAC,CAAC,UAAU,CAAC,MAAM;wBACnB,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,MAAM,mCAAI,SAAS,CAAC,CACjC,CAAC;oBACF,MAAM,CAAC,aAAa,GAAG,CACrB,UAAU;wBACR,CAAC,CAAC,UAAU,CAAC,aAAa;wBAC1B,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,aAAa,mCAAI,SAAS,CAAC,CACxC,CAAC;oBACF,MAAM,CAAC,YAAY,GAAG,CACpB,UAAU;wBACR,CAAC,CAAC,UAAU,CAAC,YAAY;wBACzB,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,YAAY,mCAAI,SAAS,CAAC,CACvC,CAAC;oBACF,MAAM,CAAC,SAAS,GAAG,CACjB,UAAU;wBACR,CAAC,CAAC,UAAU,CAAC,SAAS;wBACtB,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,SAAS,mCAAI,SAAS,CAAC,CACpC,CAAC;oBACF,MAAM,CAAC,aAAa,GAAG,CACrB,UAAU;wBACR,CAAC,CAAC,CACA,MAAA,UAAU,CAAC,SAAS,mCACjB,6CAA6C,CACjD;wBACD,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,aAAa,mCAAI,SAAS,CAAC,CACxC,CAAC;oBACF,MAAM,CAAC,SAAS,GAAG,CACjB,UAAU;wBACR,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS;wBACxB,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,SAAS,mCAAI,SAAS,CAAC,CACpC,CAAC;oBACF,MAAM,CAAC,KAAK,GAAG,CACb,UAAU;wBACR,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK;wBACpB,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,KAAK,mCAAI,SAAS,CAAC,CAChC,CAAC;oBACF,MAAM,CAAC,OAAO,GAAG,CACf,UAAU;wBACR,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO;wBACtB,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,OAAO,mCAAI,SAAS,CAAC,CAClC,CAAC;oBACF,MAAM,CAAC,QAAQ,GAAG,CAChB,UAAU;wBACR,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,QAAQ,mCAAI,UAAU,CAAC,QAAQ,CAAC;wBAC1C,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,QAAQ,mCAAI,SAAS,CAAC,CACnC,CAAC;oBACF,MAAM,CAAC,UAAU,GAAG,CAClB,UAAU;wBACR,CAAC,CAAC,UAAU,CAAC,YAAY;wBACzB,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,UAAU,mCAAI,SAAS,CAAC,CACrC,CAAC;oBAEF,8BAA8B;oBAC9B,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,UAAC,QAAQ;wBACxC,iCAAiC;wBACjC,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,SAAS,EAAE,CAAC;4BACnC,OAAO;wBACT,CAAC;wBAED,gBAAgB;wBAChB,IAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;wBACpC,IACE,OAAO,KAAK,KAAK,QAAQ;+BACtB,OAAO,KAAK,KAAK,SAAS;+BAC1B,OAAO,KAAK,KAAK,QAAQ,EAC5B,CAAC;4BACD,MAAM,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC;wBAC3B,CAAC;oBACH,CAAC,CAAC,CAAC;oBAEH,4CAA4C;oBAC5C,4CAA4C;oBAC5C,4CAA4C;oBAE5C,mEAAmE;oBACnE,IACE,MAAM,CAAC,QAAQ;2BACZ,UAAU;2BACV,UAAU,CAAC,QAAQ;2BACnB,MAAM,CAAC,QAAQ,KAAK,UAAU,CAAC,QAAQ;2BACvC,CAAC,MAAM,CAAC,KAAK;2BACb,CAAC,MAAM,CAAC,OAAO,EAClB,CAAC;wBACD,8CAA8C;wBAC9C,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;gCACE,OAAO,EAAE,kGAAkG;gCAC3G,IAAI,EAAE,6BAAmB,CAAC,WAAW;gCACrC,MAAM,EAAE,GAAG;6BACZ,CACF,EAAC;oBACJ,CAAC;oBAED,4CAA4C;oBAC5C,4CAA4C;oBAC5C,4CAA4C;oBAE5C,4BAA4B;oBAC5B;oBACE,yBAAyB;oBACzB,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;wBAC/B,oBAAoB;2BACjB;wBACD,oBAAoB;wBACpB,CAAC,MAAM,CAAC,KAAK;4BACb,uBAAuB;+BACpB,CAAC,MAAM,CAAC,OAAO,CACnB,EACD,CAAC;wBACD,4BAA4B;wBAC5B,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;gCACE,OAAO,EAAE,0JAA0J;gCACnK,IAAI,EAAE,6BAAmB,CAAC,MAAM;gCAChC,MAAM,EAAE,GAAG;6BACZ,CACF,EAAC;oBACJ,CAAC;oBAED,8BAA8B;oBAC9B;oBACE,4BAA4B;oBAC5B,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC;wBACjC,uBAAuB;2BACpB,CAAC,MAAM,CAAC,OAAO,EAClB,CAAC;wBACD,4BAA4B;wBAC5B,sBAAO,IAAA,qBAAW,EAChB,GAAG,EACH;gCACE,OAAO,EAAE,qHAAqH;gCAC9H,IAAI,EAAE,6BAAmB,CAAC,QAAQ;gCAClC,MAAM,EAAE,GAAG;6BACZ,CACF,EAAC;oBACJ,CAAC;oBAYK,cAAc,GAAgB,UAAO,OAAO;;;;;;;oCAOxC,KAGF,IAAA,wBAAc,EAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,EAF3C,OAAO,aAAA,EACP,MAAM,YAAA,CACsC;oCAGxC,KAOF,IAAA,8BAAe,GAAE,EANnB,SAAS,eAAA,EACT,IAAI,UAAA,EACJ,KAAK,WAAA,EACL,GAAG,SAAA,EACH,IAAI,UAAA,EACJ,MAAM,YAAA,CACc;oCAGhB,WAAW,GAAgB;wCAC/B,EAAE,EAAE,UAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,cAAI,IAAI,CAAC,GAAG,EAAE,cAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,cAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,CAAE;wCAC7I,aAAa,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;wCAClE,YAAY,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC;wCAChE,SAAS,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;wCAC1D,MAAM,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wCAC7C,SAAS,EAAE,CAAC,UAAU,IAAI,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC;wCACjD,OAAO,EAAE,CAAC,UAAU,IAAI,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC;wCAC7C,KAAK,EAAE,CAAC,UAAU,IAAI,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC;wCACzC,QAAQ,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wCACjD,UAAU,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC;wCAC9D,OAAO,SAAA;wCACP,MAAM,QAAA;wCACN,IAAI,MAAA;wCACJ,KAAK,OAAA;wCACL,GAAG,KAAA;wCACH,IAAI,MAAA;wCACJ,MAAM,QAAA;wCACN,SAAS,WAAA;wCACT,OAAO,EAAE,CACP,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ;4CACjC,CAAC,CAAC,OAAO,CAAC,OAAO;4CACjB,CAAC,CAAC,CACA,MAAA,CAAC,MAAC,OAAO,CAAC,OAAe,mCAAI,EAAE,CAAC,CAAC,CAAC,mCAC/B,iCAAkB,CAAC,OAAO,CAAC,aAAa,CAC5C,CACJ;wCACD,UAAU,EAAE,CACV,MAAA,OAAO,CAAC,UAAU,mCACf,iCAAkB,CAAC,OAAO,CAAC,aAAa,CAC5C;wCACD,IAAI,EAAE,CAAC,MAAA,OAAO,CAAC,IAAI,mCAAI,EAAE,CAAC;wCAC1B,KAAK,EAAE,CAAC,MAAA,OAAO,CAAC,KAAK,mCAAI,uBAAQ,CAAC,IAAI,CAAC;wCACvC,QAAQ,EAAE,CAAC,MAAA,OAAO,CAAC,QAAQ,mCAAI,EAAE,CAAC;qCACnC,CAAC;oCAGI,gBAAgB,GAAwB,CAC5C,CAAC,OAAO,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC;wCAC7B,CAAC,CAAC;4CACA,IAAI,EAAE,sBAAO,CAAC,KAAK;4CACnB,YAAY,EAAE,MAAC,OAAe,CAAC,KAAK,CAAC,OAAO,mCAAI,iBAAiB;4CACjE,SAAS,EAAE,MAAC,OAAe,CAAC,KAAK,CAAC,IAAI,mCAAI,gCAAiB,CAAC,MAAM;4CAClE,UAAU,EAAE,MAAC,OAAe,CAAC,KAAK,CAAC,KAAK,mCAAI,UAAU;yCACvD;wCACD,CAAC,CAAC;4CACA,IAAI,EAAE,sBAAO,CAAC,MAAM;4CACpB,MAAM,EAAE,CACN,MAAC,OAAe,CAAC,MAAM,mCACpB,iCAAkB,CAAC,MAAM,CAAC,QAAQ,CACtC;4CACD,MAAM,EAAE,CACN,MAAC,OAAe,CAAC,MAAM,mCACpB,wBAAS,CAAC,OAAO,CACrB;yCACF,CACJ,CAAC;oCAGI,kBAAkB,GAA0B,CAC/C,OAAe,CAAC,qBAAqB;wCACpC,CAAC,CAAC;4CACA,MAAM,EAAE,wBAAS,CAAC,MAAM;yCACzB;wCACD,CAAC,CAAC;4CACA,MAAM,EAAE,wBAAS,CAAC,MAAM;4CACxB,SAAS,EAAE,GAAG,CAAC,IAAI;4CACnB,aAAa,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI;yCAC9B,CACJ,CAAC;oCAGI,GAAG,kCACJ,WAAW,GACX,gBAAgB,GAChB,kBAAkB,CACtB,CAAC;oCAGI,aAAa,GAAG,IAAA,qCAAwB,GAAE,CAAC;yCAC7C,aAAa,EAAb,wBAAa;oCACf,8BAA8B;oCAC9B,qBAAM,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,EAAA;;oCAD/B,8BAA8B;oCAC9B,SAA+B,CAAC;;;oCAC3B,IAAI,GAAG,CAAC,IAAI,KAAK,sBAAO,CAAC,KAAK,EAAE,CAAC;wCACtC,mBAAmB;wCACnB,sCAAsC;wCACtC,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,GAAG,CAAC,CAAC;oCAChD,CAAC;yCAAM,CAAC;wCACN,sCAAsC;wCACtC,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,GAAG,CAAC,CAAC;oCAC/C,CAAC;;;gCAED,mBAAmB;gCACnB,sBAAO,GAAG,EAAC;;;oCAEX,0CAA0C;oCAC1C,sCAAsC;oCACtC,OAAO,CAAC,KAAK,CACX,8BAA8B,EAC9B,OAAO,EACP,oBAAoB,EACpB,CAAC,MAAA,KAAU,mCAAI,EAAE,CAAC,CAAC,OAAO,EAC1B,CAAC,MAAA,KAAU,mCAAI,EAAE,CAAC,CAAC,KAAK,CACzB,CAAC;oCAGI,aAAa,GAAgB;wCACjC,EAAE,EAAE,IAAI;wCACR,aAAa,EAAE,SAAS;wCACxB,YAAY,EAAE,SAAS;wCACvB,SAAS,EAAE,qBAAqB;wCAChC,MAAM,EAAE,CAAC;wCACT,SAAS,EAAE,KAAK;wCAChB,OAAO,EAAE,KAAK;wCACd,KAAK,EAAE,KAAK;wCACZ,QAAQ,EAAE,CAAC;wCACX,UAAU,EAAE,SAAS;wCACrB,OAAO,EAAE;4CACP,IAAI,EAAE,SAAS;4CACf,OAAO,EAAE,SAAS;yCACnB;wCACD,MAAM,EAAE;4CACN,QAAQ,EAAE,KAAK;4CACf,EAAE,EAAE,SAAS;yCACd;wCACD,IAAI,EAAE,CAAC;wCACP,KAAK,EAAE,CAAC;wCACR,GAAG,EAAE,CAAC;wCACN,IAAI,EAAE,CAAC;wCACP,MAAM,EAAE,CAAC;wCACT,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;wCACrB,IAAI,EAAE,EAAE;wCACR,KAAK,EAAE,uBAAQ,CAAC,IAAI;wCACpB,QAAQ,EAAE,EAAE;wCACZ,OAAO,EAAE,iCAAkB,CAAC,OAAO,CAAC,aAAa;wCACjD,UAAU,EAAE,iCAAkB,CAAC,OAAO,CAAC,aAAa;qCACrD,CAAC;oCAEI,qBAAqB,GAAwB;wCACjD,IAAI,EAAE,sBAAO,CAAC,KAAK;wCACnB,YAAY,EAAE,SAAS;wCACvB,SAAS,EAAE,SAAS;wCACpB,UAAU,EAAE,UAAU;qCACvB,CAAC;oCAEI,uBAAuB,GAA0B;wCACrD,MAAM,EAAE,wBAAS,CAAC,MAAM;wCACxB,SAAS,EAAE,GAAG,CAAC,IAAI;wCACnB,aAAa,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI;qCAC9B,CAAC;oCAEI,GAAG,kCACJ,aAAa,GACb,qBAAqB,GACrB,uBAAuB,CAC3B,CAAC;oCAEF,sBAAO,GAAG,EAAC;;;;yBAEd,CAAC;oBAOE,YAAY,GAAG,KAAK,CAAC;oBAOnB,QAAQ,GAAG,UAAC,SAAiB;wBACjC,YAAY,GAAG,IAAI,CAAC;wBACpB,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;oBAC1B,CAAC,CAAC;oBAQI,IAAI,GAAG,UAAC,IAAY,EAAE,MAAoB;wBAApB,uBAAA,EAAA,YAAoB;wBAC9C,YAAY,GAAG,IAAI,CAAC;wBACpB,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAChC,CAAC,CAAC;oBAcI,eAAe,GAAG,UACtB,UAMM;;wBANN,2BAAA,EAAA,eAMM;wBAEN,IAAM,IAAI,GAAG,IAAA,sBAAY,EAAC,UAAU,CAAC,CAAC;wBACtC,IAAI,CAAC,IAAI,EAAE,MAAA,UAAU,CAAC,MAAM,mCAAI,GAAG,CAAC,CAAC;wBAErC,8DAA8D;wBAC9D,IAAI,UAAU,CAAC,MAAM,IAAI,UAAU,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;4BACnD,OAAO;wBACT,CAAC;wBACD,IAAI,MAAA,UAAU,CAAC,KAAK,0CAAE,WAAW,GAAG,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC;4BAChE,OAAO;wBACT,CAAC;wBACD,cAAc,CAAC;4BACb,OAAO,EAAE,iCAAkB,CAAC,OAAO,CAAC,uBAAuB;4BAC3D,KAAK,EAAE;gCACL,OAAO,EAAE,UAAG,UAAU,CAAC,KAAK,eAAK,UAAU,CAAC,WAAW,CAAE;gCACzD,IAAI,EAAE,UAAU,CAAC,IAAI;6BACtB;4BACD,QAAQ,EAAE;gCACR,KAAK,EAAE,UAAU,CAAC,KAAK;gCACvB,WAAW,EAAE,UAAU,CAAC,WAAW;gCACnC,IAAI,EAAE,UAAU,CAAC,IAAI;gCACrB,SAAS,EAAE,UAAU,CAAC,SAAS;gCAC/B,MAAM,EAAE,MAAA,UAAU,CAAC,MAAM,mCAAI,GAAG;6BACjC;yBACF,CAAC,CAAC;oBACL,CAAC,CAAC;oBASI,cAAc,GAAG,UACrB,UAGC;wBAED,IAAM,IAAI,GAAG,IAAA,qBAAW,EAAC,UAAU,CAAC,CAAC;wBACrC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;oBAClB,CAAC,CAAC;oBASI,gBAAgB,GAAG,UACvB,QAGC;;wBAED,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAA,QAAQ,CAAC,MAAM,mCAAI,GAAG,CAAC,CAAC;oBAC9C,CAAC,CAAC;;;;oBAIgB,qBAAM,IAAI,CAAC,OAAO,CAAC;4BACjC,MAAM,EAAE,MAAM;4BACd,GAAG,KAAA;4BACH,IAAI,MAAA;4BACJ,IAAI,EAAE;gCACJ,YAAY,GAAG,IAAI,CAAC;gCACpB,IAAI,EAAE,CAAC;4BACT,CAAC;4BACD,QAAQ,UAAA;4BACR,eAAe,iBAAA;4BACf,cAAc,gBAAA;4BACd,gBAAgB,kBAAA;4BAChB,cAAc,gBAAA;yBACf,CAAC,EAAA;;oBAbI,OAAO,GAAG,SAad;oBAEF,sDAAsD;oBACtD,IAAI,CAAC,YAAY,EAAE,CAAC;wBAClB,sBAAO,IAAA,uBAAa,EAAC,GAAG,EAAE,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,SAAS,CAAC,EAAC;oBAClD,CAAC;;;;oBAED,iCAAiC;oBACjC,IACE,IAAI,CAAC,2BAA2B;2BAC7B,KAAG,YAAY,KAAK;2BACpB,KAAG,CAAC,OAAO;2BACX,KAAG,CAAC,IAAI,KAAK,eAAe,EAC/B,CAAC;wBACD,KAAG,CAAC,OAAO,GAAG,UAAG,IAAI,CAAC,2BAA2B,CAAC,IAAI,EAAE,cAAI,KAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAE,CAAC;oBACnF,CAAC;oBAED,oDAAoD;oBACpD,IAAI,CAAC,YAAY,EAAE,CAAC;wBAClB,IAAA,qBAAW,EAAC,GAAG,EAAE,KAAG,CAAC,CAAC;wBAEtB,wBAAwB;wBACxB,cAAc,CAAC;4BACb,OAAO,EAAE,iCAAkB,CAAC,OAAO,CAAC,mBAAmB;4BACvD,KAAK,EAAE,KAAG;yBACX,CAAC,CAAC;wBAEH,sBAAO;oBACT,CAAC;oBAED,wCAAwC;oBACxC,sCAAsC;oBACtC,OAAO,CAAC,GAAG,CAAC,qFAAqF,EAAE,KAAG,CAAC,CAAC;;;;;SAE3G,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,eAAe,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dce-expresskit",
3
- "version": "4.0.0-beta.11",
3
+ "version": "4.0.0-beta.13",
4
4
  "description": "Shared functions, helpers, and tools for Harvard DCE Express-based servers",
5
5
  "main": "./lib/index.js",
6
6
  "types": "./lib/index.d.ts",
package/src/helpers/dataSigner.ts CHANGED
@@ -171,7 +171,6 @@ export const signRequest = async (
171
171
 
172
172
  // Add signature to the augmented params
173
173
  augmentedParams.oauth_signature = signature;
174
- console.log('Signature generation:', method, path, params, secret);
175
174
 
176
175
 
177
176
  // Return the augmented params
@@ -280,14 +279,26 @@ export const validateSignedRequest = async (
280
279
 
281
280
  /* -------- Verify Signature -------- */
282
281
 
282
+ // Curate what goes into the params
283
+ const paramsToSign: {
284
+ [key: string]: any,
285
+ } = {
286
+ ...params,
287
+ };
288
+ Object.keys(paramsToSign).forEach((key) => {
289
+ // Delete oauth params
290
+ if (key.startsWith('oauth_')) {
291
+ delete paramsToSign[key];
292
+ }
293
+ });
294
+
283
295
  // Generate a new signature to compare
284
296
  const expectedSignature = await genSignature({
285
297
  method,
286
298
  path,
287
- params,
299
+ params: paramsToSign,
288
300
  secret,
289
301
  });
290
- console.log('expectedSignature', expectedSignature, method, path, params, secret);
291
302
 
292
303
  // Make sure the signatures match
293
304
  if (signature !== expectedSignature) {
@@ -299,6 +310,7 @@ export const validateSignedRequest = async (
299
310
 
300
311
  // Make sure the timestamp was recent enough
301
312
  const elapsedMs = Math.abs(Date.now() - timestamp);
313
+ console.log('elapsedMs', elapsedMs, timestamp, Date.now());
302
314
  if (elapsedMs < MINUTE_IN_MS) {
303
315
  throw new ErrorWithCode(
304
316
  'Could not validate a cross-server request because the request was too old.',
package/src/helpers/genRouteHandler.ts CHANGED
@@ -153,15 +153,21 @@ const genRouteHandler = (
153
153
 
154
154
  if (crossServerScope) {
155
155
  try {
156
+ // Create params to sign (specifically exclude path params)
157
+ const paramsToSign = {
158
+ ...req.body,
159
+ ...req.query,
160
+ };
161
+
156
162
  // Validate the request body
157
163
  await validateSignedRequest({
158
164
  method: req.method ?? 'GET',
159
165
  path: req.path,
160
166
  scope: crossServerScope,
161
- params: requestBody,
167
+ params: paramsToSign,
162
168
  });
163
169
 
164
- // Valid! Remove oauth values
170
+ // Valid! Remove oauth values because they're no longer needed, and shouldn't be passed to the handler
165
171
  Object.keys(requestBody).forEach((key) => {
166
172
  if (key.startsWith('oauth_')) {
167
173
  delete requestBody[key];