@tstdl/base 0.82.25 → 0.82.27
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 +8 -0
- package/authentication/client/authentication.service.js +21 -1
- package/authentication/client/authentication.service.js.map +1 -1
- package/authentication/server/authentication.api-controller.js +5 -4
- package/authentication/server/authentication.api-controller.js.map +1 -1
- package/package.json +1 -1
|
@@ -20,10 +20,18 @@ export declare class AuthenticationService<AdditionalTokenPayload = Record<never
|
|
|
20
20
|
readonly error$: Observable<Error>;
|
|
21
21
|
readonly token$: Observable<TokenPayload<AdditionalTokenPayload> | undefined>;
|
|
22
22
|
readonly definedToken$: Observable<TokenPayload<AdditionalTokenPayload>>;
|
|
23
|
+
readonly subject$: Observable<string | undefined>;
|
|
24
|
+
readonly definedSubject$: Observable<string>;
|
|
25
|
+
readonly sessionId$: Observable<string | undefined>;
|
|
26
|
+
readonly definedSessionId$: Observable<string>;
|
|
23
27
|
readonly loggedIn$: Observable<boolean>;
|
|
24
28
|
get loggedIn(): boolean;
|
|
25
29
|
get token(): TokenPayload<AdditionalTokenPayload> | undefined;
|
|
26
30
|
get definedToken(): TokenPayload<AdditionalTokenPayload>;
|
|
31
|
+
get subject(): string | undefined;
|
|
32
|
+
get definedSubject(): string;
|
|
33
|
+
get sessionId(): string | undefined;
|
|
34
|
+
get definedSessionId(): string;
|
|
27
35
|
constructor(client: InstanceType<ApiClient<AuthenticationApiDefinition<TokenPayload<AdditionalTokenPayload>, AuthenticationData>>>, tokenUpdateBus: MessageBus<TokenPayload<AdditionalTokenPayload> | undefined> | undefined, initialAuthenticationData: AuthenticationData | undefined, logger: Logger);
|
|
28
36
|
[afterResolve](): void;
|
|
29
37
|
initialize(): void;
|
|
@@ -38,6 +38,10 @@ let AuthenticationService = class AuthenticationService {
|
|
|
38
38
|
error$;
|
|
39
39
|
token$;
|
|
40
40
|
definedToken$;
|
|
41
|
+
subject$;
|
|
42
|
+
definedSubject$;
|
|
43
|
+
sessionId$;
|
|
44
|
+
definedSessionId$;
|
|
41
45
|
loggedIn$;
|
|
42
46
|
get loggedIn() {
|
|
43
47
|
return (0, type_guards_1.isDefined)(this.tokenSubject.value);
|
|
@@ -48,6 +52,18 @@ let AuthenticationService = class AuthenticationService {
|
|
|
48
52
|
get definedToken() {
|
|
49
53
|
return (0, type_guards_1.assertDefinedPass)(this.tokenSubject.value, 'No token available.');
|
|
50
54
|
}
|
|
55
|
+
get subject() {
|
|
56
|
+
return this.token?.subject;
|
|
57
|
+
}
|
|
58
|
+
get definedSubject() {
|
|
59
|
+
return this.definedToken.subject;
|
|
60
|
+
}
|
|
61
|
+
get sessionId() {
|
|
62
|
+
return this.token?.sessionId;
|
|
63
|
+
}
|
|
64
|
+
get definedSessionId() {
|
|
65
|
+
return this.definedToken.sessionId;
|
|
66
|
+
}
|
|
51
67
|
constructor(client, tokenUpdateBus, initialAuthenticationData, logger) {
|
|
52
68
|
this.client = client;
|
|
53
69
|
this.tokenUpdateBus = tokenUpdateBus;
|
|
@@ -59,7 +75,11 @@ let AuthenticationService = class AuthenticationService {
|
|
|
59
75
|
this.error$ = this.errorSubject.asObservable();
|
|
60
76
|
this.token$ = this.tokenSubject.asObservable();
|
|
61
77
|
this.definedToken$ = this.token$.pipe((0, rxjs_1.filter)(type_guards_1.isDefined));
|
|
62
|
-
this.
|
|
78
|
+
this.subject$ = this.token$.pipe((0, rxjs_1.map)((token) => token?.subject), (0, rxjs_1.distinctUntilChanged)());
|
|
79
|
+
this.definedSubject$ = this.subject$.pipe((0, rxjs_1.filter)(type_guards_1.isDefined));
|
|
80
|
+
this.sessionId$ = this.token$.pipe((0, rxjs_1.map)((token) => token?.sessionId), (0, rxjs_1.distinctUntilChanged)());
|
|
81
|
+
this.definedSessionId$ = this.sessionId$.pipe((0, rxjs_1.filter)(type_guards_1.isDefined));
|
|
82
|
+
this.loggedIn$ = this.token$.pipe((0, rxjs_1.map)(type_guards_1.isDefined), (0, rxjs_1.distinctUntilChanged)());
|
|
63
83
|
}
|
|
64
84
|
[container_1.afterResolve]() {
|
|
65
85
|
this.initialize();
|
|
@@ -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;AAClC,mDAA2C;AAE3C,uEAA+D;AAC/D,qDAA4D;AAC5D,+CAAmD;AACnD,yDAA6G;AAE7G,+
|
|
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;AAClC,mDAA2C;AAE3C,uEAA+D;AAC/D,qDAA4D;AAC5D,+CAAmD;AACnD,yDAA6G;AAE7G,+BAAyG;AAGzG,qCAAkF;AAElF,MAAM,eAAe,GAAG,6BAA6B,CAAC;AACtD,MAAM,kBAAkB,GAAG,mCAAmC,CAAC;AAGxD,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IACf,MAAM,CAAkG;IACxG,YAAY,CAAiB;IAC7B,YAAY,CAAoE;IAChF,cAAc,CAA2E;IACzF,MAAM,CAAS;IACf,YAAY,CAAoB;IAEzC,kBAAkB,CAAiC;IAElD,MAAM,CAAoB;IAE1B,MAAM,CAA+D;IACrE,aAAa,CAAmD;IAEhE,QAAQ,CAAiC;IACzC,eAAe,CAAqB;IAEpC,UAAU,CAAiC;IAC3C,iBAAiB,CAAqB;IAEtC,SAAS,CAAsB;IAExC,IAAI,QAAQ;QACV,OAAO,IAAA,uBAAS,EAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC;IACjC,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAA,+BAAiB,EAAC,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,qBAAqB,CAAC,CAAC;IAC3E,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC;IAC7B,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC;IACnC,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC;IAC/B,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC;IACrC,CAAC;IAED,YACqC,MAAsH,EACrG,cAAwF,EAC3F,yBAAyD,EACrD,MAAc;QAEnE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,kBAAkB,GAAG,yBAAyB,CAAC;QACpD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,IAAI,CAAC,YAAY,GAAG,IAAI,sCAAiB,EAAE,CAAC;QAC5C,IAAI,CAAC,YAAY,GAAG,IAAI,cAAO,EAAE,CAAC;QAClC,IAAI,CAAC,YAAY,GAAG,IAAI,sBAAe,CAAmD,SAAS,CAAC,CAAC;QAErG,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;QAC/C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;QAC/C,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAA,aAAM,EAAC,uBAAS,CAAC,CAAC,CAAC;QACzD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAA,UAAG,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,IAAA,2BAAoB,GAAE,CAAC,CAAC;QACzF,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAA,aAAM,EAAC,uBAAS,CAAC,CAAC,CAAC;QAC7D,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAA,UAAG,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,IAAA,2BAAoB,GAAE,CAAC,CAAC;QAC7F,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAA,aAAM,EAAC,uBAAS,CAAC,CAAC,CAAC;QACjE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAA,UAAG,EAAC,uBAAS,CAAC,EAAE,IAAA,2BAAoB,GAAE,CAAC,CAAC;IAC5E,CAAC;IAED,CAAC,wBAAY,CAAC;QACZ,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,eAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC;IAED,UAAU;QACR,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QAEnF,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,CAAC,yBAAY,CAAC;QAClB,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;QACxB,MAAM,IAAI,CAAC,cAAc,EAAE,OAAO,EAAE,CAAC;QACrC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;QAC7B,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;IAC/B,CAAC;IAED,iBAAiB,CAAC,IAAwB;QACxC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,OAAe,EAAE,MAAc,EAAE,IAAyB;QACpE,IAAI,IAAA,uBAAS,EAAC,IAAI,CAAC,EAAE;YACnB,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;SAC9B;QAED,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;QAC1F,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,MAAM;QACV,IAAI;YACF,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;SAChC;gBACO;YACN,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;SAC7B;IACH,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAyB;QACrC,IAAI,IAAA,uBAAS,EAAC,IAAI,CAAC,EAAE;YACnB,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;SAC9B;QAED,IAAI;YACF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;YAC3E,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;SACzB;QACD,OAAO,KAAK,EAAE;YACZ,MAAM,IAAI,CAAC,WAAW,CAAC,KAAc,CAAC,CAAC;YACvC,MAAM,KAAK,CAAC;SACb;IACH,CAAC;IAEO,SAAS,CAAC,KAAuD;QACvE,IAAI,IAAA,yBAAW,EAAC,UAAU,CAAC,YAAY,CAAC,EAAE;YACxC,OAAO;SACR;QAED,IAAI,IAAA,+BAAiB,EAAC,KAAK,CAAC,EAAE;YAC5B,YAAY,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;SAC1C;aACI;YACH,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACzC,YAAY,CAAC,OAAO,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;SACnD;IACH,CAAC;IAEO,SAAS;QACf,IAAI,IAAA,yBAAW,EAAC,UAAU,CAAC,YAAY,CAAC,EAAE;YACxC,OAAO;SACR;QAED,MAAM,uBAAuB,GAAG,YAAY,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAEtE,MAAM,KAAK,GAAG,IAAA,sBAAQ,EAAC,uBAAuB,CAAC;YAC7C,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAyC;YAC7E,CAAC,CAAC,SAAS,CAAC;QAEd,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAEO,WAAW,CAAC,KAAuD;QACzE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACtB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,CAAC,cAAc,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;IAEO,KAAK,CAAC,WAAW;QACvB,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE;YAChC,IAAI;gBACF,MAAM,KAAK,GAAG,MAAM,IAAA,qBAAc,EAAC,IAAA,WAAI,EAAC,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;gBAElF,IAAI,IAAA,yBAAW,EAAC,KAAK,CAAC,EAAE;oBACtB,OAAO;iBACR;gBAED,IAAI,IAAA,mCAAuB,GAAE,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE;oBACjD,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;iBACtB;gBAED,MAAM,IAAA,0BAAiB,EAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;aAClD;YACD,MAAM;gBACJ,MAAM,IAAA,0BAAiB,EAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;aAClD;SACF;IACH,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,KAAY;QACpC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACzB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAE9B,IAAI,KAAK,YAAY,uCAAiB,EAAE;YACtC,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;SACrB;IACH,CAAC;CACF,CAAA;AAvMY,qBAAqB;IADjC,IAAA,qBAAS,GAAE;IAqDP,WAAA,IAAA,kBAAM,EAAC,kCAAyB,CAAC,CAAA;IACjC,WAAA,IAAA,kBAAM,EAAC,wBAAU,EAAE,kBAAkB,CAAC,CAAA;IAAE,WAAA,IAAA,oBAAQ,GAAE,CAAA;IAClD,WAAA,IAAA,kBAAM,EAAC,oCAA2B,CAAC,CAAA;IAAE,WAAA,IAAA,oBAAQ,GAAE,CAAA;IAC/C,WAAA,IAAA,sBAAU,EAAiB,uBAAuB,CAAC,CAAA;6DAAS,eAAM;GAvD1D,qBAAqB,CAuMjC;AAvMY,sDAAqB"}
|
|
@@ -17,6 +17,7 @@ const date_time_1 = require("../../utils/date-time");
|
|
|
17
17
|
const authentication_api_1 = require("../authentication.api");
|
|
18
18
|
const authentication_service_1 = require("./authentication.service");
|
|
19
19
|
const helper_1 = require("./helper");
|
|
20
|
+
const cookieBaseOptions = { path: '/', httpOnly: true, secure: true, sameSite: 'strict' };
|
|
20
21
|
let AuthenticationApiController = class AuthenticationApiController {
|
|
21
22
|
authenticationService;
|
|
22
23
|
constructor(authenticationService) {
|
|
@@ -42,8 +43,8 @@ let AuthenticationApiController = class AuthenticationApiController {
|
|
|
42
43
|
const result = 'ok';
|
|
43
44
|
return new server_2.HttpServerResponse({
|
|
44
45
|
cookies: {
|
|
45
|
-
authorization: { value: '', expires: -1 },
|
|
46
|
-
refreshToken: { value: '', expires: -1 }
|
|
46
|
+
authorization: { value: '', ...cookieBaseOptions, expires: -1 },
|
|
47
|
+
refreshToken: { value: '', ...cookieBaseOptions, expires: -1 }
|
|
47
48
|
},
|
|
48
49
|
body: {
|
|
49
50
|
json: result
|
|
@@ -57,8 +58,8 @@ let AuthenticationApiController = class AuthenticationApiController {
|
|
|
57
58
|
const result = jsonToken.payload;
|
|
58
59
|
return new server_2.HttpServerResponse({
|
|
59
60
|
cookies: {
|
|
60
|
-
authorization: { value: `Bearer ${token}`,
|
|
61
|
-
refreshToken: { value: `Bearer ${refreshToken}`,
|
|
61
|
+
authorization: { value: `Bearer ${token}`, ...cookieBaseOptions, expires: jsonToken.payload.exp * 1000 },
|
|
62
|
+
refreshToken: { value: `Bearer ${refreshToken}`, ...cookieBaseOptions, expires: jsonToken.payload.refreshTokenExp * 1000 }
|
|
62
63
|
},
|
|
63
64
|
body: {
|
|
64
65
|
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,
|
|
1
|
+
{"version":3,"file":"authentication.api-controller.js","sourceRoot":"","sources":["../../../source/authentication/server/authentication.api-controller.ts"],"names":[],"mappings":"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"}
|