@flusys/nestjs-auth 7.0.2 → 8.0.0-beta.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.
- package/README.md +68 -1
- package/config/auth.constants.d.ts +2 -0
- package/config/event-actions.d.ts +2 -0
- package/config/index.d.ts +3 -3
- package/config/message-keys.d.ts +23 -0
- package/controllers/authentication.controller.d.ts +5 -5
- package/controllers/branch.controller.d.ts +2 -2
- package/controllers/company-selection.controller.d.ts +4 -4
- package/controllers/company.controller.d.ts +2 -2
- package/controllers/email-verification.controller.d.ts +6 -6
- package/controllers/index.d.ts +9 -7
- package/controllers/social-auth-config.controller.d.ts +22 -0
- package/controllers/social-auth.controller.d.ts +11 -0
- package/controllers/user-permission.controller.d.ts +5 -4
- package/controllers/user.controller.d.ts +7 -7
- package/docs/auth-swagger.config.d.ts +2 -2
- package/docs/index.d.ts +1 -1
- package/dtos/index.d.ts +6 -5
- package/dtos/social-auth.dto.d.ts +42 -0
- package/entities/company-branch.entity.d.ts +1 -1
- package/entities/company.entity.d.ts +1 -1
- package/entities/index.d.ts +15 -13
- package/entities/pending-registration.entity.d.ts +1 -1
- package/entities/social-auth-config.entity.d.ts +9 -0
- package/entities/user-company-permission.entity.d.ts +4 -4
- package/enums/index.d.ts +2 -1
- package/enums/social-provider-type.enum.d.ts +6 -0
- package/fesm/118.js +1230 -0
- package/fesm/120.js +2197 -0
- package/fesm/24.js +4389 -0
- package/fesm/370.js +1163 -0
- package/fesm/446.js +877 -0
- package/fesm/chunks/117.js +69 -0
- package/fesm/config/index.js +244 -3
- package/fesm/controllers/index.js +27 -7
- package/fesm/docs/index.js +479 -1
- package/fesm/dtos/index.js +123 -5
- package/fesm/entities/index.js +68 -19
- package/fesm/enums/index.js +53 -1
- package/fesm/helpers/index.js +115 -2
- package/fesm/index.js +1437 -12
- package/fesm/interceptors/index.js +508 -2
- package/fesm/interfaces/index.js +75 -7
- package/fesm/modules/index.js +546 -1
- package/fesm/runtime.js +134 -0
- package/fesm/services/index.js +67 -9
- package/helpers/auth-response.mapper.d.ts +3 -3
- package/helpers/index.d.ts +2 -2
- package/helpers/token.helper.d.ts +2 -2
- package/index.d.ts +13 -12
- package/interceptors/clear-token.interceptor.d.ts +2 -2
- package/interceptors/index.d.ts +2 -2
- package/interceptors/set-token.interceptor.d.ts +2 -2
- package/interfaces/auth-module-options.interface.d.ts +3 -3
- package/interfaces/authentication.interface.d.ts +3 -3
- package/interfaces/company-branch.interface.d.ts +2 -2
- package/interfaces/company.interface.d.ts +1 -1
- package/interfaces/index.d.ts +8 -7
- package/interfaces/social-auth.interface.d.ts +43 -0
- package/interfaces/user-enricher.interface.d.ts +3 -3
- package/modules/auth.module.d.ts +4 -4
- package/modules/index.d.ts +1 -1
- package/package.json +32 -39
- package/providers/facebook.social-provider.d.ts +10 -0
- package/providers/google.social-provider.d.ts +10 -0
- package/providers/index.d.ts +1 -0
- package/providers/linkedin.social-provider.d.ts +10 -0
- package/providers/microsoft.social-provider.d.ts +10 -0
- package/providers/oauth-http.util.d.ts +10 -0
- package/providers/social-provider.registry.d.ts +3 -0
- package/services/auth-config.service.d.ts +4 -3
- package/services/auth-datasource.provider.d.ts +4 -3
- package/services/auth-email.service.d.ts +3 -3
- package/services/authentication.service.d.ts +15 -11
- package/services/branch.service.d.ts +7 -7
- package/services/company.service.d.ts +6 -6
- package/services/index.d.ts +11 -9
- package/services/social-auth-config.service.d.ts +21 -0
- package/services/social-auth.service.d.ts +24 -0
- package/services/user-permission.service.d.ts +8 -4
- package/services/user.service.d.ts +7 -7
- package/strategies/jwt.strategy.d.ts +4 -4
- package/validators/password.validator.d.ts +1 -1
- package/cjs/config/auth.constants.js +0 -41
- package/cjs/config/event-actions.js +0 -45
- package/cjs/config/index.js +0 -20
- package/cjs/config/message-keys.js +0 -108
- package/cjs/controllers/authentication.controller.js +0 -427
- package/cjs/controllers/authentication.controller.spec.js +0 -219
- package/cjs/controllers/branch.controller.js +0 -102
- package/cjs/controllers/branch.controller.spec.js +0 -134
- package/cjs/controllers/company-selection.controller.js +0 -198
- package/cjs/controllers/company-selection.controller.spec.js +0 -84
- package/cjs/controllers/company.controller.js +0 -102
- package/cjs/controllers/company.controller.spec.js +0 -131
- package/cjs/controllers/email-verification.controller.js +0 -224
- package/cjs/controllers/email-verification.controller.spec.js +0 -142
- package/cjs/controllers/index.js +0 -24
- package/cjs/controllers/user-permission.controller.js +0 -223
- package/cjs/controllers/user-permission.controller.spec.js +0 -138
- package/cjs/controllers/user.controller.js +0 -438
- package/cjs/controllers/user.controller.spec.js +0 -204
- package/cjs/docs/auth-swagger.config.js +0 -453
- package/cjs/docs/auth-swagger.config.spec.js +0 -130
- package/cjs/docs/index.js +0 -18
- package/cjs/dtos/authentication.dto.js +0 -755
- package/cjs/dtos/company-branch.dto.js +0 -294
- package/cjs/dtos/company.dto.js +0 -298
- package/cjs/dtos/index.js +0 -22
- package/cjs/dtos/user-permission.dto.js +0 -358
- package/cjs/dtos/user.dto.js +0 -413
- package/cjs/entities/app-user.entity.js +0 -25
- package/cjs/entities/company-branch.entity.js +0 -163
- package/cjs/entities/company.entity.js +0 -146
- package/cjs/entities/index.js +0 -65
- package/cjs/entities/index.spec.js +0 -73
- package/cjs/entities/pending-registration.entity.js +0 -135
- package/cjs/entities/user-company-permission.entity.js +0 -153
- package/cjs/entities/user-token.entity.js +0 -120
- package/cjs/enums/index.js +0 -18
- package/cjs/enums/user-org-permission-type.enum.js +0 -15
- package/cjs/helpers/auth-response.mapper.js +0 -46
- package/cjs/helpers/auth-response.mapper.spec.js +0 -139
- package/cjs/helpers/index.js +0 -19
- package/cjs/helpers/token.helper.js +0 -58
- package/cjs/helpers/token.helper.spec.js +0 -86
- package/cjs/index.js +0 -29
- package/cjs/interceptors/clear-token.interceptor.js +0 -73
- package/cjs/interceptors/clear-token.interceptor.spec.js +0 -107
- package/cjs/interceptors/index.js +0 -19
- package/cjs/interceptors/set-token.interceptor.js +0 -107
- package/cjs/interceptors/set-token.interceptor.spec.js +0 -165
- package/cjs/interfaces/auth-email-provider.interface.js +0 -45
- package/cjs/interfaces/auth-module-options.interface.js +0 -4
- package/cjs/interfaces/authentication.interface.js +0 -4
- package/cjs/interfaces/company-branch.interface.js +0 -4
- package/cjs/interfaces/company.interface.js +0 -4
- package/cjs/interfaces/index.js +0 -24
- package/cjs/interfaces/user-enricher.interface.js +0 -4
- package/cjs/interfaces/user.interface.js +0 -4
- package/cjs/modules/auth.module.js +0 -202
- package/cjs/modules/auth.module.spec.js +0 -243
- package/cjs/modules/index.js +0 -18
- package/cjs/services/auth-config.service.js +0 -110
- package/cjs/services/auth-config.service.spec.js +0 -97
- package/cjs/services/auth-datasource.provider.js +0 -134
- package/cjs/services/auth-datasource.provider.spec.js +0 -161
- package/cjs/services/auth-email.service.js +0 -539
- package/cjs/services/auth-email.service.spec.js +0 -456
- package/cjs/services/authentication.service.js +0 -1173
- package/cjs/services/authentication.service.spec.js +0 -962
- package/cjs/services/branch.service.js +0 -153
- package/cjs/services/branch.service.spec.js +0 -169
- package/cjs/services/company-selection-session.service.js +0 -121
- package/cjs/services/company-selection-session.service.spec.js +0 -90
- package/cjs/services/company.service.js +0 -140
- package/cjs/services/company.service.spec.js +0 -127
- package/cjs/services/index.js +0 -26
- package/cjs/services/user-permission.service.js +0 -236
- package/cjs/services/user-permission.service.spec.js +0 -254
- package/cjs/services/user.service.js +0 -671
- package/cjs/services/user.service.spec.js +0 -718
- package/cjs/strategies/jwt.strategy.js +0 -140
- package/cjs/strategies/jwt.strategy.spec.js +0 -166
- package/cjs/validators/password.validator.js +0 -45
- package/cjs/validators/password.validator.spec.js +0 -161
- package/fesm/config/auth.constants.js +0 -11
- package/fesm/config/event-actions.js +0 -24
- package/fesm/config/message-keys.js +0 -78
- package/fesm/controllers/authentication.controller.js +0 -417
- package/fesm/controllers/authentication.controller.spec.js +0 -215
- package/fesm/controllers/branch.controller.js +0 -92
- package/fesm/controllers/branch.controller.spec.js +0 -130
- package/fesm/controllers/company-selection.controller.js +0 -188
- package/fesm/controllers/company-selection.controller.spec.js +0 -80
- package/fesm/controllers/company.controller.js +0 -92
- package/fesm/controllers/company.controller.spec.js +0 -127
- package/fesm/controllers/email-verification.controller.js +0 -214
- package/fesm/controllers/email-verification.controller.spec.js +0 -138
- package/fesm/controllers/user-permission.controller.js +0 -213
- package/fesm/controllers/user-permission.controller.spec.js +0 -134
- package/fesm/controllers/user.controller.js +0 -428
- package/fesm/controllers/user.controller.spec.js +0 -200
- package/fesm/docs/auth-swagger.config.js +0 -446
- package/fesm/docs/auth-swagger.config.spec.js +0 -126
- package/fesm/dtos/authentication.dto.js +0 -683
- package/fesm/dtos/company-branch.dto.js +0 -279
- package/fesm/dtos/company.dto.js +0 -283
- package/fesm/dtos/user-permission.dto.js +0 -339
- package/fesm/dtos/user.dto.js +0 -391
- package/fesm/entities/app-user.entity.js +0 -15
- package/fesm/entities/company-branch.entity.js +0 -153
- package/fesm/entities/company.entity.js +0 -136
- package/fesm/entities/index.spec.js +0 -69
- package/fesm/entities/pending-registration.entity.js +0 -125
- package/fesm/entities/user-company-permission.entity.js +0 -136
- package/fesm/entities/user-token.entity.js +0 -104
- package/fesm/enums/user-org-permission-type.enum.js +0 -5
- package/fesm/helpers/auth-response.mapper.js +0 -25
- package/fesm/helpers/auth-response.mapper.spec.js +0 -135
- package/fesm/helpers/token.helper.js +0 -40
- package/fesm/helpers/token.helper.spec.js +0 -82
- package/fesm/interceptors/clear-token.interceptor.js +0 -63
- package/fesm/interceptors/clear-token.interceptor.spec.js +0 -103
- package/fesm/interceptors/set-token.interceptor.js +0 -98
- package/fesm/interceptors/set-token.interceptor.spec.js +0 -161
- package/fesm/interfaces/auth-email-provider.interface.js +0 -38
- package/fesm/interfaces/auth-module-options.interface.js +0 -3
- package/fesm/interfaces/authentication.interface.js +0 -1
- package/fesm/interfaces/company-branch.interface.js +0 -1
- package/fesm/interfaces/company.interface.js +0 -1
- package/fesm/interfaces/user-enricher.interface.js +0 -4
- package/fesm/interfaces/user.interface.js +0 -1
- package/fesm/modules/auth.module.js +0 -192
- package/fesm/modules/auth.module.spec.js +0 -239
- package/fesm/services/auth-config.service.js +0 -100
- package/fesm/services/auth-config.service.spec.js +0 -93
- package/fesm/services/auth-datasource.provider.js +0 -83
- package/fesm/services/auth-datasource.provider.spec.js +0 -157
- package/fesm/services/auth-email.service.js +0 -488
- package/fesm/services/auth-email.service.spec.js +0 -411
- package/fesm/services/authentication.service.js +0 -1122
- package/fesm/services/authentication.service.spec.js +0 -917
- package/fesm/services/branch.service.js +0 -143
- package/fesm/services/branch.service.spec.js +0 -165
- package/fesm/services/company-selection-session.service.js +0 -111
- package/fesm/services/company-selection-session.service.spec.js +0 -86
- package/fesm/services/company.service.js +0 -130
- package/fesm/services/company.service.spec.js +0 -123
- package/fesm/services/user-permission.service.js +0 -226
- package/fesm/services/user-permission.service.spec.js +0 -250
- package/fesm/services/user.service.js +0 -620
- package/fesm/services/user.service.spec.js +0 -673
- package/fesm/strategies/jwt.strategy.js +0 -130
- package/fesm/strategies/jwt.strategy.spec.js +0 -162
- package/fesm/validators/password.validator.js +0 -48
- package/fesm/validators/password.validator.spec.js +0 -157
|
@@ -1,192 +0,0 @@
|
|
|
1
|
-
function _ts_decorate(decorators, target, key, desc) {
|
|
2
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
-
else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
-
}
|
|
7
|
-
import { CacheModule, UtilsModule, createModuleEventsProvider } from '@flusys/nestjs-shared/modules';
|
|
8
|
-
import { Module } from '@nestjs/common';
|
|
9
|
-
import { JwtModule } from '@nestjs/jwt';
|
|
10
|
-
import { PassportModule } from '@nestjs/passport';
|
|
11
|
-
import { JwtAuthGuard } from '@flusys/nestjs-shared/guards';
|
|
12
|
-
import { AUTH_MODULE_OPTIONS } from '../config/auth.constants';
|
|
13
|
-
import { AuthenticationController, BranchController, CompanyController, CompanySelectionController, EmailVerificationController, UserController, UserPermissionController } from '../controllers';
|
|
14
|
-
import { getAuthEntitiesByConfig } from '../entities';
|
|
15
|
-
import { ClearToken } from '../interceptors/clear-token.interceptor';
|
|
16
|
-
import { SetToken } from '../interceptors/set-token.interceptor';
|
|
17
|
-
import { AuthEmailService, AuthenticationService, BranchService, CompanySelectionSessionService, CompanyService, UserPermissionService, UserService } from '../services';
|
|
18
|
-
import { AuthConfigService } from '../services/auth-config.service';
|
|
19
|
-
import { AuthDataSourceProvider } from '../services/auth-datasource.provider';
|
|
20
|
-
import { JwtStrategy } from '../strategies/jwt.strategy';
|
|
21
|
-
export class AuthModule {
|
|
22
|
-
static forRoot(options) {
|
|
23
|
-
const optionsProvider = {
|
|
24
|
-
provide: AUTH_MODULE_OPTIONS,
|
|
25
|
-
useValue: options
|
|
26
|
-
};
|
|
27
|
-
return this.buildModule(options, [
|
|
28
|
-
optionsProvider,
|
|
29
|
-
...options.providers ?? []
|
|
30
|
-
]);
|
|
31
|
-
}
|
|
32
|
-
static forRootAsync(options) {
|
|
33
|
-
const asyncProviders = this.createAsyncProviders(options);
|
|
34
|
-
return this.buildModule(options, [
|
|
35
|
-
...asyncProviders,
|
|
36
|
-
...options.providers ?? []
|
|
37
|
-
], options.imports);
|
|
38
|
-
}
|
|
39
|
-
static buildModule(options, providers, externalImports = []) {
|
|
40
|
-
const { global = false, includeController = true, bootstrapAppConfig } = options;
|
|
41
|
-
const featureFlags = this.getFeatureFlags(bootstrapAppConfig);
|
|
42
|
-
return {
|
|
43
|
-
module: AuthModule,
|
|
44
|
-
global,
|
|
45
|
-
imports: [
|
|
46
|
-
...externalImports,
|
|
47
|
-
...this.buildImports()
|
|
48
|
-
],
|
|
49
|
-
controllers: this.buildControllers(includeController, featureFlags),
|
|
50
|
-
providers: [
|
|
51
|
-
...providers,
|
|
52
|
-
...this.buildProviders(featureFlags)
|
|
53
|
-
],
|
|
54
|
-
exports: this.buildExports(featureFlags)
|
|
55
|
-
};
|
|
56
|
-
}
|
|
57
|
-
static getFeatureFlags(bootstrapAppConfig) {
|
|
58
|
-
return {
|
|
59
|
-
enableCompanyFeature: bootstrapAppConfig?.enableCompanyFeature ?? false,
|
|
60
|
-
enableEmailVerification: bootstrapAppConfig?.enableEmailVerification ?? true
|
|
61
|
-
};
|
|
62
|
-
}
|
|
63
|
-
static buildImports() {
|
|
64
|
-
return [
|
|
65
|
-
PassportModule.register({
|
|
66
|
-
defaultStrategy: 'jwt'
|
|
67
|
-
}),
|
|
68
|
-
JwtModule.register({}),
|
|
69
|
-
CacheModule,
|
|
70
|
-
UtilsModule
|
|
71
|
-
];
|
|
72
|
-
}
|
|
73
|
-
static buildControllers(includeController, flags) {
|
|
74
|
-
if (!includeController) return [];
|
|
75
|
-
const controllers = [
|
|
76
|
-
AuthenticationController,
|
|
77
|
-
UserController
|
|
78
|
-
];
|
|
79
|
-
if (flags.enableEmailVerification) {
|
|
80
|
-
controllers.push(EmailVerificationController);
|
|
81
|
-
}
|
|
82
|
-
if (flags.enableCompanyFeature) {
|
|
83
|
-
controllers.push(CompanySelectionController, CompanyController, BranchController, UserPermissionController);
|
|
84
|
-
}
|
|
85
|
-
return controllers;
|
|
86
|
-
}
|
|
87
|
-
static buildProviders(flags) {
|
|
88
|
-
const providers = [
|
|
89
|
-
AuthConfigService,
|
|
90
|
-
AuthDataSourceProvider,
|
|
91
|
-
JwtStrategy,
|
|
92
|
-
JwtAuthGuard,
|
|
93
|
-
AuthenticationService,
|
|
94
|
-
SetToken,
|
|
95
|
-
ClearToken,
|
|
96
|
-
UserService,
|
|
97
|
-
createModuleEventsProvider('auth', AUTH_MODULE_OPTIONS)
|
|
98
|
-
];
|
|
99
|
-
if (flags.enableEmailVerification) {
|
|
100
|
-
providers.push(AuthEmailService);
|
|
101
|
-
}
|
|
102
|
-
if (flags.enableCompanyFeature) {
|
|
103
|
-
providers.push(CompanySelectionSessionService, CompanyService, BranchService, UserPermissionService);
|
|
104
|
-
}
|
|
105
|
-
return providers;
|
|
106
|
-
}
|
|
107
|
-
static buildExports(flags) {
|
|
108
|
-
const exports = [
|
|
109
|
-
PassportModule,
|
|
110
|
-
AUTH_MODULE_OPTIONS,
|
|
111
|
-
AuthConfigService,
|
|
112
|
-
AuthDataSourceProvider,
|
|
113
|
-
JwtStrategy,
|
|
114
|
-
JwtAuthGuard,
|
|
115
|
-
AuthenticationService,
|
|
116
|
-
UserService
|
|
117
|
-
];
|
|
118
|
-
if (flags.enableEmailVerification) {
|
|
119
|
-
exports.push(AuthEmailService);
|
|
120
|
-
}
|
|
121
|
-
if (flags.enableCompanyFeature) {
|
|
122
|
-
exports.push(CompanySelectionSessionService, CompanyService, BranchService, UserPermissionService);
|
|
123
|
-
}
|
|
124
|
-
return exports;
|
|
125
|
-
}
|
|
126
|
-
static createAsyncProviders(options) {
|
|
127
|
-
const staticOptions = {
|
|
128
|
-
global: options.global,
|
|
129
|
-
includeController: options.includeController,
|
|
130
|
-
bootstrapAppConfig: options.bootstrapAppConfig
|
|
131
|
-
};
|
|
132
|
-
if (options.useFactory) {
|
|
133
|
-
return [
|
|
134
|
-
{
|
|
135
|
-
provide: AUTH_MODULE_OPTIONS,
|
|
136
|
-
useFactory: async (...args)=>({
|
|
137
|
-
...staticOptions,
|
|
138
|
-
config: await options.useFactory(...args)
|
|
139
|
-
}),
|
|
140
|
-
inject: options.inject || []
|
|
141
|
-
}
|
|
142
|
-
];
|
|
143
|
-
}
|
|
144
|
-
if (options.useClass) {
|
|
145
|
-
return [
|
|
146
|
-
{
|
|
147
|
-
provide: options.useClass,
|
|
148
|
-
useClass: options.useClass
|
|
149
|
-
},
|
|
150
|
-
{
|
|
151
|
-
provide: AUTH_MODULE_OPTIONS,
|
|
152
|
-
useFactory: async (factory)=>({
|
|
153
|
-
...staticOptions,
|
|
154
|
-
config: await factory.createAuthOptions()
|
|
155
|
-
}),
|
|
156
|
-
inject: [
|
|
157
|
-
options.useClass
|
|
158
|
-
]
|
|
159
|
-
}
|
|
160
|
-
];
|
|
161
|
-
}
|
|
162
|
-
if (options.useExisting) {
|
|
163
|
-
return [
|
|
164
|
-
{
|
|
165
|
-
provide: AUTH_MODULE_OPTIONS,
|
|
166
|
-
useFactory: async (factory)=>({
|
|
167
|
-
...staticOptions,
|
|
168
|
-
config: await factory.createAuthOptions()
|
|
169
|
-
}),
|
|
170
|
-
inject: [
|
|
171
|
-
options.useExisting
|
|
172
|
-
]
|
|
173
|
-
}
|
|
174
|
-
];
|
|
175
|
-
}
|
|
176
|
-
return [
|
|
177
|
-
{
|
|
178
|
-
provide: AUTH_MODULE_OPTIONS,
|
|
179
|
-
useValue: staticOptions
|
|
180
|
-
}
|
|
181
|
-
];
|
|
182
|
-
}
|
|
183
|
-
static getEntities(config) {
|
|
184
|
-
return getAuthEntitiesByConfig({
|
|
185
|
-
enableCompanyFeature: config.enableCompanyFeature ?? false,
|
|
186
|
-
enableEmailVerification: config.enableEmailVerification ?? true
|
|
187
|
-
});
|
|
188
|
-
}
|
|
189
|
-
}
|
|
190
|
-
AuthModule = _ts_decorate([
|
|
191
|
-
Module({})
|
|
192
|
-
], AuthModule);
|
|
@@ -1,239 +0,0 @@
|
|
|
1
|
-
function _define_property(obj, key, value) {
|
|
2
|
-
if (key in obj) {
|
|
3
|
-
Object.defineProperty(obj, key, {
|
|
4
|
-
value: value,
|
|
5
|
-
enumerable: true,
|
|
6
|
-
configurable: true,
|
|
7
|
-
writable: true
|
|
8
|
-
});
|
|
9
|
-
} else {
|
|
10
|
-
obj[key] = value;
|
|
11
|
-
}
|
|
12
|
-
return obj;
|
|
13
|
-
}
|
|
14
|
-
import { AuthModule } from './auth.module';
|
|
15
|
-
import { AUTH_MODULE_OPTIONS } from '../config/auth.constants';
|
|
16
|
-
import { AuthenticationController, BranchController, CompanyController, CompanySelectionController, EmailVerificationController, UserController, UserPermissionController } from '../controllers';
|
|
17
|
-
import { AuthEmailService, BranchService, CompanySelectionSessionService, CompanyService, UserPermissionService } from '../services';
|
|
18
|
-
function providerTokens(providers) {
|
|
19
|
-
return providers.map((p)=>typeof p === 'function' ? p : p.provide);
|
|
20
|
-
}
|
|
21
|
-
describe('AuthModule', ()=>{
|
|
22
|
-
describe('forRoot', ()=>{
|
|
23
|
-
it('should build a non-global module by default with the minimal feature set', ()=>{
|
|
24
|
-
const dynamicModule = AuthModule.forRoot({
|
|
25
|
-
bootstrapAppConfig: {
|
|
26
|
-
enableEmailVerification: false
|
|
27
|
-
}
|
|
28
|
-
});
|
|
29
|
-
expect(dynamicModule.module).toBe(AuthModule);
|
|
30
|
-
expect(dynamicModule.global).toBe(false);
|
|
31
|
-
expect(dynamicModule.controllers).toEqual([
|
|
32
|
-
AuthenticationController,
|
|
33
|
-
UserController
|
|
34
|
-
]);
|
|
35
|
-
expect(providerTokens(dynamicModule.providers)).not.toContain(AuthEmailService);
|
|
36
|
-
expect(providerTokens(dynamicModule.providers)).not.toContain(CompanyService);
|
|
37
|
-
});
|
|
38
|
-
it('should respect global: true', ()=>{
|
|
39
|
-
const dynamicModule = AuthModule.forRoot({
|
|
40
|
-
global: true
|
|
41
|
-
});
|
|
42
|
-
expect(dynamicModule.global).toBe(true);
|
|
43
|
-
});
|
|
44
|
-
it('should register no controllers when includeController is false', ()=>{
|
|
45
|
-
const dynamicModule = AuthModule.forRoot({
|
|
46
|
-
includeController: false
|
|
47
|
-
});
|
|
48
|
-
expect(dynamicModule.controllers).toEqual([]);
|
|
49
|
-
});
|
|
50
|
-
it('should enable email verification by default (bootstrapAppConfig omitted)', ()=>{
|
|
51
|
-
const dynamicModule = AuthModule.forRoot({});
|
|
52
|
-
expect(dynamicModule.controllers).toContain(EmailVerificationController);
|
|
53
|
-
expect(providerTokens(dynamicModule.providers)).toContain(AuthEmailService);
|
|
54
|
-
expect(dynamicModule.exports).toContain(AuthEmailService);
|
|
55
|
-
});
|
|
56
|
-
it('should omit email verification controller/provider/export when explicitly disabled', ()=>{
|
|
57
|
-
const dynamicModule = AuthModule.forRoot({
|
|
58
|
-
bootstrapAppConfig: {
|
|
59
|
-
enableEmailVerification: false
|
|
60
|
-
}
|
|
61
|
-
});
|
|
62
|
-
expect(dynamicModule.controllers).not.toContain(EmailVerificationController);
|
|
63
|
-
expect(providerTokens(dynamicModule.providers)).not.toContain(AuthEmailService);
|
|
64
|
-
expect(dynamicModule.exports).not.toContain(AuthEmailService);
|
|
65
|
-
});
|
|
66
|
-
it('should add company controllers/providers/exports when enableCompanyFeature is true', ()=>{
|
|
67
|
-
const dynamicModule = AuthModule.forRoot({
|
|
68
|
-
bootstrapAppConfig: {
|
|
69
|
-
enableCompanyFeature: true
|
|
70
|
-
}
|
|
71
|
-
});
|
|
72
|
-
expect(dynamicModule.controllers).toEqual(expect.arrayContaining([
|
|
73
|
-
CompanySelectionController,
|
|
74
|
-
CompanyController,
|
|
75
|
-
BranchController,
|
|
76
|
-
UserPermissionController
|
|
77
|
-
]));
|
|
78
|
-
expect(providerTokens(dynamicModule.providers)).toEqual(expect.arrayContaining([
|
|
79
|
-
CompanySelectionSessionService,
|
|
80
|
-
CompanyService,
|
|
81
|
-
BranchService,
|
|
82
|
-
UserPermissionService
|
|
83
|
-
]));
|
|
84
|
-
expect(dynamicModule.exports).toEqual(expect.arrayContaining([
|
|
85
|
-
CompanyService,
|
|
86
|
-
BranchService,
|
|
87
|
-
UserPermissionService
|
|
88
|
-
]));
|
|
89
|
-
});
|
|
90
|
-
it('should register an AUTH_MODULE_OPTIONS provider carrying the given options', ()=>{
|
|
91
|
-
const options = {
|
|
92
|
-
bootstrapAppConfig: {
|
|
93
|
-
enableCompanyFeature: true
|
|
94
|
-
}
|
|
95
|
-
};
|
|
96
|
-
const dynamicModule = AuthModule.forRoot(options);
|
|
97
|
-
const optionsProvider = dynamicModule.providers.find((p)=>p.provide === AUTH_MODULE_OPTIONS);
|
|
98
|
-
expect(optionsProvider.useValue).toBe(options);
|
|
99
|
-
});
|
|
100
|
-
it('should append any caller-supplied extra providers', ()=>{
|
|
101
|
-
const extraProvider = {
|
|
102
|
-
provide: 'EXTRA',
|
|
103
|
-
useValue: 'x'
|
|
104
|
-
};
|
|
105
|
-
const dynamicModule = AuthModule.forRoot({
|
|
106
|
-
providers: [
|
|
107
|
-
extraProvider
|
|
108
|
-
]
|
|
109
|
-
});
|
|
110
|
-
expect(dynamicModule.providers).toEqual(expect.arrayContaining([
|
|
111
|
-
extraProvider
|
|
112
|
-
]));
|
|
113
|
-
});
|
|
114
|
-
});
|
|
115
|
-
describe('forRootAsync', ()=>{
|
|
116
|
-
it('should default AUTH_MODULE_OPTIONS to the static options when no useFactory/useClass/useExisting is given', async ()=>{
|
|
117
|
-
const dynamicModule = AuthModule.forRootAsync({
|
|
118
|
-
bootstrapAppConfig: {},
|
|
119
|
-
global: true
|
|
120
|
-
});
|
|
121
|
-
const optionsProvider = dynamicModule.providers.find((p)=>p.provide === AUTH_MODULE_OPTIONS);
|
|
122
|
-
expect(optionsProvider.useValue).toEqual({
|
|
123
|
-
global: true,
|
|
124
|
-
includeController: undefined,
|
|
125
|
-
bootstrapAppConfig: {}
|
|
126
|
-
});
|
|
127
|
-
});
|
|
128
|
-
it('should resolve config via useFactory and merge it with the static options', async ()=>{
|
|
129
|
-
const useFactory = jest.fn().mockResolvedValue({
|
|
130
|
-
jwtSecret: 'from-factory'
|
|
131
|
-
});
|
|
132
|
-
const dynamicModule = AuthModule.forRootAsync({
|
|
133
|
-
bootstrapAppConfig: {},
|
|
134
|
-
useFactory,
|
|
135
|
-
inject: [
|
|
136
|
-
'SOME_TOKEN'
|
|
137
|
-
]
|
|
138
|
-
});
|
|
139
|
-
const optionsProvider = dynamicModule.providers.find((p)=>p.provide === AUTH_MODULE_OPTIONS);
|
|
140
|
-
expect(optionsProvider.inject).toEqual([
|
|
141
|
-
'SOME_TOKEN'
|
|
142
|
-
]);
|
|
143
|
-
const resolved = await optionsProvider.useFactory('injected-value');
|
|
144
|
-
expect(useFactory).toHaveBeenCalledWith('injected-value');
|
|
145
|
-
expect(resolved).toEqual({
|
|
146
|
-
global: undefined,
|
|
147
|
-
includeController: undefined,
|
|
148
|
-
bootstrapAppConfig: {},
|
|
149
|
-
config: {
|
|
150
|
-
jwtSecret: 'from-factory'
|
|
151
|
-
}
|
|
152
|
-
});
|
|
153
|
-
});
|
|
154
|
-
it('should resolve config via a useClass factory', async ()=>{
|
|
155
|
-
let MyOptionsFactory = class MyOptionsFactory {
|
|
156
|
-
constructor(){
|
|
157
|
-
_define_property(this, "createAuthOptions", jest.fn().mockResolvedValue({
|
|
158
|
-
jwtSecret: 'from-class'
|
|
159
|
-
}));
|
|
160
|
-
}
|
|
161
|
-
};
|
|
162
|
-
const dynamicModule = AuthModule.forRootAsync({
|
|
163
|
-
bootstrapAppConfig: {},
|
|
164
|
-
useClass: MyOptionsFactory
|
|
165
|
-
});
|
|
166
|
-
const classProvider = dynamicModule.providers.find((p)=>p.provide === MyOptionsFactory);
|
|
167
|
-
expect(classProvider.useClass).toBe(MyOptionsFactory);
|
|
168
|
-
const optionsProvider = dynamicModule.providers.find((p)=>p.provide === AUTH_MODULE_OPTIONS);
|
|
169
|
-
expect(optionsProvider.inject).toEqual([
|
|
170
|
-
MyOptionsFactory
|
|
171
|
-
]);
|
|
172
|
-
const factoryInstance = new MyOptionsFactory();
|
|
173
|
-
const resolved = await optionsProvider.useFactory(factoryInstance);
|
|
174
|
-
expect(factoryInstance.createAuthOptions).toHaveBeenCalled();
|
|
175
|
-
expect(resolved.config).toEqual({
|
|
176
|
-
jwtSecret: 'from-class'
|
|
177
|
-
});
|
|
178
|
-
});
|
|
179
|
-
it('should resolve config via a useExisting factory', async ()=>{
|
|
180
|
-
let MyOptionsFactory = class MyOptionsFactory {
|
|
181
|
-
constructor(){
|
|
182
|
-
_define_property(this, "createAuthOptions", jest.fn().mockResolvedValue({
|
|
183
|
-
jwtSecret: 'from-existing'
|
|
184
|
-
}));
|
|
185
|
-
}
|
|
186
|
-
};
|
|
187
|
-
const dynamicModule = AuthModule.forRootAsync({
|
|
188
|
-
bootstrapAppConfig: {},
|
|
189
|
-
useExisting: MyOptionsFactory
|
|
190
|
-
});
|
|
191
|
-
const optionsProvider = dynamicModule.providers.find((p)=>p.provide === AUTH_MODULE_OPTIONS);
|
|
192
|
-
expect(optionsProvider.inject).toEqual([
|
|
193
|
-
MyOptionsFactory
|
|
194
|
-
]);
|
|
195
|
-
const factoryInstance = new MyOptionsFactory();
|
|
196
|
-
const resolved = await optionsProvider.useFactory(factoryInstance);
|
|
197
|
-
expect(resolved.config).toEqual({
|
|
198
|
-
jwtSecret: 'from-existing'
|
|
199
|
-
});
|
|
200
|
-
});
|
|
201
|
-
it('should forward the async `imports` array into the built module', ()=>{
|
|
202
|
-
let FakeImportedModule = class FakeImportedModule {
|
|
203
|
-
};
|
|
204
|
-
const dynamicModule = AuthModule.forRootAsync({
|
|
205
|
-
bootstrapAppConfig: {},
|
|
206
|
-
imports: [
|
|
207
|
-
FakeImportedModule
|
|
208
|
-
]
|
|
209
|
-
});
|
|
210
|
-
expect(dynamicModule.imports).toEqual(expect.arrayContaining([
|
|
211
|
-
FakeImportedModule
|
|
212
|
-
]));
|
|
213
|
-
});
|
|
214
|
-
it('should append any caller-supplied extra providers alongside the async options provider', ()=>{
|
|
215
|
-
const extraProvider = {
|
|
216
|
-
provide: 'EXTRA',
|
|
217
|
-
useValue: 'x'
|
|
218
|
-
};
|
|
219
|
-
const dynamicModule = AuthModule.forRootAsync({
|
|
220
|
-
bootstrapAppConfig: {},
|
|
221
|
-
providers: [
|
|
222
|
-
extraProvider
|
|
223
|
-
]
|
|
224
|
-
});
|
|
225
|
-
expect(dynamicModule.providers).toEqual(expect.arrayContaining([
|
|
226
|
-
extraProvider
|
|
227
|
-
]));
|
|
228
|
-
});
|
|
229
|
-
});
|
|
230
|
-
describe('getEntities', ()=>{
|
|
231
|
-
it('should delegate to getAuthEntitiesByConfig with the bootstrap flags', ()=>{
|
|
232
|
-
const entitiesWithDefaults = AuthModule.getEntities({});
|
|
233
|
-
const entitiesWithCompany = AuthModule.getEntities({
|
|
234
|
-
enableCompanyFeature: true
|
|
235
|
-
});
|
|
236
|
-
expect(entitiesWithDefaults.length).toBeLessThan(entitiesWithCompany.length);
|
|
237
|
-
});
|
|
238
|
-
});
|
|
239
|
-
});
|
|
@@ -1,100 +0,0 @@
|
|
|
1
|
-
function _define_property(obj, key, value) {
|
|
2
|
-
if (key in obj) {
|
|
3
|
-
Object.defineProperty(obj, key, {
|
|
4
|
-
value: value,
|
|
5
|
-
enumerable: true,
|
|
6
|
-
configurable: true,
|
|
7
|
-
writable: true
|
|
8
|
-
});
|
|
9
|
-
} else {
|
|
10
|
-
obj[key] = value;
|
|
11
|
-
}
|
|
12
|
-
return obj;
|
|
13
|
-
}
|
|
14
|
-
function _ts_decorate(decorators, target, key, desc) {
|
|
15
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
16
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
17
|
-
else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
18
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
19
|
-
}
|
|
20
|
-
function _ts_metadata(k, v) {
|
|
21
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
22
|
-
}
|
|
23
|
-
function _ts_param(paramIndex, decorator) {
|
|
24
|
-
return function(target, key) {
|
|
25
|
-
decorator(target, key, paramIndex);
|
|
26
|
-
};
|
|
27
|
-
}
|
|
28
|
-
import { envConfig } from '@flusys/nestjs-core/config';
|
|
29
|
-
import { SYSTEM_MESSAGES } from '@flusys/nestjs-shared/constants';
|
|
30
|
-
import { Inject, Injectable, InternalServerErrorException, Optional } from '@nestjs/common';
|
|
31
|
-
import { AUTH_MODULE_OPTIONS } from '../config/auth.constants';
|
|
32
|
-
import { AuthModuleOptions } from '../interfaces/auth-module-options.interface';
|
|
33
|
-
export class AuthConfigService {
|
|
34
|
-
// Database Mode (required by IModuleConfigService)
|
|
35
|
-
getDatabaseMode() {
|
|
36
|
-
return this.options.bootstrapAppConfig?.databaseMode ?? 'single';
|
|
37
|
-
}
|
|
38
|
-
isMultiTenant() {
|
|
39
|
-
return this.getDatabaseMode() === 'multi-tenant';
|
|
40
|
-
}
|
|
41
|
-
// Feature Flags
|
|
42
|
-
isCompanyFeatureEnabled() {
|
|
43
|
-
return this.options.bootstrapAppConfig?.enableCompanyFeature ?? false;
|
|
44
|
-
}
|
|
45
|
-
isEmailVerificationEnabled() {
|
|
46
|
-
return this.options.bootstrapAppConfig?.enableEmailVerification ?? true;
|
|
47
|
-
}
|
|
48
|
-
isPermissionModeFound() {
|
|
49
|
-
return this.options.bootstrapAppConfig?.permissionMode !== undefined;
|
|
50
|
-
}
|
|
51
|
-
// JWT Configuration
|
|
52
|
-
getJwtSecret() {
|
|
53
|
-
if (!this.config.jwtSecret) {
|
|
54
|
-
throw new InternalServerErrorException({
|
|
55
|
-
message: '[AuthModule] JWT_SECRET is required - set via environment or module config',
|
|
56
|
-
messageKey: SYSTEM_MESSAGES.CONFIG_REQUIRED
|
|
57
|
-
});
|
|
58
|
-
}
|
|
59
|
-
return this.config.jwtSecret;
|
|
60
|
-
}
|
|
61
|
-
getJwtExpiration() {
|
|
62
|
-
return this.config.jwtExpiration ?? '1h';
|
|
63
|
-
}
|
|
64
|
-
getRefreshTokenSecret() {
|
|
65
|
-
if (this.config.refreshTokenSecret) {
|
|
66
|
-
return this.config.refreshTokenSecret;
|
|
67
|
-
}
|
|
68
|
-
if (envConfig.isProduction()) {
|
|
69
|
-
throw new InternalServerErrorException({
|
|
70
|
-
message: '[AuthModule] REFRESH_TOKEN_SECRET is required in production - using the same secret for access and refresh tokens is a security risk',
|
|
71
|
-
messageKey: SYSTEM_MESSAGES.CONFIG_REQUIRED
|
|
72
|
-
});
|
|
73
|
-
}
|
|
74
|
-
return this.getJwtSecret();
|
|
75
|
-
}
|
|
76
|
-
getRefreshTokenExpiration() {
|
|
77
|
-
return this.config.refreshTokenExpiration ?? '7d';
|
|
78
|
-
}
|
|
79
|
-
getRefreshTokenCookieName() {
|
|
80
|
-
return this.config.refreshTokenCookieName ?? 'fsn_refresh_token';
|
|
81
|
-
}
|
|
82
|
-
constructor(injectedOptions){
|
|
83
|
-
_define_property(this, "options", void 0);
|
|
84
|
-
_define_property(this, "config", void 0);
|
|
85
|
-
this.options = injectedOptions ?? {
|
|
86
|
-
global: false,
|
|
87
|
-
includeController: true
|
|
88
|
-
};
|
|
89
|
-
this.config = this.options.config ?? {};
|
|
90
|
-
}
|
|
91
|
-
}
|
|
92
|
-
AuthConfigService = _ts_decorate([
|
|
93
|
-
Injectable(),
|
|
94
|
-
_ts_param(0, Optional()),
|
|
95
|
-
_ts_param(0, Inject(AUTH_MODULE_OPTIONS)),
|
|
96
|
-
_ts_metadata("design:type", Function),
|
|
97
|
-
_ts_metadata("design:paramtypes", [
|
|
98
|
-
typeof AuthModuleOptions === "undefined" ? Object : AuthModuleOptions
|
|
99
|
-
])
|
|
100
|
-
], AuthConfigService);
|
|
@@ -1,93 +0,0 @@
|
|
|
1
|
-
import { InternalServerErrorException } from '@nestjs/common';
|
|
2
|
-
import { envConfig } from '@flusys/nestjs-core/config';
|
|
3
|
-
import { AuthConfigService } from './auth-config.service';
|
|
4
|
-
jest.mock('@flusys/nestjs-core/config', ()=>({
|
|
5
|
-
envConfig: {
|
|
6
|
-
isProduction: jest.fn().mockReturnValue(false)
|
|
7
|
-
}
|
|
8
|
-
}));
|
|
9
|
-
describe('AuthConfigService', ()=>{
|
|
10
|
-
afterEach(()=>{
|
|
11
|
-
jest.clearAllMocks();
|
|
12
|
-
});
|
|
13
|
-
describe('with no injected options', ()=>{
|
|
14
|
-
it('defaults database mode to single and company feature to disabled', ()=>{
|
|
15
|
-
const service = new AuthConfigService();
|
|
16
|
-
expect(service.getDatabaseMode()).toBe('single');
|
|
17
|
-
expect(service.isMultiTenant()).toBe(false);
|
|
18
|
-
expect(service.isCompanyFeatureEnabled()).toBe(false);
|
|
19
|
-
expect(service.isEmailVerificationEnabled()).toBe(true);
|
|
20
|
-
expect(service.isPermissionModeFound()).toBe(false);
|
|
21
|
-
});
|
|
22
|
-
it('throws when reading the JWT secret without configuration', ()=>{
|
|
23
|
-
const service = new AuthConfigService();
|
|
24
|
-
expect(()=>service.getJwtSecret()).toThrow(InternalServerErrorException);
|
|
25
|
-
});
|
|
26
|
-
it('falls back to the JWT secret for refresh token secret outside production', ()=>{
|
|
27
|
-
const service = new AuthConfigService({
|
|
28
|
-
global: false,
|
|
29
|
-
includeController: true,
|
|
30
|
-
config: {
|
|
31
|
-
jwtSecret: 'shared-secret'
|
|
32
|
-
}
|
|
33
|
-
});
|
|
34
|
-
expect(service.getRefreshTokenSecret()).toBe('shared-secret');
|
|
35
|
-
});
|
|
36
|
-
it('returns default JWT expiration and refresh token expiration', ()=>{
|
|
37
|
-
const service = new AuthConfigService();
|
|
38
|
-
expect(service.getJwtExpiration()).toBe('1h');
|
|
39
|
-
expect(service.getRefreshTokenExpiration()).toBe('7d');
|
|
40
|
-
expect(service.getRefreshTokenCookieName()).toBe('fsn_refresh_token');
|
|
41
|
-
});
|
|
42
|
-
});
|
|
43
|
-
describe('with injected options', ()=>{
|
|
44
|
-
function buildOptions(overrides = {}) {
|
|
45
|
-
return {
|
|
46
|
-
global: false,
|
|
47
|
-
includeController: true,
|
|
48
|
-
bootstrapAppConfig: {
|
|
49
|
-
databaseMode: 'multi-tenant',
|
|
50
|
-
enableCompanyFeature: true,
|
|
51
|
-
enableEmailVerification: false,
|
|
52
|
-
permissionMode: 'RBAC'
|
|
53
|
-
},
|
|
54
|
-
config: {
|
|
55
|
-
jwtSecret: 'jwt-secret',
|
|
56
|
-
jwtExpiration: '30m',
|
|
57
|
-
refreshTokenSecret: 'refresh-secret',
|
|
58
|
-
refreshTokenExpiration: '14d',
|
|
59
|
-
refreshTokenCookieName: 'custom_cookie'
|
|
60
|
-
},
|
|
61
|
-
...overrides
|
|
62
|
-
};
|
|
63
|
-
}
|
|
64
|
-
it('reflects multi-tenant database mode', ()=>{
|
|
65
|
-
const service = new AuthConfigService(buildOptions());
|
|
66
|
-
expect(service.getDatabaseMode()).toBe('multi-tenant');
|
|
67
|
-
expect(service.isMultiTenant()).toBe(true);
|
|
68
|
-
});
|
|
69
|
-
it('reflects enabled company feature and email verification flags', ()=>{
|
|
70
|
-
const service = new AuthConfigService(buildOptions());
|
|
71
|
-
expect(service.isCompanyFeatureEnabled()).toBe(true);
|
|
72
|
-
expect(service.isEmailVerificationEnabled()).toBe(false);
|
|
73
|
-
expect(service.isPermissionModeFound()).toBe(true);
|
|
74
|
-
});
|
|
75
|
-
it('returns configured JWT and refresh token values', ()=>{
|
|
76
|
-
const service = new AuthConfigService(buildOptions());
|
|
77
|
-
expect(service.getJwtSecret()).toBe('jwt-secret');
|
|
78
|
-
expect(service.getJwtExpiration()).toBe('30m');
|
|
79
|
-
expect(service.getRefreshTokenSecret()).toBe('refresh-secret');
|
|
80
|
-
expect(service.getRefreshTokenExpiration()).toBe('14d');
|
|
81
|
-
expect(service.getRefreshTokenCookieName()).toBe('custom_cookie');
|
|
82
|
-
});
|
|
83
|
-
it('throws in production when refresh token secret is missing (security: prevents shared-secret fallback)', ()=>{
|
|
84
|
-
envConfig.isProduction.mockReturnValue(true);
|
|
85
|
-
const service = new AuthConfigService(buildOptions({
|
|
86
|
-
config: {
|
|
87
|
-
jwtSecret: 'jwt-secret'
|
|
88
|
-
}
|
|
89
|
-
}));
|
|
90
|
-
expect(()=>service.getRefreshTokenSecret()).toThrow(InternalServerErrorException);
|
|
91
|
-
});
|
|
92
|
-
});
|
|
93
|
-
});
|