@tstdl/base 0.82.23 → 0.82.25
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/api/server/middlewares/cors.middleware.js +2 -3
- package/api/server/middlewares/cors.middleware.js.map +1 -1
- package/authentication/authentication.api.d.ts +3 -0
- package/authentication/authentication.api.js +1 -0
- package/authentication/authentication.api.js.map +1 -1
- package/authentication/server/authentication.api-controller.js +2 -2
- package/authentication/server/authentication.api-controller.js.map +1 -1
- package/package.json +1 -1
|
@@ -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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"}
|
|
@@ -50,6 +50,7 @@ export declare const authenticationApiDefinition: {
|
|
|
50
50
|
credentials: true;
|
|
51
51
|
};
|
|
52
52
|
timestamp: {
|
|
53
|
+
resource: string;
|
|
53
54
|
result: import("../schema/types").ValueSchema<number>;
|
|
54
55
|
};
|
|
55
56
|
};
|
|
@@ -84,6 +85,7 @@ export declare function getAuthenticationApiDefinition<AdditionalTokenPayload, A
|
|
|
84
85
|
credentials: true;
|
|
85
86
|
};
|
|
86
87
|
timestamp: {
|
|
88
|
+
resource: string;
|
|
87
89
|
result: import("../schema/types").ValueSchema<number>;
|
|
88
90
|
};
|
|
89
91
|
};
|
|
@@ -116,6 +118,7 @@ export declare function getAuthenticationApiEndpointsDefinition<AdditionalTokenP
|
|
|
116
118
|
credentials: true;
|
|
117
119
|
};
|
|
118
120
|
timestamp: {
|
|
121
|
+
resource: string;
|
|
119
122
|
result: import("../schema/types").ValueSchema<number>;
|
|
120
123
|
};
|
|
121
124
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authentication.api.js","sourceRoot":"","sources":["../../source/authentication/authentication.api.ts"],"names":[],"mappings":";;;AACA,wCAAwC;AAExC,qDAAiD;AACjD,uDAAmD;AACnD,qDAAiD;AACjD,qDAA4E;AAC5E,qDAAiD;AACjD,uDAAmD;AAGnD,qCAA4C;AAU/B,QAAA,2BAA2B,GAAG,8BAA8B,CAAC,0BAAiB,EAAE,IAAA,iBAAO,GAAE,CAAC,CAAC;AAExG,4EAA4E;AAC5E,SAAgB,8BAA8B,CAC5C,4BAAwE,EACxE,wBAA4D,EAC5D,QAAiB,EACjB,mBAAyC;IAEzC,OAAO,IAAA,iBAAS,EAAC;QACf,QAAQ,EAAE,QAAQ,IAAI,MAAM;QAC5B,SAAS,EAAE;YACT,GAAG,uCAAuC,CAAC,4BAA4B,EAAE,wBAAwB,CAAC;YAClG,GAAG,mBAAmB;SACvB;KACF,CAAC,CAAC;AACL,CAAC;AAbD,wEAaC;AAED,4EAA4E;AAC5E,SAAgB,uCAAuC,CACrD,4BAAwE,EACxE,wBAA4D;IAE5D,MAAM,iBAAiB,GAAG,IAAA,eAAM,EAAC,yBAAgB,EAAE,4BAA4B,CAAC,CAAC;IAEjF,OAAO;QACL,KAAK,EAAE;YACL,QAAQ,EAAE,OAAO;YACjB,MAAM,EAAE,MAAM;YACd,UAAU,EAAE,IAAA,uBAAc,EAAC;gBACzB,OAAO,EAAE,IAAA,eAAM,GAAE;gBACjB,MAAM,EAAE,IAAA,eAAM,GAAE;gBAChB,IAAI,EAAE,wBAAwB;aAC/B,CAAC;YACF,MAAM,EAAE,iBAAiB;YACzB,WAAW,EAAE,IAAI;SAClB;QACD,OAAO,EAAE;YACP,QAAQ,EAAE,SAAS;YACnB,MAAM,EAAE,MAAM;YACd,UAAU,EAAE,IAAA,uBAAc,EAAC;gBACzB,IAAI,EAAE,wBAAwB;aAC/B,CAAC;YACF,MAAM,EAAE,iBAAiB;YACzB,WAAW,EAAE,IAAI;SAClB;QACD,UAAU,EAAE;YACV,QAAQ,EAAE,aAAa;YACvB,MAAM,EAAE,MAAM;YACd,MAAM,EAAE,IAAA,iBAAO,EAAC,IAAa,CAAC;YAC9B,WAAW,EAAE,IAAI;SAClB;QACD,SAAS,EAAE;YACT,MAAM,EAAE,IAAA,eAAM,GAAE;SACjB;KAC+B,CAAC;AACrC,CAAC;
|
|
1
|
+
{"version":3,"file":"authentication.api.js","sourceRoot":"","sources":["../../source/authentication/authentication.api.ts"],"names":[],"mappings":";;;AACA,wCAAwC;AAExC,qDAAiD;AACjD,uDAAmD;AACnD,qDAAiD;AACjD,qDAA4E;AAC5E,qDAAiD;AACjD,uDAAmD;AAGnD,qCAA4C;AAU/B,QAAA,2BAA2B,GAAG,8BAA8B,CAAC,0BAAiB,EAAE,IAAA,iBAAO,GAAE,CAAC,CAAC;AAExG,4EAA4E;AAC5E,SAAgB,8BAA8B,CAC5C,4BAAwE,EACxE,wBAA4D,EAC5D,QAAiB,EACjB,mBAAyC;IAEzC,OAAO,IAAA,iBAAS,EAAC;QACf,QAAQ,EAAE,QAAQ,IAAI,MAAM;QAC5B,SAAS,EAAE;YACT,GAAG,uCAAuC,CAAC,4BAA4B,EAAE,wBAAwB,CAAC;YAClG,GAAG,mBAAmB;SACvB;KACF,CAAC,CAAC;AACL,CAAC;AAbD,wEAaC;AAED,4EAA4E;AAC5E,SAAgB,uCAAuC,CACrD,4BAAwE,EACxE,wBAA4D;IAE5D,MAAM,iBAAiB,GAAG,IAAA,eAAM,EAAC,yBAAgB,EAAE,4BAA4B,CAAC,CAAC;IAEjF,OAAO;QACL,KAAK,EAAE;YACL,QAAQ,EAAE,OAAO;YACjB,MAAM,EAAE,MAAM;YACd,UAAU,EAAE,IAAA,uBAAc,EAAC;gBACzB,OAAO,EAAE,IAAA,eAAM,GAAE;gBACjB,MAAM,EAAE,IAAA,eAAM,GAAE;gBAChB,IAAI,EAAE,wBAAwB;aAC/B,CAAC;YACF,MAAM,EAAE,iBAAiB;YACzB,WAAW,EAAE,IAAI;SAClB;QACD,OAAO,EAAE;YACP,QAAQ,EAAE,SAAS;YACnB,MAAM,EAAE,MAAM;YACd,UAAU,EAAE,IAAA,uBAAc,EAAC;gBACzB,IAAI,EAAE,wBAAwB;aAC/B,CAAC;YACF,MAAM,EAAE,iBAAiB;YACzB,WAAW,EAAE,IAAI;SAClB;QACD,UAAU,EAAE;YACV,QAAQ,EAAE,aAAa;YACvB,MAAM,EAAE,MAAM;YACd,MAAM,EAAE,IAAA,iBAAO,EAAC,IAAa,CAAC;YAC9B,WAAW,EAAE,IAAI;SAClB;QACD,SAAS,EAAE;YACT,QAAQ,EAAE,WAAW;YACrB,MAAM,EAAE,IAAA,eAAM,GAAE;SACjB;KAC+B,CAAC;AACrC,CAAC;AAtCD,0FAsCC"}
|
|
@@ -57,8 +57,8 @@ let AuthenticationApiController = class AuthenticationApiController {
|
|
|
57
57
|
const result = jsonToken.payload;
|
|
58
58
|
return new server_2.HttpServerResponse({
|
|
59
59
|
cookies: {
|
|
60
|
-
authorization: { value: `Bearer ${token}`, httpOnly: true, secure: true, sameSite: 'strict', expires: jsonToken.payload.exp * 1000 },
|
|
61
|
-
refreshToken: { value: `Bearer ${refreshToken}`, httpOnly: true, secure: true, sameSite: 'strict', expires: jsonToken.payload.refreshTokenExp * 1000 }
|
|
60
|
+
authorization: { value: `Bearer ${token}`, path: '/', httpOnly: true, secure: true, sameSite: 'strict', expires: jsonToken.payload.exp * 1000 },
|
|
61
|
+
refreshToken: { value: `Bearer ${refreshToken}`, path: '/', httpOnly: true, secure: true, sameSite: 'strict', expires: jsonToken.payload.refreshTokenExp * 1000 }
|
|
62
62
|
},
|
|
63
63
|
body: {
|
|
64
64
|
json: result
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authentication.api-controller.js","sourceRoot":"","sources":["../../../source/authentication/server/authentication.api-controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA6C;AAE7C,uEAA+D;AAC/D,8CAAmD;AAEnD,qDAAqD;AAErD,8DAAoE;AAEpE,qEAAiE;AACjE,qCAAqE;AAG9D,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAC7B,qBAAqB,CAAoE;IAElG,YAAY,qBAAwF;QAClG,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,EAAE,UAAU,EAAoG;QAC1H,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;QAElH,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE;YACjC,MAAM,IAAI,sCAAiB,CAAC,sBAAsB,CAAC,CAAC;SACrD;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,oBAAoB,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;QAExG,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,UAAU,EAAsG;QACvI,MAAM,WAAW,GAAG,IAAA,kDAAyC,EAAC,OAAO,EAAE,cAAc,CAAC,IAAI,EAAE,CAAC;QAC7F,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;QAEtF,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAE,OAAO,EAAyG;QACjI,MAAM,WAAW,GAAG,IAAA,kDAAyC,EAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAC7E,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QAC1E,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAErE,MAAM,MAAM,GAA2G,IAAI,CAAC;QAE5H,OAAO,IAAI,2BAAkB,CAAC;YAC5B,OAAO,EAAE;gBACP,aAAa,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE;gBACzC,YAAY,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE;aACzC;YACD,IAAI,EAAE;gBACJ,IAAI,EAAE,MAAM;aACb;SACF,CAAC,CAAC;IACL,CAAC;IAED,SAAS;QACP,OAAO,IAAA,4BAAgB,GAAE,CAAC;IAC5B,CAAC;IAEO,gBAAgB,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,YAAY,EAAuC;QAC9F,MAAM,MAAM,GAAsG,SAAS,CAAC,OAA4G,CAAC;QAEzO,OAAO,IAAI,2BAAkB,CAAC;YAC5B,OAAO,EAAE;gBACP,aAAa,EAAE,EAAE,KAAK,EAAE,UAAU,KAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG,GAAG,IAAI,EAAE;
|
|
1
|
+
{"version":3,"file":"authentication.api-controller.js","sourceRoot":"","sources":["../../../source/authentication/server/authentication.api-controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA6C;AAE7C,uEAA+D;AAC/D,8CAAmD;AAEnD,qDAAqD;AAErD,8DAAoE;AAEpE,qEAAiE;AACjE,qCAAqE;AAG9D,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAC7B,qBAAqB,CAAoE;IAElG,YAAY,qBAAwF;QAClG,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,EAAE,UAAU,EAAoG;QAC1H,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;QAElH,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE;YACjC,MAAM,IAAI,sCAAiB,CAAC,sBAAsB,CAAC,CAAC;SACrD;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,oBAAoB,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;QAExG,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,UAAU,EAAsG;QACvI,MAAM,WAAW,GAAG,IAAA,kDAAyC,EAAC,OAAO,EAAE,cAAc,CAAC,IAAI,EAAE,CAAC;QAC7F,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;QAEtF,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAE,OAAO,EAAyG;QACjI,MAAM,WAAW,GAAG,IAAA,kDAAyC,EAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAC7E,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QAC1E,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAErE,MAAM,MAAM,GAA2G,IAAI,CAAC;QAE5H,OAAO,IAAI,2BAAkB,CAAC;YAC5B,OAAO,EAAE;gBACP,aAAa,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE;gBACzC,YAAY,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE;aACzC;YACD,IAAI,EAAE;gBACJ,IAAI,EAAE,MAAM;aACb;SACF,CAAC,CAAC;IACL,CAAC;IAED,SAAS;QACP,OAAO,IAAA,4BAAgB,GAAE,CAAC;IAC5B,CAAC;IAEO,gBAAgB,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,YAAY,EAAuC;QAC9F,MAAM,MAAM,GAAsG,SAAS,CAAC,OAA4G,CAAC;QAEzO,OAAO,IAAI,2BAAkB,CAAC;YAC5B,OAAO,EAAE;gBACP,aAAa,EAAE,EAAE,KAAK,EAAE,UAAU,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG,GAAG,IAAI,EAAE;gBAC/I,YAAY,EAAE,EAAE,KAAK,EAAE,UAAU,YAAY,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,eAAe,GAAG,IAAI,EAAE;aAClK;YACD,IAAI,EAAE;gBACJ,IAAI,EAAE,MAAM;aACb;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA7DY,2BAA2B;IADvC,IAAA,sBAAa,EAAC,gDAA2B,CAAC;qCAIN,8CAAqB;GAH7C,2BAA2B,CA6DvC;AA7DY,kEAA2B"}
|