@flink-app/generic-auth-plugin 0.12.1-alpha.27 → 0.12.1-alpha.29

package/.flink/generatedHandlers.ts

@@ -1,4 +1,4 @@
-// Generated Thu Sep 11 2025 10:23:23 GMT+0200 (Central European Summer Time)
+// Generated Mon Sep 22 2025 13:48:37 GMT+0200 (Central European Summer Time)
 import { autoRegisteredHandlers, HttpMethod } from "@flink-app/flink";
 import * as UserCreate_0 from "../src/handlers/UserCreate";
 import * as UserLogin_0 from "../src/handlers/UserLogin";

package/.flink/generatedJobs.ts

@@ -1,4 +1,4 @@
-// Generated Thu Sep 11 2025 10:23:24 GMT+0200 (Central European Summer Time)
+// Generated Mon Sep 22 2025 13:48:37 GMT+0200 (Central European Summer Time)
 import { autoRegisteredJobs } from "@flink-app/flink";
 export const jobs = [];
 autoRegisteredJobs.push(...jobs);

package/.flink/generatedRepos.ts

@@ -1,4 +1,4 @@
-// Generated Thu Sep 11 2025 10:23:23 GMT+0200 (Central European Summer Time)
+// Generated Mon Sep 22 2025 13:48:37 GMT+0200 (Central European Summer Time)
   import { autoRegisteredRepos } from "@flink-app/flink";
   export const repos = [];
   autoRegisteredRepos.push(...repos);

package/.flink/schemas/schemas.ts

@@ -29,7 +29,7 @@ import { PutManagementUserRolesByUseridRes } from "../../src/schemas/Management/
 import { PutManagementUserUsernameByUseridReq } from "../../src/schemas/Management/PutUserUsernameByUseridReq";
 import { PutManagementUserUsernameByUseridRes } from "../../src/schemas/Management/PutUserUsernameByUseridRes";
 
-// Generated Thu Sep 11 2025 10:23:24 GMT+0200 (Central European Summer Time)
+// Generated Mon Sep 22 2025 13:48:38 GMT+0200 (Central European Summer Time)
 export interface UserCreate_7_ReqSchema extends UserCreateReq {}
 
 export interface UserCreate_7_ResSchema extends UserCreateRes {}

package/.flink/start.ts

@@ -1,4 +1,4 @@
-// Generated Thu Sep 11 2025 10:23:24 GMT+0200 (Central European Summer Time)
+// Generated Mon Sep 22 2025 13:48:37 GMT+0200 (Central European Summer Time)
 import "./generatedHandlers";
 import "./generatedRepos";
 import "./generatedJobs";

package/dist/.flink/generatedHandlers.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handlers = void 0;
-// Generated Thu Sep 11 2025 10:23:23 GMT+0200 (Central European Summer Time)
+// Generated Mon Sep 22 2025 13:48:37 GMT+0200 (Central European Summer Time)
 var flink_1 = require("@flink-app/flink");
 exports.handlers = [];
 flink_1.autoRegisteredHandlers.push.apply(flink_1.autoRegisteredHandlers, exports.handlers);

package/dist/.flink/generatedJobs.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jobs = void 0;
-// Generated Thu Sep 11 2025 10:23:24 GMT+0200 (Central European Summer Time)
+// Generated Mon Sep 22 2025 13:48:37 GMT+0200 (Central European Summer Time)
 var flink_1 = require("@flink-app/flink");
 exports.jobs = [];
 flink_1.autoRegisteredJobs.push.apply(flink_1.autoRegisteredJobs, exports.jobs);

package/dist/.flink/generatedRepos.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.repos = void 0;
-// Generated Thu Sep 11 2025 10:23:23 GMT+0200 (Central European Summer Time)
+// Generated Mon Sep 22 2025 13:48:37 GMT+0200 (Central European Summer Time)
 var flink_1 = require("@flink-app/flink");
 exports.repos = [];
 flink_1.autoRegisteredRepos.push.apply(flink_1.autoRegisteredRepos, exports.repos);

package/dist/.flink/start.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// Generated Thu Sep 11 2025 10:23:24 GMT+0200 (Central European Summer Time)
+// Generated Mon Sep 22 2025 13:48:37 GMT+0200 (Central European Summer Time)
 require("./generatedHandlers");
 require("./generatedRepos");
 require("./generatedJobs");

