@autofleet/zehut 1.7.3 → 1.7.5-beta.0

package/lib/user/ApiUser.d.ts

@@ -1,3 +1,4 @@
+declare type AccountType = 'client' | 'user' | 'service';
 interface EntityPermissions {
     [key: string]: string[];
 }
@@ -17,7 +18,8 @@ export default class ApiUser {
         [key: string]: any;
     };
     emptyUser: boolean;
-    constructor(id?: string);
+    accountType: AccountType | undefined;
+    constructor(id?: string, accountType?: AccountType);
     getUserPermissions(): Promise<UserPayload>;
     useCustomPermissionLoader(customPermissionLoader: any): Promise<UserPayload>;
     get businessModels(): string[] | undefined;

package/lib/user/ApiUser.js

@@ -17,10 +17,13 @@ const node_cache_1 = __importDefault(require("node-cache"));
 const services_1 = require("../services");
 const userCache = new node_cache_1.default({ stdTTL: 10 });
 class ApiUser {
-    constructor(id) {
+    constructor(id, accountType) {
         this.id = id;
         this.emptyUser = !!id;
         this.appPermission = {};
+        if (accountType) {
+            this.accountType = accountType;
+        }
     }
     getUserPermissions() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -31,6 +34,7 @@ class ApiUser {
                 return this.privatePermissions;
             }
             const { data } = yield services_1.IdentityNetwork.get(`/api/v1/users/${this.id}/authorization-payload`);
+            this.accountType = data.accountType;
             this.privatePermissions = data;
             return this.privatePermissions;
         });

package/lib/user/index.js

@@ -44,7 +44,7 @@ exports.middleware = (options = {}) => (req, res, next) => __awaiter(void 0, voi
     return next();
 });
 exports.middlewareWithDecode = (options = {}) => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
+    var _a, _b;
     const { eagerLoadUserPermissions, eagerLoadUserPermissionsLegacy, returnErrorIfNoToken, } = options;
     const trace = tracer_1.newTrace('userPayload');
     let decoded;
@@ -77,7 +77,7 @@ exports.middlewareWithDecode = (options = {}) => (req, res, next) => __awaiter(v
         if (userId) {
             req.headers['X-AF-USER-ID'] = userId;
         }
-        const userObject = new ApiUser_1.default(userId);
+        const userObject = new ApiUser_1.default(userId, (_b = decoded === null || decoded === void 0 ? void 0 : decoded.user) === null || _b === void 0 ? void 0 : _b.accountType);
         if (eagerLoadUserPermissions) {
             yield userObject.getUserPermissions();
         }

package/lib/utils.js

@@ -1,38 +1,22 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getContextAttributes = exports.getEntitiesFromContext = exports.parsePermissions = exports.decodeBearer = exports.getAuthFromBearer = void 0;
-/* eslint-disable prefer-destructuring */
-const jwt = __importStar(require("jsonwebtoken"));
-const secret_getter_1 = require("./secret-getter");
+const network_1 = __importDefault(require("@autofleet/network"));
 const CONTEXT_PROPS = ['fleetId', 'businessModelId', 'demandSourceId'];
 const CONTEXT_MAP_PROPS = {
     fleet: 'fleets',
     business: 'businessModels',
     demand: 'demandSources',
 };
+const integrationMsNetwork = new network_1.default({
+    serviceName: 'INTEGRATION_MS',
+});
 exports.getAuthFromBearer = (bearer) => bearer.replace('Bearer ', '');
 exports.decodeBearer = (bearer, appSecret) => {
-    const token = exports.getAuthFromBearer(bearer);
-    const decoded = jwt.verify(token, appSecret || secret_getter_1.getTokenSecret(token));
+    const decoded = yield integrationMsNetwork;
     return decoded;
 };
 exports.parsePermissions = (contextId, decodedToken) => {

package/package.json

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