@flink-app/jwt-auth-plugin 0.12.1-alpha.33 → 0.12.1-alpha.35

package/dist/FlinkJwtAuthPlugin.d.ts

@@ -3,7 +3,7 @@ import jwtSimple from "jwt-simple";
 export interface JwtAuthPluginOptions {
     secret: string;
     algo?: jwtSimple.TAlgorithm;
-    getUser: (tokenData: any) => Promise<FlinkAuthUser>;
+    getUser: (tokenData: any) => Promise<FlinkAuthUser | null | undefined>;
     passwordPolicy?: RegExp;
     tokenTTL?: number;
     rolePermissions: {

package/dist/FlinkJwtAuthPlugin.js

@@ -76,12 +76,8 @@ function jwtAuthPlugin(_a) {
                     })];
             });
         }); },
-        createToken: function (payload, roles) {
-            return createToken(__assign(__assign({}, payload), { roles: roles }), { algo: algo, secret: secret, tokenTTL: tokenTTL });
-        },
-        createPasswordHashAndSalt: function (password) {
-            return createPasswordHashAndSalt(password, passwordPolicy);
-        },
+        createToken: function (payload, roles) { return createToken(__assign(__assign({}, payload), { roles: roles }), { algo: algo, secret: secret, tokenTTL: tokenTTL }); },
+        createPasswordHashAndSalt: function (password) { return createPasswordHashAndSalt(password, passwordPolicy); },
         validatePassword: validatePassword,
     };
 }
@@ -100,13 +96,11 @@ function authenticateRequest(req_1, routePermissions_1, rolePermissions_1, _a) {
                         decodedToken = jwt_simple_1.default.decode(token, secret, false, algo);
                     }
                     catch (err) {
-                        flink_1.log.debug("Failed to decode token: ".concat(err));
+                        flink_1.log.debug("[JWT AUTH PLUGIN] Failed to decode token: ".concat(err));
                         decodedToken = null;
                     }
                     if (!decodedToken) return [3 /*break*/, 2];
