@tomei/sso 0.60.4-staging.1 → 0.61.0
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/.commitlintrc.json +22 -22
- package/.gitlab-ci.yml +16 -16
- package/.husky/commit-msg +15 -9
- package/.husky/pre-commit +7 -7
- package/.prettierrc +4 -4
- package/Jenkinsfile +57 -57
- package/README.md +23 -23
- package/__tests__/unit/components/group/group.spec.ts +79 -79
- package/__tests__/unit/components/group-object-privilege/group-object-privilege.spec.ts +88 -88
- package/__tests__/unit/components/group-privilege/group-privilege.spec.ts +68 -68
- package/__tests__/unit/components/group-reporting-user/group-reporting-user.spec.ts +66 -66
- package/__tests__/unit/components/group-system-access/group-system-access.spec.ts +83 -83
- package/__tests__/unit/components/login-user/l.spec.ts +746 -746
- package/__tests__/unit/components/login-user/login.spec.ts +1164 -1164
- package/__tests__/unit/components/password-hash/password-hash.service.spec.ts +31 -31
- package/__tests__/unit/components/system/system.spec.ts +254 -254
- package/__tests__/unit/components/system-privilege/system-privilege.spec.ts +83 -83
- package/__tests__/unit/components/user-group/user-group.spec.ts +86 -86
- package/__tests__/unit/components/user-object-privilege/user-object-privilege.spec.ts +78 -78
- package/__tests__/unit/components/user-privilege/user-privilege.spec.ts +72 -72
- package/__tests__/unit/components/user-system-access/user-system-access.spec.ts +89 -89
- package/__tests__/unit/redis-client/redis.service.spec.ts +23 -23
- package/__tests__/unit/session/session.service.spec.ts +47 -47
- package/__tests__/unit/system-privilege/system-privilage.spec.ts +91 -91
- package/coverage/clover.xml +1452 -1452
- package/coverage/coverage-final.json +47 -47
- package/coverage/lcov-report/base.css +224 -224
- package/coverage/lcov-report/block-navigation.js +87 -87
- package/coverage/lcov-report/components/group/group.repository.ts.html +117 -117
- package/coverage/lcov-report/components/group/group.ts.html +327 -327
- package/coverage/lcov-report/components/group/index.html +130 -130
- package/coverage/lcov-report/components/group-object-privilege/group-object-privilege.repository.ts.html +117 -117
- package/coverage/lcov-report/components/group-object-privilege/group-object-privilege.ts.html +321 -321
- package/coverage/lcov-report/components/group-object-privilege/index.html +130 -130
- package/coverage/lcov-report/components/group-privilege/group-privilege.repository.ts.html +117 -117
- package/coverage/lcov-report/components/group-privilege/group-privilege.ts.html +303 -303
- package/coverage/lcov-report/components/group-privilege/index.html +130 -130
- package/coverage/lcov-report/components/group-reporting-user/group-reporting-user.repository.ts.html +117 -117
- package/coverage/lcov-report/components/group-reporting-user/group-reporting-user.ts.html +327 -327
- package/coverage/lcov-report/components/group-reporting-user/index.html +130 -130
- package/coverage/lcov-report/components/group-system-access/group-system-access.repository.ts.html +117 -117
- package/coverage/lcov-report/components/group-system-access/group-system-access.ts.html +309 -309
- package/coverage/lcov-report/components/group-system-access/index.html +130 -130
- package/coverage/lcov-report/components/login-history/index.html +115 -115
- package/coverage/lcov-report/components/login-history/login-history.repository.ts.html +117 -117
- package/coverage/lcov-report/components/login-user/index.html +130 -130
- package/coverage/lcov-report/components/login-user/login-user.ts.html +5007 -5007
- package/coverage/lcov-report/components/login-user/user.repository.ts.html +117 -117
- package/coverage/lcov-report/components/password-hash/index.html +115 -115
- package/coverage/lcov-report/components/password-hash/password-hash.service.ts.html +126 -126
- package/coverage/lcov-report/components/system/index.html +130 -130
- package/coverage/lcov-report/components/system/system.repository.ts.html +117 -117
- package/coverage/lcov-report/components/system/system.ts.html +909 -909
- package/coverage/lcov-report/components/system-privilege/index.html +130 -130
- package/coverage/lcov-report/components/system-privilege/system-privilege.repository.ts.html +120 -120
- package/coverage/lcov-report/components/system-privilege/system-privilege.ts.html +390 -390
- package/coverage/lcov-report/components/user-group/index.html +130 -130
- package/coverage/lcov-report/components/user-group/user-group.repository.ts.html +117 -117
- package/coverage/lcov-report/components/user-group/user-group.ts.html +354 -354
- package/coverage/lcov-report/components/user-object-privilege/index.html +130 -130
- package/coverage/lcov-report/components/user-object-privilege/user-object-privilege.repository.ts.html +117 -117
- package/coverage/lcov-report/components/user-object-privilege/user-object-privilege.ts.html +312 -312
- package/coverage/lcov-report/components/user-privilege/index.html +130 -130
- package/coverage/lcov-report/components/user-privilege/user-privilege.repository.ts.html +117 -117
- package/coverage/lcov-report/components/user-privilege/user-privilege.ts.html +306 -306
- package/coverage/lcov-report/components/user-system-access/index.html +130 -130
- package/coverage/lcov-report/components/user-system-access/user-system-access.repository.ts.html +117 -117
- package/coverage/lcov-report/components/user-system-access/user-system-access.ts.html +312 -312
- package/coverage/lcov-report/enum/group-type.enum.ts.html +108 -108
- package/coverage/lcov-report/enum/index.html +160 -160
- package/coverage/lcov-report/enum/index.ts.html +93 -93
- package/coverage/lcov-report/enum/user-status.enum.ts.html +105 -105
- package/coverage/lcov-report/enum/yn.enum.ts.html +96 -96
- package/coverage/lcov-report/index.html +370 -370
- package/coverage/lcov-report/models/group-object-privilege.entity.ts.html +333 -333
- package/coverage/lcov-report/models/group-privilege.entity.ts.html +315 -315
- package/coverage/lcov-report/models/group-reporting-user.entity.ts.html +339 -339
- package/coverage/lcov-report/models/group-system-access.entity.ts.html +324 -324
- package/coverage/lcov-report/models/group.entity.ts.html +435 -435
- package/coverage/lcov-report/models/index.html +310 -310
- package/coverage/lcov-report/models/login-history.entity.ts.html +252 -252
- package/coverage/lcov-report/models/staff.entity.ts.html +411 -411
- package/coverage/lcov-report/models/system-privilege.entity.ts.html +354 -354
- package/coverage/lcov-report/models/system.entity.ts.html +423 -423
- package/coverage/lcov-report/models/user-group.entity.ts.html +354 -354
- package/coverage/lcov-report/models/user-object-privilege.entity.ts.html +330 -330
- package/coverage/lcov-report/models/user-privilege.entity.ts.html +315 -315
- package/coverage/lcov-report/models/user-system-access.entity.ts.html +315 -315
- package/coverage/lcov-report/models/user.entity.ts.html +522 -522
- package/coverage/lcov-report/prettify.css +1 -1
- package/coverage/lcov-report/prettify.js +2 -2
- package/coverage/lcov-report/redis-client/index.html +115 -115
- package/coverage/lcov-report/redis-client/redis.service.ts.html +240 -240
- package/coverage/lcov-report/session/index.html +115 -115
- package/coverage/lcov-report/session/session.service.ts.html +246 -246
- package/coverage/lcov-report/sorter.js +196 -196
- package/coverage/lcov.info +2490 -2490
- package/coverage/test-report.xml +128 -128
- package/create-sso-user.sql +39 -39
- package/dist/src/components/login-user/user.js +9 -1
- package/dist/src/components/login-user/user.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/eslint.config.mjs +58 -58
- package/jest.config.js +14 -14
- package/migrations/20240314080602-create-user-table.js +124 -124
- package/migrations/20240314080603-create-user-group-table.js +85 -85
- package/migrations/20240314080604-create-user-user-group-table.js +55 -55
- package/migrations/20240314080605-create-login-history-table.js +53 -53
- package/migrations/20240527064925-create-system-table.js +78 -78
- package/migrations/20240527064926-create-system-privilege-table.js +71 -71
- package/migrations/20240527065342-create-group-table.js +93 -93
- package/migrations/20240527065633-create-group-reporting-user-table.js +76 -76
- package/migrations/20240528011551-create-group-system-access-table.js +72 -72
- package/migrations/20240528023018-user-system-access-table.js +75 -75
- package/migrations/20240528032229-user-privilege-table.js +76 -76
- package/migrations/20240528063003-create-group-privilege-table.js +76 -76
- package/migrations/20240528063051-create-group-object-privilege-table.js +84 -84
- package/migrations/20240528063107-create-user-object-privilege-table.js +84 -84
- package/migrations/20240528063108-create-api-key-table.js +85 -85
- package/migrations/20241104104802-create-building-table.js +95 -95
- package/migrations/20250108091132-add-area-manager-user-id-to-building-table.js +14 -14
- package/migrations/20250108091133-add-passcode-to-user-table.js +36 -36
- package/migrations/20250210115636-create-user-reporting-hierarchy.js +76 -76
- package/migrations/20250326043818-crate-user-password-history.js +42 -42
- package/package.json +90 -90
- package/sampledotenv +7 -7
- package/sonar-project.properties +22 -22
- package/src/components/api-key/api-key.repository.ts +15 -15
- package/src/components/api-key/api-key.ts +448 -448
- package/src/components/api-key/index.ts +4 -4
- package/src/components/building/building.repository.ts +27 -27
- package/src/components/building/index.ts +2 -2
- package/src/components/group/group.repository.ts +26 -26
- package/src/components/group/group.ts +2284 -2284
- package/src/components/group/index.ts +3 -3
- package/src/components/group-object-privilege/group-object-privilege.repository.ts +25 -25
- package/src/components/group-object-privilege/group-object-privilege.ts +278 -278
- package/src/components/group-object-privilege/index.ts +2 -2
- package/src/components/group-privilege/group-privilege.repository.ts +29 -29
- package/src/components/group-privilege/group-privilege.ts +84 -84
- package/src/components/group-privilege/index.ts +2 -2
- package/src/components/group-reporting-user/group-reporting-user.repository.ts +23 -23
- package/src/components/group-reporting-user/group-reporting-user.ts +506 -506
- package/src/components/group-reporting-user/index.ts +3 -3
- package/src/components/group-system-access/group-system-access.repository.ts +43 -43
- package/src/components/group-system-access/group-system-access.ts +90 -90
- package/src/components/group-system-access/index.ts +2 -2
- package/src/components/index.ts +20 -20
- package/src/components/login-history/index.ts +1 -1
- package/src/components/login-history/login-history.repository.ts +11 -11
- package/src/components/login-user/index.ts +5 -5
- package/src/components/login-user/interfaces/check-user-info-duplicated.interface.ts +7 -7
- package/src/components/login-user/interfaces/index.ts +1 -1
- package/src/components/login-user/interfaces/system-access.interface.ts +13 -13
- package/src/components/login-user/interfaces/user-info.interface.ts +34 -34
- package/src/components/login-user/login-user.ts +362 -362
- package/src/components/login-user/user.repository.ts +11 -11
- package/src/components/login-user/user.ts +3142 -3134
- package/src/components/password-hash/index.ts +2 -2
- package/src/components/password-hash/interfaces/index.ts +1 -1
- package/src/components/password-hash/interfaces/password-hash-service.interface.ts +4 -4
- package/src/components/password-hash/password-hash.service.ts +14 -14
- package/src/components/staff/index.ts +2 -2
- package/src/components/staff/staff.repository.ts +27 -27
- package/src/components/system/index.ts +3 -3
- package/src/components/system/system.repository.ts +11 -11
- package/src/components/system/system.ts +456 -456
- package/src/components/system-privilege/index.ts +4 -4
- package/src/components/system-privilege/system-privilege.repository.ts +18 -18
- package/src/components/system-privilege/system-privilege.ts +541 -541
- package/src/components/user-group/index.ts +2 -2
- package/src/components/user-group/user-group.repository.ts +19 -19
- package/src/components/user-group/user-group.ts +764 -764
- package/src/components/user-object-privilege/index.ts +2 -2
- package/src/components/user-object-privilege/user-object-privilege.repository.ts +11 -11
- package/src/components/user-object-privilege/user-object-privilege.ts +79 -79
- package/src/components/user-password-history/index.ts +2 -2
- package/src/components/user-password-history/user-password-history.repository.ts +39 -39
- package/src/components/user-password-history/user-password-history.ts +187 -187
- package/src/components/user-privilege/index.ts +2 -2
- package/src/components/user-privilege/user-privilege.repository.ts +25 -25
- package/src/components/user-privilege/user-privilege.ts +662 -662
- package/src/components/user-reporting-hierarchy/index.ts +2 -2
- package/src/components/user-reporting-hierarchy/user-reporting-hierarchy.repository.ts +30 -30
- package/src/components/user-reporting-hierarchy/user-reporting-hierarchy.ts +505 -505
- package/src/components/user-system-access/index.ts +2 -2
- package/src/components/user-system-access/user-system-access.repository.ts +41 -41
- package/src/components/user-system-access/user-system-access.ts +717 -717
- package/src/database.ts +15 -15
- package/src/enum/api-key.enum.ts +5 -5
- package/src/enum/building-type.enum.ts +6 -6
- package/src/enum/group-type.enum.ts +8 -8
- package/src/enum/index.ts +6 -6
- package/src/enum/login-status.enum.ts +4 -4
- package/src/enum/object-status.enum.ts +4 -4
- package/src/enum/user-status.enum.ts +7 -7
- package/src/enum/yn.enum.ts +4 -4
- package/src/index.ts +8 -8
- package/src/interfaces/api-key-attr.interface.ts +16 -16
- package/src/interfaces/group-object-privilege.interface.ts +14 -14
- package/src/interfaces/group-privilege.interface.ts +10 -10
- package/src/interfaces/group-reporting-user.interface.ts +11 -11
- package/src/interfaces/group-search-attr.interface.ts +9 -9
- package/src/interfaces/group-system-access.interface.ts +10 -10
- package/src/interfaces/group.interface.ts +17 -17
- package/src/interfaces/index.ts +13 -13
- package/src/interfaces/system-login.interface.ts +6 -6
- package/src/interfaces/system-privilege-search.interface.ts +5 -5
- package/src/interfaces/system-privilege.interface.ts +11 -11
- package/src/interfaces/system-search-attr.interface.ts +5 -5
- package/src/interfaces/system.interface.ts +15 -15
- package/src/interfaces/user-group.interface.ts +12 -12
- package/src/interfaces/user-object-privilege.interface.ts +14 -14
- package/src/interfaces/user-password-history.interface.ts +6 -6
- package/src/interfaces/user-privilege.interface.ts +10 -10
- package/src/interfaces/user-reporting-hierarchy.interface.ts +11 -11
- package/src/interfaces/user-session.interface.ts +5 -5
- package/src/interfaces/user-system-access.interface.ts +10 -10
- package/src/models/api-key-entity.ts +101 -101
- package/src/models/building.entity.ts +103 -103
- package/src/models/group-object-privilege.entity.ts +91 -91
- package/src/models/group-privilege.entity.ts +78 -78
- package/src/models/group-reporting-user.entity.ts +95 -95
- package/src/models/group-system-access.entity.ts +81 -81
- package/src/models/group.entity.ts +127 -127
- package/src/models/login-history.entity.ts +63 -63
- package/src/models/staff.entity.ts +91 -91
- package/src/models/system-privilege.entity.ts +90 -90
- package/src/models/system.entity.ts +113 -113
- package/src/models/user-group.entity.ts +91 -91
- package/src/models/user-object-privilege.entity.ts +90 -90
- package/src/models/user-password-history.ts +51 -51
- package/src/models/user-privilege.entity.ts +78 -78
- package/src/models/user-reporting-hierarchy.entity.ts +102 -102
- package/src/models/user-system-access.entity.ts +87 -87
- package/src/models/user.entity.ts +193 -193
- package/src/redis-client/__mocks__/jest-initial-setup.ts +2 -2
- package/src/redis-client/__mocks__/redis-mock.ts +28 -28
- package/src/redis-client/index.ts +1 -1
- package/src/redis-client/redis.service.ts +75 -75
- package/src/session/index.ts +2 -2
- package/src/session/interfaces/index.ts +1 -1
- package/src/session/interfaces/session-service.interface.ts +26 -26
- package/src/session/session.service.ts +96 -96
- package/src/types/auth-context.ts +10 -10
- package/src/types/index.ts +1 -1
- package/tsconfig.build.json +5 -5
- package/tsconfig.json +23 -23
@@ -1,75 +1,75 @@
|
|
1
|
-
import { createClient } from 'redis';
|
2
|
-
export class RedisService {
|
3
|
-
private static client;
|
4
|
-
|
5
|
-
private constructor() {}
|
6
|
-
|
7
|
-
static async init(client?: any): Promise<RedisService> {
|
8
|
-
if (!client) {
|
9
|
-
if (!RedisService.client) {
|
10
|
-
// Create a new Redis client
|
11
|
-
const host = process.env.REDIS_HOST;
|
12
|
-
const password = process.env.REDIS_PASS;
|
13
|
-
const port = process.env.REDIS_PORT;
|
14
|
-
const isProduction = process.env.REDIS_HOST.includes('windows.net');
|
15
|
-
const redis = isProduction ? 'rediss' : 'redis';
|
16
|
-
const pass = password ? `:${password}@` : '';
|
17
|
-
console.log(`${redis}://${pass}${host}:${port}`);
|
18
|
-
RedisService.client = client = createClient({
|
19
|
-
url: `${redis}://${pass}${host}:${port}`,
|
20
|
-
password: password,
|
21
|
-
});
|
22
|
-
|
23
|
-
RedisService.client.on('error', (error) => {
|
24
|
-
console.error('Redis error:', error);
|
25
|
-
});
|
26
|
-
RedisService.client.on('connect', () => console.log('Redis connected'));
|
27
|
-
RedisService.client.on('reconnecting', () =>
|
28
|
-
console.log('Redis reconnecting'),
|
29
|
-
);
|
30
|
-
|
31
|
-
await RedisService.client.connect();
|
32
|
-
}
|
33
|
-
} else {
|
34
|
-
RedisService.client = client;
|
35
|
-
}
|
36
|
-
return new RedisService();
|
37
|
-
}
|
38
|
-
|
39
|
-
public async set(
|
40
|
-
key: string,
|
41
|
-
value: any,
|
42
|
-
expire: number = 3600 * 24 * 1,
|
43
|
-
): Promise<void> {
|
44
|
-
try {
|
45
|
-
const newList = typeof value === 'string' ? value : JSON.stringify(value);
|
46
|
-
await RedisService.client.setEx(key, expire, newList);
|
47
|
-
} catch (error) {
|
48
|
-
console.log(error);
|
49
|
-
}
|
50
|
-
}
|
51
|
-
|
52
|
-
public async get(key: string): Promise<null> {
|
53
|
-
try {
|
54
|
-
return await RedisService.client.get(key);
|
55
|
-
} catch (error) {
|
56
|
-
throw error;
|
57
|
-
}
|
58
|
-
}
|
59
|
-
|
60
|
-
public async del(key: string): Promise<void> {
|
61
|
-
try {
|
62
|
-
await RedisService.client.del(key);
|
63
|
-
} catch (error) {
|
64
|
-
throw error;
|
65
|
-
}
|
66
|
-
}
|
67
|
-
|
68
|
-
public static async close(): Promise<void> {
|
69
|
-
try {
|
70
|
-
await RedisService.client.disconnect();
|
71
|
-
} catch (error) {
|
72
|
-
throw error;
|
73
|
-
}
|
74
|
-
}
|
75
|
-
}
|
1
|
+
import { createClient } from 'redis';
|
2
|
+
export class RedisService {
|
3
|
+
private static client;
|
4
|
+
|
5
|
+
private constructor() {}
|
6
|
+
|
7
|
+
static async init(client?: any): Promise<RedisService> {
|
8
|
+
if (!client) {
|
9
|
+
if (!RedisService.client) {
|
10
|
+
// Create a new Redis client
|
11
|
+
const host = process.env.REDIS_HOST;
|
12
|
+
const password = process.env.REDIS_PASS;
|
13
|
+
const port = process.env.REDIS_PORT;
|
14
|
+
const isProduction = process.env.REDIS_HOST.includes('windows.net');
|
15
|
+
const redis = isProduction ? 'rediss' : 'redis';
|
16
|
+
const pass = password ? `:${password}@` : '';
|
17
|
+
console.log(`${redis}://${pass}${host}:${port}`);
|
18
|
+
RedisService.client = client = createClient({
|
19
|
+
url: `${redis}://${pass}${host}:${port}`,
|
20
|
+
password: password,
|
21
|
+
});
|
22
|
+
|
23
|
+
RedisService.client.on('error', (error) => {
|
24
|
+
console.error('Redis error:', error);
|
25
|
+
});
|
26
|
+
RedisService.client.on('connect', () => console.log('Redis connected'));
|
27
|
+
RedisService.client.on('reconnecting', () =>
|
28
|
+
console.log('Redis reconnecting'),
|
29
|
+
);
|
30
|
+
|
31
|
+
await RedisService.client.connect();
|
32
|
+
}
|
33
|
+
} else {
|
34
|
+
RedisService.client = client;
|
35
|
+
}
|
36
|
+
return new RedisService();
|
37
|
+
}
|
38
|
+
|
39
|
+
public async set(
|
40
|
+
key: string,
|
41
|
+
value: any,
|
42
|
+
expire: number = 3600 * 24 * 1,
|
43
|
+
): Promise<void> {
|
44
|
+
try {
|
45
|
+
const newList = typeof value === 'string' ? value : JSON.stringify(value);
|
46
|
+
await RedisService.client.setEx(key, expire, newList);
|
47
|
+
} catch (error) {
|
48
|
+
console.log(error);
|
49
|
+
}
|
50
|
+
}
|
51
|
+
|
52
|
+
public async get(key: string): Promise<null> {
|
53
|
+
try {
|
54
|
+
return await RedisService.client.get(key);
|
55
|
+
} catch (error) {
|
56
|
+
throw error;
|
57
|
+
}
|
58
|
+
}
|
59
|
+
|
60
|
+
public async del(key: string): Promise<void> {
|
61
|
+
try {
|
62
|
+
await RedisService.client.del(key);
|
63
|
+
} catch (error) {
|
64
|
+
throw error;
|
65
|
+
}
|
66
|
+
}
|
67
|
+
|
68
|
+
public static async close(): Promise<void> {
|
69
|
+
try {
|
70
|
+
await RedisService.client.disconnect();
|
71
|
+
} catch (error) {
|
72
|
+
throw error;
|
73
|
+
}
|
74
|
+
}
|
75
|
+
}
|
package/src/session/index.ts
CHANGED
@@ -1,2 +1,2 @@
|
|
1
|
-
export * from './interfaces';
|
2
|
-
export * from './session.service';
|
1
|
+
export * from './interfaces';
|
2
|
+
export * from './session.service';
|
@@ -1 +1 @@
|
|
1
|
-
export * from './session-service.interface';
|
1
|
+
export * from './session-service.interface';
|
@@ -1,26 +1,26 @@
|
|
1
|
-
import { IUserSession } from '../../interfaces/user-session.interface';
|
2
|
-
|
3
|
-
export interface ISessionService {
|
4
|
-
retrieveUserSession(
|
5
|
-
userId: string,
|
6
|
-
sessionName: string,
|
7
|
-
): Promise<IUserSession>;
|
8
|
-
setUserSession(
|
9
|
-
userId: string,
|
10
|
-
sessionData: IUserSession,
|
11
|
-
sessionName: string,
|
12
|
-
duration?: number,
|
13
|
-
): Promise<void>;
|
14
|
-
refreshDuration(
|
15
|
-
userId: string,
|
16
|
-
sessionName: string,
|
17
|
-
duration?: number,
|
18
|
-
): Promise<void>;
|
19
|
-
setAuthorizationCode(
|
20
|
-
token: string,
|
21
|
-
value: string,
|
22
|
-
expire: number,
|
23
|
-
): Promise<void>;
|
24
|
-
retrieveAuthorizationCode(token: string): Promise<string>;
|
25
|
-
deleteAuthorizationCode(token: string): Promise<void>;
|
26
|
-
}
|
1
|
+
import { IUserSession } from '../../interfaces/user-session.interface';
|
2
|
+
|
3
|
+
export interface ISessionService {
|
4
|
+
retrieveUserSession(
|
5
|
+
userId: string,
|
6
|
+
sessionName: string,
|
7
|
+
): Promise<IUserSession>;
|
8
|
+
setUserSession(
|
9
|
+
userId: string,
|
10
|
+
sessionData: IUserSession,
|
11
|
+
sessionName: string,
|
12
|
+
duration?: number,
|
13
|
+
): Promise<void>;
|
14
|
+
refreshDuration(
|
15
|
+
userId: string,
|
16
|
+
sessionName: string,
|
17
|
+
duration?: number,
|
18
|
+
): Promise<void>;
|
19
|
+
setAuthorizationCode(
|
20
|
+
token: string,
|
21
|
+
value: string,
|
22
|
+
expire: number,
|
23
|
+
): Promise<void>;
|
24
|
+
retrieveAuthorizationCode(token: string): Promise<string>;
|
25
|
+
deleteAuthorizationCode(token: string): Promise<void>;
|
26
|
+
}
|
@@ -1,96 +1,96 @@
|
|
1
|
-
import { RedisService } from '../redis-client/redis.service';
|
2
|
-
import { ISessionService } from './interfaces/session-service.interface';
|
3
|
-
import { IUserSession } from '../interfaces/user-session.interface';
|
4
|
-
|
5
|
-
export class SessionService implements ISessionService {
|
6
|
-
private static _RedisService: RedisService;
|
7
|
-
private environment: string = '';
|
8
|
-
|
9
|
-
private constructor() {}
|
10
|
-
|
11
|
-
static async init(redisClient?: any): Promise<SessionService> {
|
12
|
-
const sessionService = new SessionService();
|
13
|
-
SessionService._RedisService = await RedisService.init(redisClient);
|
14
|
-
if (process.env.NODE_ENV == 'test') {
|
15
|
-
sessionService.environment = 'test:';
|
16
|
-
} else if (process.env.NODE_ENV == 'staging') {
|
17
|
-
sessionService.environment = 'staging:';
|
18
|
-
}
|
19
|
-
return sessionService;
|
20
|
-
}
|
21
|
-
|
22
|
-
async setUserSession(
|
23
|
-
userId: string,
|
24
|
-
sessionData: IUserSession,
|
25
|
-
sessionName: string = 'tomei-sid',
|
26
|
-
duration: number = 60 * 60, //1 hour
|
27
|
-
): Promise<void> {
|
28
|
-
try {
|
29
|
-
const key = `${this.environment}${sessionName}:${userId}`;
|
30
|
-
await SessionService._RedisService.set(key, sessionData, duration);
|
31
|
-
} catch (error) {
|
32
|
-
throw error;
|
33
|
-
}
|
34
|
-
}
|
35
|
-
|
36
|
-
async retrieveUserSession(
|
37
|
-
userId: string,
|
38
|
-
sessionName: string = 'tomei-sid',
|
39
|
-
): Promise<IUserSession> {
|
40
|
-
try {
|
41
|
-
const key = `${this.environment}${sessionName}:${userId}`;
|
42
|
-
const stringData = await SessionService._RedisService.get(key);
|
43
|
-
if (!stringData)
|
44
|
-
return {
|
45
|
-
systemLogins: [],
|
46
|
-
};
|
47
|
-
return JSON.parse(stringData);
|
48
|
-
} catch (error) {
|
49
|
-
throw error;
|
50
|
-
}
|
51
|
-
}
|
52
|
-
|
53
|
-
async refreshDuration(
|
54
|
-
userid: string,
|
55
|
-
sessionName: string = 'tomei-sid',
|
56
|
-
duration: number = 60 * 60,
|
57
|
-
): Promise<void> {
|
58
|
-
try {
|
59
|
-
const userSession = await this.retrieveUserSession(userid, sessionName);
|
60
|
-
await this.setUserSession(userid, userSession, sessionName, duration);
|
61
|
-
} catch (error) {
|
62
|
-
throw error;
|
63
|
-
}
|
64
|
-
}
|
65
|
-
|
66
|
-
async setAuthorizationCode(
|
67
|
-
token: string,
|
68
|
-
value: string,
|
69
|
-
expire: number,
|
70
|
-
): Promise<void> {
|
71
|
-
try {
|
72
|
-
const key = `${this.environment}tomei-auth-code:${token}`;
|
73
|
-
await SessionService._RedisService.set(key, value, expire);
|
74
|
-
} catch (error) {
|
75
|
-
throw error;
|
76
|
-
}
|
77
|
-
}
|
78
|
-
|
79
|
-
async retrieveAuthorizationCode(token: string): Promise<string> {
|
80
|
-
try {
|
81
|
-
const key = `${this.environment}tomei-auth-code:${token}`;
|
82
|
-
return await SessionService._RedisService.get(key);
|
83
|
-
} catch (error) {
|
84
|
-
throw error;
|
85
|
-
}
|
86
|
-
}
|
87
|
-
|
88
|
-
async deleteAuthorizationCode(token: string): Promise<void> {
|
89
|
-
try {
|
90
|
-
const key = `${this.environment}tomei-auth-code:${token}`;
|
91
|
-
await SessionService._RedisService.del(key);
|
92
|
-
} catch (error) {
|
93
|
-
throw error;
|
94
|
-
}
|
95
|
-
}
|
96
|
-
}
|
1
|
+
import { RedisService } from '../redis-client/redis.service';
|
2
|
+
import { ISessionService } from './interfaces/session-service.interface';
|
3
|
+
import { IUserSession } from '../interfaces/user-session.interface';
|
4
|
+
|
5
|
+
export class SessionService implements ISessionService {
|
6
|
+
private static _RedisService: RedisService;
|
7
|
+
private environment: string = '';
|
8
|
+
|
9
|
+
private constructor() {}
|
10
|
+
|
11
|
+
static async init(redisClient?: any): Promise<SessionService> {
|
12
|
+
const sessionService = new SessionService();
|
13
|
+
SessionService._RedisService = await RedisService.init(redisClient);
|
14
|
+
if (process.env.NODE_ENV == 'test') {
|
15
|
+
sessionService.environment = 'test:';
|
16
|
+
} else if (process.env.NODE_ENV == 'staging') {
|
17
|
+
sessionService.environment = 'staging:';
|
18
|
+
}
|
19
|
+
return sessionService;
|
20
|
+
}
|
21
|
+
|
22
|
+
async setUserSession(
|
23
|
+
userId: string,
|
24
|
+
sessionData: IUserSession,
|
25
|
+
sessionName: string = 'tomei-sid',
|
26
|
+
duration: number = 60 * 60, //1 hour
|
27
|
+
): Promise<void> {
|
28
|
+
try {
|
29
|
+
const key = `${this.environment}${sessionName}:${userId}`;
|
30
|
+
await SessionService._RedisService.set(key, sessionData, duration);
|
31
|
+
} catch (error) {
|
32
|
+
throw error;
|
33
|
+
}
|
34
|
+
}
|
35
|
+
|
36
|
+
async retrieveUserSession(
|
37
|
+
userId: string,
|
38
|
+
sessionName: string = 'tomei-sid',
|
39
|
+
): Promise<IUserSession> {
|
40
|
+
try {
|
41
|
+
const key = `${this.environment}${sessionName}:${userId}`;
|
42
|
+
const stringData = await SessionService._RedisService.get(key);
|
43
|
+
if (!stringData)
|
44
|
+
return {
|
45
|
+
systemLogins: [],
|
46
|
+
};
|
47
|
+
return JSON.parse(stringData);
|
48
|
+
} catch (error) {
|
49
|
+
throw error;
|
50
|
+
}
|
51
|
+
}
|
52
|
+
|
53
|
+
async refreshDuration(
|
54
|
+
userid: string,
|
55
|
+
sessionName: string = 'tomei-sid',
|
56
|
+
duration: number = 60 * 60,
|
57
|
+
): Promise<void> {
|
58
|
+
try {
|
59
|
+
const userSession = await this.retrieveUserSession(userid, sessionName);
|
60
|
+
await this.setUserSession(userid, userSession, sessionName, duration);
|
61
|
+
} catch (error) {
|
62
|
+
throw error;
|
63
|
+
}
|
64
|
+
}
|
65
|
+
|
66
|
+
async setAuthorizationCode(
|
67
|
+
token: string,
|
68
|
+
value: string,
|
69
|
+
expire: number,
|
70
|
+
): Promise<void> {
|
71
|
+
try {
|
72
|
+
const key = `${this.environment}tomei-auth-code:${token}`;
|
73
|
+
await SessionService._RedisService.set(key, value, expire);
|
74
|
+
} catch (error) {
|
75
|
+
throw error;
|
76
|
+
}
|
77
|
+
}
|
78
|
+
|
79
|
+
async retrieveAuthorizationCode(token: string): Promise<string> {
|
80
|
+
try {
|
81
|
+
const key = `${this.environment}tomei-auth-code:${token}`;
|
82
|
+
return await SessionService._RedisService.get(key);
|
83
|
+
} catch (error) {
|
84
|
+
throw error;
|
85
|
+
}
|
86
|
+
}
|
87
|
+
|
88
|
+
async deleteAuthorizationCode(token: string): Promise<void> {
|
89
|
+
try {
|
90
|
+
const key = `${this.environment}tomei-auth-code:${token}`;
|
91
|
+
await SessionService._RedisService.del(key);
|
92
|
+
} catch (error) {
|
93
|
+
throw error;
|
94
|
+
}
|
95
|
+
}
|
96
|
+
}
|
@@ -1,10 +1,10 @@
|
|
1
|
-
import { IAPIKeyAttr } from '../interfaces/api-key-attr.interface';
|
2
|
-
import { LoginUser } from '../components/login-user/login-user';
|
3
|
-
|
4
|
-
export type AuthContext =
|
5
|
-
| {
|
6
|
-
loginUser: LoginUser;
|
7
|
-
}
|
8
|
-
| {
|
9
|
-
apiKey: IAPIKeyAttr;
|
10
|
-
};
|
1
|
+
import { IAPIKeyAttr } from '../interfaces/api-key-attr.interface';
|
2
|
+
import { LoginUser } from '../components/login-user/login-user';
|
3
|
+
|
4
|
+
export type AuthContext =
|
5
|
+
| {
|
6
|
+
loginUser: LoginUser;
|
7
|
+
}
|
8
|
+
| {
|
9
|
+
apiKey: IAPIKeyAttr;
|
10
|
+
};
|
package/src/types/index.ts
CHANGED
@@ -1 +1 @@
|
|
1
|
-
export * from './auth-context';
|
1
|
+
export * from './auth-context';
|
package/tsconfig.build.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
|
-
{
|
2
|
-
"extends": "./tsconfig.json",
|
3
|
-
"include": ["**/*.ts"],
|
4
|
-
"exclude": ["node_modules", "__tests__", "dist", "**/*spec.ts"]
|
5
|
-
}
|
1
|
+
{
|
2
|
+
"extends": "./tsconfig.json",
|
3
|
+
"include": ["**/*.ts"],
|
4
|
+
"exclude": ["node_modules", "__tests__", "dist", "**/*spec.ts"]
|
5
|
+
}
|
6
6
|
|
package/tsconfig.json
CHANGED
@@ -1,24 +1,24 @@
|
|
1
|
-
{
|
2
|
-
"compilerOptions": {
|
3
|
-
"module": "commonjs",
|
4
|
-
"declaration": true,
|
5
|
-
"removeComments": true,
|
6
|
-
"emitDecoratorMetadata": true,
|
7
|
-
"experimentalDecorators": true,
|
8
|
-
"allowSyntheticDefaultImports": true,
|
9
|
-
"moduleResolution": "node",
|
10
|
-
"target": "es6",
|
11
|
-
"sourceMap": true,
|
12
|
-
"outDir": "./dist",
|
13
|
-
"baseUrl": "./src",
|
14
|
-
"rootDir": "./",
|
15
|
-
"incremental": true,
|
16
|
-
"skipLibCheck": true,
|
17
|
-
"noImplicitAny": false,
|
18
|
-
"strictBindCallApply": false,
|
19
|
-
"forceConsistentCasingInFileNames": false,
|
20
|
-
"noFallthroughCasesInSwitch": false,
|
21
|
-
"strictNullChecks": false,
|
22
|
-
},
|
23
|
-
"exclude": ["node_modules", "dist"]
|
1
|
+
{
|
2
|
+
"compilerOptions": {
|
3
|
+
"module": "commonjs",
|
4
|
+
"declaration": true,
|
5
|
+
"removeComments": true,
|
6
|
+
"emitDecoratorMetadata": true,
|
7
|
+
"experimentalDecorators": true,
|
8
|
+
"allowSyntheticDefaultImports": true,
|
9
|
+
"moduleResolution": "node",
|
10
|
+
"target": "es6",
|
11
|
+
"sourceMap": true,
|
12
|
+
"outDir": "./dist",
|
13
|
+
"baseUrl": "./src",
|
14
|
+
"rootDir": "./",
|
15
|
+
"incremental": true,
|
16
|
+
"skipLibCheck": true,
|
17
|
+
"noImplicitAny": false,
|
18
|
+
"strictBindCallApply": false,
|
19
|
+
"forceConsistentCasingInFileNames": false,
|
20
|
+
"noFallthroughCasesInSwitch": false,
|
21
|
+
"strictNullChecks": false,
|
22
|
+
},
|
23
|
+
"exclude": ["node_modules", "dist"]
|
24
24
|
}
|