@ruiapp/rapid-core 0.1.78 → 0.1.80

package/src/facilities/log/LogFacility.ts

@@ -1,35 +1,35 @@
-import winston from "winston";
-
-export interface Logger {
-  log: winston.LogMethod;
-  /**
-   * The service/app is going to stop or become unusable now. An operator should definitely look into this immediately.
-   */
-  emerg: winston.LeveledLogMethod;
-  /**
-   * Fatal for a particular service, but the app continues servicing other requests. An operator should look at this immediately.
-   */
-  crit: winston.LeveledLogMethod;
-  /**
-   * Fatal for a particular request, but the service/app continues servicing other requests. An operator should look at this soon(ish).
-   */
-  error: winston.LeveledLogMethod;
-  /**
-   * A note on something that should probably be looked at by an operator eventually.
-   */
-  warn: winston.LeveledLogMethod;
-  /**
-   * Detail on regular operation.
-   */
-  info: winston.LeveledLogMethod;
-  /**
-   * Anything else, i.e. too verbose to be included in "info" level.
-   */
-  debug: winston.LeveledLogMethod;
-  /**
-   * Logging from external libraries used by your app or very detailed application logging.
-   */
-  verbose: winston.LeveledLogMethod;
-
-  child(options: Object): Logger;
-}
+import winston from "winston";
+
+export interface Logger {
+  log: winston.LogMethod;
+  /**
+   * The service/app is going to stop or become unusable now. An operator should definitely look into this immediately.
+   */
+  emerg: winston.LeveledLogMethod;
+  /**
+   * Fatal for a particular service, but the app continues servicing other requests. An operator should look at this immediately.
+   */
+  crit: winston.LeveledLogMethod;
+  /**
+   * Fatal for a particular request, but the service/app continues servicing other requests. An operator should look at this soon(ish).
+   */
+  error: winston.LeveledLogMethod;
+  /**
+   * A note on something that should probably be looked at by an operator eventually.
+   */
+  warn: winston.LeveledLogMethod;
+  /**
+   * Detail on regular operation.
+   */
+  info: winston.LeveledLogMethod;
+  /**
+   * Anything else, i.e. too verbose to be included in "info" level.
+   */
+  debug: winston.LeveledLogMethod;
+  /**
+   * Logging from external libraries used by your app or very detailed application logging.
+   */
+  verbose: winston.LeveledLogMethod;
+
+  child(options: Object): Logger;
+}

package/src/helpers/entityHelpers.ts

