@puca/puca-core 9.18.1 → 9.18.2
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/core/services/auth.service.d.ts +1 -1
- package/dist/core/services/auth.service.js +2 -2
- package/dist/core/services/index.js +1 -1
- package/dist/core/services/index.js.map +1 -1
- package/dist/core/services/life-cycle.service.d.ts +2 -4
- package/dist/core/services/life-cycle.service.js +2 -3
- package/dist/core/services/life-cycle.service.js.map +1 -1
- package/dist/core/services/web-socket.service.js +1 -19
- package/dist/core/services/web-socket.service.js.map +1 -1
- package/dist/orm/services/sql/sql.service.js +2 -2
- package/dist/orm/services/sql/sql.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -13,7 +13,7 @@ export declare class AuthService {
|
|
|
13
13
|
constructor(configService: ConfigService, repositoryFactory: RepositoryFactory, moduleConfigService: ModuleConfigService, uuidService: UuidService);
|
|
14
14
|
init(): Promise<void>;
|
|
15
15
|
private getPublicKey;
|
|
16
|
-
private
|
|
16
|
+
private unsafeDecode;
|
|
17
17
|
private isValid;
|
|
18
18
|
decodeAndVerify(token: string): Promise<PucaAuth>;
|
|
19
19
|
decodeAndVerifyRequest(r: Request): Promise<Request & {
|
|
@@ -122,7 +122,7 @@ class AuthService {
|
|
|
122
122
|
}
|
|
123
123
|
return await getPublicKeyByModuleName(moduleName) || await getPublicKeyByModuleName(currentModuleName);
|
|
124
124
|
}
|
|
125
|
-
async
|
|
125
|
+
async unsafeDecode(token) {
|
|
126
126
|
try {
|
|
127
127
|
return jwt.decode(token);
|
|
128
128
|
}
|
|
@@ -144,7 +144,7 @@ class AuthService {
|
|
|
144
144
|
}
|
|
145
145
|
}
|
|
146
146
|
async decodeAndVerify(token) {
|
|
147
|
-
const decoded = await this.
|
|
147
|
+
const decoded = await this.unsafeDecode(token);
|
|
148
148
|
if (!decoded) {
|
|
149
149
|
return null;
|
|
150
150
|
}
|
|
@@ -65,5 +65,5 @@ exports.reportService = new report_service_1.ReportService(plugins_1.uuidService
|
|
|
65
65
|
exports.selectManyDataService = new select_many_data_service_1.SelectManyDataService(services_1.repositoryFactory);
|
|
66
66
|
exports.userService = new user_service_1.UserService(services_1.repositoryFactory, exports.selectManyDataService, services_1.cacheServiceFactory);
|
|
67
67
|
exports.linkBuilder = new link_builder_1.LinkBuilder(essential_1.envConfigService);
|
|
68
|
-
exports.lifeCycleService = new life_cycle_service_1.LifeCycleService(services_1.databaseManagerService, services_1.redisManagerService, exports.bootstrapService, essential_1.envConfigService, exports.installService,
|
|
68
|
+
exports.lifeCycleService = new life_cycle_service_1.LifeCycleService(services_1.databaseManagerService, services_1.redisManagerService, exports.bootstrapService, essential_1.envConfigService, exports.installService, exports.webSocketService, essential_1.configService, services_1.sqlService, exports.reportService, exports.jobExecutorFactory, exports.evalServiceFactory, exports.oneSignalService, exports.incrementalSearchService, exports.emailService, essential_1.auditService, exports.authService, exports.userService);
|
|
69
69
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/services/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/services/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { DatabaseManagerService } from '../../orm/services/managers/database-manager.service';
|
|
2
2
|
import { BootstrapService } from './bootstrap.service';
|
|
3
3
|
import { InstallService } from './install.service';
|
|
4
|
-
import { RepositoryFactory } from '../../orm/services/repository-factory';
|
|
5
4
|
import { WebSocketService } from './web-socket.service';
|
|
6
5
|
import { INestApplication } from '@nestjs/common';
|
|
7
6
|
import { ConfigService } from '../../essential/config.service';
|
|
@@ -21,7 +20,7 @@ export interface StartArgs {
|
|
|
21
20
|
appModule: any;
|
|
22
21
|
execBootStrap?: boolean;
|
|
23
22
|
bodyParser?: boolean;
|
|
24
|
-
|
|
23
|
+
startOneSignal?: boolean;
|
|
25
24
|
activateReportJobProcessator?: boolean;
|
|
26
25
|
}
|
|
27
26
|
export interface ShutdownArgs {
|
|
@@ -33,7 +32,6 @@ export declare class LifeCycleService {
|
|
|
33
32
|
private readonly bootstrapService;
|
|
34
33
|
private readonly envConfigService;
|
|
35
34
|
private readonly installService;
|
|
36
|
-
private readonly repositoryFactory;
|
|
37
35
|
private readonly webSocketService;
|
|
38
36
|
private readonly configService;
|
|
39
37
|
private readonly sqlService;
|
|
@@ -49,7 +47,7 @@ export declare class LifeCycleService {
|
|
|
49
47
|
private readonly logger;
|
|
50
48
|
private app;
|
|
51
49
|
private readonly intervals;
|
|
52
|
-
constructor(databaseManagerService: DatabaseManagerService, redisManagerService: RedisManagerService, bootstrapService: BootstrapService, envConfigService: EnvConfigService, installService: InstallService,
|
|
50
|
+
constructor(databaseManagerService: DatabaseManagerService, redisManagerService: RedisManagerService, bootstrapService: BootstrapService, envConfigService: EnvConfigService, installService: InstallService, webSocketService: WebSocketService, configService: ConfigService, sqlService: SqlService, reportService: ReportService, jobExecutorFactory: JobExecutorFactory, evalServiceFactory: EvalServiceFactory, oneSignalService: OneSignalService, incrementalSearchService: IncrementalSearchService, emailService: EmailService, auditService: AuditService, authService: AuthService, userService: UserService);
|
|
53
51
|
shutdown(opt?: ShutdownArgs): Promise<void>;
|
|
54
52
|
start(args: StartArgs): Promise<INestApplication>;
|
|
55
53
|
private connectToRedis;
|
|
@@ -6,13 +6,12 @@ const database_manager_service_1 = require("../../orm/services/managers/database
|
|
|
6
6
|
const core_1 = require("@nestjs/core");
|
|
7
7
|
const logger_1 = require("./logger");
|
|
8
8
|
class LifeCycleService {
|
|
9
|
-
constructor(databaseManagerService, redisManagerService, bootstrapService, envConfigService, installService,
|
|
9
|
+
constructor(databaseManagerService, redisManagerService, bootstrapService, envConfigService, installService, webSocketService, configService, sqlService, reportService, jobExecutorFactory, evalServiceFactory, oneSignalService, incrementalSearchService, emailService, auditService, authService, userService) {
|
|
10
10
|
this.databaseManagerService = databaseManagerService;
|
|
11
11
|
this.redisManagerService = redisManagerService;
|
|
12
12
|
this.bootstrapService = bootstrapService;
|
|
13
13
|
this.envConfigService = envConfigService;
|
|
14
14
|
this.installService = installService;
|
|
15
|
-
this.repositoryFactory = repositoryFactory;
|
|
16
15
|
this.webSocketService = webSocketService;
|
|
17
16
|
this.configService = configService;
|
|
18
17
|
this.sqlService = sqlService;
|
|
@@ -89,7 +88,7 @@ class LifeCycleService {
|
|
|
89
88
|
await this.sqlService.prepare();
|
|
90
89
|
doneEvent('sqlService');
|
|
91
90
|
const httpServer = this.app.getHttpServer();
|
|
92
|
-
if (args.
|
|
91
|
+
if (args.startOneSignal) {
|
|
93
92
|
await this.webSocketService.config(httpServer);
|
|
94
93
|
doneEvent('webSocketService');
|
|
95
94
|
await this.oneSignalService.startOneSignal();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"life-cycle.service.js","sourceRoot":"","sources":["../../../src/core/services/life-cycle.service.ts"],"names":[],"mappings":";;;AACA,+BAA8B;AAE9B,mGAG8D;AAI9D,uCAA2C;AAC3C,qCAAkC;AA4BlC,MAAa,gBAAgB;IAI3B,YACmB,sBAA8C,EAC9C,mBAAwC,EACxC,gBAAkC,EAClC,gBAAkC,EAClC,cAA8B,EAC9B,
|
|
1
|
+
{"version":3,"file":"life-cycle.service.js","sourceRoot":"","sources":["../../../src/core/services/life-cycle.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.WebSocketService = void 0;
|
|
4
|
-
const _ = require("lodash");
|
|
5
4
|
const socket_io_1 = require("socket.io");
|
|
6
5
|
const redis_adapter_1 = require("@socket.io/redis-adapter");
|
|
7
6
|
const logger_1 = require("./logger");
|
|
@@ -42,24 +41,7 @@ class WebSocketService {
|
|
|
42
41
|
});
|
|
43
42
|
}
|
|
44
43
|
this.io.on('connection', async (socket) => {
|
|
45
|
-
|
|
46
|
-
const pucaAuth = await this.checkLogin(token);
|
|
47
|
-
if (!pucaAuth) {
|
|
48
|
-
socket.disconnect();
|
|
49
|
-
return;
|
|
50
|
-
}
|
|
51
|
-
const method = _.get(socket, [
|
|
52
|
-
'handshake',
|
|
53
|
-
'headers',
|
|
54
|
-
'method',
|
|
55
|
-
]);
|
|
56
|
-
socket.join(this.computeRoomName({
|
|
57
|
-
method,
|
|
58
|
-
user_pid: pucaAuth.user.puca_pid
|
|
59
|
-
}));
|
|
60
|
-
socket.on('error', error => {
|
|
61
|
-
this.logger.error(error);
|
|
62
|
-
});
|
|
44
|
+
throw new Error('Not implemented');
|
|
63
45
|
});
|
|
64
46
|
this.io.on('error', error => {
|
|
65
47
|
this.logger.error(error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-socket.service.js","sourceRoot":"","sources":["../../../src/core/services/web-socket.service.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"web-socket.service.js","sourceRoot":"","sources":["../../../src/core/services/web-socket.service.ts"],"names":[],"mappings":";;;AACA,yCAA2C;AAC3C,4DAAyD;AAEzD,qCAAkC;AAclC,MAAa,gBAAgB;IAC3B,YACmB,mBAAwC,EACxC,WAAwB,EACxB,gBAAkC;QAFlC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,gBAAW,GAAX,WAAW,CAAa;QACxB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAGpC,WAAM,GAAG,IAAI,eAAM,CAAC,kBAAkB,CAAC,CAAC;IAFrD,CAAC;IAKG,KAAK,CAAC,UAAU,CAAC,KAAa;QACpC,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,IAAI,CAAC;SACb;QACD,IAAI,OAAiB,CAAC;QACtB,IAAI;YACF,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;SACzD;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACrB,OAAO,GAAG,IAAI,CAAC;SAChB;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,eAAe,CAAC,MAAc;QACpC,OAAO,GAAG,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,MAAM,EAAE,CAAA;IAC9C,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,MAAe;QAC1B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAC1D,aAAa,EACb,aAAa,CACd,CAAC;QAEF,IAAI,WAAW,KAAK,YAAY,EAAE;YAChC,IAAI,CAAC,EAAE,GAAG,IAAI,kBAAM,CAAC,MAAM,CAAC,CAAC;SAC9B;aAAM;YACL,IAAI,CAAC,EAAE,GAAG,IAAI,kBAAM,CAAC,MAAM,EAAE;gBAC3B,IAAI,EAAE;oBACJ,MAAM,EAAE,GAAG;iBACZ;aACF,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,EAAE,KAAK,EAAC,MAAM,EAAC,EAAE;YACtC,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;YAC1B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,CAAA;QAChD,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,EAAE,CAAA;QACvC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,6BAAa,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAA;IACtD,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EACT,WAAW,EACX,MAAM,EACN,OAAO,GAKR;QACC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC;YAC9B,QAAQ,EAAE,WAAW;YACrB,MAAM;SACP,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IAC9B,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;YACZ,OAAM;SACP;QACD,MAAM,IAAI,CAAC,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAA;QACrC,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAA;IACvB,CAAC;CACF;AA/ED,4CA+EC"}
|
|
@@ -21,7 +21,7 @@ class SqlService {
|
|
|
21
21
|
insert(insert) {
|
|
22
22
|
const layers = [];
|
|
23
23
|
if (!insert.disablePermissionSystem)
|
|
24
|
-
layers.push(this.sqlSecurityLayerService.insert);
|
|
24
|
+
layers.push(i => this.sqlSecurityLayerService.insert(i));
|
|
25
25
|
return this.cSqlService.insert(layers
|
|
26
26
|
.reduce((s, insert) => {
|
|
27
27
|
return insert(s);
|
|
@@ -33,7 +33,7 @@ class SqlService {
|
|
|
33
33
|
delete(d) {
|
|
34
34
|
const layers = [];
|
|
35
35
|
if (!d.disablePermissionSystem)
|
|
36
|
-
layers.push(this.sqlSecurityLayerService.delete);
|
|
36
|
+
layers.push(d => this.sqlSecurityLayerService.delete(d));
|
|
37
37
|
return this.cSqlService.delete(layers
|
|
38
38
|
.reduce((d, funcDelete) => {
|
|
39
39
|
return funcDelete(d);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql.service.js","sourceRoot":"","sources":["../../../../src/orm/services/sql/sql.service.ts"],"names":[],"mappings":";;;AAQA,6EAAuE;AAEvE,MAAa,UAAU;IAGrB,YACmB,WAAwB,EACzC,qBAA8C;QAD7B,gBAAW,GAAX,WAAW,CAAa;QAEzC,IAAI,CAAC,uBAAuB,GAAG,IAAI,oDAAuB,CAAC,qBAAqB,CAAC,CAAA;IAEnF,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,CAAA;IAC9C,CAAC;IAED,MAAM,CAAC,MAAc;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;YAC7B,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC;SAE9C,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACb,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;YACpB,OAAO,MAAM,CAAC,CAAC,CAAC,CAAA;QAClB,CAAC,EAAE,MAAM,CAAC,CAAC,CAAA;IACf,CAAC;IACD,MAAM,CAAC,MAAqD;QAC1D,MAAM,MAAM,GAAG,EAAE,CAAA;QACjB,IAAI,CAAC,MAAM,CAAC,uBAAuB;YACjC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"sql.service.js","sourceRoot":"","sources":["../../../../src/orm/services/sql/sql.service.ts"],"names":[],"mappings":";;;AAQA,6EAAuE;AAEvE,MAAa,UAAU;IAGrB,YACmB,WAAwB,EACzC,qBAA8C;QAD7B,gBAAW,GAAX,WAAW,CAAa;QAEzC,IAAI,CAAC,uBAAuB,GAAG,IAAI,oDAAuB,CAAC,qBAAqB,CAAC,CAAA;IAEnF,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,CAAA;IAC9C,CAAC;IAED,MAAM,CAAC,MAAc;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;YAC7B,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC;SAE9C,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACb,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;YACpB,OAAO,MAAM,CAAC,CAAC,CAAC,CAAA;QAClB,CAAC,EAAE,MAAM,CAAC,CAAC,CAAA;IACf,CAAC;IACD,MAAM,CAAC,MAAqD;QAC1D,MAAM,MAAM,GAAG,EAAE,CAAA;QACjB,IAAI,CAAC,MAAM,CAAC,uBAAuB;YACjC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;QAE1D,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAC5B,MAAM;aACH,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;YACpB,OAAO,MAAM,CAAC,CAAC,CAAC,CAAA;QAClB,CAAC,EAAE,MAAM,CAAC,CAAC,CAAA;IACjB,CAAC;IACD,MAAM,CAAC,MAAqD;QAC1D,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;IAC7E,CAAC;IACD,MAAM,CAAC,CAAgD;QACrD,MAAM,MAAM,GAAG,EAAE,CAAA;QACjB,IAAI,CAAC,CAAC,CAAC,uBAAuB;YAC5B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;QAE1D,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAC5B,MAAM;aACH,MAAM,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE;YACxB,OAAO,UAAU,CAAC,CAAC,CAAC,CAAA;QACtB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IACZ,CAAC;CACF;AAhDD,gCAgDC"}
|