rez_core 2.2.93 → 2.2.95
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/module/meta/service/populate-meta.service.js +19 -6
- package/dist/module/meta/service/populate-meta.service.js.map +1 -1
- package/dist/module/notification/service/otp.service.d.ts +5 -1
- package/dist/module/notification/service/otp.service.js +34 -21
- package/dist/module/notification/service/otp.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/meta/service/populate-meta.service.ts +23 -8
- package/src/module/notification/service/otp.service.ts +44 -24
|
@@ -29,12 +29,25 @@ let PopulateMetaService = class PopulateMetaService {
|
|
|
29
29
|
const factoryData = await this.dataSource.query(`SELECT * FROM ${table} WHERE organization_id = -1 AND level_type = 'ORG' AND level_id = -1`);
|
|
30
30
|
if (!factoryData.length)
|
|
31
31
|
continue;
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
32
|
+
let transformedData;
|
|
33
|
+
if (table === 'cr_attribute_master') {
|
|
34
|
+
transformedData = factoryData.map(({ id, created_date, modified_date, ...rest }) => ({
|
|
35
|
+
...rest,
|
|
36
|
+
organization_id,
|
|
37
|
+
level_type: 'ORG',
|
|
38
|
+
level_id: organization_id,
|
|
39
|
+
is_unique: rest.is_unique == 1 ? true : false,
|
|
40
|
+
required: rest.required == 1 ? true : false,
|
|
41
|
+
}));
|
|
42
|
+
}
|
|
43
|
+
else {
|
|
44
|
+
transformedData = factoryData.map(({ id, created_date, modified_date, ...rest }) => ({
|
|
45
|
+
...rest,
|
|
46
|
+
organization_id,
|
|
47
|
+
level_type: 'ORG',
|
|
48
|
+
level_id: organization_id,
|
|
49
|
+
}));
|
|
50
|
+
}
|
|
38
51
|
await this.dataSource
|
|
39
52
|
.createQueryBuilder()
|
|
40
53
|
.insert()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"populate-meta.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/populate-meta.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAqC;AACrC,+EAAkE;AAG3D,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B,YACmB,UAAsB,EACtB,iBAAoC;QADpC,eAAU,GAAV,UAAU,CAAY;QACtB,sBAAiB,GAAjB,iBAAiB,CAAmB;IACpD,CAAC;IA4CJ,KAAK,CAAC,gBAAgB,CAAC,eAAuB;QAC5C,MAAM,cAAc,GAAG;YACrB,kBAAkB;YAClB,qBAAqB;YACrB,gBAAgB;SACjB,CAAC;QACF,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAkB,CAAC;QAGvD,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE,CAAC;YACnC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAC7C,iBAAiB,KAAK,sEAAsE,CAC7F,CAAC;YAEF,IAAI,CAAC,WAAW,CAAC,MAAM;gBAAE,SAAS;YAElC,
|
|
1
|
+
{"version":3,"file":"populate-meta.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/populate-meta.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,18 @@
|
|
|
1
|
+
import { DataSource } from 'typeorm';
|
|
1
2
|
import { ConfigService } from '@nestjs/config';
|
|
2
3
|
import { ClockIDGenService } from '../../../utils/service/clockIDGenUtil.service';
|
|
3
4
|
import { Otp } from '../entity/otp.entity';
|
|
4
5
|
import { OtpRepository } from '../repository/otp.repository';
|
|
5
6
|
import { LoginService } from './../../user/service/login.service';
|
|
7
|
+
import { EmailService } from './email.service';
|
|
6
8
|
export declare class OtpService {
|
|
7
9
|
private readonly otpRepository;
|
|
8
10
|
private readonly idGen;
|
|
9
11
|
private configService;
|
|
10
12
|
private readonly loginService;
|
|
11
|
-
|
|
13
|
+
private readonly emailService;
|
|
14
|
+
private readonly dataSource;
|
|
15
|
+
constructor(otpRepository: OtpRepository, idGen: ClockIDGenService, configService: ConfigService, loginService: LoginService, emailService: EmailService, dataSource: DataSource);
|
|
12
16
|
VERIFY_OTP: any;
|
|
13
17
|
DEFAULT_OTP: any;
|
|
14
18
|
generate(identifier: string, service: string, expiresIn?: number, otpLength?: number): Promise<Otp>;
|
|
@@ -10,18 +10,22 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.OtpService = void 0;
|
|
13
|
+
const typeorm_1 = require("typeorm");
|
|
13
14
|
const common_1 = require("@nestjs/common");
|
|
14
15
|
const config_1 = require("@nestjs/config");
|
|
15
16
|
const clockIDGenUtil_service_1 = require("../../../utils/service/clockIDGenUtil.service");
|
|
16
17
|
const otp_entity_1 = require("../entity/otp.entity");
|
|
17
18
|
const otp_repository_1 = require("../repository/otp.repository");
|
|
18
19
|
const login_service_1 = require("./../../user/service/login.service");
|
|
20
|
+
const email_service_1 = require("./email.service");
|
|
19
21
|
let OtpService = class OtpService {
|
|
20
|
-
constructor(otpRepository, idGen, configService, loginService) {
|
|
22
|
+
constructor(otpRepository, idGen, configService, loginService, emailService, dataSource) {
|
|
21
23
|
this.otpRepository = otpRepository;
|
|
22
24
|
this.idGen = idGen;
|
|
23
25
|
this.configService = configService;
|
|
24
26
|
this.loginService = loginService;
|
|
27
|
+
this.emailService = emailService;
|
|
28
|
+
this.dataSource = dataSource;
|
|
25
29
|
this.VERIFY_OTP = this.configService.get('VERIFY_OTP') || 'true';
|
|
26
30
|
this.DEFAULT_OTP = this.configService.get('DEFAULT_OTP') || '123456';
|
|
27
31
|
}
|
|
@@ -37,33 +41,40 @@ let OtpService = class OtpService {
|
|
|
37
41
|
otp.service = service;
|
|
38
42
|
otp.verified = 0;
|
|
39
43
|
otp.expiration_date = new Date(Date.now() + expiresIn * 60 * 1000);
|
|
44
|
+
const userData = await this.dataSource
|
|
45
|
+
.getRepository('cr_user')
|
|
46
|
+
.findOne({ where: { email_id: identifier } });
|
|
47
|
+
const data = {
|
|
48
|
+
name: userData?.name || '',
|
|
49
|
+
otp: otp.otp,
|
|
50
|
+
};
|
|
51
|
+
await this.emailService.sendEmail(identifier, 'OTP Verification', data);
|
|
40
52
|
return await this.otpRepository.save(otp);
|
|
41
53
|
}
|
|
42
54
|
async verifyOtp(body) {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
if (otpEntity) {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
}
|
|
55
|
+
const { otp, otp_id, identifier } = body;
|
|
56
|
+
const verifyOTPResponse = { isValid: false };
|
|
57
|
+
const otpEntity = await this.findByOtpId(otp_id);
|
|
58
|
+
if (!otpEntity) {
|
|
59
|
+
throw new common_1.BadRequestException('OTP not found!');
|
|
60
|
+
}
|
|
61
|
+
if (otpEntity.identifier !== identifier) {
|
|
62
|
+
throw new common_1.BadRequestException('Invalid OTP identifier!');
|
|
63
|
+
}
|
|
64
|
+
const isOtpValid = otpEntity.otp === otp &&
|
|
65
|
+
new Date() <= otpEntity.expiration_date &&
|
|
66
|
+
otpEntity.verified === 0;
|
|
67
|
+
if (isOtpValid) {
|
|
68
|
+
otpEntity.verified = 1;
|
|
69
|
+
const updatedOtp = await this.otpRepository.update(otpEntity.id, otpEntity);
|
|
70
|
+
if (updatedOtp) {
|
|
71
|
+
verifyOTPResponse.isValid = true;
|
|
61
72
|
}
|
|
62
73
|
}
|
|
63
74
|
if (!verifyOTPResponse.isValid) {
|
|
64
75
|
throw new common_1.BadRequestException('Invalid OTP!');
|
|
65
76
|
}
|
|
66
|
-
return
|
|
77
|
+
return this.loginService.login(identifier, undefined, true);
|
|
67
78
|
}
|
|
68
79
|
async findByOtpId(otpId) {
|
|
69
80
|
return await this.otpRepository.findByOtpId(otpId);
|
|
@@ -80,6 +91,8 @@ exports.OtpService = OtpService = __decorate([
|
|
|
80
91
|
__metadata("design:paramtypes", [otp_repository_1.OtpRepository,
|
|
81
92
|
clockIDGenUtil_service_1.ClockIDGenService,
|
|
82
93
|
config_1.ConfigService,
|
|
83
|
-
login_service_1.LoginService
|
|
94
|
+
login_service_1.LoginService,
|
|
95
|
+
email_service_1.EmailService,
|
|
96
|
+
typeorm_1.DataSource])
|
|
84
97
|
], OtpService);
|
|
85
98
|
//# sourceMappingURL=otp.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"otp.service.js","sourceRoot":"","sources":["../../../../src/module/notification/service/otp.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAiE;AACjE,2CAA+C;AAC/C,0FAAkF;AAClF,qDAA2C;AAC3C,iEAA6D;AAC7D,sEAAkE;
|
|
1
|
+
{"version":3,"file":"otp.service.js","sourceRoot":"","sources":["../../../../src/module/notification/service/otp.service.ts"],"names":[],"mappings":"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"}
|