@@ -1,76 +1,76 @@
-import { isNumber, isObject } from "lodash";
-import { IRpdServer } from "~/core/server";
-import { getEntityPropertyByCode, isOneRelationProperty } from "~/helpers/metaHelper";
-import { RpdDataModel } from "~/types";
-
-export function getEntityPartChanges(server: IRpdServer, model: RpdDataModel, before: any, after: any): Record<string, any> | null {
-  if (!before) {
-    throw new Error("Argument 'before' can not be null.");
-  }
-
-  if (!after) {
-    throw new Error("Argument 'after' can not be null.");
-  }
-
-  let changed = false;
-  let changes = {};
-  for (const key in after) {
-    const property = getEntityPropertyByCode(server, model, key);
-    if (isOneRelationProperty(property)) {
-      const afterValue: number | { id: number } | null = after[key];
-      const beforeValue: number | { id: number } | null = before[key] || before[property.targetIdColumnName];
-      if (afterValue) {
-        if (isNumber(afterValue)) {
-          if (beforeValue) {
-            if (isNumber(beforeValue)) {
-              if (afterValue != beforeValue) {
-                changed = true;
-                changes[key] = afterValue;
-              }
-            } else {
-              if (afterValue != beforeValue.id) {
-                changed = true;
-                changes[key] = afterValue;
-              }
-            }
-          } else {
-            changed = true;
-            changes[key] = afterValue;
-          }
-        } else {
-          if (beforeValue) {
-            if (isNumber(beforeValue)) {
-              if (afterValue.id != beforeValue) {
-                changed = true;
-                changes[key] = afterValue;
-              }
-            } else {
-              if (afterValue.id != beforeValue.id) {
-                changed = true;
-                changes[key] = afterValue;
-              }
-            }
-          } else {
-            changed = true;
-            changes[key] = afterValue;
-          }
-        }
-      } else {
-        if (beforeValue) {
-          changed = true;
-          changes[key] = null;
-        }
-      }
-    } else {
-      if (after[key] != before[key]) {
-        changed = true;
-        changes[key] = after[key];
-      }
-    }
-  }
-
-  if (changed) {
-    return changes;
-  }
-  return null;
-}
+import { isNumber, isObject } from "lodash";
+import { IRpdServer } from "~/core/server";
+import { getEntityPropertyByCode, isOneRelationProperty } from "~/helpers/metaHelper";
+import { RpdDataModel } from "~/types";
+
+export function getEntityPartChanges(server: IRpdServer, model: RpdDataModel, before: any, after: any): Record<string, any> | null {
+  if (!before) {
+    throw new Error("Argument 'before' can not be null.");
+  }
+
+  if (!after) {
+    throw new Error("Argument 'after' can not be null.");
+  }
+
+  let changed = false;
+  let changes = {};
+  for (const key in after) {
+    const property = getEntityPropertyByCode(server, model, key);
+    if (isOneRelationProperty(property)) {
+      const afterValue: number | { id: number } | null = after[key];
+      const beforeValue: number | { id: number } | null = before[key] || before[property.targetIdColumnName];
+      if (afterValue) {
+        if (isNumber(afterValue)) {
+          if (beforeValue) {
+            if (isNumber(beforeValue)) {
+              if (afterValue != beforeValue) {
+                changed = true;
+                changes[key] = afterValue;
+              }
+            } else {
+              if (afterValue != beforeValue.id) {
+                changed = true;
+                changes[key] = afterValue;
+              }
+            }
+          } else {
+            changed = true;
+            changes[key] = afterValue;
+          }
+        } else {
+          if (beforeValue) {
+            if (isNumber(beforeValue)) {
+              if (afterValue.id != beforeValue) {
+                changed = true;
+                changes[key] = afterValue;
+              }
+            } else {
+              if (afterValue.id != beforeValue.id) {
+                changed = true;
+                changes[key] = afterValue;
+              }
+            }
+          } else {
+            changed = true;
+            changes[key] = afterValue;
+          }
+        }
+      } else {
+        if (beforeValue) {
+          changed = true;
+          changes[key] = null;
+        }
+      }
+    } else {
+      if (after[key] != before[key]) {
+        changed = true;
+        changes[key] = after[key];
+      }
+    }
+  }
+
+  if (changed) {
+    return changes;
+  }
+  return null;
+}

package/src/index.ts

@@ -12,6 +12,8 @@ export * from "./core/actionHandler";
 
 export * from "./utilities/jwtUtility";
 
+export { mapDbRowToEntity } from "./dataAccess/entityMapper";
+
 export * as bootstrapApplicationConfig from "./bootstrapApplicationConfig";
 
 export { default as MetaManagePlugin } from "./plugins/metaManage/MetaManagePlugin";

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

@@ -1,54 +1,54 @@
-import bcrypt from "bcrypt";
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
-
-export const code = "changePassword";
-
-export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any) {
-  const { server, input, routerContext } = ctx;
-  const { response } = routerContext;
-  const { id, oldPassword, newPassword } = input;
-
-  const userId = routerContext.state.userId;
-  if (!userId) {
-    ctx.status = 401;
-    ctx.output = {
-      error: {
-        message: "You are not signed in.",
-      },
-    };
-    return;
-  }
-
-  const userDataAccessor = server.getDataAccessor({
-    singularCode: "oc_user",
-  });
-
-  const user = await userDataAccessor.findOne({
-    filters: [
-      {
-        operator: "eq",
-        field: "id",
-        value: userId,
-      },
-    ],
-  });
-
-  if (!user) {
-    throw new Error("User not found.");
-  }
-
-  const isMatch = await bcrypt.compare(oldPassword, user.password);
-  if (!isMatch) {
-    throw new Error("旧密码错误。");
-  }
-
-  const saltRounds = 10;
-  const passwordHash = await bcrypt.hash(newPassword, saltRounds);
-
-  await userDataAccessor.updateById(user.id, {
-    password: passwordHash,
-  });
-
-  ctx.output = {};
-}
+import bcrypt from "bcrypt";
+import { ActionHandlerContext } from "~/core/actionHandler";
+import { RapidPlugin } from "~/core/server";
+
+export const code = "changePassword";
+
+export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any) {
+  const { server, input, routerContext } = ctx;
+  const { response } = routerContext;
+  const { id, oldPassword, newPassword } = input;
+
+  const userId = routerContext.state.userId;
+  if (!userId) {
+    ctx.status = 401;
+    ctx.output = {
+      error: {
+        message: "You are not signed in.",
+      },
+    };
+    return;
+  }
+
+  const userDataAccessor = server.getDataAccessor({
+    singularCode: "oc_user",
+  });
+
+  const user = await userDataAccessor.findOne({
+    filters: [
+      {
+        operator: "eq",
+        field: "id",
+        value: userId,
+      },
+    ],
+  });
+
+  if (!user) {
+    throw new Error("User not found.");
+  }
+
+  const isMatch = await bcrypt.compare(oldPassword, user.password);
+  if (!isMatch) {
+    throw new Error("旧密码错误。");
+  }
+
+  const saltRounds = 10;
+  const passwordHash = await bcrypt.hash(newPassword, saltRounds);
+
+  await userDataAccessor.updateById(user.id, {
+    password: passwordHash,
+  });
+
+  ctx.output = {};
+}

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

