@builder6/core 0.15.3 → 0.15.5
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/auth.service.d.ts +1 -0
- package/dist/auth/auth.service.js +11 -0
- package/dist/auth/auth.service.js.map +1 -1
- package/dist/auth/users.controller.d.ts +4 -2
- package/dist/auth/users.controller.js +44 -34
- package/dist/auth/users.controller.js.map +1 -1
- package/dist/config/env.config.js +18 -13
- package/dist/config/env.config.js.map +1 -1
- package/package.json +3 -3
|
@@ -18,6 +18,7 @@ export declare class AuthService {
|
|
|
18
18
|
}): void;
|
|
19
19
|
getPrimarySpaceId(): Promise<string>;
|
|
20
20
|
getSpaceUser(userId: string, spaceId: string): Promise<any>;
|
|
21
|
+
getUserByRequest(req: Request): Promise<any>;
|
|
21
22
|
getUserByToken(token: string): Promise<any>;
|
|
22
23
|
extractTokenFromHeaderOrCookie(request: Request): string | undefined;
|
|
23
24
|
hashLoginToken(loginToken: any): string;
|
|
@@ -125,6 +125,17 @@ let AuthService = AuthService_1 = class AuthService {
|
|
|
125
125
|
}
|
|
126
126
|
return spaceUser;
|
|
127
127
|
}
|
|
128
|
+
async getUserByRequest(req) {
|
|
129
|
+
const token = this.extractTokenFromHeaderOrCookie(req);
|
|
130
|
+
if (token) {
|
|
131
|
+
try {
|
|
132
|
+
const user = await this.getUserByToken(token);
|
|
133
|
+
return user;
|
|
134
|
+
}
|
|
135
|
+
catch { }
|
|
136
|
+
}
|
|
137
|
+
return null;
|
|
138
|
+
}
|
|
128
139
|
async getUserByToken(token) {
|
|
129
140
|
const tokenArray = token.split(',');
|
|
130
141
|
let userId = null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/auth/auth.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/auth/auth.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { AuthService } from './auth.service';
|
|
2
2
|
import { Request, Response } from 'express';
|
|
3
|
+
import { MongodbService } from '../mongodb';
|
|
3
4
|
export declare class UsersController {
|
|
4
5
|
private authService;
|
|
5
|
-
|
|
6
|
+
private mongodbService;
|
|
7
|
+
constructor(authService: AuthService, mongodbService: MongodbService);
|
|
6
8
|
me(req: Request): Promise<any>;
|
|
7
|
-
meAvatar(userId: string, req: Request, res: Response): Promise<Response<any, Record<string, any>>>;
|
|
9
|
+
meAvatar(userId: string, req: Request, res: Response): Promise<void | Response<any, Record<string, any>>>;
|
|
8
10
|
}
|
|
@@ -17,56 +17,67 @@ const common_1 = require("@nestjs/common");
|
|
|
17
17
|
const auth_service_1 = require("./auth.service");
|
|
18
18
|
const swagger_1 = require("@nestjs/swagger");
|
|
19
19
|
const auth_guard_1 = require("./auth.guard");
|
|
20
|
+
const mongodb_1 = require("../mongodb");
|
|
21
|
+
const defaultAvatar = `
|
|
22
|
+
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
|
23
|
+
viewBox="0 0 72 72" style="enable-background:new 0 0 72 72;" xml:space="preserve">
|
|
24
|
+
<style type="text/css">
|
|
25
|
+
.st0{fill:#FFFFFF;}
|
|
26
|
+
.st1{fill:#D0D0D0;}
|
|
27
|
+
</style>
|
|
28
|
+
<g>
|
|
29
|
+
<path class="st0" d="M36,71.1c-19.3,0-35-15.7-35-35s15.7-35,35-35s35,15.7,35,35S55.3,71.1,36,71.1z"/>
|
|
30
|
+
<path class="st1" d="M36,2.1c18.7,0,34,15.3,34,34s-15.3,34-34,34S2,54.8,2,36.1S17.3,2.1,36,2.1 M36,0.1c-19.9,0-36,16.1-36,36
|
|
31
|
+
s16.1,36,36,36s36-16.1,36-36S55.9,0.1,36,0.1L36,0.1z"/>
|
|
32
|
+
</g>
|
|
33
|
+
<g>
|
|
34
|
+
<g>
|
|
35
|
+
<path class="st1" d="M35.8,42.6c8.3,0,15.1-6.8,15.1-15.1c0-8.3-6.8-15.1-15.1-15.1c-8.3,0-15.1,6.8-15.1,15.1
|
|
36
|
+
C20.7,35.8,27.5,42.6,35.8,42.6z"/>
|
|
37
|
+
<path class="st1" d="M36.2,70.7c8.7,0,16.7-3.1,22.9-8.2c-3.6-9.6-12.7-15.5-23.3-15.5c-10.4,0-19.4,5.7-23.1,15
|
|
38
|
+
C19,67.4,27.2,70.7,36.2,70.7z"/>
|
|
39
|
+
</g>
|
|
40
|
+
</g>
|
|
41
|
+
</svg>
|
|
42
|
+
`;
|
|
20
43
|
let UsersController = class UsersController {
|
|
21
|
-
constructor(authService) {
|
|
44
|
+
constructor(authService, mongodbService) {
|
|
22
45
|
this.authService = authService;
|
|
46
|
+
this.mongodbService = mongodbService;
|
|
23
47
|
}
|
|
24
48
|
async me(req) {
|
|
25
49
|
const user = req['user'];
|
|
26
50
|
return user;
|
|
27
51
|
}
|
|
28
52
|
async meAvatar(userId, req, res) {
|
|
29
|
-
const
|
|
30
|
-
|
|
31
|
-
|
|
53
|
+
const user = await this.mongodbService.findOne('users', {
|
|
54
|
+
_id: userId,
|
|
55
|
+
}, {
|
|
56
|
+
projection: {
|
|
57
|
+
name: 1,
|
|
58
|
+
avatar: 1,
|
|
59
|
+
},
|
|
60
|
+
});
|
|
32
61
|
if (!user) {
|
|
33
|
-
|
|
62
|
+
res.set('Content-Type', 'image/svg+xml');
|
|
63
|
+
return res.send(defaultAvatar);
|
|
34
64
|
}
|
|
35
|
-
const defaultAvatar = `
|
|
36
|
-
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
|
37
|
-
viewBox="0 0 72 72" style="enable-background:new 0 0 72 72;" xml:space="preserve">
|
|
38
|
-
<style type="text/css">
|
|
39
|
-
.st0{fill:#FFFFFF;}
|
|
40
|
-
.st1{fill:#D0D0D0;}
|
|
41
|
-
</style>
|
|
42
|
-
<g>
|
|
43
|
-
<path class="st0" d="M36,71.1c-19.3,0-35-15.7-35-35s15.7-35,35-35s35,15.7,35,35S55.3,71.1,36,71.1z"/>
|
|
44
|
-
<path class="st1" d="M36,2.1c18.7,0,34,15.3,34,34s-15.3,34-34,34S2,54.8,2,36.1S17.3,2.1,36,2.1 M36,0.1c-19.9,0-36,16.1-36,36
|
|
45
|
-
s16.1,36,36,36s36-16.1,36-36S55.9,0.1,36,0.1L36,0.1z"/>
|
|
46
|
-
</g>
|
|
47
|
-
<g>
|
|
48
|
-
<g>
|
|
49
|
-
<path class="st1" d="M35.8,42.6c8.3,0,15.1-6.8,15.1-15.1c0-8.3-6.8-15.1-15.1-15.1c-8.3,0-15.1,6.8-15.1,15.1
|
|
50
|
-
C20.7,35.8,27.5,42.6,35.8,42.6z"/>
|
|
51
|
-
<path class="st1" d="M36.2,70.7c8.7,0,16.7-3.1,22.9-8.2c-3.6-9.6-12.7-15.5-23.3-15.5c-10.4,0-19.4,5.7-23.1,15
|
|
52
|
-
C19,67.4,27.2,70.7,36.2,70.7z"/>
|
|
53
|
-
</g>
|
|
54
|
-
</g>
|
|
55
|
-
</svg>
|
|
56
|
-
`;
|
|
57
65
|
if (user.avatar) {
|
|
58
|
-
res.redirect(`/api/v6/files/cfs.avatars.filerecord/${user.avatar}`);
|
|
66
|
+
return res.redirect(`/api/v6/files/cfs.avatars.filerecord/${user.avatar}`);
|
|
59
67
|
}
|
|
60
68
|
else if (user.avatar_url) {
|
|
61
|
-
res.redirect(user.avatar_url);
|
|
69
|
+
return res.redirect(user.avatar_url);
|
|
70
|
+
}
|
|
71
|
+
else {
|
|
72
|
+
res.set('Content-Type', 'image/svg+xml');
|
|
73
|
+
return res.send(defaultAvatar);
|
|
62
74
|
}
|
|
63
|
-
res.set('Content-Type', 'image/svg+xml');
|
|
64
|
-
res.send(defaultAvatar);
|
|
65
75
|
}
|
|
66
76
|
};
|
|
67
77
|
exports.UsersController = UsersController;
|
|
68
78
|
__decorate([
|
|
69
79
|
(0, common_1.Get)('me'),
|
|
80
|
+
(0, common_1.UseGuards)(auth_guard_1.AuthGuard),
|
|
70
81
|
(0, swagger_1.ApiOperation)({
|
|
71
82
|
summary: 'Retrieve the current user profile.',
|
|
72
83
|
}),
|
|
@@ -88,9 +99,8 @@ __decorate([
|
|
|
88
99
|
__metadata("design:returntype", Promise)
|
|
89
100
|
], UsersController.prototype, "meAvatar", null);
|
|
90
101
|
exports.UsersController = UsersController = __decorate([
|
|
91
|
-
(0, swagger_1.ApiBearerAuth)(),
|
|
92
|
-
(0, common_1.UseGuards)(auth_guard_1.AuthGuard),
|
|
93
102
|
(0, common_1.Controller)('api/v6/users'),
|
|
94
|
-
__metadata("design:paramtypes", [auth_service_1.AuthService
|
|
103
|
+
__metadata("design:paramtypes", [auth_service_1.AuthService,
|
|
104
|
+
mongodb_1.MongodbService])
|
|
95
105
|
], UsersController);
|
|
96
106
|
//# sourceMappingURL=users.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.controller.js","sourceRoot":"","sources":["../../src/auth/users.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAYwB;AACxB,iDAA6C;AAC7C,6CAKyB;AAEzB,6CAAyC;
|
|
1
|
+
{"version":3,"file":"users.controller.js","sourceRoot":"","sources":["../../src/auth/users.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAYwB;AACxB,iDAA6C;AAC7C,6CAKyB;AAEzB,6CAAyC;AACzC,wCAA4C;AAE5C,MAAM,aAAa,GAAG;;;;;;;;;;;;;;;;;;;;;CAqBrB,CAAC;AAGK,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YACU,WAAwB,EACxB,cAA8B;QAD9B,gBAAW,GAAX,WAAW,CAAa;QACxB,mBAAc,GAAd,cAAc,CAAgB;IACrC,CAAC;IAOE,AAAN,KAAK,CAAC,EAAE,CAAQ,GAAY;QAC1B,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAOK,AAAN,KAAK,CAAC,QAAQ,CACK,MAAc,EACxB,GAAY,EACZ,GAAa;QAEpB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC5C,OAAO,EACP;YACE,GAAG,EAAE,MAAM;SACZ,EACD;YACE,UAAU,EAAE;gBACV,IAAI,EAAE,CAAC;gBACP,MAAM,EAAE,CAAC;aACV;SACF,CACF,CAAC;QAEF,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;YACzC,OAAO,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,OAAO,GAAG,CAAC,QAAQ,CACjB,wCAAwC,IAAI,CAAC,MAAM,EAAE,CACtD,CAAC;QACJ,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAC3B,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACvC,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;YACzC,OAAO,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;CACF,CAAA;AAvDY,0CAAe;AAWpB;IALL,IAAA,YAAG,EAAC,IAAI,CAAC;IACT,IAAA,kBAAS,EAAC,sBAAS,CAAC;IACpB,IAAA,sBAAY,EAAC;QACZ,OAAO,EAAE,oCAAoC;KAC9C,CAAC;IACQ,WAAA,IAAA,YAAG,GAAE,CAAA;;;;yCAGd;AAOK;IAJL,IAAA,YAAG,EAAC,gBAAgB,CAAC;IACrB,IAAA,sBAAY,EAAC;QACZ,OAAO,EAAE,0CAA0C;KACpD,CAAC;IAEC,WAAA,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAA;IACf,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,YAAG,GAAE,CAAA;;;;+CA8BP;0BAtDU,eAAe;IAD3B,IAAA,mBAAU,EAAC,cAAc,CAAC;qCAGF,0BAAW;QACR,wBAAc;GAH7B,eAAe,CAuD3B"}
|
|
@@ -14,30 +14,35 @@ process.env.B6_ROOT_URL = process.env.B6_ROOT_URL || process.env.ROOT_URL;
|
|
|
14
14
|
process.env.B6_MONGO_URL = process.env.B6_MONGO_URL || process.env.MONGO_URL;
|
|
15
15
|
process.env.B6_TRANSPORTER =
|
|
16
16
|
process.env.B6_TRANSPORTER || process.env.TRANSPORTER || '';
|
|
17
|
-
process.env.B6_CACHER =
|
|
17
|
+
process.env.B6_CACHER =
|
|
18
|
+
process.env.B6_CACHER ||
|
|
19
|
+
process.env.STEEDOS_CACHER ||
|
|
20
|
+
process.env.CACHER ||
|
|
21
|
+
'';
|
|
18
22
|
process.env.B6_ROOMS_REDIS =
|
|
19
|
-
process.env.B6_ROOMS_REDIS ||
|
|
20
|
-
process.env.B6_CACHER ||
|
|
21
|
-
'redis://localhost:6379';
|
|
23
|
+
process.env.B6_ROOMS_REDIS || process.env.B6_CACHER;
|
|
22
24
|
process.env.B6_JWT_SECRET =
|
|
23
25
|
process.env.B6_JWT_SECRET || process.env.JWT_SECRET || '';
|
|
24
26
|
process.env.B6_SESSION_SECRET =
|
|
25
|
-
process.env.B6_SESSION_SECRET ||
|
|
26
|
-
process.env.SESSION_SECRET ||
|
|
27
|
-
'steedos-session-secret';
|
|
27
|
+
process.env.B6_SESSION_SECRET || 'steedos-session-secret';
|
|
28
28
|
process.env.B6_SESSION_REDIS =
|
|
29
|
-
process.env.B6_SESSION_REDIS ||
|
|
30
|
-
process.env.B6_SESSION_REDIS ||
|
|
31
|
-
'redis://localhost:6379';
|
|
29
|
+
process.env.B6_SESSION_REDIS || process.env.B6_CACHER;
|
|
32
30
|
process.env.B6_HOME = process.cwd();
|
|
33
31
|
process.env.B6_HOST = process.env.B6_HOST || process.env.B6_ROOT_URL;
|
|
34
32
|
process.env.B6_TENANT_NAME = process.env.B6_TENANT_NAME || 'Steedos';
|
|
35
33
|
process.env.B6_TENANT_LOGO_URL =
|
|
36
34
|
process.env.B6_TENANT_LOGO_URL ||
|
|
37
35
|
`${process.env.B6_ROOT_URL}/images/logo.png`;
|
|
38
|
-
process.env.B6_UNPKG_URL =
|
|
39
|
-
process.env.
|
|
40
|
-
process.env.
|
|
36
|
+
process.env.B6_UNPKG_URL =
|
|
37
|
+
process.env.B6_UNPKG_URL ||
|
|
38
|
+
process.env.STEEDOS_UNPKG_URL ||
|
|
39
|
+
'https://unpkg.com';
|
|
40
|
+
process.env.B6_STORAGE_DIR =
|
|
41
|
+
process.env.B6_STORAGE_DIR ||
|
|
42
|
+
process.env.STEEDOS_STORAGE_DIR ||
|
|
43
|
+
path_1.default.join(process.cwd(), 'steedos-storage');
|
|
44
|
+
process.env.B6_LOG_LEVEL =
|
|
45
|
+
process.env.B6_LOG_LEVEL || process.env.STEEDOS_LOG_LEVEL || 'warn';
|
|
41
46
|
function parseEnvToJSON(env, prefixes) {
|
|
42
47
|
const result = {};
|
|
43
48
|
Object.keys(env).forEach((key) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.config.js","sourceRoot":"","sources":["../../src/config/env.config.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"env.config.js","sourceRoot":"","sources":["../../src/config/env.config.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.15.
|
|
3
|
+
"version": "0.15.5",
|
|
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.15.
|
|
11
|
+
"@builder6/query-mongodb": "0.15.5",
|
|
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": "b28edf03179280c46a45bd499adb84a86a5fe0e8"
|
|
25
25
|
}
|