rez_core 5.0.135 → 5.0.136
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/user/service/user-session.service.js +12 -11
- package/dist/module/user/service/user-session.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/user/service/user-session.service.ts +64 -67
- package/.idea/inspectionProfiles/Project_Default.xml +0 -6
- package/.idea/prettier.xml +0 -6
|
@@ -123,24 +123,25 @@ let UserSessionService = class UserSessionService {
|
|
|
123
123
|
.andWhere('urm.appcode = :appcode', { appcode })
|
|
124
124
|
.andWhere('app.show_in_ui = true')
|
|
125
125
|
.getOne();
|
|
126
|
-
if (!mapping
|
|
126
|
+
if (!mapping) {
|
|
127
|
+
throw new common_1.BadRequestException(`User does not have visible access to app ${appcode}`);
|
|
128
|
+
}
|
|
129
|
+
if (mapping.level_type !== 'BRN') {
|
|
127
130
|
return mapping;
|
|
128
131
|
}
|
|
129
132
|
const schoolRepo = this.reflectionHelper.getRepoService('SSOSchool');
|
|
130
133
|
const school = await schoolRepo.findOne({
|
|
131
|
-
where: {
|
|
132
|
-
brand_id: mapping.level_id,
|
|
133
|
-
},
|
|
134
|
+
where: { brand_id: mapping.level_id },
|
|
134
135
|
order: { id: 'ASC' },
|
|
135
136
|
});
|
|
136
|
-
if (school) {
|
|
137
|
-
|
|
138
|
-
...mapping,
|
|
139
|
-
level_type: 'SCH',
|
|
140
|
-
level_id: school.id,
|
|
141
|
-
};
|
|
137
|
+
if (!school) {
|
|
138
|
+
throw new common_1.BadRequestException(`No schools found under brand ${mapping.level_id}`);
|
|
142
139
|
}
|
|
143
|
-
return
|
|
140
|
+
return {
|
|
141
|
+
...mapping,
|
|
142
|
+
level_type: 'SCH',
|
|
143
|
+
level_id: school.id,
|
|
144
|
+
};
|
|
144
145
|
}
|
|
145
146
|
};
|
|
146
147
|
exports.UserSessionService = UserSessionService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-session.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user-session.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uEAA4D;AAC5D,0FAAkF;AAClF,2CAAiE;AACjE,iFAA6E;AAC7E,iEAAsE;AACtE,2CAA+C;AAE/C,qCAAiD;AACjD,iFAAqE;AACrE,uDAAiD;AACjD,6CAAmD;AACnD,gGAAoF;AAG7E,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B,YACmB,qBAA4C,EAC5C,cAA8B,EAC9B,iBAAoC,EAC7C,aAA4B,EAEnB,kBAAwC,EAExC,yBAAsD,EACtD,gBAAkC;QARlC,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,mBAAc,GAAd,cAAc,CAAgB;QAC9B,sBAAiB,GAAjB,iBAAiB,CAAmB;QAC7C,kBAAa,GAAb,aAAa,CAAe;QAEnB,uBAAkB,GAAlB,kBAAkB,CAAsB;QAExC,8BAAyB,GAAzB,yBAAyB,CAA6B;QACtD,qBAAgB,GAAhB,gBAAgB,CAAkB;IAClD,CAAC;IACJ,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,OAAgB,EAAE,UAAgB;QAC1D,MAAM,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAE/D,MAAM,WAAW,GAAQ,IAAI,iCAAW,EAAE,CAAC;QAC3C,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC;QAC9B,WAAW,CAAC,WAAW,GAAG,YAAY,CAAC;QACvC,WAAW,CAAC,oBAAoB,GAAG,CAAC,CAAC;QACrC,WAAW,CAAC,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;QAEpC,MAAM,kBAAkB,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QACvE,WAAW,CAAC,WAAW,GAAG,IAAI,IAAI,CAChC,IAAI,CAAC,GAAG,EAAE,GAAG,kBAAkB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CACjD,CAAC;QAEF,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAE1D,MAAM,OAAO,GAAQ;YACnB,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,YAAY;YACZ,OAAO;YACP,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC;QAGF,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,CAAC,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC;YAC3C,OAAO,CAAC,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;QACzC,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAE7D,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC;QACvC,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAE1D,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,UAAkB;QACvC,OAAO,MAAM,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;IACvE,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,WAAwB;QAC1C,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAC5D,CAAC;
|
|
1
|
+
{"version":3,"file":"user-session.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user-session.service.ts"],"names":[],"mappings":"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"}
|