@tstdl/base 0.82.22 → 0.82.24
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.
|
@@ -9,10 +9,9 @@ function corsMiddleware(options = {}) {
|
|
|
9
9
|
async function corsMiddleware(request, next, context) {
|
|
10
10
|
const response = await next(request);
|
|
11
11
|
const requestMethod = request.headers.tryGetSingle('Access-Control-Request-Method') ?? request.method;
|
|
12
|
+
const isOptions = (request.method == 'OPTIONS');
|
|
12
13
|
const endpointDefinition = context.api.endpoints.get(requestMethod)?.definition;
|
|
13
14
|
const cors = { ...options.default, ...endpointDefinition?.cors };
|
|
14
|
-
const isOptions = (request.method == 'OPTIONS');
|
|
15
|
-
const isGet = (request.method == 'GET');
|
|
16
15
|
if (isOptions) {
|
|
17
16
|
const allowMethods = (await (0, types_1.resolveApiEndpointDataProvider)(request, context, cors.accessControlAllowMethods)) ?? [...context.api.endpoints.keys()].join(', ');
|
|
18
17
|
response.headers.setIfMissing('Access-Control-Allow-Methods', allowMethods);
|
|
@@ -29,7 +28,7 @@ function corsMiddleware(options = {}) {
|
|
|
29
28
|
response.headers.setIfMissing('Access-Control-Max-Age', value);
|
|
30
29
|
}
|
|
31
30
|
}
|
|
32
|
-
if (
|
|
31
|
+
if (!request.headers.has('Access-Control-Allow-Credentials')) {
|
|
33
32
|
const allowCredentials = (0, type_guards_1.isDefined)(cors.accessControlAllowCredentials)
|
|
34
33
|
? await (0, types_1.resolveApiEndpointDataProvider)(request, context, cors.accessControlAllowCredentials)
|
|
35
34
|
: endpointDefinition?.credentials;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cors.middleware.js","sourceRoot":"","sources":["../../../../source/api/server/middlewares/cors.middleware.ts"],"names":[],"mappings":";;;AACA,uCAA6D;AAE7D,gDAAwC;AAExC,4DAAgD;AAOhD,SAAgB,cAAc,CAAC,UAAiC,EAAE;IAChE,wEAAwE;IACxE,KAAK,UAAU,cAAc,CAAC,OAA0B,EAAE,IAAgE,EAAE,OAAoC;QAC9J,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC;QAErC,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,+BAA+B,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC;QACtG,MAAM,kBAAkB,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,aAAkC,CAAC,EAAE,UAAU,CAAC;QACrG,MAAM,IAAI,GAAG,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,GAAG,kBAAkB,EAAE,IAAI,EAAE,CAAC;QAEjE,
|
|
1
|
+
{"version":3,"file":"cors.middleware.js","sourceRoot":"","sources":["../../../../source/api/server/middlewares/cors.middleware.ts"],"names":[],"mappings":"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"}
|
package/http/http-value-map.js
CHANGED
|
@@ -37,10 +37,9 @@ class HttpValueMap {
|
|
|
37
37
|
}
|
|
38
38
|
/** get single value, throws if multiple values are set */
|
|
39
39
|
getSingle(key) {
|
|
40
|
-
const
|
|
41
|
-
const value = this.tryGetSingle(normalizedKey);
|
|
40
|
+
const value = this.tryGetSingle(key);
|
|
42
41
|
if ((0, type_guards_1.isUndefined)(value)) {
|
|
43
|
-
throw new bad_request_error_1.BadRequestError(`Missing ${
|
|
42
|
+
throw new bad_request_error_1.BadRequestError(`Missing ${key} ${this.valueType}`);
|
|
44
43
|
}
|
|
45
44
|
return value;
|
|
46
45
|
}
|
|
@@ -49,7 +48,7 @@ class HttpValueMap {
|
|
|
49
48
|
const normalizedKey = this.normalizeKey(key);
|
|
50
49
|
const value = this.map.get(normalizedKey)?.value;
|
|
51
50
|
if ((0, type_guards_1.isArray)(value)) {
|
|
52
|
-
throw new bad_request_error_1.BadRequestError(`Invalid ${
|
|
51
|
+
throw new bad_request_error_1.BadRequestError(`Invalid ${key} ${this.valueType}. Expected single value.`);
|
|
53
52
|
}
|
|
54
53
|
return value;
|
|
55
54
|
}
|
|
@@ -77,10 +76,9 @@ class HttpValueMap {
|
|
|
77
76
|
}
|
|
78
77
|
/** add value to existing entry or create new entry */
|
|
79
78
|
append(key, value) {
|
|
80
|
-
const
|
|
81
|
-
const existing = this.tryGet(normalizedKey);
|
|
79
|
+
const existing = this.tryGet(key);
|
|
82
80
|
const newValue = (0, type_guards_1.isUndefined)(existing) ? value : [...(0, array_1.toArray)(existing), ...(0, array_1.toArray)(value)];
|
|
83
|
-
this.set(
|
|
81
|
+
this.set(key, newValue);
|
|
84
82
|
}
|
|
85
83
|
/** remove entry */
|
|
86
84
|
remove(key) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-value-map.js","sourceRoot":"","sources":["../../source/http/http-value-map.ts"],"names":[],"mappings":";;;AAAA,kEAA4D;AAE5D,0CAAwC;AACxC,uEAAkE;AAClE,mDAAsD;AACtD,sDAAsE;AAEtE,mCAAmE;AAInE,MAAsB,YAAY;IACf,SAAS,CAAS;IAClB,eAAe,CAAU;IACzB,GAAG,CAAkE;IAEtF,YAAY,SAAiB,EAAE,eAAwB,EAAE,KAAyB;QAChF,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QAEvC,IAAI,CAAC,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC;QAErB,IAAI,IAAA,uBAAS,EAAC,KAAK,CAAC,EAAE;YACpB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;SACrB;IACH,CAAC;IAED,kCAAkC;IAClC,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9C,CAAC;IAED,yCAAyC;IACzC,GAAG,CAAC,GAAW;QACb,MAAM,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAE7C,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE;YAC5B,MAAM,IAAI,mCAAe,CAAC,WAAW,aAAa,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;SACzE;QAED,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAE,CAAC,KAAK,CAAC;IAC5C,CAAC;IAED,uBAAuB;IACvB,MAAM,CAAC,GAAW;QAChB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC;IACrD,CAAC;IAED,0DAA0D;IAC1D,SAAS,CAAC,GAAW;QACnB,MAAM,
|
|
1
|
+
{"version":3,"file":"http-value-map.js","sourceRoot":"","sources":["../../source/http/http-value-map.ts"],"names":[],"mappings":";;;AAAA,kEAA4D;AAE5D,0CAAwC;AACxC,uEAAkE;AAClE,mDAAsD;AACtD,sDAAsE;AAEtE,mCAAmE;AAInE,MAAsB,YAAY;IACf,SAAS,CAAS;IAClB,eAAe,CAAU;IACzB,GAAG,CAAkE;IAEtF,YAAY,SAAiB,EAAE,eAAwB,EAAE,KAAyB;QAChF,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QAEvC,IAAI,CAAC,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC;QAErB,IAAI,IAAA,uBAAS,EAAC,KAAK,CAAC,EAAE;YACpB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;SACrB;IACH,CAAC;IAED,kCAAkC;IAClC,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9C,CAAC;IAED,yCAAyC;IACzC,GAAG,CAAC,GAAW;QACb,MAAM,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAE7C,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE;YAC5B,MAAM,IAAI,mCAAe,CAAC,WAAW,aAAa,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;SACzE;QAED,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAE,CAAC,KAAK,CAAC;IAC5C,CAAC;IAED,uBAAuB;IACvB,MAAM,CAAC,GAAW;QAChB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC;IACrD,CAAC;IAED,0DAA0D;IAC1D,SAAS,CAAC,GAAW;QACnB,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAErC,IAAI,IAAA,yBAAW,EAAC,KAAK,CAAC,EAAE;YACtB,MAAM,IAAI,mCAAe,CAAC,WAAW,GAAG,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;SAC/D;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED,iEAAiE;IACjE,YAAY,CAAC,GAAW;QACtB,MAAM,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,KAAK,CAAC;QAEjD,IAAI,IAAA,qBAAO,EAAC,KAAK,CAAC,EAAE;YAClB,MAAM,IAAI,mCAAe,CAAC,WAAW,GAAG,IAAI,IAAI,CAAC,SAAS,0BAA0B,CAAC,CAAC;SACvF;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED,oBAAoB;IACpB,GAAG,CAAC,GAAW,EAAE,KAAuC;QACtD,IAAI,IAAA,yBAAW,EAAC,KAAK,CAAC,EAAE;YACtB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACjB,OAAO;SACR;QAED,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,KAAK,EAAE,IAAA,4BAAoB,EAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC/F,CAAC;IAED,2BAA2B;IAC3B,YAAY,CAAC,GAAW,EAAE,KAAuC;QAC/D,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAClB,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;SACtB;IACH,CAAC;IAED,OAAO,CAAC,KAAwB;QAC9B,MAAM,QAAQ,GAAG,IAAA,wBAAU,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAA,sBAAa,EAAC,KAAK,CAAC,CAAC;QAElE,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,QAAQ,EAAE;YACnC,IAAI,IAAA,uBAAS,EAAC,KAAK,CAAC,EAAE;gBACpB,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;aACtB;SACF;IACH,CAAC;IAED,sDAAsD;IACtD,MAAM,CAAC,GAAW,EAAE,KAA2B;QAC7C,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAClC,MAAM,QAAQ,GAAG,IAAA,yBAAW,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,IAAA,eAAO,EAAC,QAAQ,CAAC,EAAE,GAAG,IAAA,eAAO,EAAC,KAAK,CAAC,CAAC,CAAC;QAE3F,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC1B,CAAC;IAED,mBAAmB;IACnB,MAAM,CAAC,GAAW;QAChB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1C,CAAC;IAED,yBAAyB;IACzB,KAAK;QACH,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;IACnB,CAAC;IAED,QAAQ;QACN,OAAO,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,kBAAkB;QAChB,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,IAAA,0BAAkB,EAAC,KAAK,CAAC,CAAU,CAAC,CAAC;QAC3F,OAAO,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAED,CAAC,iBAAiB;QAChB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,IAAI,EAAE;YAC/B,MAAM,CAAC,GAAG,EAAE,IAAA,0BAAkB,EAAC,KAAK,CAAC,CAAC,CAAC;SACxC;IACH,CAAC;IAED,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;QAChB,KAAK,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE;YAC/C,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;SAC1B;IACH,CAAC;IAEO,YAAY,CAAC,GAAW;QAC9B,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,OAAO,GAAG,CAAC,WAAW,EAAE,CAAC;SAC1B;QAED,OAAO,GAAG,CAAC;IACb,CAAC;CAGF;AAvID,oCAuIC"}
|