package/dist/src/coreFunctions.d.ts

@@ -1,4 +1,4 @@
-import { FlinkRepo } from "@flink-app/flink";
+import { FlinkRepo, FlinkRequest } from "@flink-app/flink";
 import { JwtAuthPlugin } from "@flink-app/jwt-auth-plugin";
 import { User } from "./schemas/User";
 import { UserCreateRes } from "./schemas/UserCreateRes";
@@ -23,8 +23,8 @@ export declare function loginByToken(repo: FlinkRepo<any, User>, auth: JwtAuthPl
 export declare function loginUser(repo: FlinkRepo<any, User>, auth: JwtAuthPlugin, username: string, password: string | undefined, validatePasswordMethod?: {
     (password: string, hash: string, salt: string): Promise<boolean>;
 }, smsOptions?: GenericAuthsmsOptions, onSuccessfulLogin?: {
-    (user: User): Promise<void>;
-}): Promise<UserLoginRes>;
+    (user: User, req?: FlinkRequest): Promise<void>;
+}, req?: FlinkRequest): Promise<UserLoginRes>;
 export declare function changePassword(repo: FlinkRepo<any, User>, auth: JwtAuthPlugin, userId: string, newPassword: string, createPasswordHashAndSaltMethod?: {
     (password: string): Promise<{
         hash: string;

package/dist/src/coreFunctions.js

@@ -190,7 +190,7 @@ function loginByToken(repo, auth, token, code, jwtSecret) {
     });
 }
 exports.loginByToken = loginByToken;
-function loginUser(repo, auth, username, password, validatePasswordMethod, smsOptions, onSuccessfulLogin) {
+function loginUser(repo, auth, username, password, validatePasswordMethod, smsOptions, onSuccessfulLogin, req) {
     return __awaiter(this, void 0, void 0, function () {
         var user, valid, ex_1, code, payload, secret, options, token, token;
         return __generator(this, function (_a) {
@@ -262,7 +262,7 @@ function loginUser(repo, auth, username, password, validatePasswordMethod, smsOp
                 case 10:
                     token = _a.sent();
                     if (!onSuccessfulLogin) return [3 /*break*/, 12];
-                    return [4 /*yield*/, onSuccessfulLogin(user)];
+                    return [4 /*yield*/, onSuccessfulLogin(user, req)];
                 case 11:
                     _a.sent();
                     _a.label = 12;

package/dist/src/genericAuthContext.d.ts

@@ -1,4 +1,4 @@
-import { FlinkRepo } from "@flink-app/flink";
+import { FlinkRepo, FlinkRequest } from "@flink-app/flink";
 import { JwtAuthPlugin } from "@flink-app/jwt-auth-plugin";
 import { User } from "./schemas/User";
 import { UserCreateRes } from "./schemas/UserCreateRes";
@@ -13,7 +13,7 @@ export interface genericAuthContext {
     genericAuthPlugin: {
         loginUser(repo: FlinkRepo<any, User>, auth: JwtAuthPlugin, username: string, password?: string, validatePasswordMethod?: {
             (password: string, hash: string, salt: string): Promise<boolean>;
-        }, smsOptions?: GenericAuthsmsOptions, onSuccessfulLogin?: (user: User) => Promise<void>): Promise<UserLoginRes>;
+        }, smsOptions?: GenericAuthsmsOptions, onSuccessfulLogin?: (user: User, req?: FlinkRequest) => Promise<void>, req?: FlinkRequest): Promise<UserLoginRes>;
         loginByToken(repo: FlinkRepo<any, User>, auth: JwtAuthPlugin, token: string, code: string, jwtSecret: string): Promise<UserLoginRes>;
         createUser(repo: FlinkRepo<any, User>, auth: JwtAuthPlugin, username: string, password: string, authentificationMethod: "password" | "sms" | "bankid", roles: string[], profile: UserProfile, createPasswordHashAndSaltMethod?: {
             (password: string): Promise<{
@@ -48,7 +48,7 @@ export interface genericAuthContext {
         usernameFormat: RegExp;
         smsOptions?: GenericAuthsmsOptions;
         onSuccessfulLogin?: {
-            (user: User): Promise<void>;
+            (user: User, req?: FlinkRequest): Promise<void>;
         };
         onUserCreated?: {
             (user: User): Promise<void>;

package/dist/src/genericAuthPluginOptions.d.ts

@@ -1,3 +1,4 @@
+import { FlinkRequest } from "@flink-app/flink";
 import { User } from "./schemas/User";
 import { UserPasswordResetSettings } from "./schemas/UserPasswordResetSettings";
 import { client as smsClient } from "@flink-app/sms-plugin";
@@ -26,7 +27,7 @@ export interface GenericAuthPluginOptions {
     usernameFormat?: RegExp;
     sms?: GenericAuthsmsOptions;
     onSuccessfulLogin?: {
-        (user: User): Promise<void>;
+        (user: User, req?: FlinkRequest): Promise<void>;
     };
     onUserCreated?: {
         (user: User): Promise<void>;

package/dist/src/handlers/UserLogin.js

@@ -39,29 +39,61 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.__schemas = exports.__params = exports.__query = exports.__file = exports.__assumedHttpMethod = void 0;
 var flink_1 = require("@flink-app/flink");
 var userLoginHandler = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
-    var pluginName, repo, loginRespons;
+    var pluginName, repo, loginResponse, error_1;
     var ctx = _b.ctx, req = _b.req, origin = _b.origin;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
                 pluginName = origin || "genericAuthPlugin";
                 repo = ctx.repos[ctx.plugins[pluginName].repoName];
-                return [4 /*yield*/, ctx.plugins.genericAuthPlugin.loginUser(repo, ctx.auth, req.body.username, req.body.password, ctx.plugins.genericAuthPlugin.validatePasswordMethod, ctx.plugins[pluginName].smsOptions, ctx.plugins[pluginName].onSuccessfulLogin)];
+                loginResponse = undefined;
+                _c.label = 1;
             case 1:
-                loginRespons = _c.sent();
-                if (loginRespons.status != "success") {
-                    switch (loginRespons.status) {
+                _c.trys.push([1, 3, , 4]);
+                return [4 /*yield*/, ctx.plugins.genericAuthPlugin.loginUser(repo, ctx.auth, req.body.username, req.body.password, ctx.plugins.genericAuthPlugin.validatePasswordMethod, ctx.plugins[pluginName].smsOptions, ctx.plugins[pluginName].onSuccessfulLogin, req)];
+            case 2:
+                loginResponse = _c.sent();
+                return [3 /*break*/, 4];
+            case 3:
+                error_1 = _c.sent();
+                // Convert any thrown error that conforms to flink error structure to a proper response
+                // Note that any auth failures would not have been thrown, but returned as part of loginResponse
+                // but with this it is possible to throw errors from callbacks like onSuccessfulLogin
+                if (isFlinkError(error_1)) {
+                    flink_1.log.debug("Caught FlinkError in userLoginHandler:", error_1);
+                    return [2 /*return*/, {
+                            status: error_1.status,
+                            error: {
+                                id: error_1.id,
+                                title: error_1.title,
+                                code: error_1.code,
+                                detail: error_1.detail,
+                            },
+                        }];
+                }
+                // For other errors, return a generic 500 response
+                flink_1.log.error("Error in userLoginHandler:", error_1);
+                return [2 /*return*/, (0, flink_1.internalServerError)()];
+            case 4:
+                if ((loginResponse === null || loginResponse === void 0 ? void 0 : loginResponse.status) != "success") {
+                    switch (loginResponse === null || loginResponse === void 0 ? void 0 : loginResponse.status) {
                         case "failed":
-                            return [2 /*return*/, (0, flink_1.unauthorized)("Invalid username or password", loginRespons.status)];
+                            return [2 /*return*/, (0, flink_1.unauthorized)("Invalid username or password", loginResponse.status)];
                     }
                 }
                 return [2 /*return*/, {
-                        data: loginRespons,
+                        data: loginResponse,
                         status: 200,
                     }];
         }
     });
 }); };
 exports.default = userLoginHandler;
+function isFlinkError(res) {
+    if (res && res.status && typeof res.status === "number" && res.error && res.error.id) {
+        return true;
+    }
+    return false;
+}
 exports.__assumedHttpMethod = "", exports.__file = "UserLogin.ts", exports.__query = [], exports.__params = [];
 exports.__schemas = { reqSchema: { "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "additionalProperties": false, "properties": { "username": { "type": "string" }, "password": { "type": "string" } }, "required": ["username"], "definitions": {} }, resSchema: { "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "additionalProperties": false, "properties": { "status": { "type": "string", "enum": ["success", "failed", "requiresValidation"] }, "user": { "type": "object", "properties": { "_id": { "type": "string" }, "username": { "type": "string" }, "token": { "type": "string" }, "profile": { "type": "object" } }, "required": ["_id", "username", "token", "profile"], "additionalProperties": false }, "validationToken": { "type": "string" } }, "required": ["status"], "definitions": {} } };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flink-app/generic-auth-plugin",
-    "version": "0.12.1-alpha.27",
+    "version": "0.12.1-alpha.29",
     "description": "Flink plugin that provides a generic user authentification solution.",
     "scripts": {
         "test": "echo \"Error: no test specified\"",
@@ -30,5 +30,5 @@
         "ts-node": "^9.1.1",
         "typescript": "5.4.5"
     },
-    "gitHead": "6714d51c8e343b0bdfa82d34dbc205f112f9e3b9"
+    "gitHead": "40b53cd1ce0d8fc23f942f76b152a754796be01f"
 }

package/src/coreFunctions.ts

@@ -1,4 +1,4 @@
-import { FlinkRepo, FlinkAuthUser, log } from "@flink-app/flink";
+import { FlinkRepo, FlinkAuthUser, log, FlinkRequest } from "@flink-app/flink";
 import { JwtAuthPlugin, jwtAuthPlugin } from "@flink-app/jwt-auth-plugin";
 
 import { User } from "./schemas/User";
@@ -164,8 +164,9 @@ export async function loginUser(
     },
     smsOptions?: GenericAuthsmsOptions,
     onSuccessfulLogin?: {
-        (user: User): Promise<void>;
-    }
+        (user: User, req?: FlinkRequest): Promise<void>;
+    },
+    req?: FlinkRequest
 ): Promise<UserLoginRes> {
     const user = await repo.getOne({ username: username.toLowerCase() });
     if (user == null) {
@@ -231,7 +232,7 @@ export async function loginUser(
         const token = await auth.createToken({ username: username.toLowerCase(), _id: user._id }, user.roles);
 
         if (onSuccessfulLogin) {
-            await onSuccessfulLogin(user);
+            await onSuccessfulLogin(user, req);
         }
 
         return {

package/src/genericAuthContext.ts

@@ -1,4 +1,4 @@
-import { FlinkRepo } from "@flink-app/flink";
+import { FlinkRepo, FlinkRequest } from "@flink-app/flink";
 import { JwtAuthPlugin } from "@flink-app/jwt-auth-plugin";
 import { User } from "./schemas/User";
 import { UserCreateRes } from "./schemas/UserCreateRes";
@@ -19,7 +19,8 @@ export interface genericAuthContext {
             password?: string,
             validatePasswordMethod?: { (password: string, hash: string, salt: string): Promise<boolean> },
             smsOptions?: GenericAuthsmsOptions,
-            onSuccessfulLogin?: (user: User) => Promise<void>
+            onSuccessfulLogin?: (user: User, req?: FlinkRequest) => Promise<void>,
+            req?: FlinkRequest
         ): Promise<UserLoginRes>;
         loginByToken(repo: FlinkRepo<any, User>, auth: JwtAuthPlugin, token: string, code: string, jwtSecret: string): Promise<UserLoginRes>;
         createUser(
@@ -68,7 +69,7 @@ export interface genericAuthContext {
         validatePasswordMethod?: { (password: string, hash: string, salt: string): Promise<boolean> };
         usernameFormat: RegExp;
         smsOptions?: GenericAuthsmsOptions;
-        onSuccessfulLogin?: { (user: User): Promise<void> };
+        onSuccessfulLogin?: { (user: User, req?: FlinkRequest): Promise<void> };
         onUserCreated?: { (user: User): Promise<void> };
     };
 }

package/src/genericAuthPluginOptions.ts

@@ -1,3 +1,4 @@
+import { FlinkRequest } from "@flink-app/flink";
 import { User } from "./schemas/User";
 import { UserPasswordResetSettings } from "./schemas/UserPasswordResetSettings";
 import { client as smsClient } from "@flink-app/sms-plugin";
@@ -23,7 +24,7 @@ export interface GenericAuthPluginOptions {
     usernameFormat?: RegExp;
     sms?: GenericAuthsmsOptions;
     onSuccessfulLogin?: {
-        (user: User): Promise<void>;
+        (user: User, req?: FlinkRequest): Promise<void>;
     };
     onUserCreated?: {
         (user: User): Promise<void>;

package/src/handlers/UserLogin.ts

@@ -1,41 +1,66 @@
-import { FlinkContext, Handler, unauthorized } from "@flink-app/flink";
+import { FlinkContext, FlinkResponse, Handler, internalServerError, log, unauthorized } from "@flink-app/flink";
+import { JwtAuthPlugin } from "@flink-app/jwt-auth-plugin";
 import { genericAuthContext } from "../genericAuthContext";
 import { UserLoginReq } from "../schemas/UserLoginReq";
 import { UserLoginRes } from "../schemas/UserLoginRes";
-import { JwtAuthPlugin } from "@flink-app/jwt-auth-plugin";
 
-const userLoginHandler: Handler<
-  FlinkContext<genericAuthContext>,
-  UserLoginReq,
-  UserLoginRes
-> = async ({ ctx, req, origin }) => {
-  let pluginName = origin || "genericAuthPlugin";
-  let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
-  
-  const loginRespons = await ctx.plugins.genericAuthPlugin.loginUser(
-    repo,
-    <JwtAuthPlugin>ctx.auth,
-    req.body.username,
-    req.body.password,
-    ctx.plugins.genericAuthPlugin.validatePasswordMethod,
-    (<any>ctx.plugins)[pluginName].smsOptions,
-    (<any>ctx.plugins)[pluginName].onSuccessfulLogin
-  );
-
-  if (loginRespons.status != "success") {
-    switch (loginRespons.status) {
-      case "failed":
-        return unauthorized(
-          "Invalid username or password",
-          loginRespons.status
+const userLoginHandler: Handler<FlinkContext<genericAuthContext>, UserLoginReq, UserLoginRes> = async ({ ctx, req, origin }) => {
+    let pluginName = origin || "genericAuthPlugin";
+    let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
+
+    let loginResponse: UserLoginRes | undefined = undefined;
+
+    try {
+        loginResponse = await ctx.plugins.genericAuthPlugin.loginUser(
+            repo,
+            <JwtAuthPlugin>ctx.auth,
+            req.body.username,
+            req.body.password,
+            ctx.plugins.genericAuthPlugin.validatePasswordMethod,
+            (<any>ctx.plugins)[pluginName].smsOptions,
+            (<any>ctx.plugins)[pluginName].onSuccessfulLogin,
+            req
         );
+    } catch (error: any) {
+        // Convert any thrown error that conforms to flink error structure to a proper response
+        // Note that any auth failures would not have been thrown, but returned as part of loginResponse
+        // but with this it is possible to throw errors from callbacks like onSuccessfulLogin
+        if (isFlinkError(error)) {
+            log.debug("Caught FlinkError in userLoginHandler:", error);
+            return {
+                status: error.status,
+                error: {
+                    id: error.id,
+                    title: error.title,
+                    code: error.code,
+                    detail: error.detail,
+                },
+            } as FlinkResponse;
+        }
+
+        // For other errors, return a generic 500 response
+        log.error("Error in userLoginHandler:", error);
+        return internalServerError();
     }
-  }
 
-  return {
-    data: loginRespons,
-    status: 200,
-  };
+    if (loginResponse?.status != "success") {
+        switch (loginResponse?.status) {
+            case "failed":
+                return unauthorized("Invalid username or password", loginResponse.status);
+        }
+    }
+
+    return {
+        data: loginResponse,
+        status: 200,
+    };
 };
 
 export default userLoginHandler;
+
+function isFlinkError(res: any) {
+    if (res && res.status && typeof res.status === "number" && res.error && res.error.id) {
+        return true;
+    }
+    return false;
+}