@autofleet/zehut 3.0.10-beta1 → 3.0.11-beta.1

package/lib/index.d.ts

@@ -4,7 +4,6 @@ import { newTrace, traceTypes } from './tracer';
 import { checkFleetPermission, checkBusinessModelPermission, checkDemandSourcePermission, isUserExist, getUser } from './check-permission';
 import { UnauthorizedAccessError } from './errors';
 import { getRefreshTokenSecret, getTokenSecret } from './secret-getter';
-export declare const headersTracer: typeof outbreak.default;
 declare const getCurrentPayload: () => import("./tracer").Trace | {
     [x: string]: never;
 };

package/lib/index.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.outbreak = exports.createOrSetRabbitTrace = exports.appMiddleware = exports.UnauthorizedAccessError = exports.getTokenSecret = exports.getRefreshTokenSecret = exports.getUser = exports.isUserExist = exports.checkDemandSourcePermission = exports.checkBusinessModelPermission = exports.checkFleetPermission = exports.getDecodedBearer = exports.getCurrentPayload = exports.eagerLoadPermissionsMiddleware = exports.middlewareWithDecode = exports.middleware = exports.User = exports.enableTracing = exports.newTrace = exports.traceTypes = exports.headersTracer = void 0;
+exports.outbreak = exports.createOrSetRabbitTrace = exports.appMiddleware = exports.UnauthorizedAccessError = exports.getTokenSecret = exports.getRefreshTokenSecret = exports.getUser = exports.isUserExist = exports.checkDemandSourcePermission = exports.checkBusinessModelPermission = exports.checkFleetPermission = exports.getDecodedBearer = exports.getCurrentPayload = exports.eagerLoadPermissionsMiddleware = exports.middlewareWithDecode = exports.middleware = exports.User = exports.enableTracing = exports.newTrace = exports.traceTypes = void 0;
 const outbreak = __importStar(require("@autofleet/outbreak"));
 exports.outbreak = outbreak;
 const user_1 = __importStar(require("./user"));
@@ -48,11 +48,11 @@ Object.defineProperty(exports, "UnauthorizedAccessError", { enumerable: true, ge
 const secret_getter_1 = require("./secret-getter");
 Object.defineProperty(exports, "getRefreshTokenSecret", { enumerable: true, get: function () { return secret_getter_1.getRefreshTokenSecret; } });
 Object.defineProperty(exports, "getTokenSecret", { enumerable: true, get: function () { return secret_getter_1.getTokenSecret; } });
-exports.headersTracer = outbreak.default;
+const headersTracer = outbreak.default;
 const getCurrentPayload = tracer_1.getCurrentTrace;
 exports.getCurrentPayload = getCurrentPayload;
 const enableTracing = ({ outbreakOptions = {} } = {}) => {
-    (0, exports.headersTracer)({
+    headersTracer({
         headersPrefix: 'x-af',
         ...outbreakOptions,
     });

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[];
 }

package/lib/user/index.js

@@ -33,19 +33,15 @@ const tracer_1 = require("../tracer");
 const app_auth_1 = require("../app-auth");
 const appDoesNotExist_1 = __importDefault(require("../exceptions/appDoesNotExist"));
 const utils_1 = require("../utils");
-const check_permission_1 = require("../check-permission");
+const IDENTITY_MS = 'identity-ms';
+const ANONYMOUS_USER = 'anonymous';
 const middleware = (options = {}) => async (req, res, next) => {
     try {
+        const originHeader = req.headers['X-IAF-ORIGIN-SERVICE'] || req.headers['x-iaf-origin-service'] || '';
+        if (originHeader.toLowerCase() === IDENTITY_MS) {
+            return next();
+        }
         const { eagerLoadUserPermissions, eagerLoadUserPermissionsLegacy, customPermissionLoader, } = options;
-        const user = (0, check_permission_1.getUser)();
-        console.log('SEPHI vehicle ms user', { user });
-        const headers = Object.fromEntries(Object.entries(req.headers).map(([header, val]) => {
-            if (header.includes('x-')) {
-                return [header, val];
-            }
-            return null;
-        }).filter(Boolean));
-        console.log('SEPHI headers', { headers, originalHeaders: Object.keys(req.headers) });
         const userId = req.headers['x-af-user-id'];
         const trace = (0, tracer_1.newTrace)('userPayload');
         if (!userId) {
@@ -55,17 +51,19 @@ const middleware = (options = {}) => async (req, res, next) => {
             ? JSON.parse(req.headers[ApiUser_1.ELEVATED_PERMISSIONS_HEADER])
             : {};
         const userObject = new ApiUser_1.default(userId, 'user', elevatedPermissionsFromHeader);
-        if (eagerLoadUserPermissions && req.headers['x-iaf-origin-service'] !== 'driver-gateway-ms') {
-            if (customPermissionLoader) {
-                await userObject.useCustomPermissionLoader(customPermissionLoader);
+        if (userId !== ANONYMOUS_USER) {
+            if (eagerLoadUserPermissions) {
+                if (customPermissionLoader) {
+                    await userObject.useCustomPermissionLoader(customPermissionLoader);
+                }
+                else {
+                    await userObject.getUserPermissions();
+                }
             }
-            else {
-                await userObject.getUserPermissions();
+            if (eagerLoadUserPermissionsLegacy) {
+                await userObject.getUserPermissionsLegacy();
             }
         }
-        if (eagerLoadUserPermissionsLegacy) {
-            await userObject.getUserPermissionsLegacy();
-        }
         req.user = userObject;
         trace.context.set('userObject', userObject);
         // Added in order to support outbreak.

package/package.json

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