@tstdl/base 0.82.37 → 0.82.39
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/authentication/client/authentication.service.d.ts +2 -1
- package/authentication/client/authentication.service.js +19 -13
- package/authentication/client/authentication.service.js.map +1 -1
- package/authentication/server/authentication.service.js +1 -5
- package/authentication/server/authentication.service.js.map +1 -1
- package/authentication/server/helper.d.ts +2 -1
- package/authentication/server/helper.js +13 -2
- package/authentication/server/helper.js.map +1 -1
- package/http/client/module.js +1 -1
- package/http/client/module.js.map +1 -1
- package/package.json +1 -1
|
@@ -38,7 +38,7 @@ export declare class AuthenticationService<AdditionalTokenPayload = Record<never
|
|
|
38
38
|
get sessionId(): string | undefined;
|
|
39
39
|
get definedSessionId(): string;
|
|
40
40
|
get hasValidToken(): boolean;
|
|
41
|
-
constructor(client: InstanceType<ApiClient<AuthenticationApiDefinition<TokenPayload<AdditionalTokenPayload>, AuthenticationData>>>, tokenUpdateBus: MessageBus<TokenPayload<AdditionalTokenPayload> | undefined>, loggedOutBus: MessageBus<void>, refreshLock: Lock, initialAuthenticationData: AuthenticationData | undefined, logger: Logger);
|
|
41
|
+
constructor(client: InstanceType<ApiClient<AuthenticationApiDefinition<TokenPayload<AdditionalTokenPayload>, AuthenticationData>>>, tokenUpdateBus: MessageBus<TokenPayload<AdditionalTokenPayload> | undefined>, loggedOutBus: MessageBus<void>, refreshLock: Lock | undefined, initialAuthenticationData: AuthenticationData | undefined, logger: Logger);
|
|
42
42
|
[afterResolve](): void;
|
|
43
43
|
initialize(): void;
|
|
44
44
|
[disposeAsync](): Promise<void>;
|
|
@@ -51,5 +51,6 @@ export declare class AuthenticationService<AdditionalTokenPayload = Record<never
|
|
|
51
51
|
private loadToken;
|
|
52
52
|
private setNewToken;
|
|
53
53
|
private refreshLoop;
|
|
54
|
+
private refreshLoopIteration;
|
|
54
55
|
private handleError;
|
|
55
56
|
}
|
|
@@ -87,7 +87,7 @@ let AuthenticationService = class AuthenticationService {
|
|
|
87
87
|
this.error$ = this.errorSubject.asObservable();
|
|
88
88
|
this.token$ = this.tokenSubject.asObservable();
|
|
89
89
|
this.definedToken$ = this.token$.pipe((0, rxjs_1.filter)(type_guards_1.isDefined));
|
|
90
|
-
this.validToken$ = this.definedToken$.pipe((0, rxjs_1.filter)((token) => token.exp
|
|
90
|
+
this.validToken$ = this.definedToken$.pipe((0, rxjs_1.filter)((token) => token.exp > (0, date_time_1.currentTimestampSeconds)()));
|
|
91
91
|
this.subject$ = this.token$.pipe((0, rxjs_1.map)((token) => token?.subject), (0, rxjs_1.distinctUntilChanged)());
|
|
92
92
|
this.definedSubject$ = this.subject$.pipe((0, rxjs_1.filter)(type_guards_1.isDefined));
|
|
93
93
|
this.sessionId$ = this.token$.pipe((0, rxjs_1.map)((token) => token?.sessionId), (0, rxjs_1.distinctUntilChanged)());
|
|
@@ -175,15 +175,12 @@ let AuthenticationService = class AuthenticationService {
|
|
|
175
175
|
async refreshLoop() {
|
|
176
176
|
while (this.disposeToken.isUnset) {
|
|
177
177
|
try {
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
await this.refresh();
|
|
185
|
-
}
|
|
186
|
-
});
|
|
178
|
+
if ((0, type_guards_1.isDefined)(this.refreshLock)) {
|
|
179
|
+
await this.refreshLock.use(0, false, async () => this.refreshLoopIteration());
|
|
180
|
+
}
|
|
181
|
+
else {
|
|
182
|
+
await this.refreshLoopIteration();
|
|
183
|
+
}
|
|
187
184
|
await (0, timing_1.cancelableTimeout)(2500, this.disposeToken);
|
|
188
185
|
}
|
|
189
186
|
catch {
|
|
@@ -191,6 +188,15 @@ let AuthenticationService = class AuthenticationService {
|
|
|
191
188
|
}
|
|
192
189
|
}
|
|
193
190
|
}
|
|
191
|
+
async refreshLoopIteration() {
|
|
192
|
+
const token = await (0, rxjs_1.firstValueFrom)((0, rxjs_1.race)([this.definedToken$, this.disposeToken]));
|
|
193
|
+
if ((0, type_guards_1.isUndefined)(token)) {
|
|
194
|
+
return;
|
|
195
|
+
}
|
|
196
|
+
if ((0, date_time_1.currentTimestampSeconds)() >= (token.exp - 60)) {
|
|
197
|
+
await this.refresh();
|
|
198
|
+
}
|
|
199
|
+
}
|
|
194
200
|
async handleError(error) {
|
|
195
201
|
this.logger.error(error);
|
|
196
202
|
this.errorSubject.next(error);
|
|
@@ -204,13 +210,13 @@ AuthenticationService = __decorate([
|
|
|
204
210
|
__param(0, (0, container_1.inject)(tokens_1.AUTHENTICATION_API_CLIENT)),
|
|
205
211
|
__param(1, (0, container_1.resolveArg)(tokenUpdateBusName)),
|
|
206
212
|
__param(2, (0, container_1.resolveArg)(loggedOutBusName)),
|
|
207
|
-
__param(3, (0, container_1.
|
|
213
|
+
__param(3, (0, container_1.inject)(lock_1.Lock, refreshLockResource)),
|
|
214
|
+
__param(3, (0, container_1.optional)()),
|
|
208
215
|
__param(4, (0, container_1.inject)(tokens_1.INITIAL_AUTHENTICATION_DATA)),
|
|
209
216
|
__param(4, (0, container_1.optional)()),
|
|
210
217
|
__param(5, (0, container_1.resolveArg)('AuthenticationService')),
|
|
211
218
|
__metadata("design:paramtypes", [void 0, message_bus_1.MessageBus,
|
|
212
|
-
message_bus_1.MessageBus,
|
|
213
|
-
lock_1.Lock, Object, logger_1.Logger])
|
|
219
|
+
message_bus_1.MessageBus, Object, Object, logger_1.Logger])
|
|
214
220
|
], AuthenticationService);
|
|
215
221
|
exports.AuthenticationService = AuthenticationService;
|
|
216
222
|
//# 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;
|
|
1
|
+
{"version":3,"file":"authentication.service.js","sourceRoot":"","sources":["../../../source/authentication/client/authentication.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -164,11 +164,7 @@ let AuthenticationService = class AuthenticationService {
|
|
|
164
164
|
return (0, helper_1.getTokenFromString)(token, this.tokenVersion, this.derivedTokenSigningSecret);
|
|
165
165
|
}
|
|
166
166
|
async validateRefreshToken(token) {
|
|
167
|
-
|
|
168
|
-
if (validatedToken.payload.exp <= (0, date_time_1.currentTimestampSeconds)()) {
|
|
169
|
-
throw new invalid_token_error_1.InvalidTokenError('Token expired.');
|
|
170
|
-
}
|
|
171
|
-
return validatedToken;
|
|
167
|
+
return (0, helper_1.getRefreshTokenFromString)(token, this.derivedRefreshTokenSigningSecret);
|
|
172
168
|
}
|
|
173
169
|
async getActualSubject(subject) {
|
|
174
170
|
return this.subjectResolver?.resolveSubject(subject) ?? subject;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authentication.service.js","sourceRoot":"","sources":["../../../source/authentication/server/authentication.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,+CAAwE;AACxE,yEAAgE;AAChE,yCAAoD;AAEpD,mDAA4C;AAC5C,2DAAuD;AACvD,
|
|
1
|
+
{"version":3,"file":"authentication.service.js","sourceRoot":"","sources":["../../../source/authentication/server/authentication.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { HttpServerRequest } from "../../http/server";
|
|
2
2
|
import type { Record } from "../../types";
|
|
3
|
-
import type { Token } from '../models';
|
|
3
|
+
import type { RefreshToken, Token } from '../models';
|
|
4
4
|
/**
|
|
5
5
|
*
|
|
6
6
|
* @param request
|
|
@@ -11,3 +11,4 @@ export declare function tryGetAuthorizationTokenStringFromRequest(request: HttpS
|
|
|
11
11
|
export declare function tryGetTokenFromRequest<AdditionalTokenPayload = Record<never>>(request: HttpServerRequest, tokenVersion: number, secret: string | BinaryData): Promise<Token<AdditionalTokenPayload> | undefined>;
|
|
12
12
|
export declare function getTokenFromRequest<AdditionalTokenPayload = Record<never>>(request: HttpServerRequest, tokenVersion: number, secret: string | BinaryData): Promise<Token<AdditionalTokenPayload>>;
|
|
13
13
|
export declare function getTokenFromString<AdditionalTokenPayload = Record<never>>(tokenString: string, tokenVersion: number, secret: string | BinaryData): Promise<Token<AdditionalTokenPayload>>;
|
|
14
|
+
export declare function getRefreshTokenFromString(tokenString: string, secret: string | BinaryData): Promise<RefreshToken>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getTokenFromString = exports.getTokenFromRequest = exports.tryGetTokenFromRequest = exports.tryGetAuthorizationTokenStringFromRequest = void 0;
|
|
3
|
+
exports.getRefreshTokenFromString = 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
6
|
const date_time_1 = require("../../utils/date-time");
|
|
@@ -52,10 +52,21 @@ async function getTokenFromString(tokenString, tokenVersion, secret) {
|
|
|
52
52
|
if (validatedToken.header.v != tokenVersion) {
|
|
53
53
|
throw new invalid_token_error_1.InvalidTokenError('Invalid token version');
|
|
54
54
|
}
|
|
55
|
-
if (validatedToken.payload.exp <= (0, date_time_1.currentTimestampSeconds)()) {
|
|
55
|
+
if ((validatedToken.payload.exp + 2500) <= (0, date_time_1.currentTimestampSeconds)()) {
|
|
56
56
|
throw new invalid_token_error_1.InvalidTokenError('Token expired');
|
|
57
57
|
}
|
|
58
58
|
return validatedToken;
|
|
59
59
|
}
|
|
60
60
|
exports.getTokenFromString = getTokenFromString;
|
|
61
|
+
async function getRefreshTokenFromString(tokenString, secret) {
|
|
62
|
+
if ((0, type_guards_1.isUndefined)(tokenString)) {
|
|
63
|
+
throw new invalid_token_error_1.InvalidTokenError('Missing refresh token');
|
|
64
|
+
}
|
|
65
|
+
const validatedRefreshToken = await (0, jwt_1.parseAndValidateJwtTokenString)(tokenString, 'HS256', secret);
|
|
66
|
+
if (validatedRefreshToken.payload.exp <= (0, date_time_1.currentTimestampSeconds)()) {
|
|
67
|
+
throw new invalid_token_error_1.InvalidTokenError('Refresh token expired.');
|
|
68
|
+
}
|
|
69
|
+
return validatedRefreshToken;
|
|
70
|
+
}
|
|
71
|
+
exports.getRefreshTokenFromString = getRefreshTokenFromString;
|
|
61
72
|
//# sourceMappingURL=helper.js.map
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../source/authentication/server/helper.ts"],"names":[],"mappings":"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"}
|
package/http/client/module.js
CHANGED
|
@@ -12,7 +12,7 @@ function configureHttpClient({ adapter, ...rest }) {
|
|
|
12
12
|
}
|
|
13
13
|
options = {
|
|
14
14
|
...options,
|
|
15
|
-
baseUrl: rest.baseUrl,
|
|
15
|
+
baseUrl: rest.baseUrl ?? options.baseUrl,
|
|
16
16
|
middleware: [...(options.middleware ?? []), ...(rest.middleware ?? [])],
|
|
17
17
|
enableErrorHandling: rest.enableErrorHandling ?? options.enableErrorHandling
|
|
18
18
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../source/http/client/module.ts"],"names":[],"mappings":";;;AAAA,+CAAwC;AAExC,yDAAgD;AAChD,+DAA0D;AAC1D,+DAA0D;AAM1D,IAAI,OAAO,GAAsB,EAAE,CAAC;AAEpC,SAAgB,mBAAmB,CAAC,EAAE,OAAO,EAAE,GAAG,IAAI,EAA0B;IAC9E,IAAI,IAAA,uBAAS,EAAC,OAAO,CAAC,EAAE;QACtB,qBAAS,CAAC,QAAQ,CAAC,uCAAiB,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;KAC9D;IAED,OAAO,GAAG;QACR,GAAG,OAAO;QACV,OAAO,EAAE,IAAI,CAAC,OAAO;
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../source/http/client/module.ts"],"names":[],"mappings":";;;AAAA,+CAAwC;AAExC,yDAAgD;AAChD,+DAA0D;AAC1D,+DAA0D;AAM1D,IAAI,OAAO,GAAsB,EAAE,CAAC;AAEpC,SAAgB,mBAAmB,CAAC,EAAE,OAAO,EAAE,GAAG,IAAI,EAA0B;IAC9E,IAAI,IAAA,uBAAS,EAAC,OAAO,CAAC,EAAE;QACtB,qBAAS,CAAC,QAAQ,CAAC,uCAAiB,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;KAC9D;IAED,OAAO,GAAG;QACR,GAAG,OAAO;QACV,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO;QACxC,UAAU,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;QACvE,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,IAAI,OAAO,CAAC,mBAAmB;KAC7E,CAAC;IAEF,qBAAS,CAAC,QAAQ,CAAC,uCAAiB,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;AAC/D,CAAC;AAbD,kDAaC"}
|