@autofleet/zehut 3.0.10-beta-3 → 3.0.10-beta-5
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/lib/user/index.js +4 -7
- package/package.json +1 -1
package/lib/user/index.js
CHANGED
|
@@ -37,26 +37,23 @@ const middleware = (options = {}) => async (req, res, next) => {
|
|
|
37
37
|
try {
|
|
38
38
|
const { eagerLoadUserPermissions, eagerLoadUserPermissionsLegacy, customPermissionLoader, } = options;
|
|
39
39
|
const userId = req.headers['x-af-user-id'];
|
|
40
|
-
const driverId = req.headers['x-af-driver-id'];
|
|
41
40
|
const trace = (0, tracer_1.newTrace)('userPayload');
|
|
42
|
-
|
|
43
|
-
if (!(userId || driverId)) {
|
|
41
|
+
if (!userId) {
|
|
44
42
|
return next();
|
|
45
43
|
}
|
|
46
44
|
const elevatedPermissionsFromHeader = req.headers[ApiUser_1.ELEVATED_PERMISSIONS_HEADER] && req.headers[ApiUser_1.ELEVATED_PERMISSIONS_HEADER].length > 0
|
|
47
45
|
? JSON.parse(req.headers[ApiUser_1.ELEVATED_PERMISSIONS_HEADER])
|
|
48
46
|
: {};
|
|
49
|
-
const userObject = new ApiUser_1.default(userId
|
|
50
|
-
console.log(`user object ${userObject?.id}`);
|
|
47
|
+
const userObject = new ApiUser_1.default(userId, 'user', elevatedPermissionsFromHeader);
|
|
51
48
|
if (eagerLoadUserPermissions) {
|
|
52
49
|
if (customPermissionLoader) {
|
|
53
50
|
await userObject.useCustomPermissionLoader(customPermissionLoader);
|
|
54
51
|
}
|
|
55
|
-
else
|
|
52
|
+
else {
|
|
56
53
|
await userObject.getUserPermissions();
|
|
57
54
|
}
|
|
58
55
|
}
|
|
59
|
-
if (eagerLoadUserPermissionsLegacy
|
|
56
|
+
if (eagerLoadUserPermissionsLegacy) {
|
|
60
57
|
await userObject.getUserPermissionsLegacy();
|
|
61
58
|
}
|
|
62
59
|
req.user = userObject;
|