@ruiapp/rapid-core 0.9.0 → 0.9.2

package/src/plugins/auth/actionHandlers/createSession.ts

@@ -1,67 +1,69 @@
-import bcrypt from "bcrypt";
-import { setCookie } from "~/deno-std/http/cookie";
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
-import AuthService from "../services/AuthService";
-import { validateLicense } from "~/helpers/licenseHelper";
-
-export const code = "createSession";
-
-export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any) {
-  const { server, input, routerContext: routeContext, logger } = ctx;
-  const { response } = routeContext;
-  const { account, password } = input;
-
-  validateLicense(server);
-
-  const userDataAccessor = server.getDataAccessor({
-    singularCode: "oc_user",
-  });
-
-  const user = await userDataAccessor.findOne(
-    {
-      filters: [
-        {
-          operator: "eq",
-          field: "login",
-          value: account,
-        },
-        {
-          operator: "null",
-          field: "deleted_at",
-        },
-      ],
-    },
-    routeContext?.getDbTransactionClient(),
-  );
-
-  if (!user) {
-    throw new Error("用户名或密码错误。");
-  }
-
-  if (user.state !== "enabled") {
-    throw new Error("用户已被禁用，不允许登录。");
-  }
-
-  const isMatch = await bcrypt.compare(password, user.password);
-  if (!isMatch) {
-    throw new Error("用户名或密码错误。");
-  }
-
-  const authService = server.getService<AuthService>("authService");
-  const token = authService.createUserAccessToken({
-    issuer: "authManager",
-    userId: user.id,
-    userLogin: user.login,
-  });
-
-  setCookie(response.headers, {
-    name: ctx.server.config.sessionCookieName,
-    value: token,
-    path: "/",
-  });
-
-  ctx.output = {
-    token,
-  };
-}
+import bcrypt from "bcrypt";
+import { setCookie } from "~/deno-std/http/cookie";
+import { ActionHandlerContext } from "~/core/actionHandler";
+import { RapidPlugin } from "~/core/server";
+import AuthService from "../services/AuthService";
+import { validateLicense } from "~/helpers/licenseHelper";
+import AuthPlugin from "../AuthPlugin";
+
+export const code = "createSession";
+
+export async function handler(plugin: AuthPlugin, ctx: ActionHandlerContext, options: any) {
+  const { server, input, routerContext: routeContext, logger } = ctx;
+  const { response } = routeContext;
+  const { account, password } = input;
+
+  validateLicense(server);
+
+  const userEntitySingularCode = plugin.options?.userEntitySingularCode || "oc_user";
+  const userDataAccessor = server.getDataAccessor({
+    singularCode: userEntitySingularCode,
+  });
+
+  const user = await userDataAccessor.findOne(
+    {
+      filters: [
+        {
+          operator: "eq",
+          field: "login",
+          value: account,
+        },
+        {
+          operator: "null",
+          field: "deleted_at",
+        },
+      ],
+    },
+    routeContext?.getDbTransactionClient(),
+  );
+
+  if (!user) {
+    throw new Error("用户名或密码错误。");
+  }
+
+  if (user.state !== "enabled") {
+    throw new Error("用户已被禁用，不允许登录。");
+  }
+
+  const isMatch = await bcrypt.compare(password, user.password);
+  if (!isMatch) {
+    throw new Error("用户名或密码错误。");
+  }
+
+  const authService = server.getService<AuthService>("authService");
+  const token = authService.createUserAccessToken({
+    issuer: "authManager",
+    userId: user.id,
+    userLogin: user.login,
+  });
+
+  setCookie(response.headers, {
+    name: ctx.server.config.sessionCookieName,
+    value: token,
+    path: "/",
+  });
+
+  ctx.output = {
+    token,
+  };
+}

package/src/plugins/auth/actionHandlers/deleteSession.ts

@@ -1,18 +1,18 @@
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
-import { setCookie } from "~/deno-std/http/cookie";
-
-export const code = "deleteSession";
-
-export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any) {
-  const { server, input, routerContext } = ctx;
-  const { response } = routerContext;
-
-  setCookie(response.headers, {
-    name: ctx.server.config.sessionCookieName,
-    value: "",
-    path: "/",
-  });
-
-  routerContext.redirect("/signin");
-}
+import { ActionHandlerContext } from "~/core/actionHandler";
+import { RapidPlugin } from "~/core/server";
+import { setCookie } from "~/deno-std/http/cookie";
+
+export const code = "deleteSession";
+
+export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any) {
+  const { server, input, routerContext } = ctx;
+  const { response } = routerContext;
+
+  setCookie(response.headers, {
+    name: ctx.server.config.sessionCookieName,
+    value: "",
+    path: "/",
+  });
+
+  routerContext.redirect("/signin");
+}

