@autofleet/zehut 1.7.2 → 1.7.3-beta

package/lib/services.d.ts

@@ -1 +1,2 @@
 export declare const IdentityNetwork: any;
+export declare const AutofleetApiNetwork: any;

package/lib/services.js

@@ -3,9 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IdentityNetwork = void 0;
+exports.AutofleetApiNetwork = exports.IdentityNetwork = void 0;
 const network_1 = __importDefault(require("@autofleet/network"));
 const CACHE_LIFETIME_IN_SEC = 10;
+const apiGwUrl = process.env.API_GATEWAY_URL || 'https://api.autofleet.io';
 // eslint-disable-next-line import/prefer-default-export
 exports.IdentityNetwork = new network_1.default({
     serviceName: 'IDENTITY_MS',
@@ -15,3 +16,12 @@ exports.IdentityNetwork = new network_1.default({
         maxAge: CACHE_LIFETIME_IN_SEC * 1000,
     } : undefined,
 });
+exports.AutofleetApiNetwork = new network_1.default({
+    baseURL: apiGwUrl,
+    serviceUrl: apiGwUrl,
+    retries: 3,
+    retryCondition: () => true,
+    cache: process.env.NODE_ENV !== 'test' ? {
+        maxAge: CACHE_LIFETIME_IN_SEC * 1000,
+    } : undefined,
+});

package/lib/user/ApiUser.js

@@ -96,7 +96,7 @@ class ApiUser {
     }
     getUserAppPermissions(appId) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.id) {
+            if (!this.id || appId) {
                 return;
             }
             const currentAppPermission = this.appPermission[appId];
@@ -108,7 +108,7 @@ class ApiUser {
                 this.appPermission[appId] = cachedResult;
                 return cachedResult;
             }
-            const { data } = yield services_1.IdentityNetwork.post(`/api/v1/apps/${appId}/get-user-payload`, {
+            const { data } = yield services_1.AutofleetApiNetwork.post(`/api/v1/apps/${appId}/get-user-payload`, {
                 userId: this.id,
             });
             userCache.set(this.id, data);

package/lib/user/index.d.ts

@@ -13,6 +13,11 @@ export declare const middlewareWithDecode: (options?: {
     clientSecret?: string;
     returnErrorIfNoToken?: boolean;
 }) => (req: any, res: any, next: any) => Promise<void>;
+export declare const appMiddleware: (options: {
+    appId: string;
+    clientSecret: string;
+    appSecret: string;
+}) => (req: any, res: any, next: any) => Promise<void>;
 export declare const eagerLoadPermissionsMiddleware: (req: any, res: any, next: any) => Promise<any>;
 export declare const getDecodedBearer: (req: any) => any;
 export default ApiUser;

package/lib/user/index.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDecodedBearer = exports.eagerLoadPermissionsMiddleware = exports.middlewareWithDecode = exports.middleware = void 0;
+exports.getDecodedBearer = exports.eagerLoadPermissionsMiddleware = exports.appMiddleware = exports.middlewareWithDecode = exports.middleware = void 0;
 const jsonwebtoken_1 = require("jsonwebtoken");
 const ApiUser_1 = __importDefault(require("./ApiUser"));
 const utils_1 = require("../utils");
@@ -108,6 +108,54 @@ exports.middlewareWithDecode = (options = {}) => (req, res, next) => __awaiter(v
     // eslint-disable-next-line consistent-return
     return next();
 });
+exports.appMiddleware = (options) => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
+    var _b;
+    const { appId, clientSecret, appSecret, } = options;
+    const trace = tracer_1.newTrace('userPayload');
+    let decoded;
+    if (!req.headers.authorization) {
+        res.status(401);
+        return res.json({
+            errors: ['No token provided'],
+        });
+    }
+    try {
+        decoded = utils_1.decodeBearer(req.headers.authorization, appSecret);
+    }
+    catch (e) {
+        if (e instanceof jsonwebtoken_1.TokenExpiredError) {
+            res.status(401);
+            return res.json({
+                errors: ['Access token expired'],
+            });
+        }
+        if (e instanceof jsonwebtoken_1.JsonWebTokenError) {
+            res.status(400);
+            return res.json({
+                errors: [e.message],
+            });
+        }
+        res.status(500);
+        return res.json({
+            errors: ['Server error while parsing token'],
+        });
+    }
+    const userId = (_b = decoded === null || decoded === void 0 ? void 0 : decoded.user) === null || _b === void 0 ? void 0 : _b.id;
+    if (userId) {
+        req.headers['X-AF-USER-ID'] = userId;
+    }
+    const userObject = new ApiUser_1.default(userId);
+    if (appId && clientSecret) {
+        req.headers['x-autofleet-apps-secret'] = clientSecret;
+        // Won't work until we find a better solution for identity ms
+        yield userObject.getUserAppPermissions(appId);
+    }
+    req.user = userObject;
+    trace.context.set('userObject', userObject);
+    // Added in order to support outbreak.
+    req.headers['x-af-user-permissions'] = userObject;
+    return next();
+});
 exports.eagerLoadPermissionsMiddleware = (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
     yield req.user.getUserPermissions();
     return next();

package/lib/utils.d.ts

@@ -1,5 +1,5 @@
 export declare const getAuthFromBearer: (bearer: string) => string;
-export declare const decodeBearer: (bearer: string) => any;
+export declare const decodeBearer: (bearer: string, appSecret?: string) => any;
 export declare const parsePermissions: (contextId: any, decodedToken: any) => any;
 export declare const getEntitiesFromContext: (contextId: string, decodedToken: any) => any;
 export declare const getContextAttributes: (contextId: string, decodedToken: any) => any;

package/lib/utils.js

@@ -30,9 +30,9 @@ const CONTEXT_MAP_PROPS = {
     demand: 'demandSources',
 };
 exports.getAuthFromBearer = (bearer) => bearer.replace('Bearer ', '');
-exports.decodeBearer = (bearer) => {
-    const token = bearer.replace('Bearer ', '');
-    const decoded = jwt.verify(token, secret_getter_1.getTokenSecret(token));
+exports.decodeBearer = (bearer, appSecret) => {
+    const token = exports.getAuthFromBearer(bearer);
+    const decoded = jwt.verify(token, appSecret || secret_getter_1.getTokenSecret(token));
     return decoded;
 };
 exports.parsePermissions = (contextId, decodedToken) => {

package/package.json

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