rez_core 2.0.46 → 2.0.48

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.
Files changed (53) hide show
  1. package/dist/module/auth/strategies/jwt.strategy.js +1 -1
  2. package/dist/module/auth/strategies/jwt.strategy.js.map +1 -1
  3. package/dist/module/enterprise/entity/brand.entity.d.ts +1 -0
  4. package/dist/module/enterprise/entity/brand.entity.js +7 -0
  5. package/dist/module/enterprise/entity/brand.entity.js.map +1 -1
  6. package/dist/module/enterprise/entity/organization.entity.d.ts +1 -0
  7. package/dist/module/enterprise/entity/organization.entity.js +4 -0
  8. package/dist/module/enterprise/entity/organization.entity.js.map +1 -1
  9. package/dist/module/enterprise/entity/school.entity.d.ts +1 -0
  10. package/dist/module/enterprise/entity/school.entity.js +4 -0
  11. package/dist/module/enterprise/entity/school.entity.js.map +1 -1
  12. package/dist/module/enterprise/repository/school.repository.js +5 -0
  13. package/dist/module/enterprise/repository/school.repository.js.map +1 -1
  14. package/dist/module/user/controller/login.controller.d.ts +10 -1
  15. package/dist/module/user/controller/login.controller.js +22 -3
  16. package/dist/module/user/controller/login.controller.js.map +1 -1
  17. package/dist/module/user/dto/create-user.dto.d.ts +1 -0
  18. package/dist/module/user/dto/create-user.dto.js.map +1 -1
  19. package/dist/module/user/repository/role.repository.d.ts +6 -0
  20. package/dist/module/user/repository/role.repository.js +27 -0
  21. package/dist/module/user/repository/role.repository.js.map +1 -1
  22. package/dist/module/user/repository/user-role-mapping.repository.d.ts +5 -1
  23. package/dist/module/user/repository/user-role-mapping.repository.js +37 -2
  24. package/dist/module/user/repository/user-role-mapping.repository.js.map +1 -1
  25. package/dist/module/user/service/login.service.d.ts +6 -3
  26. package/dist/module/user/service/login.service.js +32 -10
  27. package/dist/module/user/service/login.service.js.map +1 -1
  28. package/dist/module/user/service/role.service.js +8 -5
  29. package/dist/module/user/service/role.service.js.map +1 -1
  30. package/dist/module/user/service/user-role-mapping.service.d.ts +3 -0
  31. package/dist/module/user/service/user-role-mapping.service.js +24 -1
  32. package/dist/module/user/service/user-role-mapping.service.js.map +1 -1
  33. package/dist/module/user/service/user-session.service.d.ts +11 -2
  34. package/dist/module/user/service/user-session.service.js +32 -4
  35. package/dist/module/user/service/user-session.service.js.map +1 -1
  36. package/dist/module/user/service/user.service.js +57 -23
  37. package/dist/module/user/service/user.service.js.map +1 -1
  38. package/dist/tsconfig.build.tsbuildinfo +1 -1
  39. package/package.json +1 -1
  40. package/src/module/auth/strategies/jwt.strategy.ts +2 -2
  41. package/src/module/enterprise/entity/brand.entity.ts +5 -2
  42. package/src/module/enterprise/entity/organization.entity.ts +3 -0
  43. package/src/module/enterprise/entity/school.entity.ts +3 -0
  44. package/src/module/enterprise/repository/school.repository.ts +5 -0
  45. package/src/module/user/controller/login.controller.ts +33 -2
  46. package/src/module/user/dto/create-user.dto.ts +2 -0
  47. package/src/module/user/repository/role.repository.ts +46 -2
  48. package/src/module/user/repository/user-role-mapping.repository.ts +54 -1
  49. package/src/module/user/service/login.service.ts +48 -29
  50. package/src/module/user/service/role.service.ts +10 -6
  51. package/src/module/user/service/user-role-mapping.service.ts +60 -0
  52. package/src/module/user/service/user-session.service.ts +144 -4
  53. package/src/module/user/service/user.service.ts +75 -65
@@ -24,7 +24,7 @@ let JwtStrategy = class JwtStrategy extends (0, passport_1.PassportStrategy)(pas
24
24
  this.configService = configService;
25
25
  }
