@autofleet/zehut 3.0.8 → 3.0.10-beta-2

package/lib/user/ApiUser.d.ts

@@ -1,4 +1,4 @@
-export type AccountType = 'client' | 'user' | 'service';
+export type AccountType = 'client' | 'user' | 'service' | 'driver';
 interface EntityPermissions {
     [key: string]: string[];
 }
@@ -7,6 +7,7 @@ export interface UserPayload {
     businessModels: EntityPermissions;
     fleets: EntityPermissions;
     demandSources: EntityPermissions;
+    businessAccounts?: EntityPermissions;
     accountType?: AccountType;
     contexts?: EntityPermissions;
     createdAt?: string;
@@ -17,6 +18,7 @@ export interface PartialUserPayload {
     demandSources?: EntityPermissions;
     vehicles?: EntityPermissions;
     drivers?: EntityPermissions;
+    businessAccounts?: EntityPermissions;
 }
 export type CustomPermissionLoader = (string: any) => Promise<UserPayload>;
 export default class ApiUser {

package/lib/user/index.js

@@ -37,23 +37,24 @@ const middleware = (options = {}) => async (req, res, next) => {
     try {
         const { eagerLoadUserPermissions, eagerLoadUserPermissionsLegacy, customPermissionLoader, } = options;
         const userId = req.headers['x-af-user-id'];
+        const driverId = req.headers['x-af-driver-id'];
         const trace = (0, tracer_1.newTrace)('userPayload');
-        if (!userId) {
+        if (!(userId || driverId)) {
             return next();
         }
         const elevatedPermissionsFromHeader = req.headers[ApiUser_1.ELEVATED_PERMISSIONS_HEADER] && req.headers[ApiUser_1.ELEVATED_PERMISSIONS_HEADER].length > 0
             ? JSON.parse(req.headers[ApiUser_1.ELEVATED_PERMISSIONS_HEADER])
             : {};
-        const userObject = new ApiUser_1.default(userId, 'user', elevatedPermissionsFromHeader);
+        const userObject = new ApiUser_1.default(userId || driverId, userId ? 'user' : 'driver', elevatedPermissionsFromHeader);
         if (eagerLoadUserPermissions) {
             if (customPermissionLoader) {
                 await userObject.useCustomPermissionLoader(customPermissionLoader);
             }
-            else {
+            else if (userId) {
                 await userObject.getUserPermissions();
             }
         }
-        if (eagerLoadUserPermissionsLegacy) {
+        if (eagerLoadUserPermissionsLegacy && userId) {
             await userObject.getUserPermissionsLegacy();
         }
         req.user = userObject;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/zehut",
-  "version": "3.0.8",
+  "version": "3.0.10-beta-2",
   "description": "manage user's identity",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",