package/src/plugins/auth/actionHandlers/getMyProfile.ts

@@ -1,35 +1,38 @@
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
-
-export const code = "getMyProfile";
-
-export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any) {
-  const { server, input, routerContext } = ctx;
-
-  const userId = routerContext.state.userId;
-  if (!userId) {
-    ctx.status = 401;
-    ctx.output = {
-      error: {
-        message: "You are not signed in.",
-      },
-    };
-    return;
-  }
-
-  const entityManager = server.getEntityManager("oc_user");
-  const user = await entityManager.findEntity({
-    filters: [
-      {
-        operator: "eq",
-        field: "id",
-        value: userId,
-      },
-    ],
-    properties: ["id", "name", "login", "email", "department", "roles", "state", "createdAt"],
-  });
-
-  ctx.output = {
-    user,
-  };
-}
+import { ActionHandlerContext } from "~/core/actionHandler";
+import { RapidPlugin } from "~/core/server";
+import AuthPlugin from "../AuthPlugin";
+
+export const code = "getMyProfile";
+
+export async function handler(plugin: AuthPlugin, ctx: ActionHandlerContext, options: any) {
+  const { server, input, routerContext } = ctx;
+
+  const userId = routerContext.state.userId;
+  if (!userId) {
+    ctx.status = 401;
+    ctx.output = {
+      error: {
+        message: "You are not signed in.",
+      },
+    };
+    return;
+  }
+
+  const userEntitySingularCode = plugin.options?.userEntitySingularCode || "oc_user";
+  const profilePropertyCodes = plugin.options?.profilePropertyCodes || ["id", "name", "login", "email", "department", "roles", "state", "createdAt"];
+  const entityManager = server.getEntityManager(userEntitySingularCode);
+  const user = await entityManager.findEntity({
+    filters: [
+      {
+        operator: "eq",
+        field: "id",
+        value: userId,
+      },
+    ],
+    properties: profilePropertyCodes,
+  });
+
+  ctx.output = {
+    user,
+  };
+}

package/src/plugins/auth/actionHandlers/index.ts

@@ -1,8 +1,8 @@
-import { IPluginActionHandler } from "~/core/actionHandler";
-import * as changePassword from "./changePassword";
-import * as createSession from "./createSession";
-import * as deleteSession from "./deleteSession";
-import * as getMyProfile from "./getMyProfile";
-import * as resetPassword from "./resetPassword";
-
-export default [changePassword, createSession, deleteSession, getMyProfile, resetPassword] satisfies IPluginActionHandler[];
+import { IPluginActionHandler } from "~/core/actionHandler";
+import * as changePassword from "./changePassword";
+import * as createSession from "./createSession";
+import * as deleteSession from "./deleteSession";
+import * as getMyProfile from "./getMyProfile";
+import * as resetPassword from "./resetPassword";
+
+export default [changePassword, createSession, deleteSession, getMyProfile, resetPassword] satisfies IPluginActionHandler[];

package/src/plugins/auth/actionHandlers/resetPassword.ts

