eservices-back-core 2.0.6 → 2.0.7
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAYhC;;;;;;GAMG;8BACwB,OAAO;AAAlC,
|
|
1
|
+
{"version":3,"file":"user-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAYhC;;;;;;GAMG;8BACwB,OAAO;AAAlC,wBA+DC"}
|
|
@@ -35,23 +35,37 @@ exports.default = (req, _res, next) => __awaiter(void 0, void 0, void 0, functio
|
|
|
35
35
|
const externalId = (0, get_auth_state_form_request_1.getAuthStateFormRequest)(req).claims.sub;
|
|
36
36
|
debug('Using externalID %s', externalId);
|
|
37
37
|
const dataService = new data_service_1.default(req.infoAccessToken);
|
|
38
|
-
|
|
38
|
+
let result = yield dataService.getList("User", {
|
|
39
39
|
filter: (0, index_1.Filter)({
|
|
40
|
-
'
|
|
40
|
+
'ExternalId': externalId
|
|
41
41
|
}),
|
|
42
|
-
fields: "
|
|
42
|
+
fields: "Id"
|
|
43
43
|
});
|
|
44
44
|
// Создание нового пользователя.
|
|
45
45
|
if (result.length === 0) {
|
|
46
46
|
debug('User not founded. Start process register.');
|
|
47
47
|
const userManagerService = new user_manager_service_1.default(req.infoAccessToken);
|
|
48
48
|
const resultRegisterUser = yield userManagerService.registerUser();
|
|
49
|
+
result = yield dataService.getList("User", {
|
|
50
|
+
filter: (0, index_1.Filter)({
|
|
51
|
+
'ExternalId': externalId
|
|
52
|
+
}),
|
|
53
|
+
fields: "Id"
|
|
54
|
+
});
|
|
49
55
|
}
|
|
50
56
|
else {
|
|
51
57
|
debug('User data %O', result);
|
|
52
58
|
}
|
|
53
|
-
req.infoUserId = result[0].
|
|
54
|
-
|
|
59
|
+
req.infoUserId = result[0].Id;
|
|
60
|
+
if (index_1.Server.instance.type === 'front') {
|
|
61
|
+
const personUserData = yield dataService.getList("PersonUser", {
|
|
62
|
+
filter: (0, index_1.Filter)({
|
|
63
|
+
'User.ExternalId': externalId
|
|
64
|
+
}),
|
|
65
|
+
fields: "PersonId"
|
|
66
|
+
});
|
|
67
|
+
req.infoPersonId = personUserData[0].PersonId;
|
|
68
|
+
}
|
|
55
69
|
req.infoCurrentContextId = (0, get_current_context_from_request_1.default)(req);
|
|
56
70
|
next();
|
|
57
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-middleware.js","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,iHAAqF;AAErF,kDAAgC;AAChC,+CAAoD;AACpD,oCAA0C;AAC1C,qDAA4C;AAC5C,4EAAmD;AACnD,4FAAkE;AAClE,qFAA4E;AAC5E,
|
|
1
|
+
{"version":3,"file":"user-middleware.js","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,iHAAqF;AAErF,kDAAgC;AAChC,+CAAoD;AACpD,oCAA0C;AAC1C,qDAA4C;AAC5C,4EAAmD;AACnD,4FAAkE;AAClE,qFAA4E;AAC5E,oCAAwC;AAExC,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,IAAA,wBAAgB,EAAC,WAAW,CAAC,CAAC,CAAA;AAExD;;;;;;GAMG;AACH,kBAAe,CAAO,GAAY,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;IAEjD,IAAI,CAAC;QACJ,GAAG,CAAC,eAAe,GAAG,IAAA,6BAAkB,EAAC,GAAG,CAAC,CAAC;QAC9C,MAAM,UAAU,GAAG,IAAA,qDAAuB,EAAC,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;QAE3D,KAAK,CAAC,qBAAqB,EAAE,UAAU,CAAC,CAAC;QAEzC,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QACzD,IAAI,MAAM,GAAG,MAAM,WAAW,CAAC,OAAO,CAEnC,MAAM,EAAE;YACV,MAAM,EAAE,IAAA,cAAM,EAAC;gBACd,YAAY,EAAE,UAAU;aACxB,CAAC;YACF,MAAM,EAAE,IAAI;SACZ,CAAC,CAAA;QAGF,gCAAgC;QAChC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,KAAK,CAAC,2CAA2C,CAAC,CAAC;YACnD,MAAM,kBAAkB,GAAG,IAAI,8BAAkB,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;YACvE,MAAM,kBAAkB,GAAG,MAAM,kBAAkB,CAAC,YAAY,EAAE,CAAC;YACnE,MAAM,GAAG,MAAM,WAAW,CAAC,OAAO,CAE/B,MAAM,EAAE;gBACV,MAAM,EAAE,IAAA,cAAM,EAAC;oBACd,YAAY,EAAE,UAAU;iBACxB,CAAC;gBACF,MAAM,EAAE,IAAI;aACZ,CAAC,CAAA;QAEH,CAAC;aACI,CAAC;YACL,KAAK,CAAC,cAAc,EAAE,MAAM,CAAC,CAAA;QAC9B,CAAC;QAID,GAAG,CAAC,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9B,IAAI,cAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACtC,MAAM,cAAc,GAAG,MAAM,WAAW,CAAC,OAAO,CAE7C,YAAY,EAAE;gBAChB,MAAM,EAAE,IAAA,cAAM,EAAC;oBACd,iBAAiB,EAAE,UAAU;iBAC7B,CAAC;gBACF,MAAM,EAAE,UAAU;aAClB,CAAC,CAAA;YACF,GAAG,CAAC,YAAY,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC/C,CAAC;QAGD,GAAG,CAAC,oBAAoB,GAAG,IAAA,0CAA4B,EAAC,GAAG,CAAC,CAAC;QAC7D,IAAI,EAAE,CAAC;IACR,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACZ,KAAK,CAAC,mCAAmC,EAAE,CAAC,CAAC,CAAC;QAC9C,mBAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAChB,GAAG,CAAC,UAAU,GAAG,IAAI,CAAC;QACtB,GAAG,CAAC,eAAe,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,CAAC,CAAC,CAAC;IACT,CAAC;AACF,CAAC,CAAA,CAAA"}
|