@builder6/core 0.12.5 → 0.12.6
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/dist/auth/admin.guard.js +11 -5
- package/dist/auth/admin.guard.js.map +1 -1
- package/dist/auth/auth.controller.d.ts +1 -1
- package/dist/auth/auth.controller.js +6 -3
- package/dist/auth/auth.controller.js.map +1 -1
- package/dist/auth/auth.service.d.ts +6 -4
- package/dist/auth/auth.service.js +20 -13
- package/dist/auth/auth.service.js.map +1 -1
- package/package.json +3 -3
package/dist/auth/admin.guard.js
CHANGED
|
@@ -22,16 +22,22 @@ let AdminGuard = class AdminGuard {
|
|
|
22
22
|
if (!token) {
|
|
23
23
|
throw new common_1.UnauthorizedException();
|
|
24
24
|
}
|
|
25
|
+
let user = null;
|
|
25
26
|
try {
|
|
26
|
-
|
|
27
|
-
if (user?.profile != 'admin') {
|
|
28
|
-
throw new common_1.UnauthorizedException();
|
|
29
|
-
}
|
|
30
|
-
request['user'] = user;
|
|
27
|
+
user = (await this.authService.getUserByToken(token));
|
|
31
28
|
}
|
|
32
29
|
catch {
|
|
33
30
|
throw new common_1.UnauthorizedException();
|
|
34
31
|
}
|
|
32
|
+
if (!user) {
|
|
33
|
+
throw new common_1.UnauthorizedException();
|
|
34
|
+
}
|
|
35
|
+
const spaceId = await this.authService.getPrimarySpaceId();
|
|
36
|
+
console.log('auth', user, spaceId);
|
|
37
|
+
if (user.profile != 'admin' || user.space != spaceId) {
|
|
38
|
+
throw new common_1.UnauthorizedException();
|
|
39
|
+
}
|
|
40
|
+
request['user'] = user;
|
|
35
41
|
return true;
|
|
36
42
|
}
|
|
37
43
|
extractTokenFromHeader(request) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin.guard.js","sourceRoot":"","sources":["../../src/auth/admin.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAKwB;AAExB,iDAA6C;AAGtC,IAAM,UAAU,GAAhB,MAAM,UAAU;IACrB,YAAoB,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IAEhD,KAAK,CAAC,WAAW,CAAC,OAAyB;QACzC,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;QACpD,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,8BAA8B,CAAC,OAAO,CAAC,CAAC;QACvE,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,8BAAqB,EAAE,CAAC;SACnC;QACD,IAAI;YAGF,
|
|
1
|
+
{"version":3,"file":"admin.guard.js","sourceRoot":"","sources":["../../src/auth/admin.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAKwB;AAExB,iDAA6C;AAGtC,IAAM,UAAU,GAAhB,MAAM,UAAU;IACrB,YAAoB,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IAEhD,KAAK,CAAC,WAAW,CAAC,OAAyB;QACzC,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;QACpD,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,8BAA8B,CAAC,OAAO,CAAC,CAAC;QACvE,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,8BAAqB,EAAE,CAAC;SACnC;QACD,IAAI,IAAI,GAAG,IAAI,CAAC;QAChB,IAAI;YAGF,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,CAAQ,CAAC;SAC9D;QAAC,MAAM;YACN,MAAM,IAAI,8BAAqB,EAAE,CAAC;SACnC;QAED,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,8BAAqB,EAAE,CAAC;SACnC;QACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,EAAE,CAAC;QAC3D,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QACnC,IAAI,IAAI,CAAC,OAAO,IAAI,OAAO,IAAI,IAAI,CAAC,KAAK,IAAI,OAAO,EAAE;YACpD,MAAM,IAAI,8BAAqB,EAAE,CAAC;SACnC;QACD,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;QACvB,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,sBAAsB,CAAC,OAAgB;QAC7C,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QACtE,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/C,CAAC;CACF,CAAA;AAlCY,UAAU;IADtB,IAAA,mBAAU,GAAE;qCAEsB,0BAAW;GADjC,UAAU,CAkCtB;AAlCY,gCAAU"}
|
|
@@ -3,5 +3,5 @@ import { Request, Response } from 'express';
|
|
|
3
3
|
export declare class AuthController {
|
|
4
4
|
private authService;
|
|
5
5
|
constructor(authService: AuthService);
|
|
6
|
-
login(req: Request, res: Response, redirect_to: string, username: string, password: string): Promise<void | Response<any, Record<string, any>>>;
|
|
6
|
+
login(req: Request, res: Response, redirect_to: string, username: string, password: string, space_id: string): Promise<void | Response<any, Record<string, any>>>;
|
|
7
7
|
}
|
|
@@ -20,14 +20,14 @@ let AuthController = class AuthController {
|
|
|
20
20
|
constructor(authService) {
|
|
21
21
|
this.authService = authService;
|
|
22
22
|
}
|
|
23
|
-
async login(req, res, redirect_to, username, password) {
|
|
23
|
+
async login(req, res, redirect_to, username, password, space_id) {
|
|
24
24
|
try {
|
|
25
25
|
if (!username || !password) {
|
|
26
26
|
return res
|
|
27
27
|
.status(401)
|
|
28
28
|
.json({ message: 'username and password is required' });
|
|
29
29
|
}
|
|
30
|
-
const result = await this.authService.signIn(username, password);
|
|
30
|
+
const result = await this.authService.signIn(username, password, space_id);
|
|
31
31
|
const { user, space, auth_token, access_token } = result;
|
|
32
32
|
this.authService.setAuthCookies(res, {
|
|
33
33
|
user_id: user,
|
|
@@ -60,6 +60,7 @@ __decorate([
|
|
|
60
60
|
properties: {
|
|
61
61
|
username: { type: 'string' },
|
|
62
62
|
password: { type: 'string' },
|
|
63
|
+
space_id: { type: 'string' },
|
|
63
64
|
},
|
|
64
65
|
},
|
|
65
66
|
examples: {
|
|
@@ -68,6 +69,7 @@ __decorate([
|
|
|
68
69
|
value: {
|
|
69
70
|
username: 'test',
|
|
70
71
|
password: 'test',
|
|
72
|
+
space_id: '',
|
|
71
73
|
},
|
|
72
74
|
},
|
|
73
75
|
},
|
|
@@ -77,8 +79,9 @@ __decorate([
|
|
|
77
79
|
__param(2, (0, common_1.Query)('redirect_to')),
|
|
78
80
|
__param(3, (0, common_1.Body)('username')),
|
|
79
81
|
__param(4, (0, common_1.Body)('password')),
|
|
82
|
+
__param(5, (0, common_1.Body)('space_id')),
|
|
80
83
|
__metadata("design:type", Function),
|
|
81
|
-
__metadata("design:paramtypes", [Object, Object, String, String, String]),
|
|
84
|
+
__metadata("design:paramtypes", [Object, Object, String, String, String, String]),
|
|
82
85
|
__metadata("design:returntype", Promise)
|
|
83
86
|
], AuthController.prototype, "login", null);
|
|
84
87
|
AuthController = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.controller.js","sourceRoot":"","sources":["../../src/auth/auth.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAWwB;AACxB,iDAA6C;AAC7C,6CAAoD;AAK7C,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAAoB,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.controller.js","sourceRoot":"","sources":["../../src/auth/auth.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAWwB;AACxB,iDAA6C;AAC7C,6CAAoD;AAK7C,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAAoB,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IA6B1C,AAAN,KAAK,CAAC,KAAK,CACF,GAAY,EACZ,GAAa,EACE,WAAmB,EACvB,QAAgB,EAChB,QAAgB,EAChB,QAAgB;QAElC,IAAI;YACF,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,EAAE;gBAC1B,OAAO,GAAG;qBACP,MAAM,CAAC,GAAG,CAAC;qBACX,IAAI,CAAC,EAAE,OAAO,EAAE,mCAAmC,EAAE,CAAC,CAAC;aAC3D;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAC3E,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;YAEzD,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,GAAG,EAAE;gBACnC,OAAO,EAAE,IAAI;gBACb,QAAQ,EAAE,KAAK;gBACf,UAAU;gBACV,YAAY;aACb,CAAC,CAAC;YACH,IAAI,WAAW;gBAAE,OAAO,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;;gBAC7C,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAC1C;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC;YAC7C,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,uBAAuB,EAAE,CAAC,CAAC;SACnE;IACH,CAAC;CACF,CAAA;AA9BO;IA3BL,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IACvB,IAAA,aAAI,EAAC,OAAO,CAAC;IACb,IAAA,kBAAQ,EAAC;QACR,IAAI,EAAE,aAAa;QACnB,QAAQ,EAAE,KAAK;QACf,WAAW,EAAE,YAAY;KAC1B,CAAC;IACD,IAAA,iBAAO,EAAC;QACP,MAAM,EAAE;YACN,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;gBAC5B,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;gBAC5B,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;aAC7B;SACF;QACD,QAAQ,EAAE;YACR,IAAI,EAAE;gBACJ,OAAO,EAAE,MAAM;gBACf,KAAK,EAAE;oBACL,QAAQ,EAAE,MAAM;oBAChB,QAAQ,EAAE,MAAM;oBAChB,QAAQ,EAAE,EAAE;iBACb;aACF;SACF;KACF,CAAC;IAEC,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,cAAK,EAAC,aAAa,CAAC,CAAA;IACpB,WAAA,IAAA,aAAI,EAAC,UAAU,CAAC,CAAA;IAChB,WAAA,IAAA,aAAI,EAAC,UAAU,CAAC,CAAA;IAChB,WAAA,IAAA,aAAI,EAAC,UAAU,CAAC,CAAA;;;;2CAuBlB;AA3DU,cAAc;IAD1B,IAAA,mBAAU,EAAC,aAAa,CAAC;qCAES,0BAAW;GADjC,cAAc,CA4D1B;AA5DY,wCAAc"}
|
|
@@ -1,20 +1,22 @@
|
|
|
1
|
+
import { ConfigService } from '@nestjs/config';
|
|
1
2
|
import { MongodbService } from '../mongodb';
|
|
2
3
|
import { JwtService } from '@nestjs/jwt';
|
|
3
4
|
import { Request, Response } from 'express';
|
|
4
5
|
export declare class AuthService {
|
|
6
|
+
private configService;
|
|
5
7
|
private mongodbService;
|
|
6
8
|
private jwtService;
|
|
7
9
|
private readonly logger;
|
|
8
|
-
private
|
|
9
|
-
constructor(mongodbService: MongodbService, jwtService: JwtService);
|
|
10
|
-
signIn(username: string, password?: string,
|
|
10
|
+
private primarySpaceId;
|
|
11
|
+
constructor(configService: ConfigService, mongodbService: MongodbService, jwtService: JwtService);
|
|
12
|
+
signIn(username: string, password?: string, space_id?: string): Promise<any>;
|
|
11
13
|
setAuthCookies(res: Response, { access_token, auth_token, user_id, space_id }: {
|
|
12
14
|
access_token: any;
|
|
13
15
|
auth_token: any;
|
|
14
16
|
user_id: any;
|
|
15
17
|
space_id: any;
|
|
16
18
|
}): void;
|
|
17
|
-
|
|
19
|
+
getPrimarySpaceId(): Promise<string>;
|
|
18
20
|
getSpaceUser(userId: string, spaceId: string): Promise<any>;
|
|
19
21
|
getUserByToken(token: string): Promise<any>;
|
|
20
22
|
extractTokenFromHeaderOrCookie(request: Request): string | undefined;
|
|
@@ -15,17 +15,19 @@ const bcrypt = require("bcrypt");
|
|
|
15
15
|
const crypto = require("crypto");
|
|
16
16
|
const uuid_1 = require("uuid");
|
|
17
17
|
const common_1 = require("@nestjs/common");
|
|
18
|
+
const config_1 = require("@nestjs/config");
|
|
18
19
|
const mongodb_1 = require("../mongodb");
|
|
19
20
|
const jwt_1 = require("@nestjs/jwt");
|
|
20
21
|
let AuthService = AuthService_1 = class AuthService {
|
|
21
|
-
constructor(mongodbService, jwtService) {
|
|
22
|
+
constructor(configService, mongodbService, jwtService) {
|
|
23
|
+
this.configService = configService;
|
|
22
24
|
this.mongodbService = mongodbService;
|
|
23
25
|
this.jwtService = jwtService;
|
|
24
26
|
this.logger = new common_1.Logger(AuthService_1.name);
|
|
25
27
|
}
|
|
26
|
-
async signIn(username, password,
|
|
27
|
-
if (!
|
|
28
|
-
|
|
28
|
+
async signIn(username, password, space_id) {
|
|
29
|
+
if (!space_id) {
|
|
30
|
+
space_id = await this.getPrimarySpaceId();
|
|
29
31
|
}
|
|
30
32
|
const user = (await this.mongodbService.findOne('users', {
|
|
31
33
|
$or: [
|
|
@@ -48,7 +50,7 @@ let AuthService = AuthService_1 = class AuthService {
|
|
|
48
50
|
throw new common_1.UnauthorizedException();
|
|
49
51
|
}
|
|
50
52
|
}
|
|
51
|
-
const space_user = await this.getSpaceUser(user._id,
|
|
53
|
+
const space_user = await this.getSpaceUser(user._id, space_id);
|
|
52
54
|
if (!space_user) {
|
|
53
55
|
this.logger.log(`Login failed ${username}, space_user not found`);
|
|
54
56
|
throw new common_1.UnauthorizedException();
|
|
@@ -57,7 +59,7 @@ let AuthService = AuthService_1 = class AuthService {
|
|
|
57
59
|
sub: user._id,
|
|
58
60
|
name: space_user.name,
|
|
59
61
|
email: space_user.email,
|
|
60
|
-
space:
|
|
62
|
+
space: space_id,
|
|
61
63
|
profile: space_user.profile,
|
|
62
64
|
};
|
|
63
65
|
const access_token = this.jwtService.sign(payload);
|
|
@@ -95,15 +97,19 @@ let AuthService = AuthService_1 = class AuthService {
|
|
|
95
97
|
res.cookie('X-User-Id', user_id, cookieOptions);
|
|
96
98
|
res.cookie('X-Space-Id', space_id, cookieOptions);
|
|
97
99
|
}
|
|
98
|
-
async
|
|
99
|
-
if (this.
|
|
100
|
-
return this.
|
|
100
|
+
async getPrimarySpaceId() {
|
|
101
|
+
if (this.primarySpaceId) {
|
|
102
|
+
return this.primarySpaceId;
|
|
103
|
+
}
|
|
104
|
+
if (this.configService.get('tenant.id')) {
|
|
105
|
+
this.primarySpaceId = this.configService.get('tenant.id');
|
|
106
|
+
return this.primarySpaceId;
|
|
101
107
|
}
|
|
102
|
-
const space = await this.mongodbService.findOne('spaces', {}, { sort: { created:
|
|
108
|
+
const space = await this.mongodbService.findOne('spaces', {}, { sort: { created: 1 } });
|
|
103
109
|
if (space) {
|
|
104
|
-
this.
|
|
110
|
+
this.primarySpaceId = space._id;
|
|
105
111
|
}
|
|
106
|
-
return this.
|
|
112
|
+
return this.primarySpaceId;
|
|
107
113
|
}
|
|
108
114
|
async getSpaceUser(userId, spaceId) {
|
|
109
115
|
const spaceUser = (await this.mongodbService.findOne('space_users', {
|
|
@@ -190,7 +196,8 @@ let AuthService = AuthService_1 = class AuthService {
|
|
|
190
196
|
};
|
|
191
197
|
AuthService = AuthService_1 = __decorate([
|
|
192
198
|
(0, common_1.Injectable)(),
|
|
193
|
-
__metadata("design:paramtypes", [
|
|
199
|
+
__metadata("design:paramtypes", [config_1.ConfigService,
|
|
200
|
+
mongodb_1.MongodbService,
|
|
194
201
|
jwt_1.JwtService])
|
|
195
202
|
], AuthService);
|
|
196
203
|
exports.AuthService = AuthService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/auth/auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,iCAAiC;AACjC,iCAAiC;AACjC,+BAAkC;AAClC,2CAA2E;AAC3E,wCAA4C;AAC5C,qCAAyC;AAIlC,IAAM,WAAW,mBAAjB,MAAM,WAAW;IAItB,YACU,cAA8B,EAC9B,UAAsB;
|
|
1
|
+
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/auth/auth.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@builder6/core",
|
|
3
|
-
"version": "0.12.
|
|
3
|
+
"version": "0.12.6",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"files": [
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
],
|
|
9
9
|
"dependencies": {
|
|
10
10
|
"@aws-sdk/client-cloudwatch-logs": "^3.721.0",
|
|
11
|
-
"@builder6/query-mongodb": "0.12.
|
|
11
|
+
"@builder6/query-mongodb": "0.12.6",
|
|
12
12
|
"moleculer": "^0.14.35",
|
|
13
13
|
"pino-http": "^10.3.0",
|
|
14
14
|
"pino-pretty": "^13.0.0"
|
|
@@ -21,5 +21,5 @@
|
|
|
21
21
|
"publishConfig": {
|
|
22
22
|
"access": "public"
|
|
23
23
|
},
|
|
24
|
-
"gitHead": "
|
|
24
|
+
"gitHead": "eef2d403ef93e9bd2f558f50b844e1f4eec99f07"
|
|
25
25
|
}
|