@builder6/core 0.7.2 → 0.7.4
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.controller.js +7 -13
- package/dist/auth/auth.controller.js.map +1 -1
- package/dist/auth/auth.service.d.ts +8 -2
- package/dist/auth/auth.service.js +24 -7
- package/dist/auth/auth.service.js.map +1 -1
- package/dist/plugin/moleculer.service.js +0 -1
- package/dist/plugin/moleculer.service.js.map +1 -1
- package/dist/plugin/plugin.module.d.ts +4 -0
- package/dist/plugin/plugin.module.js +10 -2
- package/dist/plugin/plugin.module.js.map +1 -1
- package/package.json +2 -2
|
@@ -23,19 +23,13 @@ let AuthController = class AuthController {
|
|
|
23
23
|
async login(req, res, signInDto) {
|
|
24
24
|
try {
|
|
25
25
|
const result = await this.authService.signIn(signInDto.username, signInDto.password);
|
|
26
|
-
const { user, space,
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
cookieOptions.sameSite = 'none';
|
|
34
|
-
cookieOptions.secure = true;
|
|
35
|
-
}
|
|
36
|
-
res.cookie('X-Auth-Token', authToken, cookieOptions);
|
|
37
|
-
res.cookie('X-User-Id', user, cookieOptions);
|
|
38
|
-
res.cookie('X-Space-Id', space, cookieOptions);
|
|
26
|
+
const { user, space, auth_token, access_token } = result;
|
|
27
|
+
this.authService.setAuthCookies(res, {
|
|
28
|
+
user_id: user,
|
|
29
|
+
space_id: space,
|
|
30
|
+
auth_token,
|
|
31
|
+
access_token,
|
|
32
|
+
});
|
|
39
33
|
return res.status(200).json(result);
|
|
40
34
|
}
|
|
41
35
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.controller.js","sourceRoot":"","sources":["../../src/auth/auth.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAQwB;AACxB,iDAA6C;AAC7C,6CAA0C;AAInC,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAAoB,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IAsB1C,AAAN,KAAK,CAAC,KAAK,CACF,GAAY,EACZ,GAAa,EACZ,SAA8B;QAEtC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAC1C,SAAS,CAAC,QAAQ,EAClB,SAAS,CAAC,QAAQ,CACnB,CAAC;YACF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"auth.controller.js","sourceRoot":"","sources":["../../src/auth/auth.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAQwB;AACxB,iDAA6C;AAC7C,6CAA0C;AAInC,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAAoB,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IAsB1C,AAAN,KAAK,CAAC,KAAK,CACF,GAAY,EACZ,GAAa,EACZ,SAA8B;QAEtC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAC1C,SAAS,CAAC,QAAQ,EAClB,SAAS,CAAC,QAAQ,CACnB,CAAC;YACF,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,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,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;QACpE,CAAC;IACH,CAAC;CACF,CAAA;AA/CY,wCAAc;AAuBnB;IApBL,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IACvB,IAAA,aAAI,EAAC,OAAO,CAAC;IACb,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;aAC7B;SACF;QACD,QAAQ,EAAE;YACR,IAAI,EAAE;gBACJ,OAAO,EAAE,MAAM;gBACf,KAAK,EAAE;oBACL,QAAQ,EAAE,MAAM;oBAChB,QAAQ,EAAE,MAAM;iBACjB;aACF;SACF;KACF,CAAC;IAEC,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,aAAI,GAAE,CAAA;;;;2CAoBR;yBA9CU,cAAc;IAD1B,IAAA,mBAAU,EAAC,aAAa,CAAC;qCAES,0BAAW;GADjC,cAAc,CA+C1B"}
|
|
@@ -1,12 +1,18 @@
|
|
|
1
1
|
import { MongodbService } from '../mongodb';
|
|
2
2
|
import { JwtService } from '@nestjs/jwt';
|
|
3
|
-
import { Request } from 'express';
|
|
3
|
+
import { Request, Response } from 'express';
|
|
4
4
|
export declare class AuthService {
|
|
5
5
|
private mongodbService;
|
|
6
6
|
private jwtService;
|
|
7
7
|
private masterSpaceId;
|
|
8
8
|
constructor(mongodbService: MongodbService, jwtService: JwtService);
|
|
9
|
-
signIn(username: string, password
|
|
9
|
+
signIn(username: string, password?: string, spaceId?: string): Promise<any>;
|
|
10
|
+
setAuthCookies(res: Response, { access_token, auth_token, user_id, space_id }: {
|
|
11
|
+
access_token: any;
|
|
12
|
+
auth_token: any;
|
|
13
|
+
user_id: any;
|
|
14
|
+
space_id: any;
|
|
15
|
+
}): Promise<void>;
|
|
10
16
|
getMasterSpaceId(): Promise<string>;
|
|
11
17
|
getSpaceUser(userId: string, spaceId: string): Promise<any>;
|
|
12
18
|
getUserByToken(token: string): Promise<any>;
|
|
@@ -25,9 +25,6 @@ let AuthService = class AuthService {
|
|
|
25
25
|
if (!spaceId) {
|
|
26
26
|
spaceId = await this.getMasterSpaceId();
|
|
27
27
|
}
|
|
28
|
-
const hash = crypto.createHash('sha256');
|
|
29
|
-
hash.update(password);
|
|
30
|
-
const bcryptPassword = hash.digest('hex');
|
|
31
28
|
const user = (await this.mongodbService.findOne('users', {
|
|
32
29
|
$or: [
|
|
33
30
|
{ username: username },
|
|
@@ -38,9 +35,14 @@ let AuthService = class AuthService {
|
|
|
38
35
|
if (!user) {
|
|
39
36
|
throw new common_1.UnauthorizedException();
|
|
40
37
|
}
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
38
|
+
if (password) {
|
|
39
|
+
const hash = crypto.createHash('sha256');
|
|
40
|
+
hash.update(password);
|
|
41
|
+
const bcryptPassword = hash.digest('hex');
|
|
42
|
+
const match = await bcrypt.compare(bcryptPassword, user.services.password.bcrypt);
|
|
43
|
+
if (!match) {
|
|
44
|
+
throw new common_1.UnauthorizedException();
|
|
45
|
+
}
|
|
44
46
|
}
|
|
45
47
|
const space_user = await this.getSpaceUser(user._id, spaceId);
|
|
46
48
|
if (!space_user) {
|
|
@@ -68,10 +70,25 @@ let AuthService = class AuthService {
|
|
|
68
70
|
await this.mongodbService.findOneAndUpdate('users', { _id: user._id }, data);
|
|
69
71
|
return {
|
|
70
72
|
access_token: access_token,
|
|
71
|
-
|
|
73
|
+
auth_token: authToken,
|
|
72
74
|
...space_user,
|
|
73
75
|
};
|
|
74
76
|
}
|
|
77
|
+
async setAuthCookies(res, { access_token, auth_token, user_id, space_id }) {
|
|
78
|
+
const cookieOptions = {
|
|
79
|
+
httpOnly: true,
|
|
80
|
+
sameSite: 'strict',
|
|
81
|
+
maxAge: 2 * 365 * 24 * 60 * 60 * 1000,
|
|
82
|
+
};
|
|
83
|
+
if (process.env.STEEDOS_AUTH_COOKIES_USE_SAMESITE == 'None') {
|
|
84
|
+
cookieOptions.sameSite = 'none';
|
|
85
|
+
cookieOptions.secure = true;
|
|
86
|
+
}
|
|
87
|
+
res.cookie('X-Access-Token', access_token, cookieOptions);
|
|
88
|
+
res.cookie('X-Auth-Token', auth_token, cookieOptions);
|
|
89
|
+
res.cookie('X-User-Id', user_id, cookieOptions);
|
|
90
|
+
res.cookie('X-Space-Id', space_id, cookieOptions);
|
|
91
|
+
}
|
|
75
92
|
async getMasterSpaceId() {
|
|
76
93
|
if (this.masterSpaceId) {
|
|
77
94
|
return this.masterSpaceId;
|
|
@@ -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,2CAAmE;AACnE,wCAA4C;AAC5C,qCAAyC;AAIlC,IAAM,WAAW,GAAjB,MAAM,WAAW;IAGtB,YACU,cAA8B,EAC9B,UAAsB;QADtB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,eAAU,GAAV,UAAU,CAAY;IAC7B,CAAC;IAEJ,KAAK,CAAC,MAAM,CACV,QAAgB,EAChB,
|
|
1
|
+
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/auth/auth.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"moleculer.service.js","sourceRoot":"","sources":["../../src/plugin/moleculer.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,2CAA+C;AAC/C,yCAA0C;AAC1C,yBAAyB;AACzB,6BAA6B;AAC7B,mDAAmD;AAI5C,IAAM,sBAAsB,8BAA5B,MAAM,sBAAsB;IAGjC,YACU,aAA4B,EACpB,MAAsC;QAD9C,kBAAa,GAAb,aAAa,CAAe;QACH,WAAM,GAAN,MAAM,CAAe;QAJvC,WAAM,GAAG,IAAI,eAAM,CAAC,wBAAsB,CAAC,IAAI,CAAC,CAAC;QAMhE,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAC1D,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;YACjD,OAAO;QACT,CAAC;
|
|
1
|
+
{"version":3,"file":"moleculer.service.js","sourceRoot":"","sources":["../../src/plugin/moleculer.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { DynamicModule, Logger } from '@nestjs/common';
|
|
2
|
+
import { MoleculerPluginService } from './moleculer.service';
|
|
2
3
|
export declare class PluginModule {
|
|
4
|
+
private readonly moleculerService;
|
|
3
5
|
static readonly logger: Logger;
|
|
4
6
|
static plugins: Plugin[];
|
|
5
7
|
private readonly logger;
|
|
@@ -7,7 +9,9 @@ export declare class PluginModule {
|
|
|
7
9
|
private static install_packages;
|
|
8
10
|
static state: any;
|
|
9
11
|
static targetState: any;
|
|
12
|
+
constructor(moleculerService: MoleculerPluginService);
|
|
10
13
|
static forRootAsync(): DynamicModule;
|
|
14
|
+
onModuleInit(): void;
|
|
11
15
|
static loadPlugin(packageName: string): any;
|
|
12
16
|
static getPackagePath(packageName: string): string;
|
|
13
17
|
static getPluginDir(): string;
|
|
@@ -5,6 +5,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
5
5
|
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;
|
|
6
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
7
|
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
8
11
|
var PluginModule_1;
|
|
9
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
13
|
exports.PluginModule = void 0;
|
|
@@ -26,7 +29,8 @@ const States = {
|
|
|
26
29
|
STOPPING: 'stopping',
|
|
27
30
|
};
|
|
28
31
|
let PluginModule = PluginModule_1 = class PluginModule {
|
|
29
|
-
constructor() {
|
|
32
|
+
constructor(moleculerService) {
|
|
33
|
+
this.moleculerService = moleculerService;
|
|
30
34
|
this.logger = new common_1.Logger(plugin_service_1.PluginService.name);
|
|
31
35
|
}
|
|
32
36
|
static forRootAsync() {
|
|
@@ -58,6 +62,9 @@ let PluginModule = PluginModule_1 = class PluginModule {
|
|
|
58
62
|
exports: ['PLUGINS'],
|
|
59
63
|
};
|
|
60
64
|
}
|
|
65
|
+
onModuleInit() {
|
|
66
|
+
this.moleculerService.loadServices();
|
|
67
|
+
}
|
|
61
68
|
static loadPlugin(packageName) {
|
|
62
69
|
const packageModulePath = path.resolve(this.getPackagePath(packageName), './dist/plugin.module.js');
|
|
63
70
|
if (!fs.existsSync(packageModulePath)) {
|
|
@@ -215,6 +222,7 @@ exports.PluginModule = PluginModule = PluginModule_1 = __decorate([
|
|
|
215
222
|
(0, common_1.Module)({
|
|
216
223
|
imports: [moleculer_1.MoleculerModule.forRoot({})],
|
|
217
224
|
providers: [plugin_service_1.PluginService, moleculer_service_1.MoleculerPluginService],
|
|
218
|
-
})
|
|
225
|
+
}),
|
|
226
|
+
__metadata("design:paramtypes", [moleculer_service_1.MoleculerPluginService])
|
|
219
227
|
], PluginModule);
|
|
220
228
|
//# sourceMappingURL=plugin.module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.module.js","sourceRoot":"","sources":["../../src/plugin/plugin.module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"plugin.module.js","sourceRoot":"","sources":["../../src/plugin/plugin.module.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.7.
|
|
3
|
+
"version": "0.7.4",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"files": [
|
|
@@ -16,5 +16,5 @@
|
|
|
16
16
|
"publishConfig": {
|
|
17
17
|
"access": "public"
|
|
18
18
|
},
|
|
19
|
-
"gitHead": "
|
|
19
|
+
"gitHead": "f30f14d167b6b222d4b16ed0d33f211cfd4afc44"
|
|
20
20
|
}
|