@servicelabsco/nestjs-utility-services 1.1.14 → 1.1.16
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/app.controller.js +7 -24
- package/dist/app.controller.js.map +1 -1
- package/dist/app.module.js +2 -0
- package/dist/app.module.js.map +1 -1
- package/dist/app.service.js +8 -23
- package/dist/app.service.js.map +1 -1
- package/dist/auth/controllers/auth.controller.js +54 -75
- package/dist/auth/controllers/auth.controller.js.map +1 -1
- package/dist/auth/controllers/social.controller.js +7 -20
- package/dist/auth/controllers/social.controller.js.map +1 -1
- package/dist/auth/controllers/user.controller.js +6 -17
- package/dist/auth/controllers/user.controller.js.map +1 -1
- package/dist/auth/es6.classes.d.ts +2 -1
- package/dist/auth/es6.classes.js +2 -1
- package/dist/auth/es6.classes.js.map +1 -1
- package/dist/auth/middlewares/basic.auth.middleware.js +14 -25
- package/dist/auth/middlewares/basic.auth.middleware.js.map +1 -1
- package/dist/auth/middlewares/index.d.ts +1 -0
- package/dist/auth/middlewares/index.js +1 -0
- package/dist/auth/middlewares/index.js.map +1 -1
- package/dist/auth/middlewares/internal.middleware.d.ts +10 -0
- package/dist/auth/middlewares/internal.middleware.js +48 -0
- package/dist/auth/middlewares/internal.middleware.js.map +1 -0
- package/dist/auth/middlewares/jwt.middleware.js +19 -32
- package/dist/auth/middlewares/jwt.middleware.js.map +1 -1
- package/dist/auth/services/auth.service.js +42 -63
- package/dist/auth/services/auth.service.js.map +1 -1
- package/dist/auth/services/device.token.service.js +34 -47
- package/dist/auth/services/device.token.service.js.map +1 -1
- package/dist/auth/services/refresh.token.service.js +17 -30
- package/dist/auth/services/refresh.token.service.js.map +1 -1
- package/dist/auth/services/social.service.js +20 -33
- package/dist/auth/services/social.service.js.map +1 -1
- package/dist/auth/services/user.service.js +29 -46
- package/dist/auth/services/user.service.js.map +1 -1
- package/dist/auth/strategies/fb.strategy.js +8 -19
- package/dist/auth/strategies/fb.strategy.js.map +1 -1
- package/dist/auth/strategies/google.strategy.js +8 -19
- package/dist/auth/strategies/google.strategy.js.map +1 -1
- package/dist/cli.js +12 -23
- package/dist/cli.js.map +1 -1
- package/dist/common/guards/login.guard.js +5 -20
- package/dist/common/guards/login.guard.js.map +1 -1
- package/dist/common/libraries/base.migration.utility.js +106 -145
- package/dist/common/libraries/base.migration.utility.js.map +1 -1
- package/dist/common/libraries/common.entity.js +42 -63
- package/dist/common/libraries/common.entity.js.map +1 -1
- package/dist/common/libraries/common.job.d.ts +2 -0
- package/dist/common/libraries/common.job.js +46 -46
- package/dist/common/libraries/common.job.js.map +1 -1
- package/dist/common/libraries/common.mapper.job.js +20 -35
- package/dist/common/libraries/common.mapper.job.js.map +1 -1
- package/dist/common/libraries/common.subscriber.js +4 -17
- package/dist/common/libraries/common.subscriber.js.map +1 -1
- package/dist/common/libraries/data.manager.js +85 -112
- package/dist/common/libraries/data.manager.js.map +1 -1
- package/dist/common/libraries/list.manager.js +62 -85
- package/dist/common/libraries/list.manager.js.map +1 -1
- package/dist/common/libraries/migration.utility.js +10 -31
- package/dist/common/libraries/migration.utility.js.map +1 -1
- package/dist/common/libraries/platform.utility.js +2 -13
- package/dist/common/libraries/platform.utility.js.map +1 -1
- package/dist/common/libraries/record.manager.js +106 -127
- package/dist/common/libraries/record.manager.js.map +1 -1
- package/dist/common/libraries/report.data.manager.js +66 -93
- package/dist/common/libraries/report.data.manager.js.map +1 -1
- package/dist/common/libraries/report.list.manager.js +69 -92
- package/dist/common/libraries/report.list.manager.js.map +1 -1
- package/dist/common/libraries/reverse.migration.utility.js +4 -23
- package/dist/common/libraries/reverse.migration.utility.js.map +1 -1
- package/dist/common/libraries/seeder.utility.js +51 -70
- package/dist/common/libraries/seeder.utility.js.map +1 -1
- package/dist/console.js +4 -13
- package/dist/console.js.map +1 -1
- package/dist/main.js +15 -26
- package/dist/main.js.map +1 -1
- package/dist/migrations/1599567001962-AddUserSequence.js +3 -16
- package/dist/migrations/1599567001962-AddUserSequence.js.map +1 -1
- package/dist/migrations/1607944291609-AddUniqueIndexDeviceToken.js +7 -20
- package/dist/migrations/1607944291609-AddUniqueIndexDeviceToken.js.map +1 -1
- package/dist/platformUtility/commands/entity.generator.command.js +81 -108
- package/dist/platformUtility/commands/entity.generator.command.js.map +1 -1
- package/dist/platformUtility/commands/maintenance.command.js +16 -35
- package/dist/platformUtility/commands/maintenance.command.js.map +1 -1
- package/dist/platformUtility/commands/sqs.worker.command.js +49 -72
- package/dist/platformUtility/commands/sqs.worker.command.js.map +1 -1
- package/dist/platformUtility/commands/sync.class.command.js +14 -25
- package/dist/platformUtility/commands/sync.class.command.js.map +1 -1
- package/dist/platformUtility/consumers/event.consumer.js +21 -42
- package/dist/platformUtility/consumers/event.consumer.js.map +1 -1
- package/dist/platformUtility/consumers/job.consumer.js +8 -19
- package/dist/platformUtility/consumers/job.consumer.js.map +1 -1
- package/dist/platformUtility/controllers/queue.controller.js +47 -76
- package/dist/platformUtility/controllers/queue.controller.js.map +1 -1
- package/dist/platformUtility/jobs/record.watcher.job.js +5 -18
- package/dist/platformUtility/jobs/record.watcher.job.js.map +1 -1
- package/dist/platformUtility/jobs/test.job.js +1 -12
- package/dist/platformUtility/jobs/test.job.js.map +1 -1
- package/dist/platformUtility/libraries/process.common.mail.js +27 -44
- package/dist/platformUtility/libraries/process.common.mail.js.map +1 -1
- package/dist/platformUtility/libraries/process.postmark.mail.js +22 -37
- package/dist/platformUtility/libraries/process.postmark.mail.js.map +1 -1
- package/dist/platformUtility/services/audit.service.js +50 -67
- package/dist/platformUtility/services/audit.service.js.map +1 -1
- package/dist/platformUtility/services/cache.service.js +21 -36
- package/dist/platformUtility/services/cache.service.js.map +1 -1
- package/dist/platformUtility/services/dynamo.service.js +16 -29
- package/dist/platformUtility/services/dynamo.service.js.map +1 -1
- package/dist/platformUtility/services/fcm.notification.service.js +42 -63
- package/dist/platformUtility/services/fcm.notification.service.js.map +1 -1
- package/dist/platformUtility/services/mail.service.js +8 -19
- package/dist/platformUtility/services/mail.service.js.map +1 -1
- package/dist/platformUtility/services/queue.service.js +105 -158
- package/dist/platformUtility/services/queue.service.js.map +1 -1
- package/dist/platformUtility/services/remote.request.service.js +8 -19
- package/dist/platformUtility/services/remote.request.service.js.map +1 -1
- package/dist/platformUtility/services/sql.service.js +17 -38
- package/dist/platformUtility/services/sql.service.js.map +1 -1
- package/dist/platformUtility/services/sqs.service.js +39 -56
- package/dist/platformUtility/services/sqs.service.js.map +1 -1
- package/dist/platformUtility/services/startup.service.js +8 -21
- package/dist/platformUtility/services/startup.service.js.map +1 -1
- package/dist/platformUtility/subscribers/base.subscriber.js +6 -19
- package/dist/platformUtility/subscribers/base.subscriber.js.map +1 -1
- package/dist/system/commands/db.scanner.command.js +182 -221
- package/dist/system/commands/db.scanner.command.js.map +1 -1
- package/dist/system/commands/event.queue.command.js +30 -47
- package/dist/system/commands/event.queue.command.js.map +1 -1
- package/dist/system/commands/jobs.scanner.command.js +7 -18
- package/dist/system/commands/jobs.scanner.command.js.map +1 -1
- package/dist/system/commands/model.scanner.command.js +15 -30
- package/dist/system/commands/model.scanner.command.js.map +1 -1
- package/dist/system/commands/report.scanner.command.js +9 -20
- package/dist/system/commands/report.scanner.command.js.map +1 -1
- package/dist/system/commands/service.scanner.command.js +7 -18
- package/dist/system/commands/service.scanner.command.js.map +1 -1
- package/dist/system/commands/sync.all.command.js +13 -24
- package/dist/system/commands/sync.all.command.js.map +1 -1
- package/dist/system/controllers/base.controller.js +62 -87
- package/dist/system/controllers/base.controller.js.map +1 -1
- package/dist/system/controllers/data.controller.js +10 -23
- package/dist/system/controllers/data.controller.js.map +1 -1
- package/dist/system/controllers/form.controller.js +9 -20
- package/dist/system/controllers/form.controller.js.map +1 -1
- package/dist/system/controllers/menu.controller.js +4 -17
- package/dist/system/controllers/menu.controller.js.map +1 -1
- package/dist/system/controllers/preference.controller.js +51 -74
- package/dist/system/controllers/preference.controller.js.map +1 -1
- package/dist/system/controllers/report.controller.js +29 -46
- package/dist/system/controllers/report.controller.js.map +1 -1
- package/dist/system/controllers/upload.controller.js +11 -26
- package/dist/system/controllers/upload.controller.js.map +1 -1
- package/dist/system/controllers/user.preference.controller.js +9 -22
- package/dist/system/controllers/user.preference.controller.js.map +1 -1
- package/dist/system/es6.classes.d.ts +1 -1
- package/dist/system/jobs/clean.scheduled.event.job.js +3 -14
- package/dist/system/jobs/clean.scheduled.event.job.js.map +1 -1
- package/dist/system/jobs/column.mapper.job.js +18 -33
- package/dist/system/jobs/column.mapper.job.js.map +1 -1
- package/dist/system/jobs/model.scanner.job.js +106 -133
- package/dist/system/jobs/model.scanner.job.js.map +1 -1
- package/dist/system/jobs/property.job.js +5 -16
- package/dist/system/jobs/property.job.js.map +1 -1
- package/dist/system/jobs/relationship.mapper.job.js +18 -33
- package/dist/system/jobs/relationship.mapper.job.js.map +1 -1
- package/dist/system/jobs/report.column.sync.job.js +71 -94
- package/dist/system/jobs/report.column.sync.job.js.map +1 -1
- package/dist/system/jobs/scheduled.event.job.js +15 -28
- package/dist/system/jobs/scheduled.event.job.js.map +1 -1
- package/dist/system/jobs/scheduled.events.job.js +11 -22
- package/dist/system/jobs/scheduled.events.job.js.map +1 -1
- package/dist/system/jobs/user.group.member.job.js +56 -79
- package/dist/system/jobs/user.group.member.job.js.map +1 -1
- package/dist/system/jobs/user.group.permission.job.js +24 -39
- package/dist/system/jobs/user.group.permission.job.js.map +1 -1
- package/dist/system/jobs/user.group.role.job.js +24 -39
- package/dist/system/jobs/user.group.role.job.js.map +1 -1
- package/dist/system/libraries/business.rule.filter.validator.js +20 -37
- package/dist/system/libraries/business.rule.filter.validator.js.map +1 -1
- package/dist/system/libraries/business.rule.query.evaluator.js +24 -39
- package/dist/system/libraries/business.rule.query.evaluator.js.map +1 -1
- package/dist/system/libraries/column.manager.js +42 -61
- package/dist/system/libraries/column.manager.js.map +1 -1
- package/dist/system/libraries/model.sync.js +64 -87
- package/dist/system/libraries/model.sync.js.map +1 -1
- package/dist/system/libraries/security.rule.evaluator.js +13 -26
- package/dist/system/libraries/security.rule.evaluator.js.map +1 -1
- package/dist/system/services/business.rule.service.js +23 -36
- package/dist/system/services/business.rule.service.js.map +1 -1
- package/dist/system/services/client.script.service.js +17 -28
- package/dist/system/services/client.script.service.js.map +1 -1
- package/dist/system/services/column.service.js +12 -23
- package/dist/system/services/column.service.js.map +1 -1
- package/dist/system/services/comment.service.js +2 -13
- package/dist/system/services/comment.service.js.map +1 -1
- package/dist/system/services/common.service.js +27 -44
- package/dist/system/services/common.service.js.map +1 -1
- package/dist/system/services/document.service.js +3 -14
- package/dist/system/services/document.service.js.map +1 -1
- package/dist/system/services/event.detail.service.js +10 -21
- package/dist/system/services/event.detail.service.js.map +1 -1
- package/dist/system/services/event.queue.service.js +21 -34
- package/dist/system/services/event.queue.service.js.map +1 -1
- package/dist/system/services/form.service.js +6 -17
- package/dist/system/services/form.service.js.map +1 -1
- package/dist/system/services/list.service.js +20 -35
- package/dist/system/services/list.service.js.map +1 -1
- package/dist/system/services/menu.service.js +50 -69
- package/dist/system/services/menu.service.js.map +1 -1
- package/dist/system/services/model.service.js +60 -81
- package/dist/system/services/model.service.js.map +1 -1
- package/dist/system/services/preference.service.js +32 -53
- package/dist/system/services/preference.service.js.map +1 -1
- package/dist/system/services/property.service.js +23 -36
- package/dist/system/services/property.service.js.map +1 -1
- package/dist/system/services/report.service.js +19 -32
- package/dist/system/services/report.service.js.map +1 -1
- package/dist/system/services/scheduled.event.service.js +69 -90
- package/dist/system/services/scheduled.event.service.js.map +1 -1
- package/dist/system/services/security.rule.service.js +23 -40
- package/dist/system/services/security.rule.service.js.map +1 -1
- package/dist/system/services/ui.action.service.js +13 -24
- package/dist/system/services/ui.action.service.js.map +1 -1
- package/dist/system/services/upload.service.js +33 -48
- package/dist/system/services/upload.service.js.map +1 -1
- package/dist/system/services/user.preference.service.js +38 -57
- package/dist/system/services/user.preference.service.js.map +1 -1
- package/dist/system/subscribers/column.subscriber.js +4 -17
- package/dist/system/subscribers/column.subscriber.js.map +1 -1
- package/dist/system/subscribers/property.subscriber.js +4 -17
- package/dist/system/subscribers/property.subscriber.js.map +1 -1
- package/dist/system/subscribers/relationship.subscriber.js +4 -17
- package/dist/system/subscribers/relationship.subscriber.js.map +1 -1
- package/dist/system/subscribers/scheduled.event.subscriber.js +6 -19
- package/dist/system/subscribers/scheduled.event.subscriber.js.map +1 -1
- package/dist/system/subscribers/user.group.member.subscriber.js +4 -17
- package/dist/system/subscribers/user.group.member.subscriber.js.map +1 -1
- package/dist/system/subscribers/user.group.permission.subscriber.js +4 -17
- package/dist/system/subscribers/user.group.permission.subscriber.js.map +1 -1
- package/dist/system/subscribers/user.group.role.subscriber.js +4 -17
- package/dist/system/subscribers/user.group.role.subscriber.js.map +1 -1
- package/dist/worker.js +6 -17
- package/dist/worker.js.map +1 -1
- package/package.json +2 -1
@@ -8,15 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
10
10
|
};
|
11
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
12
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
13
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
14
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
15
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
16
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
17
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
18
|
-
});
|
19
|
-
};
|
20
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
21
12
|
exports.JwtMiddleware = void 0;
|
22
13
|
const common_1 = require("@nestjs/common");
|
@@ -28,30 +19,26 @@ let JwtMiddleware = class JwtMiddleware {
|
|
28
19
|
constructor(authService) {
|
29
20
|
this.authService = authService;
|
30
21
|
}
|
31
|
-
use(req, res, next) {
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
next();
|
46
|
-
});
|
22
|
+
async use(req, res, next) {
|
23
|
+
if (auth_1.Auth.check())
|
24
|
+
return next();
|
25
|
+
const token = (0, parse_bearer_token_1.default)(req);
|
26
|
+
if (!token)
|
27
|
+
return next();
|
28
|
+
const user = await this._getUserOutOfToken(token);
|
29
|
+
if (!user)
|
30
|
+
return next();
|
31
|
+
const accessObject = await this.authService.getUserObject(user.id);
|
32
|
+
if (this.authService.isUserBlocked(user))
|
33
|
+
throw new operation_exception_1.OperationException('This user is blocked from the platform');
|
34
|
+
auth_1.Auth.login(accessObject);
|
35
|
+
next();
|
47
36
|
}
|
48
|
-
_getUserOutOfToken(token) {
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
return { id: payload.id };
|
54
|
-
});
|
37
|
+
async _getUserOutOfToken(token) {
|
38
|
+
const payload = await this.authService.verifyJwtToken(token);
|
39
|
+
if (!payload)
|
40
|
+
return false;
|
41
|
+
return { id: payload.id };
|
55
42
|
}
|
56
43
|
};
|
57
44
|
JwtMiddleware = __decorate([
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"jwt.middleware.js","sourceRoot":"","sources":["../../../src/auth/middlewares/jwt.middleware.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"jwt.middleware.js","sourceRoot":"","sources":["../../../src/auth/middlewares/jwt.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4D;AAE5D,2DAAkD;AAClD,qFAAiF;AACjF,sDAAmD;AACnD,2DAAuD;AAShD,IAAM,aAAa,GAAnB,MAAM,aAAa;IAMtB,YAA6B,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IAazD,KAAK,CAAC,GAAG,CAAC,GAAQ,EAAE,GAAa,EAAE,IAAc;QAE7C,IAAI,WAAI,CAAC,KAAK,EAAE;YAAE,OAAO,IAAI,EAAE,CAAC;QAEhC,MAAM,KAAK,GAAG,IAAA,4BAAgB,EAAC,GAAG,CAAC,CAAC;QAEpC,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,EAAE,CAAC;QAE1B,MAAM,IAAI,GAAQ,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAEvD,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,EAAE,CAAC;QAEzB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEnE,IAAI,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC;YAAE,MAAM,IAAI,wCAAkB,CAAC,wCAAwC,CAAC,CAAC;QAEjH,WAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAEzB,IAAI,EAAE,CAAC;IACX,CAAC;IAQD,KAAK,CAAC,kBAAkB,CAAC,KAAa;QAClC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC7D,IAAI,CAAC,OAAO;YAAE,OAAO,KAAK,CAAC;QAE3B,OAAO,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC;IAC9B,CAAC;CACJ,CAAA;AApDY,aAAa;IADzB,IAAA,mBAAU,GAAE;qCAOiC,0BAAW;GAN5C,aAAa,CAoDzB;AApDY,sCAAa"}
|
@@ -8,15 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
10
10
|
};
|
11
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
12
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
13
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
14
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
15
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
16
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
17
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
18
|
-
});
|
19
|
-
};
|
20
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
21
12
|
exports.AuthService = void 0;
|
22
13
|
const common_1 = require("@nestjs/common");
|
@@ -29,66 +20,54 @@ let AuthService = class AuthService {
|
|
29
20
|
this.jwtService = jwtService;
|
30
21
|
this.refreshTokenService = refreshTokenService;
|
31
22
|
}
|
32
|
-
getUserLoginInfo(user, req) {
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
return user;
|
42
|
-
});
|
23
|
+
async getUserLoginInfo(user, req) {
|
24
|
+
user = await this.getUserInfo(user);
|
25
|
+
let deviceIdentifier = req.headers['u-device-identifier'];
|
26
|
+
if (!(deviceIdentifier && deviceIdentifier.length === 36)) {
|
27
|
+
deviceIdentifier = null;
|
28
|
+
}
|
29
|
+
const token = await this.refreshTokenService.setRefreshToken(user, deviceIdentifier);
|
30
|
+
user.refresh_token = token.token;
|
31
|
+
return user;
|
43
32
|
}
|
44
|
-
getUserInfo(user) {
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
return user;
|
49
|
-
});
|
33
|
+
async getUserInfo(user) {
|
34
|
+
user = await this.getUserObject(user.id);
|
35
|
+
user.access_token = await this.generateUserJwtToken(user);
|
36
|
+
return user;
|
50
37
|
}
|
51
|
-
generateUserJwtToken(user) {
|
52
|
-
return
|
53
|
-
return this.signJwtToken({ id: user.id });
|
54
|
-
});
|
38
|
+
async generateUserJwtToken(user) {
|
39
|
+
return this.signJwtToken({ id: user.id });
|
55
40
|
}
|
56
|
-
signJwtToken(payload, expiryInSeconds) {
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
return this.jwtService.sign(payload, options);
|
62
|
-
});
|
41
|
+
async signJwtToken(payload, expiryInSeconds) {
|
42
|
+
const options = {};
|
43
|
+
if (expiryInSeconds)
|
44
|
+
options.expiresIn = expiryInSeconds;
|
45
|
+
return this.jwtService.sign(payload, options);
|
63
46
|
}
|
64
|
-
verifyJwtToken(token) {
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
}
|
72
|
-
});
|
47
|
+
async verifyJwtToken(token) {
|
48
|
+
try {
|
49
|
+
return await this.jwtService.verify(token);
|
50
|
+
}
|
51
|
+
catch (e) {
|
52
|
+
return false;
|
53
|
+
}
|
73
54
|
}
|
74
|
-
getUserObject(id) {
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
delete record[key];
|
85
|
-
});
|
86
|
-
record.roles = class_mapper_1.ClassMapper.extractNumber('id', user.roles);
|
87
|
-
record.role_identifiers = class_mapper_1.ClassMapper.extract('identifier', user.roles);
|
88
|
-
record.permissions = class_mapper_1.ClassMapper.extractNumber('id', user.permissions);
|
89
|
-
record.permission_identifiers = class_mapper_1.ClassMapper.extract('identifier', user.permissions);
|
90
|
-
return record;
|
55
|
+
async getUserObject(id) {
|
56
|
+
const user = await user_entity_1.UserEntity.first(id, {
|
57
|
+
relations: ['roles', 'permissions'],
|
58
|
+
});
|
59
|
+
if (!user)
|
60
|
+
return null;
|
61
|
+
const record = Object.assign({}, user);
|
62
|
+
const toDelete = ['password', 'created_at', 'updated_at', 'deleted_at', 'created_by', 'updated_by'];
|
63
|
+
toDelete.forEach((key) => {
|
64
|
+
delete record[key];
|
91
65
|
});
|
66
|
+
record.roles = class_mapper_1.ClassMapper.extractNumber('id', user.roles);
|
67
|
+
record.role_identifiers = class_mapper_1.ClassMapper.extract('identifier', user.roles);
|
68
|
+
record.permissions = class_mapper_1.ClassMapper.extractNumber('id', user.permissions);
|
69
|
+
record.permission_identifiers = class_mapper_1.ClassMapper.extract('identifier', user.permissions);
|
70
|
+
return record;
|
92
71
|
}
|
93
72
|
isUserBlocked(user) {
|
94
73
|
var _a;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../src/auth/services/auth.service.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../src/auth/services/auth.service.ts"],"names":[],"mappings":"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"}
|
@@ -5,15 +5,6 @@ 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 __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
9
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
10
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
11
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
12
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
13
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
14
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
15
|
-
});
|
16
|
-
};
|
17
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
18
9
|
exports.DeviceTokenService = void 0;
|
19
10
|
const common_1 = require("@nestjs/common");
|
@@ -23,52 +14,48 @@ const auth_1 = require("../../common/libraries/auth");
|
|
23
14
|
const device_token_entity_1 = require("../entities/device.token.entity");
|
24
15
|
const date_util_1 = require("../../common/libraries/date.util");
|
25
16
|
let DeviceTokenService = class DeviceTokenService {
|
26
|
-
setDeviceToken(req, body) {
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
token: body.token,
|
38
|
-
});
|
39
|
-
record = (0, class_transformer_1.plainToClassFromExist)(record, body);
|
40
|
-
record.identifier = this.getDeviceIdentifier(req);
|
41
|
-
try {
|
42
|
-
return yield record.save();
|
43
|
-
}
|
44
|
-
catch (error) {
|
45
|
-
return this.setDeviceToken(req, body);
|
46
|
-
}
|
17
|
+
async setDeviceToken(req, body) {
|
18
|
+
if (auth_1.Auth.check()) {
|
19
|
+
const user = auth_1.Auth.user();
|
20
|
+
body.user_id = user === undefined ? null : user.id;
|
21
|
+
}
|
22
|
+
else
|
23
|
+
delete body.user_id;
|
24
|
+
body.last_access_datetime = date_util_1.DateUtil.getDateTime();
|
25
|
+
body.public_ip = req.ip;
|
26
|
+
let record = await device_token_entity_1.DeviceTokenEntity.firstOrNew({
|
27
|
+
token: body.token,
|
47
28
|
});
|
29
|
+
record = (0, class_transformer_1.plainToClassFromExist)(record, body);
|
30
|
+
record.identifier = this.getDeviceIdentifier(req);
|
31
|
+
try {
|
32
|
+
return await record.save();
|
33
|
+
}
|
34
|
+
catch (error) {
|
35
|
+
return this.setDeviceToken(req, body);
|
36
|
+
}
|
48
37
|
}
|
49
38
|
getDeviceIdentifier(req) {
|
50
39
|
const parser = new UAParser(req.headers['user-agent']);
|
51
40
|
const result = parser.getResult();
|
52
41
|
return `${result.os.name}-${result.browser.name}`;
|
53
42
|
}
|
54
|
-
attachUserDevice(headers) {
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
where: { uuid: deviceIdentifier },
|
63
|
-
});
|
64
|
-
if (!device)
|
65
|
-
return;
|
66
|
-
device.user_id = user.id;
|
67
|
-
device.version = deviceVersion !== null && deviceVersion !== void 0 ? deviceVersion : null;
|
68
|
-
device.last_access_datetime = date_util_1.DateUtil.getDateTime();
|
69
|
-
yield device.save();
|
70
|
-
return device;
|
43
|
+
async attachUserDevice(headers) {
|
44
|
+
const user = auth_1.Auth.user();
|
45
|
+
const deviceIdentifier = headers['u-device-identifier'];
|
46
|
+
if (!deviceIdentifier)
|
47
|
+
return;
|
48
|
+
const deviceVersion = headers['u-device-version'];
|
49
|
+
const device = await device_token_entity_1.DeviceTokenEntity.findOne({
|
50
|
+
where: { uuid: deviceIdentifier },
|
71
51
|
});
|
52
|
+
if (!device)
|
53
|
+
return;
|
54
|
+
device.user_id = user.id;
|
55
|
+
device.version = deviceVersion !== null && deviceVersion !== void 0 ? deviceVersion : null;
|
56
|
+
device.last_access_datetime = date_util_1.DateUtil.getDateTime();
|
57
|
+
await device.save();
|
58
|
+
return device;
|
72
59
|
}
|
73
60
|
};
|
74
61
|
DeviceTokenService = __decorate([
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"device.token.service.js","sourceRoot":"","sources":["../../../src/auth/services/device.token.service.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"device.token.service.js","sourceRoot":"","sources":["../../../src/auth/services/device.token.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAC5C,yDAA0D;AAC1D,yCAAyC;AACzC,sDAAmD;AACnD,yEAAoE;AACpE,gEAA4D;AAGrD,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAQpB,KAAK,CAAC,cAAc,CAAC,GAAQ,EAAE,IAAuB;QACzD,IAAI,WAAI,CAAC,KAAK,EAAE,EAAE;YACd,MAAM,IAAI,GAAG,WAAI,CAAC,IAAI,EAAE,CAAC;YACzB,IAAI,CAAC,OAAO,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;SACtD;;YAAM,OAAO,IAAI,CAAC,OAAO,CAAC;QAE3B,IAAI,CAAC,oBAAoB,GAAG,oBAAQ,CAAC,WAAW,EAAE,CAAC;QACnD,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC,EAAE,CAAC;QAExB,IAAI,MAAM,GAAG,MAAM,uCAAiB,CAAC,UAAU,CAAC;YAC5C,KAAK,EAAE,IAAI,CAAC,KAAK;SACpB,CAAC,CAAC;QAEH,MAAM,GAAG,IAAA,yCAAqB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAE7C,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;QAElD,IAAI;YACA,OAAO,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;SAC9B;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;SACzC;IACL,CAAC;IASO,mBAAmB,CAAC,GAAQ;QAChC,MAAM,MAAM,GAAG,IAAI,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QAClC,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IACtD,CAAC;IAQM,KAAK,CAAC,gBAAgB,CAAC,OAAY;QACtC,MAAM,IAAI,GAAG,WAAI,CAAC,IAAI,EAAE,CAAC;QAEzB,MAAM,gBAAgB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;QACxD,IAAI,CAAC,gBAAgB;YAAE,OAAO;QAE9B,MAAM,aAAa,GAAQ,OAAO,CAAC,kBAAkB,CAAC,CAAC;QAGvD,MAAM,MAAM,GAAG,MAAM,uCAAiB,CAAC,OAAO,CAAC;YAC3C,KAAK,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE;SACpC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM;YAAE,OAAO;QAEpB,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC;QACzB,MAAM,CAAC,OAAO,GAAG,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,IAAI,CAAC;QACvC,MAAM,CAAC,oBAAoB,GAAG,oBAAQ,CAAC,WAAW,EAAE,CAAC;QAErD,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QAEpB,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ,CAAA;AA1EY,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;GACA,kBAAkB,CA0E9B;AA1EY,gDAAkB"}
|
@@ -8,15 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
10
10
|
};
|
11
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
12
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
13
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
14
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
15
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
16
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
17
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
18
|
-
});
|
19
|
-
};
|
20
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
21
12
|
exports.RefreshTokenService = void 0;
|
22
13
|
const common_1 = require("@nestjs/common");
|
@@ -29,28 +20,24 @@ let RefreshTokenService = class RefreshTokenService {
|
|
29
20
|
constructor(jwtService) {
|
30
21
|
this.jwtService = jwtService;
|
31
22
|
}
|
32
|
-
setRefreshToken(user, deviceIdentifier) {
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
return token.save();
|
47
|
-
});
|
23
|
+
async setRefreshToken(user, deviceIdentifier) {
|
24
|
+
const token = new refresh_token_entity_1.RefreshTokenEntity();
|
25
|
+
token.token = await this.generateRefreshToken();
|
26
|
+
token.user_id = user.id;
|
27
|
+
token.validity_datetime = date_util_1.DateUtil.getFutureDateTime(30 * 24 * 60);
|
28
|
+
token.last_access_datetime = date_util_1.DateUtil.getDateTime();
|
29
|
+
if (deviceIdentifier) {
|
30
|
+
const device = await device_token_entity_1.DeviceTokenEntity.findOne({
|
31
|
+
where: { uuid: deviceIdentifier },
|
32
|
+
});
|
33
|
+
if (device)
|
34
|
+
token.device_id = device.id;
|
35
|
+
}
|
36
|
+
return token.save();
|
48
37
|
}
|
49
|
-
generateRefreshToken() {
|
50
|
-
|
51
|
-
|
52
|
-
return this.jwtService.sign({ data: str });
|
53
|
-
});
|
38
|
+
async generateRefreshToken() {
|
39
|
+
const str = `${Date.now()}.${(0, lodash_1.floor)(Math.random() * (999999 - 100000) + 1000000)}`;
|
40
|
+
return this.jwtService.sign({ data: str });
|
54
41
|
}
|
55
42
|
};
|
56
43
|
RefreshTokenService = __decorate([
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"refresh.token.service.js","sourceRoot":"","sources":["../../../src/auth/services/refresh.token.service.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"refresh.token.service.js","sourceRoot":"","sources":["../../../src/auth/services/refresh.token.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAyC;AACzC,mCAA+B;AAC/B,gEAA4D;AAE5D,yEAAoE;AACpE,2EAAsE;AAG/D,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC5B,YAA6B,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IAEhD,KAAK,CAAC,eAAe,CAAC,IAAmB,EAAE,gBAAyB;QACvE,MAAM,KAAK,GAAG,IAAI,yCAAkB,EAAE,CAAC;QAEvC,KAAK,CAAC,KAAK,GAAG,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAChD,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC;QAExB,KAAK,CAAC,iBAAiB,GAAG,oBAAQ,CAAC,iBAAiB,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QACnE,KAAK,CAAC,oBAAoB,GAAG,oBAAQ,CAAC,WAAW,EAAE,CAAC;QAGpD,IAAI,gBAAgB,EAAE;YAClB,MAAM,MAAM,GAAG,MAAM,uCAAiB,CAAC,OAAO,CAAC;gBAC3C,KAAK,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE;aACpC,CAAC,CAAC;YAEH,IAAI,MAAM;gBAAE,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC,EAAE,CAAC;SAC3C;QAED,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;IACxB,CAAC;IAOO,KAAK,CAAC,oBAAoB;QAC9B,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,IAAI,IAAA,cAAK,EAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,CAAC;QAClF,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;IAC/C,CAAC;CACJ,CAAA;AAjCY,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;qCAEgC,gBAAU;GAD1C,mBAAmB,CAiC/B;AAjCY,kDAAmB"}
|
@@ -8,15 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
10
10
|
};
|
11
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
12
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
13
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
14
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
15
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
16
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
17
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
18
|
-
});
|
19
|
-
};
|
20
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
21
12
|
exports.SocialService = void 0;
|
22
13
|
const common_1 = require("@nestjs/common");
|
@@ -25,31 +16,27 @@ let SocialService = class SocialService {
|
|
25
16
|
constructor(remoteRequestService) {
|
26
17
|
this.remoteRequestService = remoteRequestService;
|
27
18
|
}
|
28
|
-
fbLogin(token) {
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
return response.data;
|
37
|
-
});
|
19
|
+
async fbLogin(token) {
|
20
|
+
const url = 'https://graph.facebook.com/me?fields=id,name,email,link,first_name,last_name,gender&access_token=' + token;
|
21
|
+
const options = {
|
22
|
+
method: 'get',
|
23
|
+
url,
|
24
|
+
};
|
25
|
+
const response = await this.remoteRequestService.sendThroughAxios(options);
|
26
|
+
return response.data;
|
38
27
|
}
|
39
|
-
googleLogin(token) {
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
}
|
52
|
-
});
|
28
|
+
async googleLogin(token) {
|
29
|
+
const url = 'https://oauth2.googleapis.com/tokeninfo?id_token=' + token;
|
30
|
+
const options = {
|
31
|
+
method: 'get',
|
32
|
+
url,
|
33
|
+
};
|
34
|
+
try {
|
35
|
+
return await this.remoteRequestService.sendThroughAxios(options);
|
36
|
+
}
|
37
|
+
catch (e) {
|
38
|
+
return false;
|
39
|
+
}
|
53
40
|
}
|
54
41
|
};
|
55
42
|
SocialService = __decorate([
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"social.service.js","sourceRoot":"","sources":["../../../src/auth/services/social.service.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"social.service.js","sourceRoot":"","sources":["../../../src/auth/services/social.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,oGAA+F;AAUxF,IAAM,aAAa,GAAnB,MAAM,aAAa;IAOtB,YAA6B,oBAA0C;QAA1C,yBAAoB,GAApB,oBAAoB,CAAsB;IAAG,CAAC;IAQ3E,KAAK,CAAC,OAAO,CAAC,KAAa;QACvB,MAAM,GAAG,GAAG,mGAAmG,GAAG,KAAK,CAAC;QACxH,MAAM,OAAO,GAAQ;YACjB,MAAM,EAAE,KAAK;YACb,GAAG;SACN,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC3E,OAAO,QAAQ,CAAC,IAAI,CAAC;IACzB,CAAC;IAQD,KAAK,CAAC,WAAW,CAAC,KAAa;QAC3B,MAAM,GAAG,GAAG,mDAAmD,GAAG,KAAK,CAAC;QACxE,MAAM,OAAO,GAAQ;YACjB,MAAM,EAAE,KAAK;YACb,GAAG;SACN,CAAC;QAEF,IAAI;YACA,OAAO,MAAM,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;SACpE;QAAC,OAAO,CAAC,EAAE;YACR,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;CACJ,CAAA;AA5CY,aAAa;IADzB,IAAA,mBAAU,GAAE;qCAQ0C,6CAAoB;GAP9D,aAAa,CA4CzB;AA5CY,sCAAa"}
|
@@ -1,60 +1,43 @@
|
|
1
1
|
"use strict";
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
9
|
-
});
|
10
|
-
};
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
12
3
|
exports.UserService = void 0;
|
13
4
|
const hash_1 = require("../../common/libraries/hash");
|
14
5
|
const user_entity_1 = require("../entities/user.entity");
|
15
6
|
class UserService {
|
16
|
-
findUserByEmail(email) {
|
17
|
-
return
|
18
|
-
return user_entity_1.UserEntity.findOne({ where: { email } });
|
19
|
-
});
|
7
|
+
async findUserByEmail(email) {
|
8
|
+
return user_entity_1.UserEntity.findOne({ where: { email } });
|
20
9
|
}
|
21
|
-
createUser(createUserDto) {
|
22
|
-
|
23
|
-
|
24
|
-
if (user !== undefined)
|
25
|
-
return user;
|
26
|
-
user = new user_entity_1.UserEntity();
|
27
|
-
user.email = createUserDto.email;
|
28
|
-
user.name = createUserDto.name;
|
29
|
-
if (createUserDto.password)
|
30
|
-
user.password = hash_1.Hash.hash(createUserDto.password);
|
31
|
-
yield user.save();
|
10
|
+
async createUser(createUserDto) {
|
11
|
+
let user = await this.findUserByEmail(createUserDto.email);
|
12
|
+
if (user !== undefined)
|
32
13
|
return user;
|
33
|
-
|
14
|
+
user = new user_entity_1.UserEntity();
|
15
|
+
user.email = createUserDto.email;
|
16
|
+
user.name = createUserDto.name;
|
17
|
+
if (createUserDto.password)
|
18
|
+
user.password = hash_1.Hash.hash(createUserDto.password);
|
19
|
+
await user.save();
|
20
|
+
return user;
|
34
21
|
}
|
35
|
-
validateUser(email, password) {
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
return user;
|
43
|
-
});
|
22
|
+
async validateUser(email, password) {
|
23
|
+
const user = await this.findUserByEmail(email);
|
24
|
+
if (user === undefined)
|
25
|
+
return false;
|
26
|
+
if (!user.validatePassword(password))
|
27
|
+
return false;
|
28
|
+
return user;
|
44
29
|
}
|
45
|
-
findOrCreate(record) {
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
mobile,
|
51
|
-
});
|
52
|
-
if (user.id)
|
53
|
-
return user;
|
54
|
-
user.name = name;
|
55
|
-
yield user.save();
|
56
|
-
return user;
|
30
|
+
async findOrCreate(record) {
|
31
|
+
const { dialing_code, mobile, name } = record;
|
32
|
+
const user = await user_entity_1.UserEntity.firstOrNew({
|
33
|
+
dialing_code,
|
34
|
+
mobile,
|
57
35
|
});
|
36
|
+
if (user.id)
|
37
|
+
return user;
|
38
|
+
user.name = name;
|
39
|
+
await user.save();
|
40
|
+
return user;
|
58
41
|
}
|
59
42
|
}
|
60
43
|
exports.UserService = UserService;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../src/auth/services/user.service.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../src/auth/services/user.service.ts"],"names":[],"mappings":";;;AAAA,sDAAmD;AAGnD,yDAAqD;AAOrD,MAAa,WAAW;IAOpB,KAAK,CAAC,eAAe,CAAC,KAAa;QAC/B,OAAO,wBAAU,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IACpD,CAAC;IAQD,KAAK,CAAC,UAAU,CAAC,aAA4B;QACzC,IAAI,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAE3D,IAAI,IAAI,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;QAEpC,IAAI,GAAG,IAAI,wBAAU,EAAE,CAAC;QACxB,IAAI,CAAC,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC;QACjC,IAAI,CAAC,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC;QAG/B,IAAI,aAAa,CAAC,QAAQ;YAAE,IAAI,CAAC,QAAQ,GAAG,WAAI,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAE9E,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAElB,OAAO,IAAI,CAAC;IAChB,CAAC;IASD,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,QAAQ;QAC9B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAC/C,IAAI,IAAI,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC;QAErC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC;YAAE,OAAO,KAAK,CAAC;QAEnD,OAAO,IAAI,CAAC;IAChB,CAAC;IAQM,KAAK,CAAC,YAAY,CAAC,MAAsB;QAC5C,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;QAG9C,MAAM,IAAI,GAAG,MAAM,wBAAU,CAAC,UAAU,CAAC;YACrC,YAAY;YACZ,MAAM;SACT,CAAC,CAAC;QAGH,IAAI,IAAI,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC;QAGzB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAElB,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AA1ED,kCA0EC"}
|