@@ -1,45 +1,47 @@
-import bcrypt from "bcrypt";
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
-
-export const code = "resetPassword";
-
-export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any) {
-  const { server, input, routerContext: routeContext } = ctx;
-  const { response } = routeContext;
-  const { userId, password } = input;
-
-  const userDataAccessor = server.getDataAccessor({
-    singularCode: "oc_user",
-  });
-
-  const user = await userDataAccessor.findOne(
-    {
-      filters: [
-        {
-          operator: "eq",
-          field: "id",
-          value: userId,
-        },
-      ],
-    },
-    routeContext?.getDbTransactionClient(),
-  );
-
-  if (!user) {
-    throw new Error("User not found.");
-  }
-
-  const saltRounds = 10;
-  const passwordHash = await bcrypt.hash(password, saltRounds);
-
-  await userDataAccessor.updateById(
-    user.id,
-    {
-      password: passwordHash,
-    },
-    routeContext?.getDbTransactionClient(),
-  );
-
-  ctx.output = {};
-}
+import bcrypt from "bcrypt";
+import { ActionHandlerContext } from "~/core/actionHandler";
+import { RapidPlugin } from "~/core/server";
+import AuthPlugin from "../AuthPlugin";
+
+export const code = "resetPassword";
+
+export async function handler(plugin: AuthPlugin, ctx: ActionHandlerContext, options: any) {
+  const { server, input, routerContext: routeContext } = ctx;
+  const { response } = routeContext;
+  const { userId, password } = input;
+
+  const userEntitySingularCode = plugin.options?.userEntitySingularCode || "oc_user";
+  const userDataAccessor = server.getDataAccessor({
+    singularCode: userEntitySingularCode,
+  });
+
+  const user = await userDataAccessor.findOne(
+    {
+      filters: [
+        {
+          operator: "eq",
+          field: "id",
+          value: userId,
+        },
+      ],
+    },
+    routeContext?.getDbTransactionClient(),
+  );
+
+  if (!user) {
+    throw new Error("User not found.");
+  }
+
+  const saltRounds = 10;
+  const passwordHash = await bcrypt.hash(password, saltRounds);
+
+  await userDataAccessor.updateById(
+    user.id,
+    {
+      password: passwordHash,
+    },
+    routeContext?.getDbTransactionClient(),
+  );
+
+  ctx.output = {};
+}

package/src/plugins/auth/models/AccessToken.ts

@@ -1,56 +1,56 @@
-import { RpdDataModel } from "~/types";
-
-export default {
-  maintainedBy: "authManager",
-  namespace: "auth",
-  name: "access_token",
-  singularCode: "access_token",
-  pluralCode: "access_tokens",
-  schema: "public",
-  tableName: "access_tokens",
-  properties: [
-    {
-      name: "id",
-      code: "id",
-      columnName: "id",
-      type: "integer",
-      required: true,
-      autoIncrement: true,
-    },
-    {
-      name: "token",
-      code: "token",
-      columnName: "token",
-      type: "text",
-      required: true,
-    },
-    {
-      name: "description",
-      code: "description",
-      columnName: "description",
-      type: "text",
-      required: false,
-    },
-    {
-      name: "ownerType",
-      code: "ownerType",
-      columnName: "owner_type",
-      type: "text",
-      required: true,
-    },
-    {
-      name: "ownerId",
-      code: "ownerId",
-      columnName: "owner_id",
-      type: "integer",
-      required: true,
-    },
-    {
-      name: "expirationTime",
-      code: "expirationTime",
-      columnName: "expiration_time",
-      type: "datetime",
-      required: true,
-    },
-  ],
-} as RpdDataModel;
+import { RpdDataModel } from "~/types";
+
+export default {
+  maintainedBy: "authManager",
+  namespace: "auth",
+  name: "access_token",
+  singularCode: "access_token",
+  pluralCode: "access_tokens",
+  schema: "public",
+  tableName: "access_tokens",
+  properties: [
+    {
+      name: "id",
+      code: "id",
+      columnName: "id",
+      type: "integer",
+      required: true,
+      autoIncrement: true,
+    },
+    {
+      name: "token",
+      code: "token",
+      columnName: "token",
+      type: "text",
+      required: true,
+    },
+    {
+      name: "description",
+      code: "description",
+      columnName: "description",
+      type: "text",
+      required: false,
+    },
+    {
+      name: "ownerType",
+      code: "ownerType",
+      columnName: "owner_type",
+      type: "text",
+      required: true,
+    },
+    {
+      name: "ownerId",
+      code: "ownerId",
+      columnName: "owner_id",
+      type: "integer",
+      required: true,
+    },
+    {
+      name: "expirationTime",
+      code: "expirationTime",
+      columnName: "expiration_time",
+      type: "datetime",
+      required: true,
+    },
+  ],
+} as RpdDataModel;

package/src/plugins/auth/models/index.ts

@@ -1,3 +1,3 @@
-import AccessToken from "./AccessToken";
-
-export default [AccessToken];
+import AccessToken from "./AccessToken";
+
+export default [AccessToken];

package/src/plugins/auth/routes/changePassword.ts

