@flink-app/generic-auth-plugin 0.11.0 → 0.11.3

package/.flink/generatedHandlers.ts

@@ -1,4 +1,4 @@
-// Generated Tue Jun 18 2024 09:50:54 GMT+0200 (Central European Summer Time)
+// Generated Fri Nov 08 2024 10:09:47 GMT+0100 (Central European Standard 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 Tue Jun 18 2024 09:50:54 GMT+0200 (Central European Summer Time)
+// Generated Fri Nov 08 2024 10:09:47 GMT+0100 (Central European Standard Time)
 import { autoRegisteredJobs } from "@flink-app/flink";
 export const jobs = [];
 autoRegisteredJobs.push(...jobs);

package/.flink/generatedRepos.ts

@@ -1,4 +1,4 @@
-// Generated Tue Jun 18 2024 09:50:54 GMT+0200 (Central European Summer Time)
+// Generated Fri Nov 08 2024 10:09:47 GMT+0100 (Central European Standard 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 Tue Jun 18 2024 09:50:55 GMT+0200 (Central European Summer Time)
+// Generated Fri Nov 08 2024 10:09:48 GMT+0100 (Central European Standard Time)
 export interface UserCreate_7_ReqSchema extends UserCreateReq {}
 
 export interface UserCreate_7_ResSchema extends UserCreateRes {}

package/.flink/start.ts

@@ -1,4 +1,4 @@
-// Generated Tue Jun 18 2024 09:50:54 GMT+0200 (Central European Summer Time)
+// Generated Fri Nov 08 2024 10:09:47 GMT+0100 (Central European Standard 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 Tue Jun 18 2024 09:50:54 GMT+0200 (Central European Summer Time)
+// Generated Fri Nov 08 2024 10:09:47 GMT+0100 (Central European Standard 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 Tue Jun 18 2024 09:50:54 GMT+0200 (Central European Summer Time)
+// Generated Fri Nov 08 2024 10:09:47 GMT+0100 (Central European Standard 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 Tue Jun 18 2024 09:50:54 GMT+0200 (Central European Summer Time)
+// Generated Fri Nov 08 2024 10:09:47 GMT+0100 (Central European Standard 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 Tue Jun 18 2024 09:50:54 GMT+0200 (Central European Summer Time)
+// Generated Fri Nov 08 2024 10:09:47 GMT+0100 (Central European Standard Time)
 require("./generatedHandlers");
 require("./generatedRepos");
 require("./generatedJobs");

package/dist/src/coreFunctions.d.ts

@@ -20,7 +20,9 @@ export declare function createUser(repo: FlinkRepo<any, User>, auth: JwtAuthPlug
 export declare function loginByToken(repo: FlinkRepo<any, User>, auth: JwtAuthPlugin, token: string, code: string, jwtSecret: string): Promise<UserLoginRes>;
 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): Promise<UserLoginRes>;
+}, smsOptions?: GenericAuthsmsOptions, onSuccessfulLogin?: {
+    (user: User): Promise<void>;
+}): 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

@@ -175,7 +175,7 @@ function loginByToken(repo, auth, token, code, jwtSecret) {
     });
 }
 exports.loginByToken = loginByToken;
-function loginUser(repo, auth, username, password, validatePasswordMethod, smsOptions) {
+function loginUser(repo, auth, username, password, validatePasswordMethod, smsOptions, onSuccessfulLogin) {
     return __awaiter(this, void 0, void 0, function () {
         var user, valid, ex_1, code, payload, secret, options, token, token;
         return __generator(this, function (_a) {
@@ -190,7 +190,7 @@ function loginUser(repo, auth, username, password, validatePasswordMethod, smsOp
                     if (!(user.authentificationMethod == "password")) return [3 /*break*/, 9];
                     if (password == null)
                         password = "";
-                    if (!(validatePasswordMethod != null)) return [3 /*break*/, 7];
+                    if (!validatePasswordMethod) return [3 /*break*/, 7];
                     return [4 /*yield*/, validatePasswordMethod(password, user.password, user.salt)];
                 case 2:
                     valid = _a.sent();
@@ -234,20 +234,25 @@ function loginUser(repo, auth, username, password, validatePasswordMethod, smsOp
                                 validationToken: token
                             }];
                     }
-                    if (!valid) return [3 /*break*/, 11];
+                    if (!valid) return [3 /*break*/, 13];
                     return [4 /*yield*/, auth.createToken({ username: username.toLowerCase(), _id: user._id }, user.roles)];
                 case 10:
                     token = _a.sent();
-                    return [2 /*return*/, {
-                            status: "success",
-                            user: {
-                                _id: user._id,
-                                username: user.username,
-                                token: token,
-                                profile: user.profile,
-                            },
-                        }];
-                case 11: return [2 /*return*/, { status: "failed" }];
+                    if (!onSuccessfulLogin) return [3 /*break*/, 12];
+                    return [4 /*yield*/, onSuccessfulLogin(user)];
+                case 11:
+                    _a.sent();
+                    _a.label = 12;
+                case 12: return [2 /*return*/, {
+                        status: "success",
+                        user: {
+                            _id: user._id,
+                            username: user.username,
+                            token: token,
+                            profile: user.profile,
+                        },
+                    }];
+                case 13: return [2 /*return*/, { status: "failed" }];
             }
         });
     });

package/dist/src/genericAuthContext.d.ts

@@ -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): Promise<UserLoginRes>;
+        }, smsOptions?: GenericAuthsmsOptions, onSuccessfulLogin?: (user: User) => Promise<void>): 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", roles: string[], profile: UserProfile, createPasswordHashAndSaltMethod?: {
             (password: string): Promise<{
@@ -47,5 +47,8 @@ export interface genericAuthContext {
         };
         usernameFormat: RegExp;
         smsOptions?: GenericAuthsmsOptions;
+        onSuccessfulLogin?: {
+            (user: User): Promise<void>;
+        };
     };
 }

