@ackplus/nest-auth 0.1.42 → 0.1.44
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/package.json +1 -1
- package/src/lib/auth/auth.module.js +2 -0
- package/src/lib/auth/auth.module.js.map +1 -1
- package/src/lib/role/entities/role.entity.js +3 -0
- package/src/lib/role/entities/role.entity.js.map +1 -1
- package/src/lib/role/role.module.js +2 -0
- package/src/lib/role/role.module.js.map +1 -1
- package/src/lib/role/services/role.service.d.ts +3 -1
- package/src/lib/role/services/role.service.js +7 -2
- package/src/lib/role/services/role.service.js.map +1 -1
- package/src/lib/user/services/user.service.d.ts +3 -1
- package/src/lib/user/services/user.service.js +10 -3
- package/src/lib/user/services/user.service.js.map +1 -1
- package/src/lib/user/user.module.js +2 -0
- package/src/lib/user/user.module.js.map +1 -1
package/package.json
CHANGED
|
@@ -18,6 +18,7 @@ const event_emitter_1 = require("@nestjs/event-emitter");
|
|
|
18
18
|
const user_module_1 = require("../user/user.module");
|
|
19
19
|
const core_module_1 = require("../core/core.module");
|
|
20
20
|
const session_module_1 = require("../session/session.module");
|
|
21
|
+
const tenant_module_1 = require("../tenant/tenant.module");
|
|
21
22
|
let AuthModule = class AuthModule {
|
|
22
23
|
};
|
|
23
24
|
exports.AuthModule = AuthModule;
|
|
@@ -35,6 +36,7 @@ exports.AuthModule = AuthModule = tslib_1.__decorate([
|
|
|
35
36
|
(0, common_1.forwardRef)(() => core_module_1.CoreModule),
|
|
36
37
|
(0, common_1.forwardRef)(() => user_module_1.UserModule),
|
|
37
38
|
(0, common_1.forwardRef)(() => session_module_1.SessionModule),
|
|
39
|
+
(0, common_1.forwardRef)(() => tenant_module_1.TenantModule),
|
|
38
40
|
],
|
|
39
41
|
providers: [
|
|
40
42
|
auth_service_1.AuthService,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../../../../../../packages/nest-auth/src/lib/auth/auth.module.ts"],"names":[],"mappings":";;;;AAAA,2CAAoD;AACpD,0DAAsD;AACtD,8DAA0D;AAC1D,wDAAoD;AACpD,mEAA+D;AAC/D,iEAA6D;AAC7D,sEAAoE;AACpE,6CAAgD;AAChD,8DAA4D;AAC5D,sDAAoD;AACpD,oEAAiE;AACjE,0EAAuE;AACvE,yDAA2D;AAC3D,qDAAiD;AACjD,qDAAiD;AACjD,8DAA0D;
|
|
1
|
+
{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../../../../../../packages/nest-auth/src/lib/auth/auth.module.ts"],"names":[],"mappings":";;;;AAAA,2CAAoD;AACpD,0DAAsD;AACtD,8DAA0D;AAC1D,wDAAoD;AACpD,mEAA+D;AAC/D,iEAA6D;AAC7D,sEAAoE;AACpE,6CAAgD;AAChD,8DAA4D;AAC5D,sDAAoD;AACpD,oEAAiE;AACjE,0EAAuE;AACvE,yDAA2D;AAC3D,qDAAiD;AACjD,qDAAiD;AACjD,8DAA0D;AAC1D,2DAAuD;AA6BhD,IAAM,UAAU,GAAhB,MAAM,UAAU;CACtB,CAAA;AADY,gCAAU;qBAAV,UAAU;IA3BtB,IAAA,eAAM,EAAC;QACJ,OAAO,EAAE;YACL,kCAAkB;YAClB,uBAAa,CAAC,UAAU,CAAC;gBACrB,0BAAY;gBACZ,wBAAW;gBACX,qCAAiB;gBACjB,qCAAiB;gBACjB,kCAAgB;aACnB,CAAC;YACF,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,wBAAU,CAAC;YAC5B,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,wBAAU,CAAC;YAC5B,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,8BAAa,CAAC;YAC/B,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,4BAAY,CAAC;SACjC;QACD,SAAS,EAAE;YACP,0BAAW;YACX,8BAAa;YACb,wBAAU;SACb;QACD,WAAW,EAAE,CAAC,gCAAc,EAAE,8BAAa,CAAC;QAC5C,OAAO,EAAE;YACL,0BAAW;YACX,8BAAa;YACb,wBAAU;SACb;KACJ,CAAC;GACW,UAAU,CACtB"}
|
|
@@ -17,6 +17,9 @@ let NestAuthRole = NestAuthRole_1 = class NestAuthRole extends typeorm_1.BaseEnt
|
|
|
17
17
|
if (existingSystemRole) {
|
|
18
18
|
throw new common_1.ConflictException(`Cannot create role with name '${name}' as it conflicts with a system role`);
|
|
19
19
|
}
|
|
20
|
+
if (!isSystem && !tenantId) {
|
|
21
|
+
throw new common_1.BadRequestException('Tenant ID is required');
|
|
22
|
+
}
|
|
20
23
|
const role = new NestAuthRole_1();
|
|
21
24
|
role.name = name;
|
|
22
25
|
role.guard = guard;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.entity.js","sourceRoot":"","sources":["../../../../../../../packages/nest-auth/src/lib/role/entities/role.entity.ts"],"names":[],"mappings":";;;;;AAAA,qCAAuK;AACvK,mCAA8B;AAC9B,yDAA0D;AAC1D,uEAAqE;AACrE,
|
|
1
|
+
{"version":3,"file":"role.entity.js","sourceRoot":"","sources":["../../../../../../../packages/nest-auth/src/lib/role/entities/role.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ const common_1 = require("@nestjs/common");
|
|
|
6
6
|
const typeorm_1 = require("@nestjs/typeorm");
|
|
7
7
|
const role_entity_1 = require("./entities/role.entity");
|
|
8
8
|
const role_service_1 = require("./services/role.service");
|
|
9
|
+
const tenant_module_1 = require("../tenant/tenant.module");
|
|
9
10
|
let RoleModule = class RoleModule {
|
|
10
11
|
};
|
|
11
12
|
exports.RoleModule = RoleModule;
|
|
@@ -13,6 +14,7 @@ exports.RoleModule = RoleModule = tslib_1.__decorate([
|
|
|
13
14
|
(0, common_1.Module)({
|
|
14
15
|
imports: [
|
|
15
16
|
typeorm_1.TypeOrmModule.forFeature([role_entity_1.NestAuthRole]),
|
|
17
|
+
tenant_module_1.TenantModule,
|
|
16
18
|
],
|
|
17
19
|
providers: [role_service_1.RoleService],
|
|
18
20
|
exports: [role_service_1.RoleService],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.module.js","sourceRoot":"","sources":["../../../../../../packages/nest-auth/src/lib/role/role.module.ts"],"names":[],"mappings":";;;;AAAA,2CAAwC;AACxC,6CAAgD;AAChD,wDAAsD;AACtD,0DAAsD;
|
|
1
|
+
{"version":3,"file":"role.module.js","sourceRoot":"","sources":["../../../../../../packages/nest-auth/src/lib/role/role.module.ts"],"names":[],"mappings":";;;;AAAA,2CAAwC;AACxC,6CAAgD;AAChD,wDAAsD;AACtD,0DAAsD;AACtD,2DAAuD;AAUhD,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAI,CAAA;AAAd,gCAAU;qBAAV,UAAU;IARtB,IAAA,eAAM,EAAC;QACJ,OAAO,EAAE;YACL,uBAAa,CAAC,UAAU,CAAC,CAAC,0BAAY,CAAC,CAAC;YACxC,4BAAY;SACf;QACD,SAAS,EAAE,CAAC,0BAAW,CAAC;QACxB,OAAO,EAAE,CAAC,0BAAW,CAAC;KACzB,CAAC;GACW,UAAU,CAAI"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { FindManyOptions, FindOneOptions, Repository } from 'typeorm';
|
|
2
2
|
import { NestAuthRole } from '../entities/role.entity';
|
|
3
|
+
import { TenantService } from '../../tenant';
|
|
3
4
|
export declare class RoleService {
|
|
4
5
|
private roleRepository;
|
|
5
|
-
|
|
6
|
+
private tenantService;
|
|
7
|
+
constructor(roleRepository: Repository<NestAuthRole>, tenantService: TenantService);
|
|
6
8
|
createRole(name: string, guard: string, tenantId?: string, isSystem?: boolean, permissionIds?: string | string[]): Promise<NestAuthRole>;
|
|
7
9
|
getRoleById(id: string, options?: FindOneOptions<NestAuthRole>): Promise<NestAuthRole>;
|
|
8
10
|
getRoleByName(name: string, guard?: string, tenantId?: string, options?: FindOneOptions<NestAuthRole>): Promise<NestAuthRole>;
|
|
@@ -6,11 +6,14 @@ const common_1 = require("@nestjs/common");
|
|
|
6
6
|
const typeorm_1 = require("@nestjs/typeorm");
|
|
7
7
|
const typeorm_2 = require("typeorm");
|
|
8
8
|
const role_entity_1 = require("../entities/role.entity");
|
|
9
|
+
const tenant_1 = require("../../tenant");
|
|
9
10
|
let RoleService = class RoleService {
|
|
10
|
-
constructor(roleRepository) {
|
|
11
|
+
constructor(roleRepository, tenantService) {
|
|
11
12
|
this.roleRepository = roleRepository;
|
|
13
|
+
this.tenantService = tenantService;
|
|
12
14
|
}
|
|
13
15
|
async createRole(name, guard, tenantId = null, isSystem = false, permissionIds) {
|
|
16
|
+
tenantId = await this.tenantService.resolveTenantId(tenantId);
|
|
14
17
|
const existingRole = await this.roleRepository.findOne({
|
|
15
18
|
where: {
|
|
16
19
|
name,
|
|
@@ -109,6 +112,7 @@ let RoleService = class RoleService {
|
|
|
109
112
|
});
|
|
110
113
|
}
|
|
111
114
|
async getRolesByTenant(tenantId, includeSystemRoles = true, options) {
|
|
115
|
+
tenantId = await this.tenantService.resolveTenantId(tenantId);
|
|
112
116
|
if (!tenantId) {
|
|
113
117
|
return [];
|
|
114
118
|
}
|
|
@@ -214,6 +218,7 @@ exports.RoleService = RoleService;
|
|
|
214
218
|
exports.RoleService = RoleService = tslib_1.__decorate([
|
|
215
219
|
(0, common_1.Injectable)(),
|
|
216
220
|
tslib_1.__param(0, (0, typeorm_1.InjectRepository)(role_entity_1.NestAuthRole)),
|
|
217
|
-
tslib_1.__metadata("design:paramtypes", [typeorm_2.Repository
|
|
221
|
+
tslib_1.__metadata("design:paramtypes", [typeorm_2.Repository,
|
|
222
|
+
tenant_1.TenantService])
|
|
218
223
|
], RoleService);
|
|
219
224
|
//# sourceMappingURL=role.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../../../../../packages/nest-auth/src/lib/role/services/role.service.ts"],"names":[],"mappings":";;;;AAAA,2CAAuG;AACvG,6CAAmD;AACnD,qCAA8E;AAC9E,yDAAuD;
|
|
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,10 +1,12 @@
|
|
|
1
1
|
import { FindManyOptions, FindOneOptions, Repository } from 'typeorm';
|
|
2
2
|
import { NestAuthUser } from '../entities/user.entity';
|
|
3
3
|
import { EventEmitter2 } from '@nestjs/event-emitter';
|
|
4
|
+
import { TenantService } from '../../tenant';
|
|
4
5
|
export declare class UserService {
|
|
5
6
|
private userRepository;
|
|
6
7
|
private eventEmitter;
|
|
7
|
-
|
|
8
|
+
private tenantService;
|
|
9
|
+
constructor(userRepository: Repository<NestAuthUser>, eventEmitter: EventEmitter2, tenantService: TenantService);
|
|
8
10
|
createUser(data: Partial<NestAuthUser>): Promise<NestAuthUser>;
|
|
9
11
|
getUserById(id: string, options?: FindOneOptions<NestAuthUser>): Promise<NestAuthUser>;
|
|
10
12
|
getUserByEmail(email: string, tenantId?: string, options?: FindOneOptions<NestAuthUser>): Promise<NestAuthUser>;
|
|
@@ -11,13 +11,16 @@ const auth_constants_1 = require("../../auth.constants");
|
|
|
11
11
|
const user_updated_event_1 = require("../events/user-updated.event");
|
|
12
12
|
const user_deleted_event_1 = require("../events/user-deleted.event");
|
|
13
13
|
const user_created_event_1 = require("../events/user-created.event");
|
|
14
|
+
const tenant_1 = require("../../tenant");
|
|
14
15
|
let UserService = class UserService {
|
|
15
|
-
constructor(userRepository, eventEmitter) {
|
|
16
|
+
constructor(userRepository, eventEmitter, tenantService) {
|
|
16
17
|
this.userRepository = userRepository;
|
|
17
18
|
this.eventEmitter = eventEmitter;
|
|
19
|
+
this.tenantService = tenantService;
|
|
18
20
|
}
|
|
19
21
|
async createUser(data) {
|
|
20
|
-
const { email, phone
|
|
22
|
+
const { email, phone } = data;
|
|
23
|
+
const tenantId = await this.tenantService.resolveTenantId(data?.tenantId || null);
|
|
21
24
|
if (!tenantId) {
|
|
22
25
|
throw new common_1.BadRequestException('Tenant ID is required');
|
|
23
26
|
}
|
|
@@ -68,6 +71,7 @@ let UserService = class UserService {
|
|
|
68
71
|
return user;
|
|
69
72
|
}
|
|
70
73
|
async getUserByEmail(email, tenantId, options) {
|
|
74
|
+
tenantId = await this.tenantService.resolveTenantId(tenantId || null);
|
|
71
75
|
if (!email) {
|
|
72
76
|
return null;
|
|
73
77
|
}
|
|
@@ -80,6 +84,7 @@ let UserService = class UserService {
|
|
|
80
84
|
});
|
|
81
85
|
}
|
|
82
86
|
async getUserByPhone(phone, tenantId, options) {
|
|
87
|
+
tenantId = await this.tenantService.resolveTenantId(tenantId || null);
|
|
83
88
|
if (!phone) {
|
|
84
89
|
return null;
|
|
85
90
|
}
|
|
@@ -95,6 +100,7 @@ let UserService = class UserService {
|
|
|
95
100
|
return this.userRepository.find(options);
|
|
96
101
|
}
|
|
97
102
|
async getUsersByTenant(tenantId, options) {
|
|
103
|
+
tenantId = await this.tenantService.resolveTenantId(tenantId || null);
|
|
98
104
|
if (!tenantId) {
|
|
99
105
|
return [];
|
|
100
106
|
}
|
|
@@ -229,6 +235,7 @@ exports.UserService = UserService = tslib_1.__decorate([
|
|
|
229
235
|
(0, common_1.Injectable)(),
|
|
230
236
|
tslib_1.__param(0, (0, typeorm_1.InjectRepository)(user_entity_1.NestAuthUser)),
|
|
231
237
|
tslib_1.__metadata("design:paramtypes", [typeorm_2.Repository,
|
|
232
|
-
event_emitter_1.EventEmitter2
|
|
238
|
+
event_emitter_1.EventEmitter2,
|
|
239
|
+
tenant_1.TenantService])
|
|
233
240
|
], UserService);
|
|
234
241
|
//# sourceMappingURL=user.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../../../../../packages/nest-auth/src/lib/user/services/user.service.ts"],"names":[],"mappings":";;;;AAAA,2CAAuG;AACvG,6CAAmD;AACnD,qCAAmF;AACnF,yDAAuD;AACvD,yDAAsD;AACtD,yDAAgG;AAChG,qEAAgE;AAChE,qEAAgE;AAChE,qEAAgE;
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../../../../../packages/nest-auth/src/lib/user/services/user.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ const access_key_service_1 = require("./services/access-key.service");
|
|
|
10
10
|
const auth_module_1 = require("../auth/auth.module");
|
|
11
11
|
const access_key_entity_1 = require("./entities/access-key.entity");
|
|
12
12
|
const identity_entity_1 = require("./entities/identity.entity");
|
|
13
|
+
const tenant_module_1 = require("../tenant/tenant.module");
|
|
13
14
|
let UserModule = class UserModule {
|
|
14
15
|
};
|
|
15
16
|
exports.UserModule = UserModule;
|
|
@@ -18,6 +19,7 @@ exports.UserModule = UserModule = tslib_1.__decorate([
|
|
|
18
19
|
imports: [
|
|
19
20
|
typeorm_1.TypeOrmModule.forFeature([user_entity_1.NestAuthUser, access_key_entity_1.NestAuthAccessKey, identity_entity_1.NestAuthIdentity]),
|
|
20
21
|
(0, common_1.forwardRef)(() => auth_module_1.AuthModule),
|
|
22
|
+
(0, common_1.forwardRef)(() => tenant_module_1.TenantModule),
|
|
21
23
|
],
|
|
22
24
|
providers: [
|
|
23
25
|
user_service_1.UserService,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.module.js","sourceRoot":"","sources":["../../../../../../packages/nest-auth/src/lib/user/user.module.ts"],"names":[],"mappings":";;;;AAAA,2CAAoD;AACpD,6CAAgD;AAChD,wDAAsD;AACtD,0DAAsD;AACtD,sEAAiE;AACjE,qDAAiD;AACjD,oEAAiE;AACjE,gEAA8D;
|
|
1
|
+
{"version":3,"file":"user.module.js","sourceRoot":"","sources":["../../../../../../packages/nest-auth/src/lib/user/user.module.ts"],"names":[],"mappings":";;;;AAAA,2CAAoD;AACpD,6CAAgD;AAChD,wDAAsD;AACtD,0DAAsD;AACtD,sEAAiE;AACjE,qDAAiD;AACjD,oEAAiE;AACjE,gEAA8D;AAC9D,2DAAuD;AAiBhD,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAI,CAAA;AAAd,gCAAU;qBAAV,UAAU;IAftB,IAAA,eAAM,EAAC;QACJ,OAAO,EAAE;YACL,uBAAa,CAAC,UAAU,CAAC,CAAC,0BAAY,EAAE,qCAAiB,EAAE,kCAAgB,CAAC,CAAC;YAC7E,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,wBAAU,CAAC;YAC5B,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,4BAAY,CAAC;SACjC;QACD,SAAS,EAAE;YACP,0BAAW;YACX,qCAAgB;SACnB;QACD,OAAO,EAAE;YACL,0BAAW;YACX,qCAAgB;SACnB;KACJ,CAAC;GACW,UAAU,CAAI"}
|