@flink-app/generic-auth-plugin 0.11.19 → 0.12.1-alpha.0

package/.flink/generatedHandlers.ts

@@ -1,4 +1,4 @@
-// Generated Wed Mar 12 2025 12:06:29 GMT+0100 (Central European Standard Time)
+// Generated Wed Mar 19 2025 16:32:03 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 Wed Mar 12 2025 12:06:29 GMT+0100 (Central European Standard Time)
+// Generated Wed Mar 19 2025 16:32:03 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 Wed Mar 12 2025 12:06:29 GMT+0100 (Central European Standard Time)
+// Generated Wed Mar 19 2025 16:32:03 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 Wed Mar 12 2025 12:06:30 GMT+0100 (Central European Standard Time)
+// Generated Wed Mar 19 2025 16:32:04 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 Wed Mar 12 2025 12:06:29 GMT+0100 (Central European Standard Time)
+// Generated Wed Mar 19 2025 16:32:03 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 Wed Mar 12 2025 12:06:29 GMT+0100 (Central European Standard Time)
+// Generated Wed Mar 19 2025 16:32:03 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 Wed Mar 12 2025 12:06:29 GMT+0100 (Central European Standard Time)
+// Generated Wed Mar 19 2025 16:32:03 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 Wed Mar 12 2025 12:06:29 GMT+0100 (Central European Standard Time)
+// Generated Wed Mar 19 2025 16:32:03 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 Wed Mar 12 2025 12:06:29 GMT+0100 (Central European Standard Time)
+// Generated Wed Mar 19 2025 16:32:03 GMT+0100 (Central European Standard Time)
 require("./generatedHandlers");
 require("./generatedRepos");
 require("./generatedJobs");

package/dist/src/coreFunctions.js

@@ -66,7 +66,7 @@ function getJtwTokenPlugin(secret, rolePermissions, passwordPolicy, tokenTTL) {
         },
         passwordPolicy: passwordPolicy,
         rolePermissions: rolePermissions,
-        tokenTTL: tokenTTL
+        tokenTTL: tokenTTL,
     });
 }
 exports.getJtwTokenPlugin = getJtwTokenPlugin;