@@ -1,15 +1,15 @@
-import { RpdRoute } from "~/types";
-
-export default {
-  namespace: "auth",
-  name: "auth.changePassword",
-  code: "auth.changePassword",
-  type: "RESTful",
-  method: "POST",
-  endpoint: "/changePassword",
-  actions: [
-    {
-      code: "changePassword",
-    },
-  ],
-} satisfies RpdRoute;
+import { RpdRoute } from "~/types";
+
+export default {
+  namespace: "auth",
+  name: "auth.changePassword",
+  code: "auth.changePassword",
+  type: "RESTful",
+  method: "POST",
+  endpoint: "/changePassword",
+  actions: [
+    {
+      code: "changePassword",
+    },
+  ],
+} satisfies RpdRoute;

package/src/plugins/auth/routes/getMyProfile.ts

@@ -1,15 +1,15 @@
-import { RpdRoute } from "~/types";
-
-export default {
-  namespace: "auth",
-  name: "auth.getMyProfile",
-  code: "auth.getMyProfile",
-  type: "RESTful",
-  method: "GET",
-  endpoint: "/me",
-  actions: [
-    {
-      code: "getMyProfile",
-    },
-  ],
-} satisfies RpdRoute;
+import { RpdRoute } from "~/types";
+
+export default {
+  namespace: "auth",
+  name: "auth.getMyProfile",
+  code: "auth.getMyProfile",
+  type: "RESTful",
+  method: "GET",
+  endpoint: "/me",
+  actions: [
+    {
+      code: "getMyProfile",
+    },
+  ],
+} satisfies RpdRoute;

package/src/plugins/auth/routes/index.ts

@@ -1,7 +1,7 @@
-import changePassword from "./changePassword";
-import getMyProfile from "./getMyProfile";
-import resetPassword from "./resetPassword";
-import signin from "./signin";
-import signout from "./signout";
-
-export default [changePassword, getMyProfile, resetPassword, signin, signout];
+import changePassword from "./changePassword";
+import getMyProfile from "./getMyProfile";
+import resetPassword from "./resetPassword";
+import signin from "./signin";
+import signout from "./signout";
+
+export default [changePassword, getMyProfile, resetPassword, signin, signout];

package/src/plugins/auth/routes/resetPassword.ts

@@ -1,15 +1,15 @@
-import { RpdRoute } from "~/types";
-
-export default {
-  namespace: "auth",
-  name: "auth.resetPassword",
-  code: "auth.resetPassword",
-  type: "RESTful",
-  method: "POST",
-  endpoint: "/resetPassword",
-  actions: [
-    {
-      code: "resetPassword",
-    },
-  ],
-} satisfies RpdRoute;
+import { RpdRoute } from "~/types";
+
+export default {
+  namespace: "auth",
+  name: "auth.resetPassword",
+  code: "auth.resetPassword",
+  type: "RESTful",
+  method: "POST",
+  endpoint: "/resetPassword",
+  actions: [
+    {
+      code: "resetPassword",
+    },
+  ],
+} satisfies RpdRoute;

package/src/plugins/auth/routes/signin.ts

@@ -1,15 +1,15 @@
-import { RpdRoute } from "~/types";
-
-export default {
-  namespace: "auth",
-  name: "auth.signin",
-  code: "auth.signin",
-  type: "RESTful",
-  method: "POST",
-  endpoint: "/signin",
-  actions: [
-    {
-      code: "createSession",
-    },
-  ],
-} satisfies RpdRoute;
+import { RpdRoute } from "~/types";
+
+export default {
+  namespace: "auth",
+  name: "auth.signin",
+  code: "auth.signin",
+  type: "RESTful",
+  method: "POST",
+  endpoint: "/signin",
+  actions: [
+    {
+      code: "createSession",
+    },
+  ],
+} satisfies RpdRoute;

package/src/plugins/auth/routes/signout.ts

@@ -1,15 +1,15 @@
-import { RpdRoute } from "~/types";
-
-export default {
-  namespace: "auth",
-  name: "auth.signout",
-  code: "auth.signout",
-  type: "RESTful",
-  method: "GET",
-  endpoint: "/signout",
-  actions: [
-    {
-      code: "deleteSession",
-    },
-  ],
-} satisfies RpdRoute;
+import { RpdRoute } from "~/types";
+
+export default {
+  namespace: "auth",
+  name: "auth.signout",
+  code: "auth.signout",
+  type: "RESTful",
+  method: "GET",
+  endpoint: "/signout",
+  actions: [
+    {
+      code: "deleteSession",
+    },
+  ],
+} satisfies RpdRoute;