nodecommons-esm-security 2.3.0 → 2.4.1
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.
|
@@ -1,14 +1,16 @@
|
|
|
1
|
-
import { CommonsFixedDuration } from 'tscommons-esm-core';
|
|
1
|
+
import { CommonsFixedDuration, TPropertyObject } from 'tscommons-esm-core';
|
|
2
2
|
import { ICommonsSession } from 'tscommons-esm-session';
|
|
3
|
-
export declare abstract class CommonsSessionService<T> {
|
|
3
|
+
export declare abstract class CommonsSessionService<T extends TPropertyObject> {
|
|
4
4
|
private allowMultipleSessionsForSameUser;
|
|
5
5
|
private maximumLast?;
|
|
6
6
|
private sessions;
|
|
7
7
|
constructor(allowMultipleSessionsForSameUser?: boolean, maximumLast?: CommonsFixedDuration | undefined);
|
|
8
8
|
get activeSessions(): number;
|
|
9
|
+
protected get list(): ICommonsSession<T>[];
|
|
9
10
|
protected abstract isEqual(a: T, b: T): boolean;
|
|
10
11
|
protected abstract isStillValid(data: T): Promise<boolean>;
|
|
11
12
|
create(data: T): ICommonsSession<T>;
|
|
13
|
+
private internalDestroy;
|
|
12
14
|
destroy(session: ICommonsSession<T>): boolean;
|
|
13
15
|
abort(data: T): boolean;
|
|
14
16
|
private cleanup;
|
|
@@ -12,6 +12,16 @@ export class CommonsSessionService {
|
|
|
12
12
|
this.cleanup();
|
|
13
13
|
return this.sessions.length;
|
|
14
14
|
}
|
|
15
|
+
get list() {
|
|
16
|
+
this.cleanup();
|
|
17
|
+
return this.sessions
|
|
18
|
+
.map((session) => ({
|
|
19
|
+
...session,
|
|
20
|
+
start: session.start.clone,
|
|
21
|
+
last: session.last.clone,
|
|
22
|
+
data: { ...session.data }
|
|
23
|
+
}));
|
|
24
|
+
}
|
|
15
25
|
create(data) {
|
|
16
26
|
if (!this.allowMultipleSessionsForSameUser)
|
|
17
27
|
this.abort(data); // clear out any existing sessions for the same user
|
|
@@ -24,8 +34,7 @@ export class CommonsSessionService {
|
|
|
24
34
|
this.sessions.push(session);
|
|
25
35
|
return session;
|
|
26
36
|
}
|
|
27
|
-
|
|
28
|
-
this.cleanup();
|
|
37
|
+
internalDestroy(session) {
|
|
29
38
|
const match = this.sessions
|
|
30
39
|
.find((s) => s.sid === session.sid);
|
|
31
40
|
if (!match)
|
|
@@ -34,13 +43,17 @@ export class CommonsSessionService {
|
|
|
34
43
|
.filter((s) => s.sid !== session.sid);
|
|
35
44
|
return true;
|
|
36
45
|
}
|
|
46
|
+
destroy(session) {
|
|
47
|
+
this.cleanup();
|
|
48
|
+
return this.internalDestroy(session); // prevents infinite loops of cleanup calling destroy calling cleanup etc.
|
|
49
|
+
}
|
|
37
50
|
abort(data) {
|
|
38
51
|
this.cleanup();
|
|
39
52
|
const existing = this.sessions
|
|
40
53
|
.find((s) => this.isEqual(data, s.data));
|
|
41
54
|
if (!existing)
|
|
42
55
|
return false;
|
|
43
|
-
this.
|
|
56
|
+
this.internalDestroy(existing);
|
|
44
57
|
return true;
|
|
45
58
|
}
|
|
46
59
|
cleanup() {
|
|
@@ -50,7 +63,7 @@ export class CommonsSessionService {
|
|
|
50
63
|
expirationThreshold.subtract(this.maximumLast);
|
|
51
64
|
for (const session of [...this.sessions]) {
|
|
52
65
|
if (session.last.isLessThan(expirationThreshold))
|
|
53
|
-
this.
|
|
66
|
+
this.internalDestroy(session);
|
|
54
67
|
}
|
|
55
68
|
}
|
|
56
69
|
touch(sid) {
|
|
@@ -68,7 +81,7 @@ export class CommonsSessionService {
|
|
|
68
81
|
if (!session)
|
|
69
82
|
return undefined;
|
|
70
83
|
if (!(await this.isStillValid(session.data))) {
|
|
71
|
-
this.
|
|
84
|
+
this.internalDestroy(session);
|
|
72
85
|
return undefined;
|
|
73
86
|
}
|
|
74
87
|
session.last = new CommonsFixedDate();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commons-session.service.mjs","sourceRoot":"","sources":["../../src/services/commons-session.service.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"commons-session.service.mjs","sourceRoot":"","sources":["../../src/services/commons-session.service.mts"],"names":[],"mappings":"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"}
|