-                    permissionsArr = Array.isArray(routePermissions)
-                        ? routePermissions
-                        : [routePermissions];
+                    permissionsArr = Array.isArray(routePermissions) ? routePermissions : [routePermissions];
                     if (permissionsArr && permissionsArr.length > 0) {
                         validPerms = (0, PermissionValidator_1.hasValidPermissions)(decodedToken.roles || [], rolePermissions, permissionsArr);
                         if (!validPerms) {
@@ -116,6 +110,10 @@ function authenticateRequest(req_1, routePermissions_1, rolePermissions_1, _a) {
                     return [4 /*yield*/, getUser(decodedToken)];
                 case 1:
                     user = _c.sent();
+                    if (!user) {
+                        flink_1.log.debug("[JWT AUTH PLUGIN] User not returned from getUser callback");
+                        return [2 /*return*/, false];
+                    }
                     req.user = user;
                     return [2 /*return*/, true];
                 case 2: return [2 /*return*/, false];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flink-app/jwt-auth-plugin",
-    "version": "0.12.1-alpha.33",
+    "version": "0.12.1-alpha.35",
     "description": "Flink plugin for JWT auth",
     "scripts": {
         "test": "node --preserve-symlinks -r ts-node/register -- node_modules/jasmine/bin/jasmine --config=./spec/support/jasmine.json",
@@ -20,7 +20,7 @@
         "jwt-simple": "^0.5.6"
     },
     "devDependencies": {
-        "@flink-app/flink": "^0.12.1-alpha.23",
+        "@flink-app/flink": "^0.12.1-alpha.35",
         "@types/bcrypt": "^5.0.0",
         "@types/jasmine": "^3.7.1",
         "@types/node": "22.13.10",
@@ -31,5 +31,5 @@
         "tsc-watch": "^4.2.9",
         "typescript": "5.4.5"
     },
-    "gitHead": "eec3a22c21db0e7fec84190bf7a74c1e430e5ec4"
+    "gitHead": "f8e8c6565a9ca1dd3e5fdb4c2a791c99ae3ba51a"
 }

package/src/FlinkJwtAuthPlugin.ts

@@ -1,9 +1,4 @@
-import {
-  FlinkAuthPlugin,
-  FlinkAuthUser,
-  FlinkRequest,
-  log,
-} from "@flink-app/flink";
+import { FlinkAuthPlugin, FlinkAuthUser, FlinkRequest, log } from "@flink-app/flink";
 import jwtSimple from "jwt-simple";
 import { encrypt, genSalt } from "./BcryptUtils";
 import { hasValidPermissions } from "./PermissionValidator";
@@ -15,166 +10,141 @@ import { hasValidPermissions } from "./PermissionValidator";
 const defaultPasswordPolicy = /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{8,}$/;
 
 export interface JwtAuthPluginOptions {
-  secret: string;
-  algo?: jwtSimple.TAlgorithm;
-  getUser: (tokenData: any) => Promise<FlinkAuthUser>;
-  passwordPolicy?: RegExp;
-  tokenTTL? : number;
-  rolePermissions: {
-    [role: string]: string[];
-  };
+    secret: string;
+    algo?: jwtSimple.TAlgorithm;
+    getUser: (tokenData: any) => Promise<FlinkAuthUser | null | undefined>;
+    passwordPolicy?: RegExp;
+    tokenTTL?: number;
+    rolePermissions: {
+        [role: string]: string[];
+    };
 }
 
 export interface JwtAuthPlugin extends FlinkAuthPlugin {
-  /**
-   * Encodes and returns JWT token that includes provided payload.
-   *
-   * The payload can by anything but should in most cases be and object that
-   * holds user information including an identifier such as the username or id.
-   */
-  createToken: (payload: any, roles: string[]) => Promise<string>;
-
-  /**
-   * Generates new password hash and salt for provided password.
-   *
-   * This method should be used when setting a new password. Both hash and salt needs
-   * to be saved in database as both are needed to validate the password.
-   *
-   * Returns null if password does not match configured `passwordPolicy`.
-   */
-  createPasswordHashAndSalt: (
-    password: string
-  ) => Promise<{ hash: string; salt: string } | null>;
-
-  /**
-   * Validates that provided `password` is same as provided `hash`.
-   */
-  validatePassword: (
-    password: string,
-    passwordHash: string,
-    salt: string
-  ) => Promise<boolean>;
+    /**
+     * Encodes and returns JWT token that includes provided payload.
+     *
+     * The payload can by anything but should in most cases be and object that
+     * holds user information including an identifier such as the username or id.
+     */
+    createToken: (payload: any, roles: string[]) => Promise<string>;
+
+    /**
+     * Generates new password hash and salt for provided password.
+     *
+     * This method should be used when setting a new password. Both hash and salt needs
+     * to be saved in database as both are needed to validate the password.
+     *
+     * Returns null if password does not match configured `passwordPolicy`.
+     */
+    createPasswordHashAndSalt: (password: string) => Promise<{ hash: string; salt: string } | null>;
+
+    /**
+     * Validates that provided `password` is same as provided `hash`.
+     */
+    validatePassword: (password: string, passwordHash: string, salt: string) => Promise<boolean>;
 }
 
 /**
  * Configures and creates authentication plugin.
  */
 export function jwtAuthPlugin({
-  secret,
-  getUser,
-  rolePermissions,
-  algo = "HS256",
-  passwordPolicy = defaultPasswordPolicy,
-  tokenTTL = 1000 * 60 * 60 * 24 * 365 * 100, //Defaults to hundred year
+    secret,
+    getUser,
+    rolePermissions,
+    algo = "HS256",
+    passwordPolicy = defaultPasswordPolicy,
+    tokenTTL = 1000 * 60 * 60 * 24 * 365 * 100, //Defaults to hundred year
 }: JwtAuthPluginOptions): JwtAuthPlugin {
-  return {
-    authenticateRequest: async (req, permissions) =>
-      authenticateRequest(req, permissions, rolePermissions, {
-        algo,
-        secret,
-        getUser,
-      }),
-    createToken: (payload, roles) =>
-      createToken({ ...payload, roles }, { algo, secret, tokenTTL }),
-    createPasswordHashAndSalt: (password: string) =>
-      createPasswordHashAndSalt(password, passwordPolicy),
-    validatePassword,
-  };
+    return {
+        authenticateRequest: async (req, permissions) =>
+            authenticateRequest(req, permissions, rolePermissions, {
+                algo,
+                secret,
+                getUser,
+            }),
+        createToken: (payload, roles) => createToken({ ...payload, roles }, { algo, secret, tokenTTL }),
+        createPasswordHashAndSalt: (password: string) => createPasswordHashAndSalt(password, passwordPolicy),
+        validatePassword,
+    };
 }
 
 async function authenticateRequest(
-  req: FlinkRequest,
-  routePermissions: string | string[],
-  rolePermissions: { [x: string]: string[] },
-  {
-    secret,
-    algo,
-    getUser,
-  }: Pick<JwtAuthPluginOptions, "algo" | "secret" | "getUser">
+    req: FlinkRequest,
+    routePermissions: string | string[],
+    rolePermissions: { [x: string]: string[] },
+    { secret, algo, getUser }: Pick<JwtAuthPluginOptions, "algo" | "secret" | "getUser">
 ) {
-  const token = getTokenFromReq(req);
+    const token = getTokenFromReq(req);
 
-  if (token) {
-    let decodedToken;
+    if (token) {
+        let decodedToken;
 
-    try {
-      decodedToken = jwtSimple.decode(token, secret, false, algo);
-    } catch (err) {
-      log.debug(`Failed to decode token: ${err}`);
-      decodedToken = null;
-    }
+        try {
+            decodedToken = jwtSimple.decode(token, secret, false, algo);
+        } catch (err) {
+            log.debug(`[JWT AUTH PLUGIN] Failed to decode token: ${err}`);
+            decodedToken = null;
+        }
 
-    if (decodedToken) {
-      const permissionsArr = Array.isArray(routePermissions)
-        ? routePermissions
-        : [routePermissions];
+        if (decodedToken) {
+            const permissionsArr = Array.isArray(routePermissions) ? routePermissions : [routePermissions];
 
-      if (permissionsArr && permissionsArr.length > 0) {
-        const validPerms = hasValidPermissions(
-          decodedToken.roles || [],
-          rolePermissions,
-          permissionsArr
-        );
+            if (permissionsArr && permissionsArr.length > 0) {
+                const validPerms = hasValidPermissions(decodedToken.roles || [], rolePermissions, permissionsArr);
 
-        if (!validPerms) {
-          return false;
-        }
-      }
+                if (!validPerms) {
+                    return false;
+                }
+            }
 
-      const user = await getUser(decodedToken);
+            const user = await getUser(decodedToken);
 
+            if (!user) {
+                log.debug("[JWT AUTH PLUGIN] User not returned from getUser callback");
+                return false;
+            }
 
-      req.user = user;
-      return true;
+            req.user = user;
+            return true;
+        }
     }
-  }
-  return false;
+    return false;
 }
 
 function getTokenFromReq(req: FlinkRequest) {
-  const authHeader = req.headers.authorization;
-  if (authHeader) {
-    const [, token] = authHeader.split("Bearer ");
-    return token;
-  }
-  return;
+    const authHeader = req.headers.authorization;
+    if (authHeader) {
+        const [, token] = authHeader.split("Bearer ");
+        return token;
+    }
+    return;
 }
 
-async function createToken(
-  payload: any,
-  { secret, algo, tokenTTL }: Pick<JwtAuthPluginOptions, "algo" | "secret" | "tokenTTL" >
-) {
-  if (!payload) {
-    throw new Error("Cannot create token - payload is missing");
-  }
+async function createToken(payload: any, { secret, algo, tokenTTL }: Pick<JwtAuthPluginOptions, "algo" | "secret" | "tokenTTL">) {
+    if (!payload) {
+        throw new Error("Cannot create token - payload is missing");
+    }
 
-  return jwtSimple.encode({exp : _calculateExpiration(tokenTTL || 1000 * 60 * 60 * 24 * 365 * 100),  ...payload}, secret, algo);
+    return jwtSimple.encode({ exp: _calculateExpiration(tokenTTL || 1000 * 60 * 60 * 24 * 365 * 100), ...payload }, secret, algo);
 }
 
-function _calculateExpiration(expiresInMs : number) {
+function _calculateExpiration(expiresInMs: number) {
     return Math.floor((Date.now() + expiresInMs) / 1000);
 }
 
+async function createPasswordHashAndSalt(password: string, passwordPolicy: RegExp) {
+    if (!passwordPolicy.test(password)) {
+        log.debug(`Password does not match password policy '${passwordPolicy}'`);
+        return null;
+    }
 
-async function createPasswordHashAndSalt(
-  password: string,
-  passwordPolicy: RegExp
-) {
-  if (!passwordPolicy.test(password)) {
-    log.debug(`Password does not match password policy '${passwordPolicy}'`);
-    return null;
-  }
-
-  const salt = await genSalt(10);
-  const hash = await encrypt(password, salt);
-  return { salt, hash };
+    const salt = await genSalt(10);
+    const hash = await encrypt(password, salt);
+    return { salt, hash };
 }
 
-async function validatePassword(
-  password: string,
-  passwordHash: string,
-  salt: string
-) {
-  const hashCandidate = await encrypt(password, salt);
-  return hashCandidate === passwordHash;
+async function validatePassword(password: string, passwordHash: string, salt: string) {
+    const hashCandidate = await encrypt(password, salt);
+    return hashCandidate === passwordHash;
 }