26
26
  async validate(payload) {
27
- const { userId, sessionToken, appcode, email_id, organization_id, enterprise_id, level_id, level_type } = payload;
27
+ const { userId, sessionToken, appcode, email_id, organization_id, enterprise_id, level_id, level_type, } = payload;
28
28
  let userData = {
29
29
  id: userId,
30
30
  sessionToken: sessionToken,
@@ -1 +1 @@
1
- {"version":3,"file":"jwt.strategy.js","sourceRoot":"","sources":["../../../../src/module/auth/strategies/jwt.strategy.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAoD;AACpD,+CAAoD;AACpD,2CAAmE;AAKnE,2CAA+C;AAGxC,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,IAAA,2BAAgB,EAAC,uBAAQ,CAAC;IACzD,YAA6B,aAA4B;QACvD,KAAK,CAAC;YACJ,cAAc,EAAE,yBAAU,CAAC,2BAA2B,EAAE;YACxD,gBAAgB,EAAE,KAAK;YACvB,WAAW,EAAE,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC;SAC7C,CAAC,CAAC;QALwB,kBAAa,GAAb,aAAa,CAAe;IAMzD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAO;QACpB,MAAM,EACJ,MAAM,EACN,YAAY,EACZ,OAAO,EACP,QAAQ,EACR,eAAe,EACf,aAAa,EACb,QAAQ,EACR,UAAU,EACX,GAAG,OAAO,CAAC;QAeZ,IAAI,QAAQ,GAAG;YACb,EAAE,EAAE,MAAM;YACV,YAAY,EAAE,YAAY;YAC1B,OAAO,EAAE,OAAO;YAChB,QAAQ,EAAE,QAAQ;YAClB,eAAe,EAAE,eAAe;YAChC,aAAa,EAAE,aAAa;YAC5B,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,UAAU;SACvB,CAAC;QAEF,OAAO,EAAE,QAAQ,EAAE,CAAC;IACtB,CAAC;CACF,CAAA;AA/CY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAEiC,sBAAa;GAD9C,WAAW,CA+CvB"}
1
+ {"version":3,"file":"jwt.strategy.js","sourceRoot":"","sources":["../../../../src/module/auth/strategies/jwt.strategy.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAoD;AACpD,+CAAoD;AACpD,2CAAmE;AAKnE,2CAA+C;AAGxC,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,IAAA,2BAAgB,EAAC,uBAAQ,CAAC;IACzD,YAA6B,aAA4B;QACvD,KAAK,CAAC;YACJ,cAAc,EAAE,yBAAU,CAAC,2BAA2B,EAAE;YACxD,gBAAgB,EAAE,KAAK;YACvB,WAAW,EAAE,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC;SAC7C,CAAC,CAAC;QALwB,kBAAa,GAAb,aAAa,CAAe;IAMzD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAO;QACpB,MAAM,EACJ,MAAM,EACN,YAAY,EACZ,OAAO,EACP,QAAQ,EACR,eAAe,EACf,aAAa,EACb,QAAQ,EACR,UAAU,GACX,GAAG,OAAO,CAAC;QAeZ,IAAI,QAAQ,GAAG;YACb,EAAE,EAAE,MAAM;YACV,YAAY,EAAE,YAAY;YAC1B,OAAO,EAAE,OAAO;YAChB,QAAQ,EAAE,QAAQ;YAClB,eAAe,EAAE,eAAe;YAChC,aAAa,EAAE,aAAa;YAC5B,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,UAAU;SACvB,CAAC;QAEF,OAAO,EAAE,QAAQ,EAAE,CAAC;IACtB,CAAC;CACF,CAAA;AA/CY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAEiC,sBAAa;GAD9C,WAAW,CA+CvB"}
@@ -1,3 +1,4 @@
1
1
  import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
2
2
  export declare class BrandData extends BaseEntity {
3
+ type: string;
3
4
  }
@@ -5,6 +5,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
5
5
  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
6
6
  return c > 3 && r && Object.defineProperty(target, key, r), r;
7
7
  };
8
+ var __metadata = (this && this.__metadata) || function (k, v) {
9
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
+ };
8
11
  Object.defineProperty(exports, "__esModule", { value: true });
9
12
  exports.BrandData = void 0;
10
13
  const base_entity_entity_1 = require("../../meta/entity/base-entity.entity");
@@ -12,6 +15,10 @@ const typeorm_1 = require("typeorm");
12
15
  let BrandData = class BrandData extends base_entity_entity_1.BaseEntity {
13
16
  };
14
17
  exports.BrandData = BrandData;
18
+ __decorate([
19
+ (0, typeorm_1.Column)({ name: 'type', nullable: true }),
20
+ __metadata("design:type", String)
21
+ ], BrandData.prototype, "type", void 0);
15
22
  exports.BrandData = BrandData = __decorate([
16
23
  (0, typeorm_1.Entity)({ name: 'cr_brand' })
17
24
  ], BrandData);
@@ -1 +1 @@
1
- {"version":3,"file":"brand.entity.js","sourceRoot":"","sources":["../../../../src/module/enterprise/entity/brand.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,6EAAuE;AACvE,qCAAiC;AAG1B,IAAM,SAAS,GAAf,MAAM,SAAU,SAAQ,+BAAU;CAAG,CAAA;AAA/B,8BAAS;oBAAT,SAAS;IADrB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;GAChB,SAAS,CAAsB"}
1
+ {"version":3,"file":"brand.entity.js","sourceRoot":"","sources":["../../../../src/module/enterprise/entity/brand.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6EAAuE;AACvE,qCAAyC;AAGlC,IAAM,SAAS,GAAf,MAAM,SAAU,SAAQ,+BAAU;CAGxC,CAAA;AAHY,8BAAS;AAEpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uCAC5B;oBAFF,SAAS;IADrB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;GAChB,SAAS,CAGrB"}
@@ -24,4 +24,5 @@ export declare class OrganizationData {
24
24
  bankacc_account_number: string;
25
25
  organization_type: string;
26
26
  is_brand: boolean;
27
+ type: string;
27
28
  }
@@ -118,6 +118,10 @@ __decorate([
118
118
  (0, typeorm_1.Column)({ name: 'is_brand', type: 'boolean', nullable: true }),
119
119
  __metadata("design:type", Boolean)
120
120
  ], OrganizationData.prototype, "is_brand", void 0);
121
+ __decorate([
122
+ (0, typeorm_1.Column)({ name: 'type', nullable: true }),
123
+ __metadata("design:type", String)
124
+ ], OrganizationData.prototype, "type", void 0);
121
125
  exports.OrganizationData = OrganizationData = __decorate([
122
126
  (0, typeorm_1.Entity)({ name: 'cr_organization' })
123
127
  ], OrganizationData);
@@ -1 +1 @@
1
- {"version":3,"file":"organization.entity.js","sourceRoot":"","sources":["../../../../src/module/enterprise/entity/organization.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiE;AAG1D,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;CA+E5B,CAAA;AA/EY,4CAAgB;AAE3B;IADC,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;4CACzC;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;uDACzB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC5B;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAC5B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC5B;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC7C;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC5B;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDAC5B;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDAC5B;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACnC,IAAI;sDAAC;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDAC5B;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACnC,IAAI;uDAAC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wDAC5B;AAGvB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAC1B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDAC5B;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,sBAAsB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8DAC5B;AAG7B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAC5B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CAC5B;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4DAC5B;AAG3B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4DAC5B;AAG3B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,mBAAmB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2DAC5B;AAG1B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8DAC9B;AAG7B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gEACzB;AAO/B;IALC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,mBAAmB;QACzB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,IAAI;KACf,CAAC;;2DACwB;AAG1B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDAC5C;2BA9EP,gBAAgB;IAD5B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;GACvB,gBAAgB,CA+E5B"}
1
+ {"version":3,"file":"organization.entity.js","sourceRoot":"","sources":["../../../../src/module/enterprise/entity/organization.entity.ts"],"names":[],"mappings":"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"}
@@ -3,4 +3,5 @@ export declare class SchoolData extends BaseEntity {
3
3
  brand_id: number;
4
4
  brand_code: string;
5
5
  location: string;
6
+ type: string;
6
7
  }
@@ -27,6 +27,10 @@ __decorate([
27
27
  (0, typeorm_1.Column)({ name: 'location', nullable: true }),
28
28
  __metadata("design:type", String)
29
29
  ], SchoolData.prototype, "location", void 0);
30
+ __decorate([
31
+ (0, typeorm_1.Column)({ name: 'type', nullable: true }),
32
+ __metadata("design:type", String)
33
+ ], SchoolData.prototype, "type", void 0);
30
34
  exports.SchoolData = SchoolData = __decorate([
31
35
  (0, typeorm_1.Entity)({ name: 'cr_school' })
32
36
  ], SchoolData);
@@ -1 +1 @@
1
- {"version":3,"file":"school.entity.js","sourceRoot":"","sources":["../../../../src/module/enterprise/entity/school.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6EAAuE;AACvE,qCAAyC;AAGlC,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,+BAAU;CASzC,CAAA;AATY,gCAAU;AAErB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CAC5B;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC5B;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CAC5B;qBARN,UAAU;IADtB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;GACjB,UAAU,CAStB"}
1
+ {"version":3,"file":"school.entity.js","sourceRoot":"","sources":["../../../../src/module/enterprise/entity/school.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6EAAuE;AACvE,qCAAyC;AAGlC,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,+BAAU;CAYzC,CAAA;AAZY,gCAAU;AAErB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CAC5B;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC5B;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CAC5B;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCAC5B;qBAXF,UAAU;IADtB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;GACjB,UAAU,CAYtB"}
@@ -67,6 +67,7 @@ let SchoolRepository = class SchoolRepository {
67
67
  org_id,
68
68
  org_name,
69
69
  org_address,
70
+ type: 'Organization',
70
71
  brands: {},
71
72
  };
72
73
  }
@@ -74,6 +75,7 @@ let SchoolRepository = class SchoolRepository {
74
75
  result[org_id].brands[brand_id] = {
75
76
  brand_id,
76
77
  brand_name,
78
+ type: 'Brand',
77
79
  schools: [],
78
80
  };
79
81
  }
@@ -81,6 +83,7 @@ let SchoolRepository = class SchoolRepository {
81
83
  school_id,
82
84
  school_name,
83
85
  school_location,
86
+ type: 'School',
84
87
  });
85
88
  }
86
89
  return Object.values(result).map((org) => ({
@@ -128,6 +131,7 @@ let SchoolRepository = class SchoolRepository {
128
131
  result[brand_id] = {
129
132
  brand_id,
130
133
  brand_name,
134
+ type: 'Brand',
131
135
  schools: [],
132
136
  };
133
137
  }
@@ -137,6 +141,7 @@ let SchoolRepository = class SchoolRepository {
137
141
  school_id,
138
142
  school_name,
139
143
  school_location,
144
+ type: 'School',
140
145
  });
141
146
  }
142
147
  }
@@ -1 +1 @@
1
- {"version":3,"file":"school.repository.js","sourceRoot":"","sources":["../../../../src/module/enterprise/repository/school.repository.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"school.repository.js","sourceRoot":"","sources":["../../../../src/module/enterprise/repository/school.repository.ts"],"names":[],"mappings":"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"}
@@ -1,12 +1,21 @@
1
1
  import { LoginService } from '../service/login.service';
2
2
  import { Request, Response } from 'express';
3
+ import { UserSessionService } from '../service/user-session.service';
3
4
  export declare class LoginController {
4
5
  private loginService;
5
- constructor(loginService: LoginService);
6
+ private userSessionService;
7
+ constructor(loginService: LoginService, userSessionService: UserSessionService);
6
8
  login(body: any, res: Response): Promise<Response<any, Record<string, any>>>;
7
9
  logout(request: Request & {
8
10
  user: any;
9
11
  }, response: Response): Promise<void>;
10
12
  googleLogin(): Promise<void>;
11
13
  googleAuthRedirect(req: any): Promise<string>;
14
+ switchCurrentLevel(req: Request & {
15
+ user: any;
16
+ }, data: {
17
+ level_id: string;
18
+ level_type: string;
19
+ appcode: string;
20
+ }): Promise<any>;
12
21
  }
@@ -17,9 +17,11 @@ const common_1 = require("@nestjs/common");
17
17
  const login_service_1 = require("../service/login.service");
18
18
  const google_auth_guard_1 = require("../../../module/auth/guards/google-auth.guard");
19
19
  const jwt_guard_1 = require("../../auth/guards/jwt.guard");
20
+ const user_session_service_1 = require("../service/user-session.service");
20
21
  let LoginController = class LoginController {
21
- constructor(loginService) {
22
+ constructor(loginService, userSessionService) {
22
23
  this.loginService = loginService;
24
+ this.userSessionService = userSessionService;
23
25
  }
24
26
  async login(body, res) {
25
27
  const { email_id, password, appcode } = body;
@@ -27,7 +29,7 @@ let LoginController = class LoginController {
27
29
  return res.status(common_1.HttpStatus.OK).json(result);
28
30
  }
29
31
  async logout(request, response) {
30
- let requestUser = request.user;
32
+ let requestUser = request.user.userData;
31
33
  response
32
34
  .status(common_1.HttpStatus.OK)
33
35
  .json(await this.loginService.logout(requestUser.sessionToken));
@@ -38,6 +40,13 @@ let LoginController = class LoginController {
38
40
  let { email, name } = req.user.userData;
39
41
  return this.loginService.loginWithGoogle(email, name);
40
42
  }
43
+ async switchCurrentLevel(req, data) {
44
+ const userId = req.user.userData.id;
45
+ const currentUserLevelType = req.user.userData.level_type;
46
+ const currentUserLevelId = req.user.userData.level_id;
47
+ const currentUserOrganization_id = req.user.userData.organization_id;
48
+ return await this.userSessionService.switchCurrentLevelService(userId, currentUserLevelType, currentUserLevelId, currentUserOrganization_id, data);
49
+ }
41
50
  };
42
51
  exports.LoginController = LoginController;
43
52
  __decorate([
@@ -72,8 +81,18 @@ __decorate([
72
81
  __metadata("design:paramtypes", [Object]),
73
82
  __metadata("design:returntype", Promise)
74
83
  ], LoginController.prototype, "googleAuthRedirect", null);
84
+ __decorate([
85
+ (0, common_1.UseGuards)(jwt_guard_1.JwtAuthGuard),
86
+ (0, common_1.Post)('switch'),
87
+ __param(0, (0, common_1.Req)()),
88
+ __param(1, (0, common_1.Body)()),
89
+ __metadata("design:type", Function),
90
+ __metadata("design:paramtypes", [Object, Object]),
91
+ __metadata("design:returntype", Promise)
92
+ ], LoginController.prototype, "switchCurrentLevel", null);
75
93
  exports.LoginController = LoginController = __decorate([
76
94
  (0, common_1.Controller)('auth'),
77
- __metadata("design:paramtypes", [login_service_1.LoginService])
95
+ __metadata("design:paramtypes", [login_service_1.LoginService,
96
+ user_session_service_1.UserSessionService])
78
97
  ], LoginController);
79
98
  //# sourceMappingURL=login.controller.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"login.controller.js","sourceRoot":"","sources":["../../../../src/module/user/controller/login.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CASwB;AACxB,4DAAwD;AACxD,qFAAgF;AAChF,2DAA2D;AAIpD,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YAAoB,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAG,CAAC;IAG5C,AAAN,KAAK,CAAC,KAAK,CAAS,IAAI,EAAS,GAAa;QAC5C,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QAC7C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC1E,OAAO,GAAG,CAAC,MAAM,CAAC,mBAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;IAIK,AAAN,KAAK,CAAC,MAAM,CACH,OAAgC,EAChC,QAAkB;QAEzB,IAAI,WAAW,GAAQ,OAAO,CAAC,IAAI,CAAC;QACpC,QAAQ;aACL,MAAM,CAAC,mBAAU,CAAC,EAAE,CAAC;aACrB,IAAI,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC;IACpE,CAAC;IAIK,AAAN,KAAK,CAAC,WAAW;IAEjB,CAAC;IAKK,AAAN,KAAK,CAAC,kBAAkB,CAAQ,GAAG;QACjC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QAGxC,OAAO,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACxD,CAAC;CACF,CAAA;AArCY,0CAAe;AAIpB;IADL,IAAA,aAAI,EAAC,OAAO,CAAC;IACD,WAAA,IAAA,aAAI,GAAE,CAAA;IAAQ,WAAA,IAAA,YAAG,GAAE,CAAA;;;;4CAI/B;AAIK;IAFL,IAAA,kBAAS,EAAC,wBAAY,CAAC;IACvB,IAAA,aAAI,EAAC,QAAQ,CAAC;IAEZ,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,YAAG,GAAE,CAAA;;;;6CAMP;AAIK;IAFL,IAAA,YAAG,EAAC,QAAQ,CAAC;IACb,IAAA,kBAAS,EAAC,mCAAe,CAAC;;;;kDAG1B;AAKK;IAFL,IAAA,YAAG,EAAC,iBAAiB,CAAC;IACtB,IAAA,kBAAS,EAAC,mCAAe,CAAC;IACD,WAAA,IAAA,YAAG,GAAE,CAAA;;;;yDAK9B;0BApCU,eAAe;IAD3B,IAAA,mBAAU,EAAC,MAAM,CAAC;qCAEiB,4BAAY;GADnC,eAAe,CAqC3B"}
1
+ {"version":3,"file":"login.controller.js","sourceRoot":"","sources":["../../../../src/module/user/controller/login.controller.ts"],"names":[],"mappings":"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"}
@@ -13,4 +13,5 @@ export declare class CreateUserDto extends BaseEntity {
13
13
  is_customer: number;
14
14
  appcode: string;
15
15
  is_factory: number;
16
+ access: any[];
16
17
  }
@@ -1 +1 @@
1
- {"version":3,"file":"create-user.dto.js","sourceRoot":"","sources":["../../../../src/module/user/dto/create-user.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAgE;AAChE,6EAAkE;AAClE,uEAAoE;AACpE,yDAA2C;AAE3C,MAAa,aAAc,SAAQ,+BAAU;IAC3C;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,iCAAe,CAAC;IACrC,CAAC;CAkDF;AAtDD,sCAsDC;AA5CC;IAJC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,EAAC,qBAAqB,EAAE,EAAE,OAAO,EAAE,wBAAwB,EAAE,CAAC;IACrE,IAAA,0BAAM,GAAE;;iDACU;AAMnB;IAJC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,EAAC,qBAAqB,EAAE,EAAE,OAAO,EAAE,uBAAuB,EAAE,CAAC;IACpE,IAAA,0BAAM,GAAE;;gDACS;AAQlB;IANC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,EACN,sEAAsE,EACtE,EAAE,OAAO,EAAE,mBAAmB,EAAE,CACjC;;+CACgB;AAYjB;IAVC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,EACN,sEAAsE,EACtE;QACE,OAAO,EACL,gJAAgJ;KACnJ,CACF;IACA,IAAA,0BAAM,GAAE;;+CACQ;AAMjB;IAJC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,EAAC,aAAa,EAAE,EAAE,OAAO,EAAE,4BAA4B,EAAE,CAAC;IACjE,IAAA,0BAAM,GAAE;;6CACM;AAGf;IADC,IAAA,0BAAM,GAAE;;4CACI"}
1
+ {"version":3,"file":"create-user.dto.js","sourceRoot":"","sources":["../../../../src/module/user/dto/create-user.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAgE;AAChE,6EAAkE;AAClE,uEAAoE;AACpE,yDAA2C;AAE3C,MAAa,aAAc,SAAQ,+BAAU;IAC3C;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,iCAAe,CAAC;IACrC,CAAC;CAoDF;AAxDD,sCAwDC;AA9CC;IAJC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,EAAC,qBAAqB,EAAE,EAAE,OAAO,EAAE,wBAAwB,EAAE,CAAC;IACrE,IAAA,0BAAM,GAAE;;iDACU;AAMnB;IAJC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,EAAC,qBAAqB,EAAE,EAAE,OAAO,EAAE,uBAAuB,EAAE,CAAC;IACpE,IAAA,0BAAM,GAAE;;gDACS;AAQlB;IANC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,EACN,sEAAsE,EACtE,EAAE,OAAO,EAAE,mBAAmB,EAAE,CACjC;;+CACgB;AAYjB;IAVC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,EACN,sEAAsE,EACtE;QACE,OAAO,EACL,gJAAgJ;KACnJ,CACF;IACA,IAAA,0BAAM,GAAE;;+CACQ;AAMjB;IAJC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,EAAC,aAAa,EAAE,EAAE,OAAO,EAAE,4BAA4B,EAAE,CAAC;IACjE,IAAA,0BAAM,GAAE;;6CACM;AAGf;IADC,IAAA,0BAAM,GAAE;;4CACI"}
@@ -9,4 +9,10 @@ export declare class RoleRepository {
9
9
  organization_id?: number;
10
10
  }): Promise<boolean>;
11
11
  find(data: any): Promise<Role[] | null>;
12
+ isRoleNameWithLevelExists(name: string, options?: {
13
+ excludeRoleId?: number;
14
+ organization_id?: number;
15
+ level_type?: string;
16
+ level_id?: number;
17
+ }): Promise<boolean>;
12
18
  }
@@ -50,6 +50,33 @@ let RoleRepository = class RoleRepository {
50
50
  },
51
51
  });
52
52
  }
53
+ async isRoleNameWithLevelExists(name, options) {
54
+ const query = this.roleRepo
55
+ .createQueryBuilder('role')
56
+ .where('role.name = :name', { name });
57
+ if (options?.excludeRoleId) {
58
+ query.andWhere('role.id != :excludeRoleId', {
59
+ excludeRoleId: options.excludeRoleId,
60
+ });
61
+ }
62
+ if (options?.organization_id !== undefined) {
63
+ query.andWhere('role.organization_id = :organization_id', {
64
+ organization_id: options.organization_id,
65
+ });
66
+ }
67
+ if (options?.level_type) {
68
+ query.andWhere('role.level_type = :level_type', {
69
+ level_type: options.level_type,
70
+ });
71
+ }
72
+ if (options?.level_id !== undefined) {
73
+ query.andWhere('role.level_id = :level_id', {
74
+ level_id: options.level_id,
75
+ });
76
+ }
77
+ const existingRole = await query.getOne();
78
+ return !!existingRole;
79
+ }
53
80
  };
54
81
  exports.RoleRepository = RoleRepository;
55
82
  exports.RoleRepository = RoleRepository = __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"role.repository.js","sourceRoot":"","sources":["../../../../src/module/user/repository/role.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAiE;AACjE,qCAAqC;AACrC,6CAAmD;AACnD,uDAA6C;AAKtC,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAEmB,QAA0B;QAA1B,aAAQ,GAAR,QAAQ,CAAkB;IAC1C,CAAC;IAEJ,KAAK,CAAC,UAAU,CAAC,IAAY;QAC3B,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IACpD,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAC3B,IAAY,EACZ,OAA8D;QAE9D,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ;aACxB,kBAAkB,CAAC,MAAM,CAAC;aAC1B,KAAK,CAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;QAExC,IAAI,OAAO,EAAE,aAAa,EAAE,CAAC;YAC3B,KAAK,CAAC,QAAQ,CAAC,2BAA2B,EAAE;gBAC1C,aAAa,EAAE,OAAO,CAAC,aAAa;aACrC,CAAC,CAAC;QACL,CAAC;QAED,IAAI,OAAO,EAAE,eAAe,KAAK,SAAS,EAAE,CAAC;YAC3C,KAAK,CAAC,QAAQ,CAAC,yCAAyC,EAAE;gBACxD,eAAe,EAAE,OAAO,CAAC,eAAe;aACzC,CAAC,CAAC;QACL,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC;QAC1C,OAAO,CAAC,CAAC,YAAY,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,IAAI;QACb,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YACxB,KAAK,EAAE;gBACL,GAAG,CAAC,IAAI,CAAC,UAAU,KAAK,SAAS,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC;gBACrE,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,SAAS,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAC/D,GAAG,CAAC,IAAI,CAAC,UAAU,KAAK,SAAS,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC;aACtE;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA3CY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,kBAAI,CAAC,CAAA;qCACI,oBAAU;GAH5B,cAAc,CA2C1B"}
1
+ {"version":3,"file":"role.repository.js","sourceRoot":"","sources":["../../../../src/module/user/repository/role.repository.ts"],"names":[],"mappings":"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"}
@@ -4,12 +4,16 @@ export declare class UserRoleMappingRepository {
4
4
  private readonly userRoleMappingRepository;
5
5
  constructor(userRoleMappingRepository: Repository<UserRoleMapping>);
6
6
  save(userRoleMapping: UserRoleMapping): Promise<UserRoleMapping | null>;
7
+ update(id: number, userRoleMapping: UserRoleMapping): Promise<UserRoleMapping | null>;
7
8
  findByUserId(userId: number): Promise<UserRoleMapping[] | null>;
8
9
  getDefaultForUser(userId: number): Promise<UserRoleMapping | null>;
9
- findByUserIdAndRoleId(userId: number, roleId: number): Promise<UserRoleMapping | null>;
10
+ findByUserIdAndRoleId(userId: number, roleId: number, appcode?: string, level_id?: string, level_type?: string): Promise<UserRoleMapping | null>;
11
+ findByUSRId(usrId: number): Promise<UserRoleMapping | null>;
10
12
  delete(userId: number, roleId: number): Promise<void>;
11
13
  deleteByUserId(userId: number): Promise<void>;
12
14
  findDistinctAppcodeByUserId(userId: number): Promise<{
13
15
  appcode: string[];
14
16
  }>;
17
+ findByUserIdAndAppCode(userId: number, appCode: string): Promise<UserRoleMapping | null>;
18
+ findByUserIdAndAppCodeAndLevel(userId: number, appCode: string, levelType: string, levelId: string): Promise<UserRoleMapping | null>;
15
19
  }
@@ -24,6 +24,10 @@ let UserRoleMappingRepository = class UserRoleMappingRepository {
24
24
  async save(userRoleMapping) {
25
25
  return await this.userRoleMappingRepository.save(userRoleMapping);
26
26
  }
27
+ async update(id, userRoleMapping) {
28
+ await this.userRoleMappingRepository.update(id, userRoleMapping);
29
+ return await this.userRoleMappingRepository.findOneBy({ id });
30
+ }
27
31
  async findByUserId(userId) {
28
32
  return await this.userRoleMappingRepository.find({
29
33
  where: { user_id: userId },
@@ -34,9 +38,25 @@ let UserRoleMappingRepository = class UserRoleMappingRepository {
34
38
  where: { user_id: userId, is_default: 1 },
35
39
  });
36
40
  }
37
- async findByUserIdAndRoleId(userId, roleId) {
41
+ async findByUserIdAndRoleId(userId, roleId, appcode, level_id, level_type) {
38
42
  return await this.userRoleMappingRepository.findOne({
39
- where: { user_id: userId, role_id: roleId },
43
+ where: {
44
+ user_id: userId,
45
+ role_id: roleId,
46
+ appcode,
47
+ level_id,
48
+ level_type,
49
+ },
50
+ });
51
+ }
52
+ async findByUSRId(usrId) {
53
+ if (usrId) {
54
+ return null;
55
+ }
56
+ return await this.userRoleMappingRepository.findOne({
57
+ where: {
58
+ id: usrId,
59
+ },
40
60
  });
41
61
  }
42
62
  async delete(userId, roleId) {
@@ -57,6 +77,21 @@ let UserRoleMappingRepository = class UserRoleMappingRepository {
57
77
  const appcodeArray = result.map((row) => row.appcode);
58
78
  return { appcode: appcodeArray };
59
79
  }
80
+ async findByUserIdAndAppCode(userId, appCode) {
81
+ return await this.userRoleMappingRepository.findOne({
82
+ where: { user_id: userId, appcode: appCode },
83
+ });
84
+ }
85
+ async findByUserIdAndAppCodeAndLevel(userId, appCode, levelType, levelId) {
86
+ return await this.userRoleMappingRepository.findOne({
87
+ where: {
88
+ user_id: userId,
89
+ appcode: appCode,
90
+ level_type: levelType,
91
+ level_id: levelId,
92
+ },
93
+ });
94
+ }
60
95
  };
61
96
  exports.UserRoleMappingRepository = UserRoleMappingRepository;
62
97
  exports.UserRoleMappingRepository = UserRoleMappingRepository = __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"user-role-mapping.repository.js","sourceRoot":"","sources":["../../../../src/module/user/repository/user-role-mapping.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,iFAAqE;AACrE,qCAAqC;AAG9B,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IACpC,YAEmB,yBAAsD;QAAtD,8BAAyB,GAAzB,yBAAyB,CAA6B;IACtE,CAAC;IAEJ,KAAK,CAAC,IAAI,CACR,eAAgC;QAEhC,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAc;QAC/B,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC;YAC/C,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;SAC3B,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,MAAc;QACpC,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC;YAClD,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,EAAE;SAC1C,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,qBAAqB,CACzB,MAAc,EACd,MAAc;QAEd,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC;YAClD,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;SAC5C,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,MAAc,EAAE,MAAc;QACzC,MAAM,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC;YAC1C,OAAO,EAAE,MAAM;YACf,OAAO,EAAE,MAAM;SAChB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,MAAc;QACjC,MAAM,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,2BAA2B,CAC/B,MAAc;QAEd,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,yBAAyB;aAChD,kBAAkB,CAAC,KAAK,CAAC;aACzB,MAAM,CAAC,sBAAsB,EAAE,SAAS,CAAC;aACzC,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,CAAC;aAC1C,UAAU,EAAE,CAAC;QAEhB,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAEtD,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC;IACnC,CAAC;CACF,CAAA;AAzDY,8DAAyB;oCAAzB,yBAAyB;IADrC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,0CAAe,CAAC,CAAA;qCACU,oBAAU;GAH7C,yBAAyB,CAyDrC"}
1
+ {"version":3,"file":"user-role-mapping.repository.js","sourceRoot":"","sources":["../../../../src/module/user/repository/user-role-mapping.repository.ts"],"names":[],"mappings":"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"}
@@ -1,13 +1,16 @@
1
1
  import { UserSessionService } from './user-session.service';
2
2
  import { UserService } from './user.service';
3
3
  import { ConfigService } from '@nestjs/config';
4
- import { UserAppMappingService } from 'src/module/meta/service/user-app-mapping.service';
4
+ import { UserRoleMapping } from '../entity/user-role-mapping.entity';
5
+ import { Repository } from 'typeorm';
6
+ import { Role } from '../entity/role.entity';
5
7
  export declare class LoginService {
6
8
  private readonly userService;
7
9
  private userSessionService;
8
10
  private configService;
9
- private readonly userAppMappingService;
10
- constructor(userService: UserService, userSessionService: UserSessionService, configService: ConfigService, userAppMappingService: UserAppMappingService);
11
+ private readonly userRoleMappingRepository;
12
+ private readonly roleRepo;
13
+ constructor(userService: UserService, userSessionService: UserSessionService, configService: ConfigService, userRoleMappingRepository: Repository<UserRoleMapping>, roleRepo: Repository<Role>);
11
14
  masterKey: string;
12
15
  masterIv: string;
13
16
  login(email: string, password: string, appcode: string): Promise<{
@@ -19,13 +19,17 @@ const user_entity_1 = require("../entity/user.entity");
19
19
  const user_session_service_1 = require("./user-session.service");
20
20
  const user_service_1 = require("./user.service");
21
21
  const config_1 = require("@nestjs/config");
22
- const user_app_mapping_service_1 = require("../../meta/service/user-app-mapping.service");
22
+ const typeorm_1 = require("@nestjs/typeorm");
23
+ const user_role_mapping_entity_1 = require("../entity/user-role-mapping.entity");
24
+ const typeorm_2 = require("typeorm");
25
+ const role_entity_1 = require("../entity/role.entity");
23
26
  let LoginService = class LoginService {
24
- constructor(userService, userSessionService, configService, userAppMappingService) {
27
+ constructor(userService, userSessionService, configService, userRoleMappingRepository, roleRepo) {
25
28
  this.userService = userService;
26
29
  this.userSessionService = userSessionService;
27
30
  this.configService = configService;
28
- this.userAppMappingService = userAppMappingService;
31
+ this.userRoleMappingRepository = userRoleMappingRepository;
32
+ this.roleRepo = roleRepo;
29
33
  this.masterKey = this.configService.get('MASTER_KEY') || '';
30
34
  this.masterIv = this.configService.get('MASTER_IV') || '';
31
35
  }
@@ -34,14 +38,10 @@ let LoginService = class LoginService {
34
38
  if (!user) {
35
39
  return {
36
40
  success: false,
37
- message: 'Your Email ID not registered.',
41
+ message: 'Your Email ID is not registered.',
38
42
  type: 'email',
39
43
  };
40
44
  }
41
- const userAppMapping = await this.userAppMappingService.getUserAppMappings(user.id, appcode);
42
- if (!userAppMapping) {
43
- throw new common_1.BadRequestException(`User with email ${email} is not mapped to the app ${appcode}.`);
44
- }
45
45
  if (user.status !== 'ACTIVE') {
46
46
  return {
47
47
  success: false,
@@ -57,7 +57,26 @@ let LoginService = class LoginService {
57
57
  type: 'password',
58
58
  };
59
59
  }
60
- const token = await this.userSessionService.createSession(user, appcode);
60
+ const roleMappings = await this.userRoleMappingRepository.find({
61
+ where: {
62
+ user_id: user.id,
63
+ appcode: appcode,
64
+ },
65
+ });
66
+ if (!roleMappings.length) {
67
+ throw new common_1.BadRequestException('User does not have any access mapped for this app.');
68
+ }
69
+ const priority = { org: 1, sch: 2, brn: 3 };
70
+ const defaultAccess = roleMappings.sort((a, b) => priority[a.level_type] - priority[b.level_type])[0];
71
+ const role = await this.roleRepo.findOne({
72
+ where: { id: defaultAccess.role_id },
73
+ });
74
+ const token = await this.userSessionService.createSession(user, appcode, {
75
+ level_type: defaultAccess.level_type,
76
+ level_id: defaultAccess.level_id,
77
+ role_id: defaultAccess.role_id,
78
+ role_code: role?.code || null,
79
+ });
61
80
  if (user.is_firstlogin === 1) {
62
81
  user.invitation_status = 'ACCEPTED';
63
82
  user.is_firstlogin = 0;
@@ -96,9 +115,12 @@ exports.LoginService = LoginService;
96
115
  exports.LoginService = LoginService = __decorate([
97
116
  (0, common_1.Injectable)(),
98
117
  __param(0, (0, common_1.Inject)('UserService')),
118
+ __param(3, (0, typeorm_1.InjectRepository)(user_role_mapping_entity_1.UserRoleMapping)),
119
+ __param(4, (0, typeorm_1.InjectRepository)(role_entity_1.Role)),
99
120
  __metadata("design:paramtypes", [user_service_1.UserService,
100
121
  user_session_service_1.UserSessionService,
101
122
  config_1.ConfigService,
102
- user_app_mapping_service_1.UserAppMappingService])
123
+ typeorm_2.Repository,
124
+ typeorm_2.Repository])
103
125
  ], LoginService);
104
126
  //# 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":"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"}
1
+ {"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/login.service.ts"],"names":[],"mappings":"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"}
@@ -29,13 +29,16 @@ let RoleService = class RoleService extends entity_service_impl_service_1.Entity
29
29
  }
30
30
  async createEntity(entityData, loggedInUser, manager, appcode) {
31
31
  let role = entityData;
32
- if (appcode) {
33
- role.appcode = appcode;
32
+ if (loggedInUser?.level_type && loggedInUser?.level_id) {
33
+ role.level_type = loggedInUser.level_type;
34
+ role.level_id = loggedInUser.level_id;
34
35
  }
35
- if (await this.roleRepository.isRoleNameExists(role.name, {
36
- organization_id: entityData.organization_id,
36
+ if (await this.roleRepository.isRoleNameWithLevelExists(role.name, {
37
+ organization_id: loggedInUser?.organization_id || undefined,
38
+ level_type: loggedInUser?.level_type,
39
+ level_id: parseInt(loggedInUser?.level_id || '', 10),
37
40
  })) {
38
- throw new common_1.BadRequestException('Role name already exists.');
41
+ throw new common_1.BadRequestException('Role code already exists.');
39
42
  }
40
43
  const sourceRole = role.copy_from_role_id
41
44
  ? await this.getEntityData(global_constant_1.ENTITYTYPE_ROLE, role.copy_from_role_id)
@@ -1 +1 @@
1
- {"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/role.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/role.service.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,9 @@ export declare class UserRoleMappingService {
4
4
  private readonly userRoleMappingRepository;
5
5
  constructor(userRoleMappingRepository: UserRoleMappingRepository);
6
6
  assignUserRole(userRoleMapping: UserRoleMapping): Promise<UserRoleMapping | null | undefined>;
7
+ updateAssignedRole(userRoleMapping: UserRoleMapping): Promise<UserRoleMapping | null>;
7
8
  findByUserId(userId: number): Promise<UserRoleMapping[] | null>;
8
9
  deleteByUserId(userId: number): Promise<void>;
10
+ getUserByIdAndAppCode(userId: number, appCode: string): Promise<UserRoleMapping | null>;
11
+ getUserByIdAppCodeAndLevel(userId: number, appCode: string, levelType: string, levelId: string): Promise<UserRoleMapping | null>;
9
12
  }