@autofleet/zehut 1.7.3-alpha → 1.7.3-beta

package/lib/secret-getter.d.ts

@@ -1,3 +1,2 @@
-export declare const getAppSecret: (appId: any) => Promise<any>;
 export declare const getRefreshTokenSecret: (token?: any) => string;
 export declare const getTokenSecret: (token?: any) => string;

package/lib/secret-getter.js

@@ -1,40 +1,11 @@
 "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 __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());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTokenSecret = exports.getRefreshTokenSecret = exports.getAppSecret = void 0;
+exports.getTokenSecret = exports.getRefreshTokenSecret = void 0;
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const moment_1 = __importDefault(require("moment"));
-const identityNetwork = __importStar(require("./services"));
 const { DEPRECATED_JWT_SECRET, JWT_NEW_SECRET, DEPRECATED_REFRESH_JWT_SECRET, REFRESH_JWT_SECRET, DEPRECATION_UNIX_TIMESTAMP, } = process.env;
 const getRelevantSecret = (token, deprecatedSecret, newSecret) => {
     const deprecationTime = moment_1.default(parseInt(DEPRECATION_UNIX_TIMESTAMP, 10) * 1000);
@@ -53,9 +24,5 @@ const getRelevantSecret = (token, deprecatedSecret, newSecret) => {
         return newSecret;
     }
 };
-exports.getAppSecret = (appId) => __awaiter(void 0, void 0, void 0, function* () {
-    const app = yield identityNetwork.getAppSecret(appId);
-    return app.appSecret;
-});
 exports.getRefreshTokenSecret = (token) => getRelevantSecret(token, DEPRECATED_REFRESH_JWT_SECRET, REFRESH_JWT_SECRET);
 exports.getTokenSecret = (token) => getRelevantSecret(token, DEPRECATED_JWT_SECRET, JWT_NEW_SECRET);

package/lib/services.d.ts

@@ -1,2 +1,2 @@
 export declare const IdentityNetwork: any;
-export declare const getAppSecret: (appId: any) => Promise<any>;
+export declare const AutofleetApiNetwork: any;

package/lib/services.js

@@ -1,20 +1,12 @@
 "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());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAppSecret = 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',
@@ -24,7 +16,12 @@ exports.IdentityNetwork = new network_1.default({
         maxAge: CACHE_LIFETIME_IN_SEC * 1000,
     } : undefined,
 });
-exports.getAppSecret = (appId) => __awaiter(void 0, void 0, void 0, function* () {
-    const { data } = yield exports.IdentityNetwork.get(`/api/v1/apps/${appId}`);
-    return data;
+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");
@@ -54,12 +54,7 @@ exports.middlewareWithDecode = (options = {}) => (req, res, next) => __awaiter(v
     let decoded;
     if (req.headers.authorization) {
         try {
-            if (appId) {
-                decoded = yield utils_1.decodeAppBearer(req.headers.authorization, appId);
-            }
-            else {
-                decoded = utils_1.decodeBearer(req.headers.authorization);
-            }
+            decoded = utils_1.decodeBearer(req.headers.authorization);
         }
         catch (e) {
             if (e instanceof jsonwebtoken_1.TokenExpiredError) {
@@ -113,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,6 +1,5 @@
 export declare const getAuthFromBearer: (bearer: string) => string;
-export declare const decodeAppBearer: (bearer: string, appId: string) => Promise<any>;
-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

@@ -18,17 +18,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-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 });
-exports.getContextAttributes = exports.getEntitiesFromContext = exports.parsePermissions = exports.decodeBearer = exports.decodeAppBearer = exports.getAuthFromBearer = void 0;
+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");
@@ -39,15 +30,9 @@ const CONTEXT_MAP_PROPS = {
     demand: 'demandSources',
 };
 exports.getAuthFromBearer = (bearer) => bearer.replace('Bearer ', '');
-exports.decodeAppBearer = (bearer, appId) => __awaiter(void 0, void 0, void 0, function* () {
+exports.decodeBearer = (bearer, appSecret) => {
     const token = exports.getAuthFromBearer(bearer);
-    const secret = yield secret_getter_1.getAppSecret(appId);
-    const decoded = jwt.verify(token, secret);
-    return decoded;
-});
-exports.decodeBearer = (bearer) => {
-    const token = bearer.replace('Bearer ', '');
-    const decoded = jwt.verify(token, secret_getter_1.getTokenSecret(token));
+    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.3-alpha",
+  "version": "1.7.3-beta",
   "description": "manage user's identity",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",