@flink-app/generic-auth-plugin 1.0.0 → 2.0.0-alpha.100

package/dist/src/schemas/UserPasswordResetStartRes.js

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

package/dist/src/schemas/UserPasswordResetStartRes.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"names":[],"mappings":""}

package/dist/src/schemas/UserPasswordResetStartResPublic.js

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

package/dist/src/schemas/UserPasswordResetStartResPublic.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"names":[],"mappings":""}

package/dist/src/schemas/UserProfile.js

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

package/dist/src/schemas/UserProfile.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"names":[],"mappings":""}

package/dist/src/schemas/UserTokenRes.js

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

package/dist/src/schemas/UserTokenRes.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flink-app/generic-auth-plugin",
-  "version": "1.0.0",
+  "version": "2.0.0-alpha.100",
   "description": "Flink plugin that provides a generic user authentification solution.",
   "author": "johan@frost.se",
   "publishConfig": {
@@ -12,18 +12,21 @@
   "dependencies": {
     "handlebars": "^4.7.7",
     "jsonwebtoken": "^8.5.1",
-    "@flink-app/management-api-plugin": "1.0.0",
-    "@flink-app/jwt-auth-plugin": "1.0.0",
-    "@flink-app/sms-plugin": "1.0.0",
-    "@flink-app/email-plugin": "1.0.0"
+    "@flink-app/email-plugin": "2.0.0-alpha.100",
+    "@flink-app/management-api-plugin": "2.0.0-alpha.100",
+    "@flink-app/jwt-auth-plugin": "2.0.0-alpha.100",
+    "@flink-app/sms-plugin": "2.0.0-alpha.100"
   },
   "devDependencies": {
     "@types/jsonwebtoken": "^8.5.2",
     "@types/node": "22.13.10",
     "ts-node": "^10.9.2",
-    "@flink-app/flink": "1.0.0"
+    "@flink-app/flink": "2.0.0-alpha.100"
   },
   "gitHead": "4243e3b3cd6d4e1ca001a61baa8436bf2bbe4113",
+  "peerDependencies": {
+    "@flink-app/flink": ">=2.0.0-alpha.100"
+  },
   "scripts": {
     "test": "echo \"Error: no test specified\"",
     "build": "flink build",

package/src/coreFunctions.ts

@@ -281,7 +281,7 @@ export async function changePassword(
         };
     }
 
-    await repo.updateOne(userId, {
+    await repo.updateById(userId, {
         password: passwordAndSalt.hash,
         salt: passwordAndSalt.salt,
     });
@@ -329,7 +329,7 @@ export async function passwordResetStart(
         secret = jwtSecret + ":" + code;
     } else {
         secret = jwtSecret + ":" + code + ":" + pwdResetStartedAt;
-        await repo.updateOne(user._id, { pwdResetStartedAt });
+        await repo.updateById(user._id, { pwdResetStartedAt });
     }
 
     const options: jsonwebtoken.SignOptions = {
@@ -398,7 +398,7 @@ export async function passwordResetComplete(
         };
     }
 
-    await repo.updateOne(user._id, {
+    await repo.updateById(user._id, {
         password: passwordAndSalt.hash,
         salt: passwordAndSalt.salt,
         pwdResetStartedAt: null,

package/src/handlers/Management/DeleteUserByUserid.ts

@@ -2,22 +2,18 @@ import { FlinkContext, Handler, HttpMethod, notFound, RouteProps } from "@flink-
 import { DeleteManagementUserByUseridReq } from "../../schemas/Management/DeleteUserByUseridReq";
 import { DeleteManagementUserByUseridRes } from "../../schemas/Management/DeleteUserByUseridRes";
 
-
 const DeleteManagementUserByUserid: Handler<FlinkContext, DeleteManagementUserByUseridReq, DeleteManagementUserByUseridRes> = async ({ ctx, req, origin }) => {
+    let pluginName = origin || "genericAuthPlugin";
+    let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
 
+    const count = await repo.deleteById(req.params.userid);
+    if (count == null) {
+        return notFound();
+    }
 
-  let pluginName = origin || "genericAuthPlugin";
-  let repo = ctx.repos[ (<any>ctx.plugins)[pluginName].repoName ];
-
-  const count = await repo.deleteById(req.params.userid);
-  if(count == null){
-    return notFound();
-  }
-  
     return {
-      data: {},
-      status : 200
+        data: {},
+        status: 200,
     };
-
-}
-export default DeleteManagementUserByUserid;
+};
+export default DeleteManagementUserByUserid;

package/src/handlers/Management/GetSchema.ts

@@ -1,19 +1,13 @@
 import { FlinkContext, Handler } from "@flink-app/flink";
 
-
-  const GetSchema: Handler<FlinkContext, any, any> = async ({
-    ctx,
-    req,
-    origin,
-  }) => {
-
-      const modules = ctx.plugins.managementApi.moduleList.modules as any[];
-      const module = modules.find( p => p.id == origin);
+const GetSchema: Handler<FlinkContext, any, any> = async ({ ctx, req, origin }) => {
+    const modules = ctx.plugins.managementApi.moduleList.modules as any[];
+    const module = modules.find((p) => p.id == origin);
 
     return {
-      data: module?.data.profileSchema,
-      status: 200,
+        data: module?.data.profileSchema,
+        status: 200,
     };
-  };
+};
 
 export default GetSchema;

package/src/handlers/Management/GetUser.ts

@@ -2,22 +2,18 @@ import { FlinkContext, Handler } from "@flink-app/flink";
 import { GetManagementUserReq } from "../../schemas/Management/GetUserReq";
 import { GetManagementUserRes } from "../../schemas/Management/GetUserRes";
 
-const GetManagementUser: Handler<
-  FlinkContext,
-  GetManagementUserReq,
-  GetManagementUserRes
-> = async ({ ctx, req, origin }) => {
-  let pluginName = origin || "genericAuthPlugin";
-  let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
+const GetManagementUser: Handler<FlinkContext, GetManagementUserReq, GetManagementUserRes> = async ({ ctx, req, origin }) => {
+    let pluginName = origin || "genericAuthPlugin";
+    let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
 
-  let users = await repo.findAll({});
-  users = users.map((u) => {
-    return { username: u.username, _id: u._id };
-  });
+    let users = await repo.findAll({});
+    users = users.map((u) => {
+        return { username: u.username, _id: u._id };
+    });
 
-  return {
-    data: { users: users },
-    status: 200,
-  };
+    return {
+        data: { users: users },
+        status: 200,
+    };
 };
 export default GetManagementUser;

package/src/handlers/Management/GetUserByUserid.ts

@@ -1,31 +1,21 @@
-import {
-  FlinkContext,
-  Handler,
-  HttpMethod,
-  notFound,
-  RouteProps,
-} from "@flink-app/flink";
+import { FlinkContext, Handler, HttpMethod, notFound, RouteProps } from "@flink-app/flink";
 import { GetManagementUserByUseridReq } from "../../schemas/Management/GetUserByUseridReq";
 import { GetManagementUserByUseridRes } from "../../schemas/Management/GetUserByUseridRes";
 
-const GetManagementUserByUserid: Handler<
-  FlinkContext,
-  GetManagementUserByUseridReq,
-  any
-> = async ({ ctx, req, origin }) => {
-  let pluginName = origin || "genericAuthPlugin";
-  let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
+const GetManagementUserByUserid: Handler<FlinkContext, GetManagementUserByUseridReq, any> = async ({ ctx, req, origin }) => {
+    let pluginName = origin || "genericAuthPlugin";
+    let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
 
-  const user = await repo.getById(req.params.userid);
-  if (user == null) {
-    return notFound();
-  }
+    const user = await repo.getById(req.params.userid);
+    if (user == null) {
+        return notFound();
+    }
 
-  const { password, salt, ...u } = user;
+    const { password, salt, ...u } = user;
 
-  return {
-    data: u,
-    status: 200,
-  };
+    return {
+        data: u,
+        status: 200,
+    };
 };
 export default GetManagementUserByUserid;

package/src/handlers/Management/PutUserPasswordByUserid.ts

@@ -3,50 +3,44 @@ import { JwtAuthPlugin } from "@flink-app/jwt-auth-plugin";
 import { PutManagementUserPasswordByUseridReq } from "../../schemas/Management/PutUserPasswordByUseridReq";
 import { PutManagementUserPasswordByUseridRes } from "../../schemas/Management/PutUserPasswordByUseridRes";
 
-const PutManagementUserPasswordByUserid: Handler<
-  FlinkContext,
-  PutManagementUserPasswordByUseridReq,
-  PutManagementUserPasswordByUseridRes
-> = async ({ ctx, req, origin }) => {
-  let pluginName = origin || "genericAuthPlugin";
-  let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
-
-  const user = await repo.getById(req.params.userid);
-  if (user == null) {
-    return notFound();
-  }
-
-  const resp = await ctx.plugins.genericAuthPlugin.changePassword(
-    repo,
-    <JwtAuthPlugin>ctx.auth,
-    user._id,
-    req.body.password
-  );
-
-  const auth = <JwtAuthPlugin>ctx.auth;
-
-  const createPasswordHashAndSaltMethod =
-    ctx.plugins.genericAuthPlugin.createPasswordHashAndSaltMethod;
-  let passwordAndSalt = null;
-
-  if (createPasswordHashAndSaltMethod == null) {
-    passwordAndSalt = await auth.createPasswordHashAndSalt(req.body.password);
-  } else {
-    passwordAndSalt = await createPasswordHashAndSaltMethod(req.body.password);
-  }
-
-  if (passwordAndSalt == null) {
-    return badRequest("Password not accepted");
-  }
-
-  await repo.updateOne(req.params.userid, {
-    password: passwordAndSalt.hash,
-    salt: passwordAndSalt.salt,
-  });
-
-  return {
-    data: {},
-    status: 200,
-  };
+const PutManagementUserPasswordByUserid: Handler<FlinkContext, PutManagementUserPasswordByUseridReq, PutManagementUserPasswordByUseridRes> = async ({
+    ctx,
+    req,
+    origin,
+}) => {
+    let pluginName = origin || "genericAuthPlugin";
+    let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
+
+    const user = await repo.getById(req.params.userid);
+    if (user == null) {
+        return notFound();
+    }
+
+    const resp = await ctx.plugins.genericAuthPlugin.changePassword(repo, <JwtAuthPlugin>ctx.auth, user._id, req.body.password);
+
+    const auth = <JwtAuthPlugin>ctx.auth;
+
+    const createPasswordHashAndSaltMethod = ctx.plugins.genericAuthPlugin.createPasswordHashAndSaltMethod;
+    let passwordAndSalt = null;
+
+    if (createPasswordHashAndSaltMethod == null) {
+        passwordAndSalt = await auth.createPasswordHashAndSalt(req.body.password);
+    } else {
+        passwordAndSalt = await createPasswordHashAndSaltMethod(req.body.password);
+    }
+
+    if (passwordAndSalt == null) {
+        return badRequest("Password not accepted");
+    }
+
+    await repo.updateById(req.params.userid, {
+        password: passwordAndSalt.hash,
+        salt: passwordAndSalt.salt,
+    });
+
+    return {
+        data: {},
+        status: 200,
+    };
 };
 export default PutManagementUserPasswordByUserid;

package/src/handlers/Management/PutUserProfileByUserid.ts

@@ -1,37 +1,31 @@
-import {
-  FlinkContext,
-  Handler,
-  HttpMethod,
-  notFound,
-  RouteProps,
-} from "@flink-app/flink";
+import { FlinkContext, Handler, HttpMethod, notFound, RouteProps } from "@flink-app/flink";
 import { PutManagementUserProfileByUseridReq } from "../../schemas/Management/PutUserProfileByUseridReq";
 import { PutManagementUserProfileByUseridRes } from "../../schemas/Management/PutUserProfileByUseridRes";
 
-const PutManagementUserProfileByUserid: Handler<
-  FlinkContext,
-  PutManagementUserProfileByUseridReq,
-  PutManagementUserProfileByUseridRes
-> = async ({ ctx, req, origin }) => {
-  let pluginName = origin || "genericAuthPlugin";
-  let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
+const PutManagementUserProfileByUserid: Handler<FlinkContext, PutManagementUserProfileByUseridReq, PutManagementUserProfileByUseridRes> = async ({
+    ctx,
+    req,
+    origin,
+}) => {
+    let pluginName = origin || "genericAuthPlugin";
+    let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
 
-  const user = await repo.getById(req.params.userid);
-  if (user == null) {
-    return notFound();
-  }
+    const user = await repo.getById(req.params.userid);
+    if (user == null) {
+        return notFound();
+    }
 
-  await repo.updateOne(user._id, { profile: req.body });
+    await repo.updateById(user._id, { profile: req.body });
 
-  const updatedUser = await repo.getById(req.params.userid);
+    const updatedUser = await repo.getById(req.params.userid);
 
-  if ((<any>ctx.plugins)[pluginName].onUserUpdated) {
-    await (<any>ctx.plugins)[pluginName].onUserUpdated(updatedUser, req.body);
-  }
+    if ((<any>ctx.plugins)[pluginName].onUserUpdated) {
+        await (<any>ctx.plugins)[pluginName].onUserUpdated(updatedUser, req.body);
+    }
 
-  return {
-    data: {},
-    status: 200,
-  };
+    return {
+        data: {},
+        status: 200,
+    };
 };
 export default PutManagementUserProfileByUserid;

package/src/handlers/Management/PutUserProfileByUseridAppend.ts

@@ -1,38 +1,32 @@
-import {
-  FlinkContext,
-  Handler,
-  HttpMethod,
-  notFound,
-  RouteProps,
-} from "@flink-app/flink";
+import { FlinkContext, Handler, HttpMethod, notFound, RouteProps } from "@flink-app/flink";
 import { PutManagementUserProfileByUseridReq } from "../../schemas/Management/PutUserProfileByUseridReq";
 import { PutManagementUserProfileByUseridRes } from "../../schemas/Management/PutUserProfileByUseridRes";
 
-const PutManagementUserProfileByUserid: Handler<
-  FlinkContext,
-  PutManagementUserProfileByUseridReq,
-  PutManagementUserProfileByUseridRes
-> = async ({ ctx, req, origin }) => {
-  let pluginName = origin || "genericAuthPlugin";
-  let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
+const PutManagementUserProfileByUserid: Handler<FlinkContext, PutManagementUserProfileByUseridReq, PutManagementUserProfileByUseridRes> = async ({
+    ctx,
+    req,
+    origin,
+}) => {
+    let pluginName = origin || "genericAuthPlugin";
+    let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
 
-  const user = await repo.getById(req.params.userid);
-  if (user == null) {
-    return notFound();
-  }
+    const user = await repo.getById(req.params.userid);
+    if (user == null) {
+        return notFound();
+    }
 
-  if (user.profile == null) user.profile = {};
+    if (user.profile == null) user.profile = {};
 
-  const profile = {
-    ...user.profile,
-    ...req.body,
-  };
+    const profile = {
+        ...user.profile,
+        ...req.body,
+    };
 
-  await repo.updateOne(user._id, { profile: profile });
+    await repo.updateById(user._id, { profile: profile });
 
-  return {
-    data: {},
-    status: 200,
-  };
+    return {
+        data: {},
+        status: 200,
+    };
 };
 export default PutManagementUserProfileByUserid;

package/src/handlers/Management/PutUserRolesByUserid.ts

@@ -1,31 +1,25 @@
-import {
-  FlinkContext,
-  Handler,
-  HttpMethod,
-  notFound,
-  RouteProps,
-} from "@flink-app/flink";
+import { FlinkContext, Handler, HttpMethod, notFound, RouteProps } from "@flink-app/flink";
 import { PutManagementUserRolesByUseridReq } from "../../schemas/Management/PutUserRolesByUseridReq";
 import { PutManagementUserRolesByUseridRes } from "../../schemas/Management/PutUserRolesByUseridRes";
 
-const PutManagementUserRolesByUserid: Handler<
-  FlinkContext,
-  PutManagementUserRolesByUseridReq,
-  PutManagementUserRolesByUseridRes
-> = async ({ ctx, req, origin }) => {
-  let pluginName = origin || "genericAuthPlugin";
-  let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
+const PutManagementUserRolesByUserid: Handler<FlinkContext, PutManagementUserRolesByUseridReq, PutManagementUserRolesByUseridRes> = async ({
+    ctx,
+    req,
+    origin,
+}) => {
+    let pluginName = origin || "genericAuthPlugin";
+    let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
 
-  const user = await repo.getById(req.params.userid);
-  if (user == null) {
-    return notFound();
-  }
+    const user = await repo.getById(req.params.userid);
+    if (user == null) {
+        return notFound();
+    }
 
-  await repo.updateOne(user._id, { roles: req.body.roles });
+    await repo.updateById(user._id, { roles: req.body.roles });
 
-  return {
-    data: {},
-    status: 200,
-  };
+    return {
+        data: {},
+        status: 200,
+    };
 };
 export default PutManagementUserRolesByUserid;

package/src/handlers/Management/PutUserUsernameByUserid.ts

@@ -1,41 +1,34 @@
-import {
-  conflict,
-  FlinkContext,
-  Handler,
-  HttpMethod,
-  notFound,
-  RouteProps,
-} from "@flink-app/flink";
+import { conflict, FlinkContext, Handler, HttpMethod, notFound, RouteProps } from "@flink-app/flink";
 import { PutManagementUserUsernameByUseridReq } from "../../schemas/Management/PutUserUsernameByUseridReq";
 import { PutManagementUserUsernameByUseridRes } from "../../schemas/Management/PutUserUsernameByUseridRes";
 
-const PutManagementUserUsernameByUserid: Handler<
-  FlinkContext,
-  PutManagementUserUsernameByUseridReq,
-  PutManagementUserUsernameByUseridRes
-> = async ({ ctx, req, origin }) => {
-  let pluginName = origin || "genericAuthPlugin";
-  let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
+const PutManagementUserUsernameByUserid: Handler<FlinkContext, PutManagementUserUsernameByUseridReq, PutManagementUserUsernameByUseridRes> = async ({
+    ctx,
+    req,
+    origin,
+}) => {
+    let pluginName = origin || "genericAuthPlugin";
+    let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
 
-  const user = await repo.getById(req.params.userid);
-  if (user == null) {
-    return notFound();
-  }
+    const user = await repo.getById(req.params.userid);
+    if (user == null) {
+        return notFound();
+    }
 
-  const existingUser = await repo.getOne({
-    username: req.body.username.toLowerCase(),
-  });
-  if (existingUser != null) {
-    if (existingUser._id + "" != user._id + "") {
-      return conflict("Username already taken");
+    const existingUser = await repo.getOne({
+        username: req.body.username.toLowerCase(),
+    });
+    if (existingUser != null) {
+        if (existingUser._id + "" != user._id + "") {
+            return conflict("Username already taken");
+        }
     }
-  }
 
-  await repo.updateOne(user._id, { username: req.body.username.toLowerCase() });
+    await repo.updateById(user._id, { username: req.body.username.toLowerCase() });
 
-  return {
-    data: {},
-    status: 200,
-  };
+    return {
+        data: {},
+        status: 200,
+    };
 };
 export default PutManagementUserUsernameByUserid;

package/src/handlers/UserLoginByToken.ts

@@ -4,36 +4,29 @@ import { genericAuthContext } from "../genericAuthContext";
 import { UserLoginByTokenReq } from "../schemas/UserLoginByTokenReq";
 import { UserLoginRes } from "../schemas/UserLoginRes";
 
-const userLoginHandler: Handler<
-  FlinkContext<genericAuthContext>,
-  UserLoginByTokenReq,
-  UserLoginRes
-> = async ({ ctx, req, origin }) => {
-  let pluginName = origin || "genericAuthPlugin";
-  let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
-  
-  const loginRespons = await ctx.plugins.genericAuthPlugin.loginByToken(
-    repo,
-    <JwtAuthPlugin>ctx.auth,
-    req.body.token,
-    req.body.code,
-    (<any>ctx.plugins)[pluginName].smsOptions.jwtToken
-  );
+const userLoginHandler: Handler<FlinkContext<genericAuthContext>, UserLoginByTokenReq, UserLoginRes> = async ({ ctx, req, origin }) => {
+    let pluginName = origin || "genericAuthPlugin";
+    let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
 
-  if (loginRespons.status != "success") {
-    switch (loginRespons.status) {
-      case "failed":
-        return unauthorized(
-          "Invalid token or code",
-          loginRespons.status
-        );
+    const loginRespons = await ctx.plugins.genericAuthPlugin.loginByToken(
+        repo,
+        <JwtAuthPlugin>ctx.auth,
+        req.body.token,
+        req.body.code,
+        (<any>ctx.plugins)[pluginName].smsOptions.jwtToken
+    );
+
+    if (loginRespons.status != "success") {
+        switch (loginRespons.status) {
+            case "failed":
+                return unauthorized("Invalid token or code", loginRespons.status);
+        }
     }
-  }
 
-  return {
-    data: loginRespons,
-    status: 200,
-  };
+    return {
+        data: loginRespons,
+        status: 200,
+    };
 };
 
 export default userLoginHandler;