@@ -1,63 +1,63 @@
-import bcrypt from "bcrypt";
-import { setCookie } from "~/deno-std/http/cookie";
-import { createJwt } from "~/utilities/jwtUtility";
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
-
-export interface UserAccessToken {
-  sub: "userAccessToken";
-  aud: string;
-}
-
-export const code = "createSession";
-
-export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any) {
-  const { server, input, routerContext } = ctx;
-  const { response } = routerContext;
-  const { account, password } = input;
-
-  const userDataAccessor = server.getDataAccessor({
-    singularCode: "oc_user",
-  });
-
-  const user = await userDataAccessor.findOne({
-    filters: [
-      {
-        operator: "eq",
-        field: "login",
-        value: account,
-      },
-    ],
-  });
-
-  if (!user) {
-    throw new Error("用户名或密码错误。");
-  }
-
-  const isMatch = await bcrypt.compare(password, user.password);
-  if (!isMatch) {
-    throw new Error("用户名或密码错误。");
-  }
-
-  const secretKey = Buffer.from(server.config.jwtKey, "base64");
-  const token = createJwt(
-    {
-      iss: "authManager",
-      sub: "userAccessToken",
-      aud: "" + user.id,
-      iat: Math.floor(Date.now() / 1000),
-      act: user.login,
-    } as UserAccessToken,
-    secretKey,
-  );
-
-  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 { createJwt } from "~/utilities/jwtUtility";
+import { ActionHandlerContext } from "~/core/actionHandler";
+import { RapidPlugin } from "~/core/server";
+
+export interface UserAccessToken {
+  sub: "userAccessToken";
+  aud: string;
+}
+
+export const code = "createSession";
+
+export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any) {
+  const { server, input, routerContext } = ctx;
+  const { response } = routerContext;
+  const { account, password } = input;
+
+  const userDataAccessor = server.getDataAccessor({
+    singularCode: "oc_user",
+  });
+
+  const user = await userDataAccessor.findOne({
+    filters: [
+      {
+        operator: "eq",
+        field: "login",
+        value: account,
+      },
+    ],
+  });
+
+  if (!user) {
+    throw new Error("用户名或密码错误。");
+  }
+
+  const isMatch = await bcrypt.compare(password, user.password);
+  if (!isMatch) {
+    throw new Error("用户名或密码错误。");
+  }
+
+  const secretKey = Buffer.from(server.config.jwtKey, "base64");
+  const token = createJwt(
+    {
+      iss: "authManager",
+      sub: "userAccessToken",
+      aud: "" + user.id,
+      iat: Math.floor(Date.now() / 1000),
+      act: user.login,
+    } as UserAccessToken,
+    secretKey,
+  );
+
+  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,35 @@
-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";
+
+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,
+  };
+}

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,38 +1,38 @@
-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 } = ctx;
-  const { response } = routerContext;
-  const { userId, password } = input;
-
-  const userDataAccessor = server.getDataAccessor({
-    singularCode: "oc_user",
-  });
-
-  const user = await userDataAccessor.findOne({
-    filters: [
-      {
-        operator: "eq",
-        field: "id",
-        value: userId,
-      },
-    ],
-  });
-
-  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,
-  });
-
-  ctx.output = {};
-}
+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 } = ctx;
+  const { response } = routerContext;
+  const { userId, password } = input;
+
+  const userDataAccessor = server.getDataAccessor({
+    singularCode: "oc_user",
+  });
+
+  const user = await userDataAccessor.findOne({
+    filters: [
+      {
+        operator: "eq",
+        field: "id",
+        value: userId,
+      },
+    ],
+  });
+
+  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,
+  });
+
+  ctx.output = {};
+}