@tstdl/base 0.82.21 → 0.82.23
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.
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getTokenFromString = exports.getTokenFromRequest = exports.tryGetTokenFromRequest = exports.tryGetAuthorizationTokenStringFromRequest = void 0;
|
|
4
4
|
const bad_request_error_1 = require("../../error/bad-request.error");
|
|
5
5
|
const invalid_token_error_1 = require("../../error/invalid-token.error");
|
|
6
|
-
const unauthorized_error_1 = require("../../error/unauthorized.error");
|
|
7
6
|
const date_time_1 = require("../../utils/date-time");
|
|
8
7
|
const jwt_1 = require("../../utils/jwt");
|
|
9
8
|
const type_guards_1 = require("../../utils/type-guards");
|
|
@@ -40,21 +39,21 @@ exports.tryGetTokenFromRequest = tryGetTokenFromRequest;
|
|
|
40
39
|
async function getTokenFromRequest(request, tokenVersion, secret) {
|
|
41
40
|
const token = await tryGetTokenFromRequest(request, tokenVersion, secret);
|
|
42
41
|
if ((0, type_guards_1.isUndefined)(token)) {
|
|
43
|
-
throw new
|
|
42
|
+
throw new invalid_token_error_1.InvalidTokenError('Missing authorization token');
|
|
44
43
|
}
|
|
45
44
|
return token;
|
|
46
45
|
}
|
|
47
46
|
exports.getTokenFromRequest = getTokenFromRequest;
|
|
48
47
|
async function getTokenFromString(tokenString, tokenVersion, secret) {
|
|
49
48
|
if ((0, type_guards_1.isUndefined)(tokenString)) {
|
|
50
|
-
throw new
|
|
49
|
+
throw new invalid_token_error_1.InvalidTokenError('Missing authorization token');
|
|
51
50
|
}
|
|
52
51
|
const validatedToken = await (0, jwt_1.parseAndValidateJwtTokenString)(tokenString, 'HS256', secret);
|
|
53
52
|
if (validatedToken.header.v != tokenVersion) {
|
|
54
|
-
throw new invalid_token_error_1.InvalidTokenError('Invalid token version
|
|
53
|
+
throw new invalid_token_error_1.InvalidTokenError('Invalid token version');
|
|
55
54
|
}
|
|
56
55
|
if (validatedToken.payload.exp <= (0, date_time_1.currentTimestampSeconds)()) {
|
|
57
|
-
throw new invalid_token_error_1.InvalidTokenError('Token expired
|
|
56
|
+
throw new invalid_token_error_1.InvalidTokenError('Token expired');
|
|
58
57
|
}
|
|
59
58
|
return validatedToken;
|
|
60
59
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../source/authentication/server/helper.ts"],"names":[],"mappings":";;;AAAA,qEAA4D;AAC5D,yEAAgE;
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../source/authentication/server/helper.ts"],"names":[],"mappings":";;;AAAA,qEAA4D;AAC5D,yEAAgE;AAGhE,qDAA4D;AAC5D,yCAA6D;AAC7D,yDAAsE;AAGtE;;;;;GAKG;AACH,SAAgB,yCAAyC,CAAC,OAA0B,EAAE,aAAqB,eAAe;IACxH,MAAM,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAkC,CAAC;IAEtG,MAAM,mBAAmB,GAAG,CAAC,IAAA,qBAAO,EAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC;WACvG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAExC,IAAI,IAAA,uBAAS,EAAC,mBAAmB,CAAC,EAAE;QAClC,MAAM,sBAAsB,GAAG,mBAAmB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAChE,MAAM,mBAAmB,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC,EAAE,sBAAsB,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAEtG,IAAI,mBAAmB,IAAI,QAAQ,EAAE;YACnC,MAAM,IAAI,mCAAe,CAAC,qCAAqC,mBAAmB,IAAI,CAAC,CAAC;SACzF;QAED,MAAM,aAAa,GAAG,mBAAmB,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC,IAAI,EAAE,CAAC;QAC/E,OAAO,aAAa,CAAC;KACtB;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAnBD,8FAmBC;AAEM,KAAK,UAAU,sBAAsB,CAAyC,OAA0B,EAAE,YAAoB,EAAE,MAA2B;IAChK,MAAM,WAAW,GAAG,yCAAyC,CAAC,OAAO,CAAC,CAAC;IAEvE,IAAI,IAAA,yBAAW,EAAC,WAAW,CAAC,EAAE;QAC5B,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,kBAAkB,CAAC,WAAW,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;AAC/D,CAAC;AARD,wDAQC;AAEM,KAAK,UAAU,mBAAmB,CAAyC,OAA0B,EAAE,YAAoB,EAAE,MAA2B;IAC7J,MAAM,KAAK,GAAG,MAAM,sBAAsB,CAAyB,OAAO,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IAElG,IAAI,IAAA,yBAAW,EAAC,KAAK,CAAC,EAAE;QACtB,MAAM,IAAI,uCAAiB,CAAC,6BAA6B,CAAC,CAAC;KAC5D;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AARD,kDAQC;AAEM,KAAK,UAAU,kBAAkB,CAAyC,WAAmB,EAAE,YAAoB,EAAE,MAA2B;IACrJ,IAAI,IAAA,yBAAW,EAAC,WAAW,CAAC,EAAE;QAC5B,MAAM,IAAI,uCAAiB,CAAC,6BAA6B,CAAC,CAAC;KAC5D;IAED,MAAM,cAAc,GAAG,MAAM,IAAA,oCAA8B,EAAgC,WAAW,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAEzH,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC,IAAI,YAAY,EAAE;QAC3C,MAAM,IAAI,uCAAiB,CAAC,uBAAuB,CAAC,CAAC;KACtD;IAED,IAAI,cAAc,CAAC,OAAO,CAAC,GAAG,IAAI,IAAA,mCAAuB,GAAE,EAAE;QAC3D,MAAM,IAAI,uCAAiB,CAAC,eAAe,CAAC,CAAC;KAC9C;IAED,OAAO,cAAc,CAAC;AACxB,CAAC;AAhBD,gDAgBC"}
|
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":"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"}
|