@@ -223,7 +223,7 @@ function loginUser(repo, auth, username, password, validatePasswordMethod, smsOp
                         smsOptions.smsClient.send({
                             to: [user.username],
                             from: smsOptions.smsFrom,
-                            message: smsOptions.smsMessage.replace("{{code}}", code)
+                            message: smsOptions.smsMessage.replace("{{code}}", code),
                         });
                         payload = {
                             type: "smsLogin",
@@ -236,7 +236,7 @@ function loginUser(repo, auth, username, password, validatePasswordMethod, smsOp
                         token = jsonwebtoken_1.default.sign(payload, secret, options);
                         return [2 /*return*/, {
                                 status: "success",
-                                validationToken: token
+                                validationToken: token,
                             }];
                     }
                     if (!valid) return [3 /*break*/, 13];
@@ -410,7 +410,7 @@ function passwordResetComplete(repo, auth, jwtSecret, passwordResetToken, code,
                     return [4 /*yield*/, repo.updateOne(user._id, {
                             password: passwordAndSalt.hash,
                             salt: passwordAndSalt.salt,
-                            pwdResetStartedAt: null
+                            pwdResetStartedAt: null,
                         })];
                 case 6:
                     _a.sent();
@@ -431,8 +431,8 @@ function generate(n) {
     return ("" + number).substring(add);
 }
 function generateString(length) {
-    var characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-    var result = ' ';
+    var characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+    var result = " ";
     var charactersLength = characters.length;
     for (var i = 0; i < length; i++) {
         result += characters.charAt(Math.floor(Math.random() * charactersLength));

package/dist/src/schemas/User.d.ts

@@ -5,7 +5,7 @@ export interface User {
     username: string;
     password?: string;
     salt?: string;
-    pwdResetStartedAt?: string;
+    pwdResetStartedAt?: string | null;
     roles: string[];
     authentificationMethod: "password" | "sms";
     profile: UserProfile;

package/dist/src/schemas/User.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flink-app/generic-auth-plugin",
-  "version": "0.11.19",
+  "version": "0.12.1-alpha.0",
   "description": "Flink plugin that provides a generic user authentification solution.",
   "scripts": {
     "test": "echo \"Error: no test specified\"",
@@ -16,19 +16,19 @@
   "types": "dist/src/index.d.ts",
   "main": "dist/src/index.js",
   "dependencies": {
-    "@flink-app/email-plugin": "^0.11.14",
-    "@flink-app/jwt-auth-plugin": "^0.11.14",
-    "@flink-app/management-api-plugin": "^0.11.14",
-    "@flink-app/sms-plugin": "^0.11.14",
+    "@flink-app/email-plugin": "^0.12.1-alpha.0",
+    "@flink-app/jwt-auth-plugin": "^0.12.1-alpha.0",
+    "@flink-app/management-api-plugin": "^0.12.1-alpha.0",
+    "@flink-app/sms-plugin": "^0.12.1-alpha.0",
     "handlebars": "^4.7.7",
     "jsonwebtoken": "^8.5.1"
   },
   "devDependencies": {
-    "@flink-app/flink": "^0.11.14",
+    "@flink-app/flink": "^0.12.1-alpha.0",
     "@types/jsonwebtoken": "^8.5.2",
     "@types/node": "^15.6.2",
     "ts-node": "^9.1.1",
     "typescript": "^4.2.4"
   },
-  "gitHead": "a7530956e3caa0e8e16bf4786ab5eae75c9f6c1d"
+  "gitHead": "7f6e32aa896f5cade313f3c5133c756fc5391ce8"
 }

package/src/coreFunctions.ts

@@ -12,7 +12,7 @@ import { UserPasswordResetCompleteRes } from "./schemas/UserPasswordResetComplet
 import jsonwebtoken from "jsonwebtoken";
 import { GenericAuthsmsOptions } from "./genericAuthPluginOptions";
 
-export function getJtwTokenPlugin(secret: string, rolePermissions?: { [role: string]: string[] }, passwordPolicy?: RegExp, tokenTTL? : number) {
+export function getJtwTokenPlugin(secret: string, rolePermissions?: { [role: string]: string[] }, passwordPolicy?: RegExp, tokenTTL?: number) {
     if (passwordPolicy == undefined) {
         passwordPolicy = /.{1,}$/;
     }
@@ -36,7 +36,7 @@ export function getJtwTokenPlugin(secret: string, rolePermissions?: { [role: str
         },
         passwordPolicy,
         rolePermissions,
-        tokenTTL
+        tokenTTL,
     });
 }
 
@@ -112,36 +112,23 @@ export async function createUser(
     };
 }
 
-export async function loginByToken(
-    repo: FlinkRepo<any, User>,
-    auth: JwtAuthPlugin,
-    token : string,
-    code : string,
-    jwtSecret : string
-
-): Promise<UserLoginRes> {
-
-
-    let payload : { type : string, userId : string};
-    try{
-        payload = jsonwebtoken.verify(token, jwtSecret + ":" + code) as { type : string, userId : string};
-    }catch(ex){
+export async function loginByToken(repo: FlinkRepo<any, User>, auth: JwtAuthPlugin, token: string, code: string, jwtSecret: string): Promise<UserLoginRes> {
+    let payload: { type: string; userId: string };
+    try {
+        payload = jsonwebtoken.verify(token, jwtSecret + ":" + code) as { type: string; userId: string };
+    } catch (ex) {
         return { status: "failed" };
     }
-     
 
-    if(payload.type != "smsLogin"){
+    if (payload.type != "smsLogin") {
         return { status: "failed" };
     }
 
-    
-
-    const user = await repo.getById(payload.userId)
+    const user = await repo.getById(payload.userId);
     if (user == null) {
         return { status: "failed" };
     }
 
-
     const authToken = await auth.createToken({ username: user.username.toLowerCase(), _id: user._id }, user.roles);
 
     return {
@@ -149,14 +136,12 @@ export async function loginByToken(
         user: {
             _id: user._id,
             username: user.username,
-            token : authToken,
+            token: authToken,
             profile: user.profile,
         },
-    };    
-
+    };
 }
 
-
 export async function loginUser(
     repo: FlinkRepo<any, User>,
     auth: JwtAuthPlugin,
@@ -165,12 +150,11 @@ export async function loginUser(
     validatePasswordMethod?: {
         (password: string, hash: string, salt: string): Promise<boolean>;
     },
-    smsOptions? : GenericAuthsmsOptions,
+    smsOptions?: GenericAuthsmsOptions,
     onSuccessfulLogin?: {
-        (user:User): Promise<void>
-    },
+        (user: User): Promise<void>;
+    }
 ): Promise<UserLoginRes> {
-
     const user = await repo.getOne({ username: username.toLowerCase() });
     if (user == null) {
         return { status: "failed" };
@@ -195,34 +179,31 @@ export async function loginUser(
         }
     }
     if (user.authentificationMethod == "sms") {
-        if(!smsOptions) throw "SMS options must be specified to use SMS login"
+        if (!smsOptions) throw "SMS options must be specified to use SMS login";
         let code = smsOptions.codeType == "numeric" ? generate(smsOptions.codeLength) : generateString(smsOptions.codeLength);
         smsOptions.smsClient.send({
-            to : [user.username],
-            from : smsOptions.smsFrom,
-            message : smsOptions.smsMessage.replace("{{code}}", code)
-        })
+            to: [user.username],
+            from: smsOptions.smsFrom,
+            message: smsOptions.smsMessage.replace("{{code}}", code),
+        });
 
         const payload = {
             type: "smsLogin",
             userId: user._id,
         };
-    
+
         const secret = smsOptions.jwtToken + ":" + code;
-    
+
         const options: jsonwebtoken.SignOptions = {
             expiresIn: "1h",
         };
-    
+
         const token = jsonwebtoken.sign(payload, secret, options);
 
         return {
             status: "success",
-            validationToken : token
+            validationToken: token,
         };
-
-
-
     }
 
     if (valid) {
@@ -304,11 +285,11 @@ export async function passwordResetStart(
     const fakeToken = jsonwebtoken.sign(fakepayload, "fake_payload", { expiresIn: lifeTime });
 
     if (user == null) {
-        return { status: "userNotFound", passwordResetToken : fakeToken };
+        return { status: "userNotFound", passwordResetToken: fakeToken };
     }
 
     if (user.authentificationMethod != "password") {
-        return { status: "userNotFound", passwordResetToken : fakeToken };
+        return { status: "userNotFound", passwordResetToken: fakeToken };
     }
 
     if (numberOfDigits == null) numberOfDigits = 6;
@@ -322,7 +303,7 @@ export async function passwordResetStart(
 
     const pwdResetStartedAt = new Date().toISOString();
     let secret;
-    if(passwordResetReusableTokens) {
+    if (passwordResetReusableTokens) {
         secret = jwtSecret + ":" + code;
     } else {
         secret = jwtSecret + ":" + code + ":" + pwdResetStartedAt;
@@ -355,11 +336,9 @@ export async function passwordResetComplete(
     },
     passwordResetReusableTokens: boolean = true
 ): Promise<UserPasswordResetCompleteRes> {
+    const payload = <{ username: string }>jsonwebtoken.decode(passwordResetToken);
 
-    const payload = <{ username:string }>jsonwebtoken.decode(passwordResetToken);
-
-    if(!payload || !payload.username)
-        return { status: "invalidCode" };
+    if (!payload || !payload.username) return { status: "invalidCode" };
 
     const user = await repo.getOne({ username: payload.username });
 
@@ -383,7 +362,6 @@ export async function passwordResetComplete(
         return { status: "invalidCode" };
     }
 
-
     let passwordAndSalt = null;
 
     if (createPasswordHashAndSaltMethod == null) {
@@ -401,7 +379,7 @@ export async function passwordResetComplete(
     await repo.updateOne(user._id, {
         password: passwordAndSalt.hash,
         salt: passwordAndSalt.salt,
-        pwdResetStartedAt: null
+        pwdResetStartedAt: null,
     });
 
     return { status: "success" };
@@ -422,16 +400,13 @@ function generate(n: number): string {
     return ("" + number).substring(add);
 }
 
-
-
-
-function generateString(length : number) {
-    const characters ='ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-    let result = ' ';
+function generateString(length: number) {
+    const characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+    let result = " ";
     const charactersLength = characters.length;
-    for ( let i = 0; i < length; i++ ) {
+    for (let i = 0; i < length; i++) {
         result += characters.charAt(Math.floor(Math.random() * charactersLength));
     }
 
     return result;
-}
+}

package/src/schemas/User.ts

@@ -1,4 +1,4 @@
-import { PushNotificationToken} from "./PushNotificationToken";
+import { PushNotificationToken } from "./PushNotificationToken";
 import { UserProfile } from "./UserProfile";
 
 export interface User {
@@ -6,12 +6,12 @@ export interface User {
     username: string;
 
     password?: string;
-    salt? : string;
+    salt?: string;
 
-    pwdResetStartedAt?: string;
+    pwdResetStartedAt?: string | null;
     roles: string[];
-    
-    authentificationMethod : "password" | "sms";
-    profile : UserProfile;
-    pushNotificationTokens : Array<PushNotificationToken>
-};
+
+    authentificationMethod: "password" | "sms";
+    profile: UserProfile;
+    pushNotificationTokens: Array<PushNotificationToken>;
+}