rez_core 2.2.168 → 2.2.169
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/listmaster/service/list-master.service.js +3 -1
- package/dist/module/listmaster/service/list-master.service.js.map +1 -1
- package/dist/module/notification/controller/otp.controller.d.ts +2 -1
- package/dist/module/notification/controller/otp.controller.js +2 -2
- package/dist/module/notification/controller/otp.controller.js.map +1 -1
- package/dist/module/notification/notification.module.js +1 -1
- package/dist/module/notification/notification.module.js.map +1 -1
- package/dist/module/notification/service/otp.service.d.ts +2 -1
- package/dist/module/notification/service/otp.service.js +8 -3
- package/dist/module/notification/service/otp.service.js.map +1 -1
- package/dist/module/user/controller/login.controller.js +16 -4
- package/dist/module/user/controller/login.controller.js.map +1 -1
- package/dist/module/user/controller/user.controller.d.ts +1 -9
- package/dist/module/user/controller/user.controller.js +10 -4
- package/dist/module/user/controller/user.controller.js.map +1 -1
- package/dist/module/user/entity/user.entity.d.ts +1 -0
- package/dist/module/user/entity/user.entity.js +4 -0
- package/dist/module/user/entity/user.entity.js.map +1 -1
- package/dist/module/user/service/login.service.d.ts +17 -3
- package/dist/module/user/service/login.service.js +14 -5
- package/dist/module/user/service/login.service.js.map +1 -1
- package/dist/module/user/service/user.service.d.ts +7 -10
- package/dist/module/user/service/user.service.js +23 -8
- package/dist/module/user/service/user.service.js.map +1 -1
- package/dist/module/workflow/service/task.service.d.ts +3 -1
- package/dist/module/workflow/service/task.service.js +6 -2
- package/dist/module/workflow/service/task.service.js.map +1 -1
- package/dist/module/workflow/workflow.module.js +2 -0
- package/dist/module/workflow/workflow.module.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/listmaster/service/list-master.service.ts +3 -1
- package/src/module/notification/controller/otp.controller.ts +3 -2
- package/src/module/notification/notification.module.ts +1 -1
- package/src/module/notification/service/otp.service.ts +9 -3
- package/src/module/user/controller/login.controller.ts +26 -11
- package/src/module/user/controller/user.controller.ts +7 -2
- package/src/module/user/entity/user.entity.ts +3 -0
- package/src/module/user/service/login.service.ts +24 -8
- package/src/module/user/service/user.service.ts +32 -6
- package/src/module/workflow/service/task.service.ts +7 -0
- package/src/module/workflow/workflow.module.ts +2 -0
|
@@ -179,10 +179,12 @@ let ListMasterService = class ListMasterService {
|
|
|
179
179
|
}
|
|
180
180
|
async createEntity(entityData, loggedInUser) {
|
|
181
181
|
const name = entityData.name?.trim();
|
|
182
|
-
|
|
182
|
+
const code = entityData.code?.trim();
|
|
183
|
+
if (!name || !code) {
|
|
183
184
|
throw new common_1.BadRequestException('Name and Code are required and cannot be empty');
|
|
184
185
|
}
|
|
185
186
|
entityData.name = name;
|
|
187
|
+
entityData.code = code;
|
|
186
188
|
entityData.is_factory = entityData.is_factory || 0;
|
|
187
189
|
entityData.source = entityData.source || 'master';
|
|
188
190
|
entityData.status = entityData.status || 'ACTIVE';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-master.service.js","sourceRoot":"","sources":["../../../../src/module/listmaster/service/list-master.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"list-master.service.js","sourceRoot":"","sources":["../../../../src/module/listmaster/service/list-master.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,11 +12,12 @@ export declare class OtpController {
|
|
|
12
12
|
otp_id: string;
|
|
13
13
|
success: boolean;
|
|
14
14
|
}>;
|
|
15
|
-
verifyOtp(
|
|
15
|
+
verifyOtp(data: {
|
|
16
16
|
otp: string;
|
|
17
17
|
otp_id: string;
|
|
18
18
|
identifier: string;
|
|
19
19
|
subdomain: string;
|
|
20
|
+
fcm_token: string;
|
|
20
21
|
}): Promise<{
|
|
21
22
|
success: boolean;
|
|
22
23
|
message: string;
|
|
@@ -34,8 +34,8 @@ let OtpController = class OtpController {
|
|
|
34
34
|
const otp = await this.otpService.generate(identifier, service, parseInt(this.otpExpiry), parseInt(this.otpLength));
|
|
35
35
|
return { otp_id: otp.otp_id, success: true };
|
|
36
36
|
}
|
|
37
|
-
async verifyOtp(
|
|
38
|
-
return await this.otpService.verifyOtp(
|
|
37
|
+
async verifyOtp(data) {
|
|
38
|
+
return await this.otpService.verifyOtp(data);
|
|
39
39
|
}
|
|
40
40
|
async sendMail(body) {
|
|
41
41
|
return await this.emailService.sendEmailWithDynamicTemplate(body.to, body.subject, body.message, body.templateCode, body.payload, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"otp.controller.js","sourceRoot":"","sources":["../../../../src/module/notification/controller/otp.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CASwB;AACxB,wDAAoD;AACpD,2CAA+C;AAC/C,4DAAwD;AAGjD,IAAM,aAAa,GAAnB,MAAM,aAAa;IACxB,YACmB,UAAsB,EACtB,YAA0B,EACnC,aAA4B;QAFnB,eAAU,GAAV,UAAU,CAAY;QACtB,iBAAY,GAAZ,YAAY,CAAc;QACnC,kBAAa,GAAb,aAAa,CAAe;QAGtC,cAAS,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC;QACxD,cAAS,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC;IAHrD,CAAC;IAOE,AAAN,KAAK,CAAC,WAAW,CAAS,OAAY;QACpC,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QACtC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAEhC,IAAI,CAAC,UAAU,IAAI,CAAC,OAAO,EAAE,CAAC;YAC5B,MAAM,IAAI,4BAAmB,CAAC,gCAAgC,CAAC,CAAC;QAClE,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CACxC,UAAU,EACV,OAAO,EACP,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,EACxB,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CACzB,CAAC;QACF,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC/C,CAAC;IAIK,AAAN,KAAK,CAAC,SAAS,CAEb,
|
|
1
|
+
{"version":3,"file":"otp.controller.js","sourceRoot":"","sources":["../../../../src/module/notification/controller/otp.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CASwB;AACxB,wDAAoD;AACpD,2CAA+C;AAC/C,4DAAwD;AAGjD,IAAM,aAAa,GAAnB,MAAM,aAAa;IACxB,YACmB,UAAsB,EACtB,YAA0B,EACnC,aAA4B;QAFnB,eAAU,GAAV,UAAU,CAAY;QACtB,iBAAY,GAAZ,YAAY,CAAc;QACnC,kBAAa,GAAb,aAAa,CAAe;QAGtC,cAAS,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC;QACxD,cAAS,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC;IAHrD,CAAC;IAOE,AAAN,KAAK,CAAC,WAAW,CAAS,OAAY;QACpC,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QACtC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAEhC,IAAI,CAAC,UAAU,IAAI,CAAC,OAAO,EAAE,CAAC;YAC5B,MAAM,IAAI,4BAAmB,CAAC,gCAAgC,CAAC,CAAC;QAClE,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CACxC,UAAU,EACV,OAAO,EACP,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,EACxB,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CACzB,CAAC;QACF,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC/C,CAAC;IAIK,AAAN,KAAK,CAAC,SAAS,CAEb,IAMC;QAED,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;IAIK,AAAN,KAAK,CAAC,QAAQ,CAEZ,IAMC;QAGD,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,4BAA4B,CACzD,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,OAAO,EACZ;YACE,KAAK,EAAE,yBAAyB;YAChC,WAAW,EAAE,gCAAgC;YAC7C,QAAQ,EAAE,2BAA2B;YACrC,eAAe,EAAE,EAAE;YACnB,UAAU,EAAE,sCAAsC;YAClD,QAAQ,EAAE,aAAa;YACvB,aAAa,EAAE,SAAS;YACxB,cAAc,EAAE,eAAe;YAC/B,SAAS,EAAE;gBACT,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,kBAAkB,EAAE;gBAC/C,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,kBAAkB,EAAE;aAClD;SACF,CACF,CAAC;IACJ,CAAC;CACF,CAAA;AA9EY,sCAAa;AAYlB;IAFL,IAAA,aAAI,EAAC,UAAU,CAAC;IAChB,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IACL,WAAA,IAAA,aAAI,GAAE,CAAA;;;;gDAcxB;AAIK;IAFL,IAAA,aAAI,EAAC,QAAQ,CAAC;IACd,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IAErB,WAAA,IAAA,aAAI,GAAE,CAAA;;;;8CAUR;AAIK;IAFL,IAAA,aAAI,EAAC,WAAW,CAAC;IACjB,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IAErB,WAAA,IAAA,aAAI,GAAE,CAAA;;;;6CA+BR;wBA7EU,aAAa;IADzB,IAAA,mBAAU,EAAC,KAAK,CAAC;qCAGe,wBAAU;QACR,4BAAY;QACpB,sBAAa;GAJ3B,aAAa,CA8EzB"}
|
|
@@ -61,7 +61,7 @@ exports.NotificationModule = NotificationModule = __decorate([
|
|
|
61
61
|
ics_module_1.IcsMeetingModule,
|
|
62
62
|
],
|
|
63
63
|
providers: [otp_service_1.OtpService, otp_repository_1.OtpRepository, email_service_1.EmailService, firebase_service_1.NotificationsService],
|
|
64
|
-
exports: [otp_service_1.OtpService, email_service_1.EmailService],
|
|
64
|
+
exports: [otp_service_1.OtpService, email_service_1.EmailService, firebase_service_1.NotificationsService],
|
|
65
65
|
controllers: [otp_controller_1.OtpController, notification_controller_1.NotificationsController],
|
|
66
66
|
})
|
|
67
67
|
], NotificationModule);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notification.module.js","sourceRoot":"","sources":["../../../src/module/notification/notification.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,uDAAmD;AACnD,gEAA4D;AAC5D,6CAAgD;AAChD,oDAA0C;AAC1C,gEAA4D;AAC5D,mDAAsD;AACtD,gGAA4F;AAC5F,2DAAuD;AACvD,+BAA4B;AAC5B,2CAA6D;AAC7D,qDAAiD;AACjD,qDAAiD;AACjD,kDAAqD;AACrD,sEAAgE;AAChE,kFAA+E;AAC/E,iEAAkE;AAsC3D,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;CAAG,CAAA;AAArB,gDAAkB;6BAAlB,kBAAkB;IApC9B,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC,CAAC,gBAAG,EAAE,sCAAgB,CAAC,CAAC;YACjD,qBAAY,CAAC,YAAY,CAAC;gBACxB,OAAO,EAAE,CAAC,qBAAY,CAAC;gBACvB,MAAM,EAAE,CAAC,sBAAa,CAAC;gBACvB,UAAU,EAAE,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC;oBAC7C,SAAS,EAAE;wBACT,IAAI,EAAE,gBAAgB;wBACtB,IAAI,EAAE,GAAG;wBACT,MAAM,EAAE,IAAI;wBACZ,IAAI,EAAE;4BACJ,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC;4BACrC,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,gBAAgB,CAAC;yBAC1C;qBACF;oBACD,QAAQ,EAAE;wBACR,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,GAAG;qBACnD;oBACD,QAAQ,EAAE;wBACR,GAAG,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC;wBAC7C,OAAO,EAAE,IAAI,sCAAiB,EAAE;wBAChC,OAAO,EAAE;4BACP,MAAM,EAAE,IAAI;yBACb;qBACF;iBACF,CAAC;aACH,CAAC;YACF,wBAAU;YACV,wBAAU;YACV,6BAAgB;SACjB;QACD,SAAS,EAAE,CAAC,wBAAU,EAAE,8BAAa,EAAE,4BAAY,EAAE,uCAAoB,CAAC;QAC1E,OAAO,EAAE,CAAC,wBAAU,EAAE,4BAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"notification.module.js","sourceRoot":"","sources":["../../../src/module/notification/notification.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,uDAAmD;AACnD,gEAA4D;AAC5D,6CAAgD;AAChD,oDAA0C;AAC1C,gEAA4D;AAC5D,mDAAsD;AACtD,gGAA4F;AAC5F,2DAAuD;AACvD,+BAA4B;AAC5B,2CAA6D;AAC7D,qDAAiD;AACjD,qDAAiD;AACjD,kDAAqD;AACrD,sEAAgE;AAChE,kFAA+E;AAC/E,iEAAkE;AAsC3D,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;CAAG,CAAA;AAArB,gDAAkB;6BAAlB,kBAAkB;IApC9B,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC,CAAC,gBAAG,EAAE,sCAAgB,CAAC,CAAC;YACjD,qBAAY,CAAC,YAAY,CAAC;gBACxB,OAAO,EAAE,CAAC,qBAAY,CAAC;gBACvB,MAAM,EAAE,CAAC,sBAAa,CAAC;gBACvB,UAAU,EAAE,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC;oBAC7C,SAAS,EAAE;wBACT,IAAI,EAAE,gBAAgB;wBACtB,IAAI,EAAE,GAAG;wBACT,MAAM,EAAE,IAAI;wBACZ,IAAI,EAAE;4BACJ,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC;4BACrC,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,gBAAgB,CAAC;yBAC1C;qBACF;oBACD,QAAQ,EAAE;wBACR,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,GAAG;qBACnD;oBACD,QAAQ,EAAE;wBACR,GAAG,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC;wBAC7C,OAAO,EAAE,IAAI,sCAAiB,EAAE;wBAChC,OAAO,EAAE;4BACP,MAAM,EAAE,IAAI;yBACb;qBACF;iBACF,CAAC;aACH,CAAC;YACF,wBAAU;YACV,wBAAU;YACV,6BAAgB;SACjB;QACD,SAAS,EAAE,CAAC,wBAAU,EAAE,8BAAa,EAAE,4BAAY,EAAE,uCAAoB,CAAC;QAC1E,OAAO,EAAE,CAAC,wBAAU,EAAE,4BAAY,EAAE,uCAAoB,CAAC;QACzD,WAAW,EAAE,CAAC,8BAAa,EAAE,iDAAuB,CAAC;KACtD,CAAC;GACW,kBAAkB,CAAG"}
|
|
@@ -16,11 +16,12 @@ export declare class OtpService {
|
|
|
16
16
|
VERIFY_OTP: any;
|
|
17
17
|
DEFAULT_OTP: any;
|
|
18
18
|
generate(identifier: string, service: string, expiresIn?: number, otpLength?: number): Promise<Otp>;
|
|
19
|
-
verifyOtp(
|
|
19
|
+
verifyOtp(data: {
|
|
20
20
|
otp: string;
|
|
21
21
|
otp_id: string;
|
|
22
22
|
identifier: string;
|
|
23
23
|
subdomain: string;
|
|
24
|
+
fcm_token: string;
|
|
24
25
|
}): Promise<{
|
|
25
26
|
success: boolean;
|
|
26
27
|
message: string;
|
|
@@ -51,8 +51,8 @@ let OtpService = class OtpService {
|
|
|
51
51
|
await this.emailService.sendEmail(identifier, 'OTP Verification', data);
|
|
52
52
|
return await this.otpRepository.save(otp);
|
|
53
53
|
}
|
|
54
|
-
async verifyOtp(
|
|
55
|
-
const { otp, otp_id, identifier, subdomain } =
|
|
54
|
+
async verifyOtp(data) {
|
|
55
|
+
const { otp, otp_id, identifier, subdomain, fcm_token } = data;
|
|
56
56
|
const verifyOTPResponse = { isValid: false };
|
|
57
57
|
const otpEntity = await this.findByOtpId(otp_id);
|
|
58
58
|
if (!otpEntity) {
|
|
@@ -75,7 +75,12 @@ let OtpService = class OtpService {
|
|
|
75
75
|
if (!verifyOTPResponse.isValid) {
|
|
76
76
|
throw new common_1.BadRequestException('Invalid OTP!');
|
|
77
77
|
}
|
|
78
|
-
return this.loginService.login(
|
|
78
|
+
return this.loginService.login({
|
|
79
|
+
email: data.identifier,
|
|
80
|
+
is_otp: true,
|
|
81
|
+
subdomain: data.subdomain,
|
|
82
|
+
fcm_token: data.fcm_token,
|
|
83
|
+
});
|
|
79
84
|
}
|
|
80
85
|
async findByOtpId(otpId) {
|
|
81
86
|
return await this.otpRepository.findByOtpId(otpId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"otp.service.js","sourceRoot":"","sources":["../../../../src/module/notification/service/otp.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAqC;AACrC,2CAAiE;AACjE,2CAA+C;AAC/C,0FAAkF;AAClF,qDAA2C;AAC3C,iEAA6D;AAC7D,sEAAkE;AAClE,mDAA+C;AAGxC,IAAM,UAAU,GAAhB,MAAM,UAAU;IACrB,YACmB,aAA4B,EAC5B,KAAwB,EACjC,aAA4B,EACnB,YAA0B,EAC1B,YAA0B,EAC1B,UAAsB;QALtB,kBAAa,GAAb,aAAa,CAAe;QAC5B,UAAK,GAAL,KAAK,CAAmB;QACjC,kBAAa,GAAb,aAAa,CAAe;QACnB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,eAAU,GAAV,UAAU,CAAY;QAGzC,eAAU,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,MAAM,CAAC;QAC5D,gBAAW,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,QAAQ,CAAC;IAH7D,CAAC;IAKJ,KAAK,CAAC,QAAQ,CACZ,UAAkB,EAClB,OAAe,EACf,YAAoB,CAAC,EACrB,YAAoB,CAAC;QAErB,MAAM,GAAG,GAAG,IAAI,gBAAG,EAAE,CAAC;QACtB,GAAG,CAAC,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC;QAC9B,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;QACtC,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC;QAC5B,GAAG,CAAC,GAAG;YACL,MAAM,KAAK,IAAI,CAAC,UAAU;gBACxB,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC;gBAC7B,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC;QACvB,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC;QACtB,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC;QACjB,GAAG,CAAC,eAAe,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QAEnE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU;aACnC,aAAa,CAAC,SAAS,CAAC;aACxB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;QAEhD,MAAM,IAAI,GAAG;YACX,IAAI,EAAE,QAAQ,EAAE,IAAI,IAAI,EAAE;YAC1B,GAAG,EAAE,GAAG,CAAC,GAAG;SACb,CAAC;QAEF,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,UAAU,EAAE,kBAAkB,EAAE,IAAI,CAAC,CAAC;QAExE,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"otp.service.js","sourceRoot":"","sources":["../../../../src/module/notification/service/otp.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAqC;AACrC,2CAAiE;AACjE,2CAA+C;AAC/C,0FAAkF;AAClF,qDAA2C;AAC3C,iEAA6D;AAC7D,sEAAkE;AAClE,mDAA+C;AAGxC,IAAM,UAAU,GAAhB,MAAM,UAAU;IACrB,YACmB,aAA4B,EAC5B,KAAwB,EACjC,aAA4B,EACnB,YAA0B,EAC1B,YAA0B,EAC1B,UAAsB;QALtB,kBAAa,GAAb,aAAa,CAAe;QAC5B,UAAK,GAAL,KAAK,CAAmB;QACjC,kBAAa,GAAb,aAAa,CAAe;QACnB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,eAAU,GAAV,UAAU,CAAY;QAGzC,eAAU,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,MAAM,CAAC;QAC5D,gBAAW,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,QAAQ,CAAC;IAH7D,CAAC;IAKJ,KAAK,CAAC,QAAQ,CACZ,UAAkB,EAClB,OAAe,EACf,YAAoB,CAAC,EACrB,YAAoB,CAAC;QAErB,MAAM,GAAG,GAAG,IAAI,gBAAG,EAAE,CAAC;QACtB,GAAG,CAAC,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC;QAC9B,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;QACtC,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC;QAC5B,GAAG,CAAC,GAAG;YACL,MAAM,KAAK,IAAI,CAAC,UAAU;gBACxB,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC;gBAC7B,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC;QACvB,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC;QACtB,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC;QACjB,GAAG,CAAC,eAAe,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QAEnE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU;aACnC,aAAa,CAAC,SAAS,CAAC;aACxB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;QAEhD,MAAM,IAAI,GAAG;YACX,IAAI,EAAE,QAAQ,EAAE,IAAI,IAAI,EAAE;YAC1B,GAAG,EAAE,GAAG,CAAC,GAAG;SACb,CAAC;QAEF,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,UAAU,EAAE,kBAAkB,EAAE,IAAI,CAAC,CAAC;QAExE,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAMf;QACC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;QAC/D,MAAM,iBAAiB,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAG7C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACjD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,4BAAmB,CAAC,gBAAgB,CAAC,CAAC;QAClD,CAAC;QAGD,IAAI,SAAS,CAAC,UAAU,KAAK,UAAU,EAAE,CAAC;YACxC,MAAM,IAAI,4BAAmB,CAAC,yBAAyB,CAAC,CAAC;QAC3D,CAAC;QAGD,MAAM,UAAU,GACd,CAAC,SAAS,CAAC,GAAG,KAAK,GAAG;YACpB,CAAC,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,KAAK,GAAG,CAAC,CAAC;YACjD,IAAI,IAAI,EAAE,IAAI,SAAS,CAAC,eAAe;YACvC,SAAS,CAAC,QAAQ,KAAK,CAAC,CAAC;QAE3B,IAAI,UAAU,EAAE,CAAC;YACf,SAAS,CAAC,QAAQ,GAAG,CAAC,CAAC;YAGvB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAChD,SAAS,CAAC,EAAE,EACZ,SAAS,CACV,CAAC;YACF,IAAI,UAAU,EAAE,CAAC;gBACf,iBAAiB,CAAC,OAAO,GAAG,IAAI,CAAC;YACnC,CAAC;QACH,CAAC;QAED,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC;YAC/B,MAAM,IAAI,4BAAmB,CAAC,cAAc,CAAC,CAAC;QAChD,CAAC;QAGD,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC;YAC7B,KAAK,EAAE,IAAI,CAAC,UAAU;YACtB,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAa;QAC7B,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IACrD,CAAC;IAEO,WAAW,CAAC,MAAc;QAChC,MAAM,GAAG,GAAG,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC/B,MAAM,GAAG,GAAG,EAAE,IAAI,MAAM,GAAG,CAAC,CAAC;QAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IACtE,CAAC;CACF,CAAA;AA5GY,gCAAU;qBAAV,UAAU;IADtB,IAAA,mBAAU,GAAE;qCAGuB,8BAAa;QACrB,0CAAiB;QAClB,sBAAa;QACL,4BAAY;QACZ,4BAAY;QACd,oBAAU;GAP9B,UAAU,CA4GtB"}
|
|
@@ -28,8 +28,14 @@ let LoginController = class LoginController {
|
|
|
28
28
|
this.communicationService = communicationService;
|
|
29
29
|
}
|
|
30
30
|
async login(body, res) {
|
|
31
|
-
const { email_id, password, appcode, organization_id, subdomain } = body;
|
|
32
|
-
const result = await this.loginService.login(
|
|
31
|
+
const { email_id, password, appcode, organization_id, subdomain, fcm_token, } = body;
|
|
32
|
+
const result = await this.loginService.login({
|
|
33
|
+
email: email_id,
|
|
34
|
+
password,
|
|
35
|
+
subdomain,
|
|
36
|
+
fcm_token,
|
|
37
|
+
is_otp: false,
|
|
38
|
+
});
|
|
33
39
|
return res.status(common_1.HttpStatus.OK).json(result);
|
|
34
40
|
}
|
|
35
41
|
async formLogin(body, res) {
|
|
@@ -45,7 +51,7 @@ let LoginController = class LoginController {
|
|
|
45
51
|
async googleLogin() {
|
|
46
52
|
}
|
|
47
53
|
async googleAuthRedirect(req, res) {
|
|
48
|
-
const { email, name, accessToken: googleAccessToken, refreshToken: googleRefreshToken, } = req.user;
|
|
54
|
+
const { email, password, name, accessToken: googleAccessToken, refreshToken: googleRefreshToken, subdomain, fcm_token, } = req.user;
|
|
49
55
|
const { state } = req.query;
|
|
50
56
|
if (state &&
|
|
51
57
|
typeof state === 'string' &&
|
|
@@ -59,7 +65,13 @@ let LoginController = class LoginController {
|
|
|
59
65
|
return res.redirect(`${this.configService.get('BASE_URL')}`);
|
|
60
66
|
}
|
|
61
67
|
}
|
|
62
|
-
const data = await this.loginService.loginWithGoogle(
|
|
68
|
+
const data = await this.loginService.loginWithGoogle({
|
|
69
|
+
email,
|
|
70
|
+
password,
|
|
71
|
+
name,
|
|
72
|
+
subdomain,
|
|
73
|
+
fcm_token,
|
|
74
|
+
});
|
|
63
75
|
if (!('accessToken' in data) || !data.accessToken)
|
|
64
76
|
return res.redirect(`${this.configService.get('BASE_URL')}/auth?email=${email}&error='User not found'`);
|
|
65
77
|
const { accessToken, appcode } = data;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.controller.js","sourceRoot":"","sources":["../../../../src/module/user/controller/login.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAUwB;AACxB,4DAAwD;AACxD,qFAAgF;AAChF,2DAA2D;AAE3D,0EAAqE;AACrE,2CAA+C;AAC/C,6FAAyF;AAGlF,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YACU,YAA0B,EAC1B,kBAAsC,EACtC,aAA4B,EAC5B,oBAA0C;QAH1C,iBAAY,GAAZ,YAAY,CAAc;QAC1B,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,kBAAa,GAAb,aAAa,CAAe;QAC5B,yBAAoB,GAApB,oBAAoB,CAAsB;IACjD,CAAC;IAGE,AAAN,KAAK,CAAC,KAAK,CAAS,IAAI,EAAS,GAAa;QAC5C,MAAM,
|
|
1
|
+
{"version":3,"file":"login.controller.js","sourceRoot":"","sources":["../../../../src/module/user/controller/login.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,13 +5,5 @@ export declare class UserController {
|
|
|
5
5
|
private readonly userService;
|
|
6
6
|
constructor(userService: UserService);
|
|
7
7
|
signup(createUserDto: CreateUserDto, res: Response): Promise<void>;
|
|
8
|
-
checkEmail(
|
|
9
|
-
success: boolean;
|
|
10
|
-
message: string;
|
|
11
|
-
userId?: undefined;
|
|
12
|
-
} | {
|
|
13
|
-
success: boolean;
|
|
14
|
-
message: string;
|
|
15
|
-
userId: number;
|
|
16
|
-
}>;
|
|
8
|
+
checkEmail(body: any, res: Response): Promise<Response<any, Record<string, any>>>;
|
|
17
9
|
}
|
|
@@ -24,8 +24,13 @@ let UserController = class UserController {
|
|
|
24
24
|
const result = await this.userService.createEntity(createUserDto, null);
|
|
25
25
|
res.status(common_1.HttpStatus.OK).json(result);
|
|
26
26
|
}
|
|
27
|
-
async checkEmail(
|
|
28
|
-
|
|
27
|
+
async checkEmail(body, res) {
|
|
28
|
+
const { email, subdomain } = body;
|
|
29
|
+
const result = await this.userService.checkEmailExists({
|
|
30
|
+
email,
|
|
31
|
+
subdomain,
|
|
32
|
+
});
|
|
33
|
+
return res.status(common_1.HttpStatus.OK).json(result);
|
|
29
34
|
}
|
|
30
35
|
};
|
|
31
36
|
exports.UserController = UserController;
|
|
@@ -40,9 +45,10 @@ __decorate([
|
|
|
40
45
|
__decorate([
|
|
41
46
|
(0, common_1.Post)('check-email'),
|
|
42
47
|
(0, common_1.HttpCode)(common_1.HttpStatus.OK),
|
|
43
|
-
__param(0, (0, common_1.Body)(
|
|
48
|
+
__param(0, (0, common_1.Body)()),
|
|
49
|
+
__param(1, (0, common_1.Res)()),
|
|
44
50
|
__metadata("design:type", Function),
|
|
45
|
-
__metadata("design:paramtypes", [
|
|
51
|
+
__metadata("design:paramtypes", [Object, Object]),
|
|
46
52
|
__metadata("design:returntype", Promise)
|
|
47
53
|
], UserController.prototype, "checkEmail", null);
|
|
48
54
|
exports.UserController = UserController = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.controller.js","sourceRoot":"","sources":["../../../../src/module/user/controller/user.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CASwB;AACxB,0DAAsD;AACtD,4DAAuD;AAIhD,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAC0C,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAC/D,CAAC;IAGE,AAAN,KAAK,CAAC,MAAM,CACkB,aAA4B,EACjD,GAAa;QAEpB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QACxE,GAAG,CAAC,MAAM,CAAC,mBAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAIK,AAAN,KAAK,CAAC,UAAU,
|
|
1
|
+
{"version":3,"file":"user.controller.js","sourceRoot":"","sources":["../../../../src/module/user/controller/user.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CASwB;AACxB,0DAAsD;AACtD,4DAAuD;AAIhD,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAC0C,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAC/D,CAAC;IAGE,AAAN,KAAK,CAAC,MAAM,CACkB,aAA4B,EACjD,GAAa;QAEpB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QACxE,GAAG,CAAC,MAAM,CAAC,mBAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAIK,AAAN,KAAK,CAAC,UAAU,CAAS,IAAI,EAAS,GAAa;QACjD,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;QAClC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC;YACrD,KAAK;YACL,SAAS;SACV,CAAC,CAAC;QACH,OAAO,GAAG,CAAC,MAAM,CAAC,mBAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;CACF,CAAA;AAxBY,wCAAc;AAMnB;IADL,IAAA,aAAI,EAAC,aAAa,CAAC;IAEjB,WAAA,IAAA,aAAI,EAAC,IAAI,uBAAc,EAAE,CAAC,CAAA;IAC1B,WAAA,IAAA,YAAG,GAAE,CAAA;;qCADqC,+BAAa;;4CAKzD;AAIK;IAFL,IAAA,aAAI,EAAC,aAAa,CAAC;IACnB,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IACN,WAAA,IAAA,aAAI,GAAE,CAAA;IAAQ,WAAA,IAAA,YAAG,GAAE,CAAA;;;;gDAOpC;yBAvBU,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,eAAM,EAAC,aAAa,CAAC,CAAA;qCAA+B,0BAAW;GAFvD,cAAc,CAwB1B"}
|
|
@@ -80,6 +80,10 @@ __decorate([
|
|
|
80
80
|
(0, typeorm_1.Column)({ nullable: true }),
|
|
81
81
|
__metadata("design:type", Date)
|
|
82
82
|
], UserData.prototype, "date", void 0);
|
|
83
|
+
__decorate([
|
|
84
|
+
(0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
|
|
85
|
+
__metadata("design:type", String)
|
|
86
|
+
], UserData.prototype, "fcm_token", void 0);
|
|
83
87
|
exports.UserData = UserData = __decorate([
|
|
84
88
|
(0, typeorm_1.Entity)({ name: 'cr_user' }),
|
|
85
89
|
__metadata("design:paramtypes", [])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.entity.js","sourceRoot":"","sources":["../../../../src/module/user/entity/user.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyC;AACzC,uEAAoE;AACpE,6EAAkE;AAG3D,IAAM,QAAQ,GAAd,MAAM,QAAS,SAAQ,+BAAU;IACtC;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,iCAAe,CAAC;IACrC,CAAC;
|
|
1
|
+
{"version":3,"file":"user.entity.js","sourceRoot":"","sources":["../../../../src/module/user/entity/user.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyC;AACzC,uEAAoE;AACpE,6EAAkE;AAG3D,IAAM,QAAQ,GAAd,MAAM,QAAS,SAAQ,+BAAU;IACtC;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,iCAAe,CAAC;IACrC,CAAC;CAiDF,CAAA;AArDY,4BAAQ;AAOnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACrC;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACtC;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACxC;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACxC;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCACzC;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CAClB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAC1B;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDAC9B;AAG1B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACpB;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAChB;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACrB;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACpB;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACpB;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACtB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACrB,IAAI;sCAAC;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CAC1B;mBApDP,QAAQ;IADpB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;GACf,QAAQ,CAqDpB"}
|
|
@@ -5,6 +5,7 @@ import { ListMasterService } from 'src/module/listmaster/service/list-master.ser
|
|
|
5
5
|
import { DataSource, Repository } from 'typeorm';
|
|
6
6
|
import { Role } from '../entity/role.entity';
|
|
7
7
|
import { UserRoleMapping } from '../entity/user-role-mapping.entity';
|
|
8
|
+
import { UserData } from '../entity/user.entity';
|
|
8
9
|
import { UserSessionService } from './user-session.service';
|
|
9
10
|
import { UserService } from './user.service';
|
|
10
11
|
import { JwtAuthService } from 'src/module/auth/services/jwt.service';
|
|
@@ -18,10 +19,17 @@ export declare class LoginService {
|
|
|
18
19
|
private readonly organizationRepository;
|
|
19
20
|
private readonly listMasterService;
|
|
20
21
|
private readonly jwtAuthService;
|
|
21
|
-
|
|
22
|
+
private readonly userRepository;
|
|
23
|
+
constructor(userService: UserService, userSessionService: UserSessionService, configService: ConfigService, userRoleMappingRepository: Repository<UserRoleMapping>, roleRepo: Repository<Role>, dataSource: DataSource, organizationRepository: OrganizationRepository, listMasterService: ListMasterService, jwtAuthService: JwtAuthService, userRepository: Repository<UserData>);
|
|
22
24
|
masterKey: string;
|
|
23
25
|
masterIv: string;
|
|
24
|
-
login(
|
|
26
|
+
login(data: {
|
|
27
|
+
email: string;
|
|
28
|
+
password?: string;
|
|
29
|
+
subdomain: string;
|
|
30
|
+
fcm_token: string;
|
|
31
|
+
is_otp?: boolean;
|
|
32
|
+
}): Promise<{
|
|
25
33
|
success: boolean;
|
|
26
34
|
message: string;
|
|
27
35
|
type: string;
|
|
@@ -40,7 +48,13 @@ export declare class LoginService {
|
|
|
40
48
|
}>;
|
|
41
49
|
formLogin(body: any): Promise<any>;
|
|
42
50
|
private getDefaultAccess;
|
|
43
|
-
loginWithGoogle(
|
|
51
|
+
loginWithGoogle(data: {
|
|
52
|
+
email: string;
|
|
53
|
+
password: string;
|
|
54
|
+
name: any;
|
|
55
|
+
subdomain: string;
|
|
56
|
+
fcm_token: string;
|
|
57
|
+
}): Promise<BadRequestException | {
|
|
44
58
|
success: boolean;
|
|
45
59
|
message: string;
|
|
46
60
|
type: string;
|
|
@@ -23,11 +23,12 @@ const typeorm_2 = require("typeorm");
|
|
|
23
23
|
const encryptUtil_service_1 = require("../../../utils/service/encryptUtil.service");
|
|
24
24
|
const role_entity_1 = require("../entity/role.entity");
|
|
25
25
|
const user_role_mapping_entity_1 = require("../entity/user-role-mapping.entity");
|
|
26
|
+
const user_entity_1 = require("../entity/user.entity");
|
|
26
27
|
const user_session_service_1 = require("./user-session.service");
|
|
27
28
|
const user_service_1 = require("./user.service");
|
|
28
29
|
const jwt_service_1 = require("../../auth/services/jwt.service");
|
|
29
30
|
let LoginService = class LoginService {
|
|
30
|
-
constructor(userService, userSessionService, configService, userRoleMappingRepository, roleRepo, dataSource, organizationRepository, listMasterService, jwtAuthService) {
|
|
31
|
+
constructor(userService, userSessionService, configService, userRoleMappingRepository, roleRepo, dataSource, organizationRepository, listMasterService, jwtAuthService, userRepository) {
|
|
31
32
|
this.userService = userService;
|
|
32
33
|
this.userSessionService = userSessionService;
|
|
33
34
|
this.configService = configService;
|
|
@@ -37,10 +38,12 @@ let LoginService = class LoginService {
|
|
|
37
38
|
this.organizationRepository = organizationRepository;
|
|
38
39
|
this.listMasterService = listMasterService;
|
|
39
40
|
this.jwtAuthService = jwtAuthService;
|
|
41
|
+
this.userRepository = userRepository;
|
|
40
42
|
this.masterKey = this.configService.get('MASTER_KEY') || '';
|
|
41
43
|
this.masterIv = this.configService.get('MASTER_IV') || '';
|
|
42
44
|
}
|
|
43
|
-
async login(
|
|
45
|
+
async login(data) {
|
|
46
|
+
const { email, password, is_otp = false, subdomain, fcm_token } = data;
|
|
44
47
|
let organization;
|
|
45
48
|
if (subdomain) {
|
|
46
49
|
organization =
|
|
@@ -53,6 +56,9 @@ let LoginService = class LoginService {
|
|
|
53
56
|
if (!user || (organization && user.organization_id !== organization.id)) {
|
|
54
57
|
throw new common_1.BadRequestException('User not found in organization.');
|
|
55
58
|
}
|
|
59
|
+
if (fcm_token) {
|
|
60
|
+
await this.userRepository.update({ id: user.id }, { fcm_token });
|
|
61
|
+
}
|
|
56
62
|
const userOrgData = await this.organizationRepository.findOrganizationById(user.organization_id);
|
|
57
63
|
const resolveStatus = await this.listMasterService.getResolvedListCode(global_constant_1.STATUS_ACTIVE, user?.organization_id || 0);
|
|
58
64
|
if (user.status != resolveStatus.id ||
|
|
@@ -160,12 +166,13 @@ let LoginService = class LoginService {
|
|
|
160
166
|
}
|
|
161
167
|
throw new common_1.BadRequestException('User does not have ORG, BRN, or SCH access for this app.');
|
|
162
168
|
}
|
|
163
|
-
async loginWithGoogle(
|
|
169
|
+
async loginWithGoogle(data) {
|
|
170
|
+
const { email, password, name, subdomain, fcm_token } = data;
|
|
164
171
|
const user = await this.userService.findByEmailId(email);
|
|
165
172
|
if (!user) {
|
|
166
173
|
return new common_1.BadRequestException('User not found');
|
|
167
174
|
}
|
|
168
|
-
return await this.login(
|
|
175
|
+
return await this.login(data);
|
|
169
176
|
}
|
|
170
177
|
async logout(sessionKey) {
|
|
171
178
|
const userSession = await this.userSessionService.findBySessionKey(sessionKey);
|
|
@@ -184,6 +191,7 @@ exports.LoginService = LoginService = __decorate([
|
|
|
184
191
|
__param(3, (0, typeorm_1.InjectRepository)(user_role_mapping_entity_1.UserRoleMapping)),
|
|
185
192
|
__param(4, (0, typeorm_1.InjectRepository)(role_entity_1.Role)),
|
|
186
193
|
__param(7, (0, common_1.Inject)('ListMasterService')),
|
|
194
|
+
__param(9, (0, typeorm_1.InjectRepository)(user_entity_1.UserData)),
|
|
187
195
|
__metadata("design:paramtypes", [user_service_1.UserService,
|
|
188
196
|
user_session_service_1.UserSessionService,
|
|
189
197
|
config_1.ConfigService,
|
|
@@ -192,6 +200,7 @@ exports.LoginService = LoginService = __decorate([
|
|
|
192
200
|
typeorm_2.DataSource,
|
|
193
201
|
organization_repository_1.OrganizationRepository,
|
|
194
202
|
list_master_service_1.ListMasterService,
|
|
195
|
-
jwt_service_1.JwtAuthService
|
|
203
|
+
jwt_service_1.JwtAuthService,
|
|
204
|
+
typeorm_2.Repository])
|
|
196
205
|
], LoginService);
|
|
197
206
|
//# sourceMappingURL=login.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/login.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAyE;AACzE,2CAA+C;AAC/C,6CAAmD;AACnD,uEAGsC;AACtC,iGAAkG;AAClG,sFAAsF;AACtF,qCAAiD;AACjD,oFAAgF;AAChF,uDAA6C;AAC7C,iFAAqE;
|
|
1
|
+
{"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/login.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,14 +9,16 @@ import { EntityManager } from 'typeorm';
|
|
|
9
9
|
import { ConfigService } from '@nestjs/config';
|
|
10
10
|
import { ServiceResult } from 'src/dtos/response.dto';
|
|
11
11
|
import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
|
|
12
|
+
import { OrganizationRepository } from 'src/module/enterprise/repository/organization.repository';
|
|
12
13
|
export declare class UserService extends EntityServiceImpl {
|
|
13
14
|
private userRepository;
|
|
14
15
|
private userRoleMappingService;
|
|
15
16
|
private readonly clockIDGenService;
|
|
16
17
|
private configService;
|
|
18
|
+
private readonly organizationRepository;
|
|
17
19
|
private readonly roleService;
|
|
18
20
|
private readonly listMasterService;
|
|
19
|
-
constructor(userRepository: UserRepository, userRoleMappingService: UserRoleMappingService, clockIDGenService: ClockIDGenService, configService: ConfigService, roleService: RoleService, listMasterService: ListMasterService);
|
|
21
|
+
constructor(userRepository: UserRepository, userRoleMappingService: UserRoleMappingService, clockIDGenService: ClockIDGenService, configService: ConfigService, organizationRepository: OrganizationRepository, roleService: RoleService, listMasterService: ListMasterService);
|
|
20
22
|
masterKey: any;
|
|
21
23
|
masterIv: any;
|
|
22
24
|
createEntity(entityData: BaseEntity, loggedInUser: UserData | null, manager?: EntityManager): Promise<ServiceResult<BaseEntity>>;
|
|
@@ -26,13 +28,8 @@ export declare class UserService extends EntityServiceImpl {
|
|
|
26
28
|
findByMobile(mobile: string, organization_id?: number, appCode?: string): Promise<UserData | null>;
|
|
27
29
|
setDefaultLastAccess(userId: number, appcode: string): Promise<void>;
|
|
28
30
|
setLastLevelTypeAndId(userId: number, levelType: string, levelId: string, appcode: string): Promise<void>;
|
|
29
|
-
checkEmailExists(
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
} | {
|
|
34
|
-
success: boolean;
|
|
35
|
-
message: string;
|
|
36
|
-
userId: number;
|
|
37
|
-
}>;
|
|
31
|
+
checkEmailExists(data: {
|
|
32
|
+
email: string;
|
|
33
|
+
subdomain: string;
|
|
34
|
+
}): Promise<any>;
|
|
38
35
|
}
|
|
@@ -24,13 +24,15 @@ const user_role_mapping_service_1 = require("./user-role-mapping.service");
|
|
|
24
24
|
const user_role_mapping_entity_1 = require("../entity/user-role-mapping.entity");
|
|
25
25
|
const config_1 = require("@nestjs/config");
|
|
26
26
|
const list_master_service_1 = require("../../listmaster/service/list-master.service");
|
|
27
|
+
const organization_repository_1 = require("../../enterprise/repository/organization.repository");
|
|
27
28
|
let UserService = class UserService extends entity_service_impl_service_1.EntityServiceImpl {
|
|
28
|
-
constructor(userRepository, userRoleMappingService, clockIDGenService, configService, roleService, listMasterService) {
|
|
29
|
+
constructor(userRepository, userRoleMappingService, clockIDGenService, configService, organizationRepository, roleService, listMasterService) {
|
|
29
30
|
super();
|
|
30
31
|
this.userRepository = userRepository;
|
|
31
32
|
this.userRoleMappingService = userRoleMappingService;
|
|
32
33
|
this.clockIDGenService = clockIDGenService;
|
|
33
34
|
this.configService = configService;
|
|
35
|
+
this.organizationRepository = organizationRepository;
|
|
34
36
|
this.roleService = roleService;
|
|
35
37
|
this.listMasterService = listMasterService;
|
|
36
38
|
this.masterKey = this.configService.get('MASTER_KEY') || '';
|
|
@@ -38,11 +40,11 @@ let UserService = class UserService extends entity_service_impl_service_1.Entity
|
|
|
38
40
|
}
|
|
39
41
|
async createEntity(entityData, loggedInUser, manager) {
|
|
40
42
|
const userData = entityData;
|
|
41
|
-
let existingUser = await this.userRepository.findByEmailId(userData.email_id);
|
|
43
|
+
let existingUser = await this.userRepository.findByEmailId(userData.email_id, loggedInUser?.organization_id);
|
|
42
44
|
if (existingUser) {
|
|
43
45
|
return { success: false, error: 'User with this email already exists' };
|
|
44
46
|
}
|
|
45
|
-
existingUser = await this.userRepository.findByMobile(userData.mobile);
|
|
47
|
+
existingUser = await this.userRepository.findByMobile(userData.mobile, loggedInUser?.organization_id);
|
|
46
48
|
if (existingUser) {
|
|
47
49
|
return { success: false, error: 'User with this mobile already exists' };
|
|
48
50
|
}
|
|
@@ -181,11 +183,23 @@ let UserService = class UserService extends entity_service_impl_service_1.Entity
|
|
|
181
183
|
user.last_app_access = appcode;
|
|
182
184
|
await this.userRepository.saveUser(user);
|
|
183
185
|
}
|
|
184
|
-
async checkEmailExists(
|
|
185
|
-
|
|
186
|
-
|
|
186
|
+
async checkEmailExists(data) {
|
|
187
|
+
const { email, subdomain } = data;
|
|
188
|
+
if (!email || !subdomain) {
|
|
189
|
+
return { success: false, message: 'Email and Subdomain is required' };
|
|
190
|
+
}
|
|
191
|
+
let organization;
|
|
192
|
+
if (subdomain) {
|
|
193
|
+
organization =
|
|
194
|
+
await this.organizationRepository.findOrganizationBySubdomain(subdomain);
|
|
195
|
+
if (!organization) {
|
|
196
|
+
throw new common_1.BadRequestException('Organization not found.');
|
|
197
|
+
}
|
|
187
198
|
}
|
|
188
199
|
const user = await this.userRepository.findByEmailId(email);
|
|
200
|
+
if (!user || (organization && user.organization_id !== organization.id)) {
|
|
201
|
+
throw new common_1.BadRequestException('User not found in organization.');
|
|
202
|
+
}
|
|
189
203
|
if (user) {
|
|
190
204
|
return {
|
|
191
205
|
success: true,
|
|
@@ -201,12 +215,13 @@ let UserService = class UserService extends entity_service_impl_service_1.Entity
|
|
|
201
215
|
exports.UserService = UserService;
|
|
202
216
|
exports.UserService = UserService = __decorate([
|
|
203
217
|
(0, common_1.Injectable)(),
|
|
204
|
-
__param(
|
|
205
|
-
__param(
|
|
218
|
+
__param(5, (0, common_1.Inject)('RoleService')),
|
|
219
|
+
__param(6, (0, common_1.Inject)('ListMasterService')),
|
|
206
220
|
__metadata("design:paramtypes", [user_repository_1.UserRepository,
|
|
207
221
|
user_role_mapping_service_1.UserRoleMappingService,
|
|
208
222
|
clockIDGenUtil_service_1.ClockIDGenService,
|
|
209
223
|
config_1.ConfigService,
|
|
224
|
+
organization_repository_1.OrganizationRepository,
|
|
210
225
|
role_service_1.RoleService,
|
|
211
226
|
list_master_service_1.ListMasterService])
|
|
212
227
|
], UserService);
|