package/dist/src/genericAuthPluginOptions.d.ts

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

package/dist/src/handlers/UserLogin.js

@@ -47,7 +47,7 @@ var userLoginHandler = function (_a) {
                 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)];
+                    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.genericAuthPlugin.onSuccessfulLogin)];
                 case 1:
                     loginRespons = _b.sent();
                     if (loginRespons.status != "success") {

package/dist/src/index.js

@@ -36,6 +36,7 @@ var genericAuthPlugin = function (options) {
             createPasswordHashAndSaltMethod: options.createPasswordHashAndSaltMethod,
             validatePasswordMethod: options.validatePasswordMethod,
             usernameFormat: options.usernameFormat || /.{1,}$/,
+            onSuccessfulLogin: options.onSuccessfulLogin,
             smsOptions: options.sms
         },
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flink-app/generic-auth-plugin",
-  "version": "0.11.0",
+  "version": "0.11.3",
   "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": "^4.2.4"
   },
-  "gitHead": "3869def3e7e7e7105373ad31bc23a8ed68108015"
+  "gitHead": "83d258db9a45d1f397ca51f2221a36443af78f9f"
 }

package/src/coreFunctions.ts

@@ -158,8 +158,12 @@ export async function loginUser(
     validatePasswordMethod?: {
         (password: string, hash: string, salt: string): Promise<boolean>;
     },
-    smsOptions? : GenericAuthsmsOptions
+    smsOptions? : GenericAuthsmsOptions,
+    onSuccessfulLogin?: {
+        (user:User): Promise<void>
+    },
 ): Promise<UserLoginRes> {
+
     const user = await repo.getOne({ username: username.toLowerCase() });
     if (user == null) {
         return { status: "failed" };
@@ -170,7 +174,7 @@ export async function loginUser(
     if (user.authentificationMethod == "password") {
         if (password == null) password = "";
 
-        if (validatePasswordMethod != null) {
+        if (validatePasswordMethod) {
             valid = await validatePasswordMethod(password, <string>user.password, <string>user.salt);
 
             //If not valid, try to use default auth
@@ -205,7 +209,6 @@ export async function loginUser(
     
         const token = jsonwebtoken.sign(payload, secret, options);
 
-
         return {
             status: "success",
             validationToken : token
@@ -218,6 +221,10 @@ export async function loginUser(
     if (valid) {
         const token = await auth.createToken({ username: username.toLowerCase(), _id: user._id }, user.roles);
 
+        if (onSuccessfulLogin) {
+            await onSuccessfulLogin(user);
+        }
+
         return {
             status: "success",
             user: {

package/src/genericAuthContext.ts

@@ -14,7 +14,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 ) : Promise<UserLoginRes>,
+        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>,
         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",  roles : string[], profile : UserProfile, createPasswordHashAndSaltMethod? : { (password : string) : Promise<{ hash: string; salt: string;} | null>  }  ) : Promise<UserCreateRes>,
         changePassword( repo : FlinkRepo<any, User>, auth : JwtAuthPlugin, userId : string, newPassword : string, createPasswordHashAndSaltMethod? : { (password : string) : Promise<{ hash: string; salt: string;} | null>  } ) : Promise<UserPasswordChangeRes>,
@@ -25,7 +25,8 @@ export interface genericAuthContext{
         createPasswordHashAndSaltMethod? : { (password : string) : Promise<{ hash: string; salt: string;} | null>  },
         validatePasswordMethod? : { (password : string, hash : string, salt : string) : Promise<boolean>  },
         usernameFormat : RegExp      
-        smsOptions? : GenericAuthsmsOptions
+        smsOptions? : GenericAuthsmsOptions,
+        onSuccessfulLogin?: { (user:User) : Promise<void> }
     }
 
 }

package/src/genericAuthPluginOptions.ts

@@ -1,3 +1,4 @@
+import { User } from "./schemas/User";
 import { UserPasswordResetSettings } from "./schemas/UserPasswordResetSettings";
 import { client as smsClient } from "@flink-app/sms-plugin";
 export interface GenericAuthPluginOptions {
@@ -18,9 +19,11 @@ export interface GenericAuthPluginOptions {
     validatePasswordMethod?: {
         (password: string, hash: string, salt: string): Promise<boolean>;
     };
-
     usernameFormat?: RegExp;
     sms?: GenericAuthsmsOptions;
+    onSuccessfulLogin?: {
+        (user:User): Promise<void>
+    };
 }
 
 export interface GenericAuthsmsOptions {

package/src/handlers/UserLogin.ts

@@ -18,7 +18,8 @@ const userLoginHandler: Handler<
     req.body.username,
     req.body.password,
     ctx.plugins.genericAuthPlugin.validatePasswordMethod,
-    (<any>ctx.plugins)[pluginName].smsOptions
+    (<any>ctx.plugins)[pluginName].smsOptions,
+    ctx.plugins.genericAuthPlugin.onSuccessfulLogin
   );
 
   if (loginRespons.status != "success") {

package/src/index.ts

@@ -35,6 +35,7 @@ export const genericAuthPlugin = (
       createPasswordHashAndSaltMethod: options.createPasswordHashAndSaltMethod,
       validatePasswordMethod: options.validatePasswordMethod,
       usernameFormat: options.usernameFormat || /.{1,}$/,
+      onSuccessfulLogin: options.onSuccessfulLogin,
       smsOptions : options.sms
     },
   };