@autofleet/zehut 3.1.0-beta.0 → 3.1.0-beta.1

package/lib/user/ApiUser.d.ts

@@ -3,6 +3,7 @@ interface EntityPermissions {
     [key: string]: string[];
 }
 export declare const ELEVATED_PERMISSIONS_HEADER = "x-af-elevated-permissions";
+export declare const CONTEXTS_IDS_HEADER = "x-af-context-ids";
 export interface UserPayload {
     businessModels: EntityPermissions;
     fleets: EntityPermissions;
@@ -20,15 +21,9 @@ export interface PartialUserPayload {
     drivers?: EntityPermissions;
     businessAccounts?: EntityPermissions;
 }
-export interface AuthorizationFilters {
-    businessModelId?: string;
-    fleetId?: string;
-    demandSourceId?: string;
-}
 export type CustomPermissionLoader = (string: any) => Promise<UserPayload>;
 export default class ApiUser {
     id: string | undefined;
-    authorizationFilters: AuthorizationFilters;
     privatePermissions: UserPayload | undefined;
     privateElevatedPermissionsHash: Map<string, PartialUserPayload | undefined>;
     privatePermissionsLegacy: any;
@@ -37,7 +32,8 @@ export default class ApiUser {
     };
     emptyUser: boolean;
     accountType: AccountType | undefined;
-    constructor(id?: string, accountType?: AccountType, elevatedPermissions?: PartialUserPayload, authorizationFilters?: AuthorizationFilters);
+    contextIds?: string[];
+    constructor(id?: string, accountType?: AccountType, elevatedPermissions?: PartialUserPayload, contextIds?: string[]);
     getUserPermissions(): Promise<UserPayload>;
     useCustomPermissionLoader(customPermissionLoader: any): Promise<UserPayload>;
     get businessModels(): string[] | undefined;

package/lib/user/ApiUser.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ELEVATED_PERMISSIONS_HEADER = void 0;
+exports.CONTEXTS_IDS_HEADER = exports.ELEVATED_PERMISSIONS_HEADER = void 0;
 /* eslint-disable consistent-return */
 const node_cache_1 = __importDefault(require("node-cache"));
 const object_hash_1 = __importDefault(require("object-hash"));
@@ -12,14 +12,15 @@ const uuid_1 = require("uuid");
 const outbreak_1 = require("@autofleet/outbreak");
 const services_1 = require("../services");
 exports.ELEVATED_PERMISSIONS_HEADER = 'x-af-elevated-permissions';
+exports.CONTEXTS_IDS_HEADER = 'x-af-context-ids';
 const userCache = new node_cache_1.default({ stdTTL: 10 });
 class ApiUser {
-    constructor(id, accountType, elevatedPermissions, authorizationFilters = {}) {
+    constructor(id, accountType, elevatedPermissions, contextIds) {
         this.id = id;
-        this.authorizationFilters = authorizationFilters;
         this.emptyUser = !!id;
         this.appPermission = {};
         this.privateElevatedPermissionsHash = new Map();
+        this.contextIds = contextIds;
         if (elevatedPermissions) {
             this.privateElevatedPermissionsHash.set('initial', elevatedPermissions);
         }
@@ -36,11 +37,11 @@ class ApiUser {
         }
         const cacheKey = (0, object_hash_1.default)({
             id: this.id,
-            authorizationFilters: this.authorizationFilters,
+            contextIds: this.contextIds,
         });
         let data = userCache.get(cacheKey);
         if (!data) {
-            ({ data } = await services_1.IdentityNetwork.get(`/api/v1/users/${this.id}/authorization-payload`, this.authorizationFilters));
+            ({ data } = await services_1.IdentityNetwork.get(`/api/v1/users/${this.id}/authorization-payload`, { contextIds: this.contextIds }));
             userCache.set(cacheKey, data);
         }
         this.accountType = data.accountType;

package/lib/user/index.js

@@ -42,7 +42,7 @@ const middleware = (options = {}) => async (req, res, next) => {
         }
         const { eagerLoadUserPermissions, eagerLoadUserPermissionsLegacy, customPermissionLoader, } = options;
         const userId = req.headers['x-af-user-id'];
-        const { fleetId, businessModelId, demandSourceId, } = req.query;
+        const contextIds = req.headers?.['x-af-contexts-ids']?.split(',');
         const trace = (0, tracer_1.newTrace)('userPayload');
         if (!userId) {
             return next();
@@ -50,11 +50,7 @@ const middleware = (options = {}) => async (req, res, 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, {
-            fleetId,
-            businessModelId,
-            demandSourceId,
-        });
+        const userObject = new ApiUser_1.default(userId, 'user', elevatedPermissionsFromHeader, contextIds);
         if (eagerLoadUserPermissions) {
             if (customPermissionLoader) {
                 await userObject.useCustomPermissionLoader(customPermissionLoader);
@@ -113,12 +109,8 @@ const middlewareWithDecode = (options = {}) => async (req, res, next) => {
         if (userId) {
             req.headers['X-AF-USER-ID'] = userId;
         }
-        const { fleetId, businessModelId, demandSourceId, } = req.query;
-        const userObject = new ApiUser_1.default(userId, decoded?.user?.accountType, undefined, {
-            fleetId,
-            businessModelId,
-            demandSourceId,
-        });
+        const contextIds = req.headers?.['x-af-contexts-ids']?.split(',');
+        const userObject = new ApiUser_1.default(userId, decoded?.user?.accountType, undefined, contextIds);
         if (eagerLoadUserPermissions) {
             await userObject.getUserPermissions();
         }

package/package.json

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