@ackplus/nest-auth 0.1.31 → 0.1.33
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/README.md +167 -3
- package/package.json +1 -1
- package/src/index.d.ts +2 -0
- package/src/index.js +3 -0
- package/src/index.js.map +1 -1
- package/src/lib/auth/services/auth.service.d.ts +3 -3
- package/src/lib/auth/services/auth.service.js +11 -9
- package/src/lib/auth/services/auth.service.js.map +1 -1
- package/src/lib/auth/services/cookie.service.d.ts +1 -2
- package/src/lib/auth/services/cookie.service.js +4 -4
- package/src/lib/auth/services/cookie.service.js.map +1 -1
- package/src/lib/auth/services/mfa.service.d.ts +3 -3
- package/src/lib/auth/services/mfa.service.js +7 -5
- package/src/lib/auth/services/mfa.service.js.map +1 -1
- package/src/lib/auth.constants.d.ts +1 -1
- package/src/lib/auth.constants.js +2 -2
- package/src/lib/auth.constants.js.map +1 -1
- package/src/lib/core/core.module.d.ts +0 -3
- package/src/lib/core/core.module.js +5 -27
- package/src/lib/core/core.module.js.map +1 -1
- package/src/lib/core/interfaces/auth-module-options.interface.d.ts +1 -1
- package/src/lib/core/interfaces/token-payload.interface.d.ts +3 -2
- package/src/lib/core/providers/apple-auth.provider.d.ts +1 -3
- package/src/lib/core/providers/apple-auth.provider.js +3 -4
- package/src/lib/core/providers/apple-auth.provider.js.map +1 -1
- package/src/lib/core/providers/base-auth.provider.d.ts +2 -0
- package/src/lib/core/providers/base-auth.provider.js +2 -0
- package/src/lib/core/providers/base-auth.provider.js.map +1 -1
- package/src/lib/core/providers/email-auth.provider.d.ts +1 -3
- package/src/lib/core/providers/email-auth.provider.js +2 -4
- package/src/lib/core/providers/email-auth.provider.js.map +1 -1
- package/src/lib/core/providers/facebook-auth.provider.d.ts +1 -3
- package/src/lib/core/providers/facebook-auth.provider.js +2 -4
- package/src/lib/core/providers/facebook-auth.provider.js.map +1 -1
- package/src/lib/core/providers/google-auth.provider.d.ts +1 -3
- package/src/lib/core/providers/google-auth.provider.js +2 -4
- package/src/lib/core/providers/google-auth.provider.js.map +1 -1
- package/src/lib/core/providers/jwt-auth.provider.d.ts +2 -4
- package/src/lib/core/providers/jwt-auth.provider.js +3 -4
- package/src/lib/core/providers/jwt-auth.provider.js.map +1 -1
- package/src/lib/core/providers/phone-auth.provider.d.ts +1 -3
- package/src/lib/core/providers/phone-auth.provider.js +2 -4
- package/src/lib/core/providers/phone-auth.provider.js.map +1 -1
- package/src/lib/core/services/auth-config.service.d.ts +12 -0
- package/src/lib/core/services/auth-config.service.js +71 -0
- package/src/lib/core/services/auth-config.service.js.map +1 -0
- package/src/lib/core/services/auth-provider-registry.service.d.ts +2 -3
- package/src/lib/core/services/auth-provider-registry.service.js +4 -5
- package/src/lib/core/services/auth-provider-registry.service.js.map +1 -1
- package/src/lib/core/services/jwt.service.d.ts +1 -2
- package/src/lib/core/services/jwt.service.js +4 -5
- package/src/lib/core/services/jwt.service.js.map +1 -1
- package/src/lib/nest-auth.module.d.ts +2 -0
- package/src/lib/nest-auth.module.js +60 -12
- package/src/lib/nest-auth.module.js.map +1 -1
- package/src/lib/role/services/role.service.js +1 -2
- package/src/lib/role/services/role.service.js.map +1 -1
- package/src/lib/session/services/base-session.service.d.ts +2 -2
- package/src/lib/session/services/base-session.service.js +8 -10
- package/src/lib/session/services/base-session.service.js.map +1 -1
- package/src/lib/session/services/database-session.service.d.ts +1 -3
- package/src/lib/session/services/database-session.service.js +4 -8
- package/src/lib/session/services/database-session.service.js.map +1 -1
- package/src/lib/session/services/redis-session.service.d.ts +1 -3
- package/src/lib/session/services/redis-session.service.js +4 -7
- package/src/lib/session/services/redis-session.service.js.map +1 -1
- package/src/lib/user/entities/user.entity.d.ts +1 -1
- package/src/lib/user/entities/user.entity.js +3 -4
- package/src/lib/user/entities/user.entity.js.map +1 -1
|
@@ -15,15 +15,19 @@ const session_module_1 = require("./session/session.module");
|
|
|
15
15
|
const tenant_module_1 = require("./tenant/tenant.module");
|
|
16
16
|
const mfa_options_interface_1 = require("./core/interfaces/mfa-options.interface");
|
|
17
17
|
const core_module_1 = require("./core/core.module");
|
|
18
|
-
const
|
|
18
|
+
const auth_config_service_1 = require("./core/services/auth-config.service");
|
|
19
|
+
const auth_constants_1 = require("./auth.constants");
|
|
19
20
|
let NestAuthModule = NestAuthModule_1 = class NestAuthModule {
|
|
20
21
|
static forRoot(options) {
|
|
21
22
|
const mergedOptions = this.getOptions(options);
|
|
23
|
+
auth_config_service_1.AuthConfigService.setOptions(mergedOptions);
|
|
22
24
|
return {
|
|
23
25
|
module: NestAuthModule_1,
|
|
24
26
|
global: mergedOptions.isGlobal,
|
|
25
27
|
imports: [
|
|
26
|
-
|
|
28
|
+
typeorm_1.TypeOrmModule.forFeature(core_1.NestAuthEntities),
|
|
29
|
+
event_emitter_1.EventEmitterModule,
|
|
30
|
+
core_module_1.CoreModule,
|
|
27
31
|
auth_module_1.AuthModule,
|
|
28
32
|
tenant_module_1.TenantModule,
|
|
29
33
|
user_module_1.UserModule,
|
|
@@ -41,28 +45,76 @@ let NestAuthModule = NestAuthModule_1 = class NestAuthModule {
|
|
|
41
45
|
};
|
|
42
46
|
}
|
|
43
47
|
static forRootAsync(options) {
|
|
48
|
+
const asyncProviders = this.createAsyncProviders(options);
|
|
44
49
|
return {
|
|
45
50
|
module: NestAuthModule_1,
|
|
46
51
|
global: options.isGlobal,
|
|
47
52
|
imports: [
|
|
48
|
-
|
|
53
|
+
typeorm_1.TypeOrmModule.forFeature(core_1.NestAuthEntities),
|
|
54
|
+
event_emitter_1.EventEmitterModule,
|
|
55
|
+
core_module_1.CoreModule,
|
|
49
56
|
auth_module_1.AuthModule,
|
|
57
|
+
tenant_module_1.TenantModule,
|
|
50
58
|
user_module_1.UserModule,
|
|
51
59
|
role_module_1.RoleModule,
|
|
52
60
|
session_module_1.SessionModule,
|
|
53
|
-
...options.imports || [],
|
|
61
|
+
...(options.imports || []),
|
|
62
|
+
],
|
|
63
|
+
providers: [
|
|
64
|
+
...asyncProviders,
|
|
54
65
|
],
|
|
55
66
|
exports: [
|
|
56
67
|
core_module_1.CoreModule,
|
|
57
68
|
auth_module_1.AuthModule,
|
|
69
|
+
tenant_module_1.TenantModule,
|
|
58
70
|
user_module_1.UserModule,
|
|
59
71
|
role_module_1.RoleModule,
|
|
60
72
|
session_module_1.SessionModule,
|
|
61
73
|
],
|
|
62
74
|
};
|
|
63
75
|
}
|
|
76
|
+
static createAsyncProviders(options) {
|
|
77
|
+
if (options.useExisting || options.useFactory) {
|
|
78
|
+
return [this.createAsyncOptionsProvider(options)];
|
|
79
|
+
}
|
|
80
|
+
if (options.useClass) {
|
|
81
|
+
return [
|
|
82
|
+
this.createAsyncOptionsProvider(options),
|
|
83
|
+
{
|
|
84
|
+
provide: options.useClass,
|
|
85
|
+
useClass: options.useClass,
|
|
86
|
+
},
|
|
87
|
+
];
|
|
88
|
+
}
|
|
89
|
+
return [];
|
|
90
|
+
}
|
|
91
|
+
static createAsyncOptionsProvider(options) {
|
|
92
|
+
if (options.useFactory) {
|
|
93
|
+
return {
|
|
94
|
+
provide: auth_constants_1.NEST_AUTH_ASYNC_OPTIONS_PROVIDER,
|
|
95
|
+
useFactory: async (...args) => {
|
|
96
|
+
const userOptions = await options.useFactory(...args);
|
|
97
|
+
const mergedOptions = this.getOptions(userOptions);
|
|
98
|
+
auth_config_service_1.AuthConfigService.setOptions(mergedOptions);
|
|
99
|
+
return mergedOptions;
|
|
100
|
+
},
|
|
101
|
+
inject: options.inject || [],
|
|
102
|
+
};
|
|
103
|
+
}
|
|
104
|
+
return {
|
|
105
|
+
provide: auth_constants_1.NEST_AUTH_ASYNC_OPTIONS_PROVIDER,
|
|
106
|
+
useFactory: async (optionsFactory) => {
|
|
107
|
+
const userOptions = await optionsFactory.createAuthModuleOptions();
|
|
108
|
+
const mergedOptions = this.getOptions(userOptions);
|
|
109
|
+
auth_config_service_1.AuthConfigService.setOptions(mergedOptions);
|
|
110
|
+
return mergedOptions;
|
|
111
|
+
},
|
|
112
|
+
inject: [options.useExisting || options.useClass],
|
|
113
|
+
};
|
|
114
|
+
}
|
|
64
115
|
static getOptions(options) {
|
|
65
|
-
|
|
116
|
+
const deepmerge = require('deepmerge');
|
|
117
|
+
return deepmerge(this.moduleDefaultOptions, options);
|
|
66
118
|
}
|
|
67
119
|
configure(consumer) {
|
|
68
120
|
consumer.apply(request_context_middleware_1.RequestContextMiddleware).forRoutes('auth/*');
|
|
@@ -100,20 +152,16 @@ exports.NestAuthModule = NestAuthModule = NestAuthModule_1 = tslib_1.__decorate(
|
|
|
100
152
|
(0, common_1.Module)({
|
|
101
153
|
imports: [
|
|
102
154
|
typeorm_1.TypeOrmModule.forFeature(core_1.NestAuthEntities),
|
|
103
|
-
event_emitter_1.EventEmitterModule,
|
|
104
155
|
core_module_1.CoreModule,
|
|
105
|
-
auth_module_1.AuthModule,
|
|
106
|
-
tenant_module_1.TenantModule,
|
|
107
156
|
user_module_1.UserModule,
|
|
108
157
|
role_module_1.RoleModule,
|
|
109
|
-
|
|
158
|
+
tenant_module_1.TenantModule,
|
|
110
159
|
],
|
|
111
160
|
exports: [
|
|
112
|
-
|
|
113
|
-
tenant_module_1.TenantModule,
|
|
161
|
+
core_module_1.CoreModule,
|
|
114
162
|
user_module_1.UserModule,
|
|
115
163
|
role_module_1.RoleModule,
|
|
116
|
-
|
|
164
|
+
tenant_module_1.TenantModule,
|
|
117
165
|
],
|
|
118
166
|
})
|
|
119
167
|
], NestAuthModule);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nest-auth.module.js","sourceRoot":"","sources":["../../../../../packages/nest-auth/src/lib/nest-auth.module.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"nest-auth.module.js","sourceRoot":"","sources":["../../../../../packages/nest-auth/src/lib/nest-auth.module.ts"],"names":[],"mappings":"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"}
|
|
@@ -112,8 +112,7 @@ let RoleService = class RoleService {
|
|
|
112
112
|
if (!tenantId) {
|
|
113
113
|
return [];
|
|
114
114
|
}
|
|
115
|
-
const query = this.roleRepository.createQueryBuilder('role')
|
|
116
|
-
.leftJoinAndSelect('role.rolePermissions', 'rolePermission');
|
|
115
|
+
const query = this.roleRepository.createQueryBuilder('role');
|
|
117
116
|
query.where('role.tenantId = :tenantId', { tenantId });
|
|
118
117
|
if (includeSystemRoles) {
|
|
119
118
|
query.orWhere('role.tenantId IS NULL AND role.isSystem = :isSystem', { isSystem: true });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../../../../../packages/nest-auth/src/lib/role/services/role.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../../../../../packages/nest-auth/src/lib/role/services/role.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,9 @@ import { SessionOptions } from '../../core/interfaces/session-options.interface'
|
|
|
3
3
|
import { SessionPayload } from '../../core/interfaces/token-payload.interface';
|
|
4
4
|
import { User } from '../../user/entities/user.entity';
|
|
5
5
|
export declare abstract class BaseSessionService {
|
|
6
|
-
protected readonly authModuleOptions: AuthModuleOptions;
|
|
7
6
|
protected readonly sessionOptions: SessionOptions;
|
|
8
|
-
|
|
7
|
+
protected readonly authModuleOptions: AuthModuleOptions;
|
|
8
|
+
constructor();
|
|
9
9
|
getSessionOptions(): SessionOptions;
|
|
10
10
|
createSessionFromUser(user: User, extraData?: {
|
|
11
11
|
isMfaVerified?: boolean;
|
|
@@ -3,20 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.BaseSessionService = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const common_1 = require("@nestjs/common");
|
|
6
|
-
const auth_constants_1 = require("../../auth.constants");
|
|
7
|
-
const common_2 = require("@nestjs/common");
|
|
8
6
|
const request_context_1 = require("../../request-context/request-context");
|
|
9
7
|
const ms_1 = tslib_1.__importDefault(require("ms"));
|
|
10
8
|
const lodash_1 = require("lodash");
|
|
11
9
|
const session_options_interface_1 = require("../../core/interfaces/session-options.interface");
|
|
10
|
+
const auth_config_service_1 = require("../../core/services/auth-config.service");
|
|
12
11
|
let BaseSessionService = class BaseSessionService {
|
|
13
|
-
constructor(
|
|
14
|
-
this.authModuleOptions = authModuleOptions;
|
|
12
|
+
constructor() {
|
|
15
13
|
const defaultSessionOptions = {
|
|
16
|
-
sessionExpiry:
|
|
17
|
-
refreshTokenExpiry:
|
|
14
|
+
sessionExpiry: '7d',
|
|
15
|
+
refreshTokenExpiry: '15m',
|
|
18
16
|
storageType: session_options_interface_1.SessionStorageType.DATABASE,
|
|
19
17
|
};
|
|
18
|
+
this.authModuleOptions = auth_config_service_1.AuthConfigService.getOptions();
|
|
20
19
|
this.sessionOptions = Object.assign({}, defaultSessionOptions, this.authModuleOptions.session);
|
|
21
20
|
}
|
|
22
21
|
getSessionOptions() {
|
|
@@ -28,7 +27,7 @@ let BaseSessionService = class BaseSessionService {
|
|
|
28
27
|
if (!user) {
|
|
29
28
|
throw new common_1.UnauthorizedException('User not found');
|
|
30
29
|
}
|
|
31
|
-
const expiresAt = new Date(Date.now() + (0, ms_1.default)(this.
|
|
30
|
+
const expiresAt = new Date(Date.now() + (0, ms_1.default)(this.sessionOptions.sessionExpiry));
|
|
32
31
|
const roles = await user.getRoles();
|
|
33
32
|
const permissions = await user.getPermissions();
|
|
34
33
|
const session = {
|
|
@@ -52,7 +51,7 @@ let BaseSessionService = class BaseSessionService {
|
|
|
52
51
|
createSessionFromSession(session) {
|
|
53
52
|
const newSession = {
|
|
54
53
|
...(0, lodash_1.omit)(session, 'id'),
|
|
55
|
-
expiresAt: new Date(Date.now() + (0, ms_1.default)(this.
|
|
54
|
+
expiresAt: new Date(Date.now() + (0, ms_1.default)(this.sessionOptions.sessionExpiry)),
|
|
56
55
|
};
|
|
57
56
|
return this.createSession(newSession);
|
|
58
57
|
}
|
|
@@ -60,7 +59,6 @@ let BaseSessionService = class BaseSessionService {
|
|
|
60
59
|
exports.BaseSessionService = BaseSessionService;
|
|
61
60
|
exports.BaseSessionService = BaseSessionService = tslib_1.__decorate([
|
|
62
61
|
(0, common_1.Injectable)(),
|
|
63
|
-
tslib_1.
|
|
64
|
-
tslib_1.__metadata("design:paramtypes", [Object])
|
|
62
|
+
tslib_1.__metadata("design:paramtypes", [])
|
|
65
63
|
], BaseSessionService);
|
|
66
64
|
//# sourceMappingURL=base-session.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-session.service.js","sourceRoot":"","sources":["../../../../../../../packages/nest-auth/src/lib/session/services/base-session.service.ts"],"names":[],"mappings":";;;;AAAA,2CAAmE;AACnE,
|
|
1
|
+
{"version":3,"file":"base-session.service.js","sourceRoot":"","sources":["../../../../../../../packages/nest-auth/src/lib/session/services/base-session.service.ts"],"names":[],"mappings":";;;;AAAA,2CAAmE;AACnE,2EAAuE;AACvE,oDAAoB;AACpB,mCAA8B;AAE9B,+FAAqG;AAGrG,iFAA4E;AAGrE,IAAe,kBAAkB,GAAjC,MAAe,kBAAkB;IAIpC;QACI,MAAM,qBAAqB,GAAmB;YAC1C,aAAa,EAAE,IAAI;YACnB,kBAAkB,EAAE,KAAK;YACzB,WAAW,EAAE,8CAAkB,CAAC,QAAQ;SAC3C,CAAC;QACF,IAAI,CAAC,iBAAiB,GAAG,uCAAiB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,qBAAqB,EAAE,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACnG,CAAC;IAED,iBAAiB;QACb,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,IAAU,EAAE,YAAyC,EAAE;QAC/E,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,gCAAc,CAAC,aAAa,EAAE,CAAC;QAC1E,MAAM,EAAE,aAAa,GAAG,KAAK,EAAE,GAAG,SAAS,CAAC;QAE5C,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,MAAM,IAAI,8BAAqB,CAAC,gBAAgB,CAAC,CAAC;QACtD,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAA,YAAE,EAAC,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC;QAE/E,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACpC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAGhD,MAAM,OAAO,GAAmB;YAC5B,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,IAAI,EAAE;gBACF,IAAI;gBACJ,aAAa,EAAE,aAAa;gBAC5B,KAAK;gBACL,WAAW;aACd;YACD,SAAS,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;YAC5C,SAAS;YACT,UAAU;YACV,SAAS;YACT,UAAU,EAAE,IAAI,IAAI,EAAE;YACtB,SAAS,EAAE,IAAI,IAAI,EAAE;YACrB,SAAS,EAAE,IAAI,IAAI,EAAE;SACxB,CAAC;QAEF,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAED,wBAAwB,CAAC,OAAuB;QAC5C,MAAM,UAAU,GAAmB;YAC/B,GAAG,IAAA,aAAI,EAAC,OAAO,EAAE,IAAI,CAAC;YACtB,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAA,YAAE,EAAC,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;SAC1E,CAAC;QAEF,OAAO,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IAC1C,CAAC;CAWJ,CAAA;AAtEqB,gDAAkB;6BAAlB,kBAAkB;IADvC,IAAA,mBAAU,GAAE;;GACS,kBAAkB,CAsEvC"}
|
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
import { Repository } from 'typeorm';
|
|
2
2
|
import { Session } from '../../session/entities/session.entity';
|
|
3
3
|
import { BaseSessionService } from './base-session.service';
|
|
4
|
-
import { AuthModuleOptions } from '../../core/interfaces/auth-module-options.interface';
|
|
5
4
|
import { SessionPayload } from '../../core/interfaces/token-payload.interface';
|
|
6
5
|
export declare class DatabaseSessionService extends BaseSessionService {
|
|
7
|
-
readonly authModuleOptions: AuthModuleOptions;
|
|
8
6
|
private readonly sessionRepository;
|
|
9
|
-
constructor(
|
|
7
|
+
constructor(sessionRepository: Repository<Session>);
|
|
10
8
|
createSession(session: SessionPayload): Promise<Session>;
|
|
11
9
|
getSession(sessionId: string): Promise<Session | null>;
|
|
12
10
|
getUserSessions(userId: string): Promise<Session[]>;
|
|
@@ -7,12 +7,9 @@ const typeorm_1 = require("@nestjs/typeorm");
|
|
|
7
7
|
const typeorm_2 = require("typeorm");
|
|
8
8
|
const session_entity_1 = require("../../session/entities/session.entity");
|
|
9
9
|
const base_session_service_1 = require("./base-session.service");
|
|
10
|
-
const auth_constants_1 = require("../../auth.constants");
|
|
11
|
-
const common_2 = require("@nestjs/common");
|
|
12
10
|
let DatabaseSessionService = class DatabaseSessionService extends base_session_service_1.BaseSessionService {
|
|
13
|
-
constructor(
|
|
14
|
-
super(
|
|
15
|
-
this.authModuleOptions = authModuleOptions;
|
|
11
|
+
constructor(sessionRepository) {
|
|
12
|
+
super();
|
|
16
13
|
this.sessionRepository = sessionRepository;
|
|
17
14
|
}
|
|
18
15
|
async createSession(session) {
|
|
@@ -48,8 +45,7 @@ let DatabaseSessionService = class DatabaseSessionService extends base_session_s
|
|
|
48
45
|
exports.DatabaseSessionService = DatabaseSessionService;
|
|
49
46
|
exports.DatabaseSessionService = DatabaseSessionService = tslib_1.__decorate([
|
|
50
47
|
(0, common_1.Injectable)(),
|
|
51
|
-
tslib_1.__param(0, (0,
|
|
52
|
-
tslib_1.
|
|
53
|
-
tslib_1.__metadata("design:paramtypes", [Object, typeorm_2.Repository])
|
|
48
|
+
tslib_1.__param(0, (0, typeorm_1.InjectRepository)(session_entity_1.Session)),
|
|
49
|
+
tslib_1.__metadata("design:paramtypes", [typeorm_2.Repository])
|
|
54
50
|
], DatabaseSessionService);
|
|
55
51
|
//# sourceMappingURL=database-session.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database-session.service.js","sourceRoot":"","sources":["../../../../../../../packages/nest-auth/src/lib/session/services/database-session.service.ts"],"names":[],"mappings":";;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,qCAA+C;AAC/C,0EAAgE;AAChE,iEAA4D;
|
|
1
|
+
{"version":3,"file":"database-session.service.js","sourceRoot":"","sources":["../../../../../../../packages/nest-auth/src/lib/session/services/database-session.service.ts"],"names":[],"mappings":";;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,qCAA+C;AAC/C,0EAAgE;AAChE,iEAA4D;AAKrD,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,yCAAkB;IAC1D,YAEqB,iBAAsC;QAEvD,KAAK,EAAE,CAAC;QAFS,sBAAiB,GAAjB,iBAAiB,CAAqB;IAG3D,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,OAAuB;QACvC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjE,OAAO,aAAa,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,SAAiB;QAC9B,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,MAAc;QAChC,OAAO,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,MAAc;QACnC,OAAO,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,IAAA,kBAAQ,EAAC,IAAI,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAC/F,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,SAAiB,EAAE,OAAyB;QAC5D,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,SAAiB;QACjC,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,MAAc;QACnC,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,SAAiB;QACjC,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,MAAc;QACnC,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IACpD,CAAC;CACJ,CAAA;AA7CY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;IAGJ,mBAAA,IAAA,0BAAgB,EAAC,wBAAO,CAAC,CAAA;6CACU,oBAAU;GAHzC,sBAAsB,CA6ClC"}
|
|
@@ -1,13 +1,11 @@
|
|
|
1
1
|
import { Redis } from 'ioredis';
|
|
2
2
|
import { SessionPayload } from '../../core/interfaces/token-payload.interface';
|
|
3
|
-
import { AuthModuleOptions } from '../../core/interfaces/auth-module-options.interface';
|
|
4
3
|
import { BaseSessionService } from './base-session.service';
|
|
5
4
|
export declare class RedisSessionService extends BaseSessionService {
|
|
6
|
-
readonly authModuleOptions: AuthModuleOptions;
|
|
7
5
|
private readonly redis;
|
|
8
6
|
private readonly sessionPrefix;
|
|
9
7
|
private readonly userSessionsPrefix;
|
|
10
|
-
constructor(
|
|
8
|
+
constructor(redis: Redis);
|
|
11
9
|
private getSessionKey;
|
|
12
10
|
private getUserSessionsKey;
|
|
13
11
|
createSession(session: SessionPayload): Promise<SessionPayload>;
|
|
@@ -5,13 +5,11 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const common_1 = require("@nestjs/common");
|
|
6
6
|
const ioredis_1 = require("ioredis");
|
|
7
7
|
const ioredis_2 = require("@nestjs-modules/ioredis");
|
|
8
|
-
const auth_constants_1 = require("../../auth.constants");
|
|
9
8
|
const base_session_service_1 = require("./base-session.service");
|
|
10
9
|
const uuid_1 = require("uuid");
|
|
11
10
|
let RedisSessionService = class RedisSessionService extends base_session_service_1.BaseSessionService {
|
|
12
|
-
constructor(
|
|
13
|
-
super(
|
|
14
|
-
this.authModuleOptions = authModuleOptions;
|
|
11
|
+
constructor(redis) {
|
|
12
|
+
super();
|
|
15
13
|
this.redis = redis;
|
|
16
14
|
this.sessionPrefix = 'session:';
|
|
17
15
|
this.userSessionsPrefix = 'user_sessions:';
|
|
@@ -113,8 +111,7 @@ let RedisSessionService = class RedisSessionService extends base_session_service
|
|
|
113
111
|
exports.RedisSessionService = RedisSessionService;
|
|
114
112
|
exports.RedisSessionService = RedisSessionService = tslib_1.__decorate([
|
|
115
113
|
(0, common_1.Injectable)(),
|
|
116
|
-
tslib_1.__param(0, (0,
|
|
117
|
-
tslib_1.
|
|
118
|
-
tslib_1.__metadata("design:paramtypes", [Object, ioredis_1.Redis])
|
|
114
|
+
tslib_1.__param(0, (0, ioredis_2.InjectRedis)()),
|
|
115
|
+
tslib_1.__metadata("design:paramtypes", [ioredis_1.Redis])
|
|
119
116
|
], RedisSessionService);
|
|
120
117
|
//# sourceMappingURL=redis-session.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis-session.service.js","sourceRoot":"","sources":["../../../../../../../packages/nest-auth/src/lib/session/services/redis-session.service.ts"],"names":[],"mappings":";;;;AAAA,2CAAoD;AACpD,qCAAgC;AAChC,qDAAsD;AAEtD,
|
|
1
|
+
{"version":3,"file":"redis-session.service.js","sourceRoot":"","sources":["../../../../../../../packages/nest-auth/src/lib/session/services/redis-session.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,7 @@ export declare class User extends BaseEntity {
|
|
|
30
30
|
updatedAt: Date;
|
|
31
31
|
updateTenantFields(): void;
|
|
32
32
|
getPermissions(): Promise<string[]>;
|
|
33
|
-
getRoles(): Promise<
|
|
33
|
+
getRoles(): Promise<Role[]>;
|
|
34
34
|
assignRoles(roles: string | string[], guard: string): Promise<void>;
|
|
35
35
|
findOrCreateIdentity(provider: string, providerId: string): Promise<AuthIdentity>;
|
|
36
36
|
updateOrCreateIdentity(provider: string, data: Partial<AuthIdentity>): Promise<AuthIdentity>;
|
|
@@ -39,14 +39,13 @@ let User = class User extends typeorm_1.BaseEntity {
|
|
|
39
39
|
select: {
|
|
40
40
|
id: true,
|
|
41
41
|
name: true,
|
|
42
|
+
isSystem: true,
|
|
43
|
+
guard: true,
|
|
42
44
|
},
|
|
43
45
|
where: { users: { id: this.id }, tenantId: this.tenantId }
|
|
44
46
|
});
|
|
45
47
|
}
|
|
46
|
-
return
|
|
47
|
-
.map(role => role.name)
|
|
48
|
-
.uniq()
|
|
49
|
-
.value();
|
|
48
|
+
return this.roles;
|
|
50
49
|
}
|
|
51
50
|
async assignRoles(roles, guard) {
|
|
52
51
|
this.roles = await role_entity_1.Role.find({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.entity.js","sourceRoot":"","sources":["../../../../../../../packages/nest-auth/src/lib/user/entities/user.entity.ts"],"names":[],"mappings":";;;;AAAA,qCAciB;AACjB,4DAA4B;AAC5B,yCAAsC;AACtC,iEAAsD;AACtD,0EAAgE;AAChE,mCAA+B;AAC/B,+DAAqD;AACrD,6EAAkE;AAClE,iEAAuD;AAGhD,IAAM,IAAI,GAAV,MAAM,IAAK,SAAQ,oBAAU;IA4EhC,kBAAkB;QACd,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,QAAQ,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACpF,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,QAAQ,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACxF,CAAC;IAED,KAAK,CAAC,cAAc;QAChB,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACd,IAAI,CAAC,KAAK,GAAG,MAAM,kBAAI,CAAC,IAAI,CAAC;gBACzB,MAAM,EAAE;oBACJ,EAAE,EAAE,IAAI;oBACR,IAAI,EAAE,IAAI;oBACV,WAAW,EAAE,IAAI;iBACpB;gBACD,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE;aAC7D,CAAC,CAAC;QACP,CAAC;QACD,OAAO,IAAA,cAAK,EAAC,IAAI,CAAC,KAAK,CAAC;aACnB,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC;aAC7B,OAAO,EAAE;aACT,IAAI,EAAE;aACN,KAAK,EAAE,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,QAAQ;QACV,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACd,IAAI,CAAC,KAAK,GAAG,MAAM,kBAAI,CAAC,IAAI,CAAC;gBACzB,MAAM,EAAE;oBACJ,EAAE,EAAE,IAAI;oBACR,IAAI,EAAE,IAAI;
|
|
1
|
+
{"version":3,"file":"user.entity.js","sourceRoot":"","sources":["../../../../../../../packages/nest-auth/src/lib/user/entities/user.entity.ts"],"names":[],"mappings":"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"}
|