@autofleet/zehut 1.7.0-beta1 → 1.7.0-beta3

package/lib/user/ApiUser.d.ts

@@ -16,7 +16,7 @@ export default class ApiUser {
     emptyUser: boolean;
     constructor(id?: string);
     getUserPermissions(): Promise<UserPayload>;
-    useCustomPermissionLoader(customPermissionLoader: any): Promise<unknown>;
+    useCustomPermissionLoader(customPermissionLoader: any): Promise<UserPayload>;
     get businessModels(): string[] | undefined;
     get fleets(): string[] | undefined;
     get demandSources(): string[] | undefined;

package/lib/user/ApiUser.js

@@ -44,6 +44,7 @@ class ApiUser {
             }
             const cachedResult = userCache.get(this.id);
             if (cachedResult) {
+                this.privatePermissions = cachedResult;
                 return cachedResult;
             }
             const data = yield customPermissionLoader(this.id);

package/lib/user/index.js

@@ -33,9 +33,6 @@ exports.middleware = (options = {}) => (req, res, next) => __awaiter(void 0, voi
             yield userObject.getUserPermissions();
         }
     }
-    if (options.eagerLoadUserPermissions) {
-        yield userObject.getUserPermissions();
-    }
     if (options.eagerLoadUserPermissionsLegacy) {
         yield userObject.getUserPermissionsLegacy();
     }

package/package.json

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

package/lib/user/api-user.d.ts

@@ -1,25 +0,0 @@
-interface EntityPermissions {
-    [key: string]: string[];
-}
-export interface UserPayload {
-    businessModels: EntityPermissions;
-    fleets: EntityPermissions;
-    demandSources: EntityPermissions;
-    createdAt?: string;
-}
-export default class ApiUser {
-    id: string | undefined;
-    privatePermissions: UserPayload | undefined;
-    privatePermissionsLegacy: any;
-    emptyUser: boolean;
-    constructor(id?: string);
-    getUserPermissions(): Promise<UserPayload>;
-    get businessModels(): string[] | undefined;
-    get fleets(): string[] | undefined;
-    get demandSources(): string[] | undefined;
-    getUserProperty(key: any): string[] | undefined;
-    get permissions(): UserPayload | undefined;
-    getUserPermissionsLegacy(): Promise<any>;
-    get permissionsLegacy(): any;
-}
-export {};

package/lib/user/api-user.js

@@ -1,73 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-/* eslint-disable consistent-return */
-const services_1 = require("../services");
-class ApiUser {
-    constructor(id) {
-        this.id = id;
-        this.emptyUser = !!id;
-    }
-    getUserPermissions() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.id) {
-                return;
-            }
-            if (this.privatePermissions) {
-                return this.privatePermissions;
-            }
-            const { data } = yield services_1.IdentityNetwork.get(`/api/v1/users/${this.id}/authorization-payload`);
-            this.privatePermissions = data;
-            return this.privatePermissions;
-        });
-    }
-    get businessModels() {
-        return this.getUserProperty('businessModels');
-    }
-    get fleets() {
-        return this.getUserProperty('fleets');
-    }
-    get demandSources() {
-        return this.getUserProperty('demandSources');
-    }
-    getUserProperty(key) {
-        if (!this.privatePermissions) {
-            throw new Error(`Cannot get ${key} without calling (async) getUserPermissions before`);
-        }
-        return Object.keys(this.privatePermissions[key] || {});
-    }
-    get permissions() {
-        if (!this.privatePermissions) {
-            throw new Error('Cannot get permissions without calling (async) getUserPermissions before');
-        }
-        return this.privatePermissions;
-    }
-    getUserPermissionsLegacy() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.id) {
-                return;
-            }
-            if (this.privatePermissionsLegacy) {
-                return this.privatePermissionsLegacy;
-            }
-            const { data } = yield services_1.IdentityNetwork.get(`/api/v1/users/${this.id}/authorization-payload-legacy`);
-            this.privatePermissionsLegacy = data;
-            return this.privatePermissionsLegacy;
-        });
-    }
-    get permissionsLegacy() {
-        if (!this.privatePermissionsLegacy) {
-            throw new Error('Cannot get permissionsLegacy without calling (async) getUserPermissionsLegacy before');
-        }
-        return this.privatePermissionsLegacy;
-    }
-}
-exports.default = ApiUser;