@tstdl/base 0.82.27 → 0.82.28
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.
|
@@ -32,7 +32,7 @@ export declare class AuthenticationService<AdditionalTokenPayload = Record<never
|
|
|
32
32
|
get definedSubject(): string;
|
|
33
33
|
get sessionId(): string | undefined;
|
|
34
34
|
get definedSessionId(): string;
|
|
35
|
-
constructor(client: InstanceType<ApiClient<AuthenticationApiDefinition<TokenPayload<AdditionalTokenPayload>, AuthenticationData>>>, tokenUpdateBus: MessageBus<TokenPayload<AdditionalTokenPayload> | undefined
|
|
35
|
+
constructor(client: InstanceType<ApiClient<AuthenticationApiDefinition<TokenPayload<AdditionalTokenPayload>, AuthenticationData>>>, tokenUpdateBus: MessageBus<TokenPayload<AdditionalTokenPayload> | undefined>, initialAuthenticationData: AuthenticationData | undefined, logger: Logger);
|
|
36
36
|
[afterResolve](): void;
|
|
37
37
|
initialize(): void;
|
|
38
38
|
[disposeAsync](): Promise<void>;
|
|
@@ -87,7 +87,7 @@ let AuthenticationService = class AuthenticationService {
|
|
|
87
87
|
}
|
|
88
88
|
initialize() {
|
|
89
89
|
this.loadToken();
|
|
90
|
-
this.tokenUpdateBus
|
|
90
|
+
this.tokenUpdateBus.messages$.subscribe((token) => this.tokenSubject.next(token));
|
|
91
91
|
void this.refreshLoop();
|
|
92
92
|
}
|
|
93
93
|
async [disposable_1.disposeAsync]() {
|
|
@@ -95,9 +95,9 @@ let AuthenticationService = class AuthenticationService {
|
|
|
95
95
|
}
|
|
96
96
|
async dispose() {
|
|
97
97
|
this.disposeToken.set();
|
|
98
|
-
await this.tokenUpdateBus?.dispose();
|
|
99
98
|
this.tokenSubject.complete();
|
|
100
99
|
this.errorSubject.complete();
|
|
100
|
+
await this.tokenUpdateBus.dispose();
|
|
101
101
|
}
|
|
102
102
|
setAdditionalData(data) {
|
|
103
103
|
this.authenticationData = data;
|
|
@@ -155,7 +155,7 @@ let AuthenticationService = class AuthenticationService {
|
|
|
155
155
|
setNewToken(token) {
|
|
156
156
|
this.saveToken(token);
|
|
157
157
|
this.tokenSubject.next(token);
|
|
158
|
-
this.tokenUpdateBus
|
|
158
|
+
this.tokenUpdateBus.publishAndForget(token);
|
|
159
159
|
}
|
|
160
160
|
async refreshLoop() {
|
|
161
161
|
while (this.disposeToken.isUnset) {
|
|
@@ -185,12 +185,11 @@ let AuthenticationService = class AuthenticationService {
|
|
|
185
185
|
AuthenticationService = __decorate([
|
|
186
186
|
(0, container_1.singleton)(),
|
|
187
187
|
__param(0, (0, container_1.inject)(tokens_1.AUTHENTICATION_API_CLIENT)),
|
|
188
|
-
__param(1, (0, container_1.
|
|
189
|
-
__param(1, (0, container_1.optional)()),
|
|
188
|
+
__param(1, (0, container_1.resolveArg)(tokenUpdateBusName)),
|
|
190
189
|
__param(2, (0, container_1.inject)(tokens_1.INITIAL_AUTHENTICATION_DATA)),
|
|
191
190
|
__param(2, (0, container_1.optional)()),
|
|
192
191
|
__param(3, (0, container_1.resolveArg)('AuthenticationService')),
|
|
193
|
-
__metadata("design:paramtypes", [void 0,
|
|
192
|
+
__metadata("design:paramtypes", [void 0, message_bus_1.MessageBus, Object, logger_1.Logger])
|
|
194
193
|
], AuthenticationService);
|
|
195
194
|
exports.AuthenticationService = AuthenticationService;
|
|
196
195
|
//# sourceMappingURL=authentication.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authentication.service.js","sourceRoot":"","sources":["../../../source/authentication/client/authentication.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,+CAAoF;AACpF,qCAAkC;AAElC,iDAA4C;AAC5C,yEAAgE;AAEhE,yCAAkC;
|
|
1
|
+
{"version":3,"file":"authentication.service.js","sourceRoot":"","sources":["../../../source/authentication/client/authentication.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/utils/jwt.js
CHANGED
|
@@ -10,7 +10,7 @@ const equals_1 = require("./equals");
|
|
|
10
10
|
function parseJwtTokenString(tokenString) {
|
|
11
11
|
const splits = tokenString.split('.');
|
|
12
12
|
if (splits.length != 3) {
|
|
13
|
-
throw new error_1.InvalidTokenError('
|
|
13
|
+
throw new error_1.InvalidTokenError('Invalid token format');
|
|
14
14
|
}
|
|
15
15
|
const [encodedHeader, encodedPayload, encodedSignature] = splits;
|
|
16
16
|
const textDecoder = new TextDecoder();
|
|
@@ -28,19 +28,24 @@ function parseJwtTokenString(tokenString) {
|
|
|
28
28
|
header: textDecoder.decode(bytes.header),
|
|
29
29
|
payload: textDecoder.decode(bytes.payload)
|
|
30
30
|
};
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
31
|
+
try {
|
|
32
|
+
const header = JSON.parse(string.header);
|
|
33
|
+
const payload = JSON.parse(string.payload);
|
|
34
|
+
const token = {
|
|
35
|
+
header,
|
|
36
|
+
payload
|
|
37
|
+
};
|
|
38
|
+
return {
|
|
39
|
+
raw: tokenString,
|
|
40
|
+
token: token,
|
|
41
|
+
encoded,
|
|
42
|
+
bytes,
|
|
43
|
+
string
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
catch {
|
|
47
|
+
throw new error_1.InvalidTokenError('Invalid token format');
|
|
48
|
+
}
|
|
44
49
|
}
|
|
45
50
|
exports.parseJwtTokenString = parseJwtTokenString;
|
|
46
51
|
async function createJwtTokenString(jwtToken, key) {
|
|
@@ -60,20 +65,20 @@ async function parseAndValidateJwtTokenString(tokenString, allowedAlgorithms, ke
|
|
|
60
65
|
try {
|
|
61
66
|
const { encoded, bytes, token } = parseJwtTokenString(tokenString);
|
|
62
67
|
if (!(0, array_1.toArray)(allowedAlgorithms).includes(token.header.alg)) {
|
|
63
|
-
throw new error_1.
|
|
68
|
+
throw new error_1.InvalidTokenError('Invalid signature algorithm');
|
|
64
69
|
}
|
|
65
70
|
const calculatedSignature = await getSignature((0, encoding_1.encodeUtf8)(`${encoded.header}.${encoded.payload}`), token.header.alg, key);
|
|
66
71
|
const validSignature = (0, equals_1.binaryEquals)(calculatedSignature, bytes.signature);
|
|
67
72
|
if (!validSignature) {
|
|
68
|
-
throw new error_1.
|
|
73
|
+
throw new error_1.InvalidTokenError('Invalid token signature');
|
|
69
74
|
}
|
|
70
75
|
return token;
|
|
71
76
|
}
|
|
72
77
|
catch (error) {
|
|
73
|
-
if (error instanceof error_1.
|
|
78
|
+
if (error instanceof error_1.InvalidTokenError) {
|
|
74
79
|
throw error;
|
|
75
80
|
}
|
|
76
|
-
throw new error_1.
|
|
81
|
+
throw new error_1.InvalidTokenError('Invalid token');
|
|
77
82
|
}
|
|
78
83
|
}
|
|
79
84
|
exports.parseAndValidateJwtTokenString = parseAndValidateJwtTokenString;
|
package/utils/jwt.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../../source/utils/jwt.ts"],"names":[],"mappings":";;;AAAA,oCAAgE;AAEhE,yCAAwC;AACxC,qCAA4D;AAE5D,iDAAqD;AACrD,yCAAwC;AACxC,qCAAwC;AAiCxC,SAAgB,mBAAmB,CAAgC,WAAmB;IACpF,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEtC,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE;QACtB,MAAM,IAAI,yBAAiB,CAAC,sBAAsB,CAAC,CAAC;KACrD;IAED,MAAM,CAAC,aAAa,EAAE,cAAc,EAAE,gBAAgB,CAAC,GAAG,MAAM,CAAC;IAEjE,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;IAEtC,MAAM,OAAO,GAAmC;QAC9C,MAAM,EAAE,aAAc;QACtB,OAAO,EAAE,cAAe;QACxB,SAAS,EAAE,gBAAiB;KAC7B,CAAC;IAEF,MAAM,KAAK,GAAiC;QAC1C,MAAM,EAAE,IAAA,wBAAe,EAAC,aAAc,CAAC;QACvC,OAAO,EAAE,IAAA,wBAAe,EAAC,cAAe,CAAC;QACzC,SAAS,EAAE,IAAA,wBAAe,EAAC,gBAAiB,CAAC;KAC9C,CAAC;IAEF,MAAM,MAAM,GAAkC;QAC5C,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;QACxC,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;KAC3C,CAAC;IAEF,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../../source/utils/jwt.ts"],"names":[],"mappings":"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"}
|