@ruiapp/rapid-core 0.1.62 → 0.1.65

package/src/helpers/inputHelper.ts

@@ -1,11 +1,11 @@
-import { isArray, mergeWith } from "lodash";
-
-export function mergeInput(defaultInput: any, input: any, fixedInput: any) {
-  return mergeWith({}, defaultInput, input, fixedInput, doNotMergeArray);
-}
-
-function doNotMergeArray(objValue: any, srcValue: any) {
-  if (isArray(srcValue)) {
-    return srcValue;
-  }
-}
+import { isArray, mergeWith } from "lodash";
+
+export function mergeInput(defaultInput: any, input: any, fixedInput: any) {
+  return mergeWith({}, defaultInput, input, fixedInput, doNotMergeArray);
+}
+
+function doNotMergeArray(objValue: any, srcValue: any) {
+  if (isArray(srcValue)) {
+    return srcValue;
+  }
+}

package/src/{dataAccess → helpers}/metaHelper.ts

@@ -2,6 +2,18 @@ import { cloneDeep } from "lodash";
 import { IRpdServer } from "~/core/server";
 import { RpdDataModel, RpdDataModelProperty } from "~/types";
 
+export function isRelationProperty(property: RpdDataModelProperty) {
+  return property.type === "relation" || property.type === "relation[]";
+}
+
+export function isOneRelationProperty(property: RpdDataModelProperty) {
+  return isRelationProperty(property) && property.relation === "one";
+}
+
+export function isManyRelationProperty(property: RpdDataModelProperty) {
+  return isRelationProperty(property) && property.relation === "many";
+}
+
 export function getEntityProperties(server: IRpdServer, model: RpdDataModel) {
   return model.properties;
 }
@@ -20,13 +32,10 @@ export function getEntityPropertiesIncludingBase(server: IRpdServer, model: RpdD
       property = cloneDeep(property);
       property.isBaseProperty = true;
       return property;
-    })
+    });
   }
 
-  return [
-    ...baseProperties,
-    ...model.properties,
-  ]
+  return [...baseProperties, ...model.properties];
 }
 
 export function getEntityPropertyByCode(server: IRpdServer, model: RpdDataModel, propertyCode: string) {
@@ -51,4 +60,4 @@ export function getEntityProperty(server: IRpdServer, model: RpdDataModel, predi
   }
 
   return property;
-}
+}

package/src/helpers/runCollectionEntityActionHandler.ts

@@ -5,7 +5,12 @@ import EntityManager from "~/dataAccess/entityManager";
 
 type EntityActionHandler = (entityManager: EntityManager, input: any) => Promise<any>;
 
-export default async function runCollectionEntityActionHandler(ctx: ActionHandlerContext, options: RunEntityActionHandlerOptions, code: string, handleEntityAction: EntityActionHandler) {
+export default async function runCollectionEntityActionHandler(
+  ctx: ActionHandlerContext,
+  options: RunEntityActionHandlerOptions,
+  code: string,
+  handleEntityAction: EntityActionHandler,
+) {
   const { logger, server, input } = ctx;
 
   const { defaultInput, fixedInput } = options;

package/src/index.ts

@@ -1,41 +1,41 @@
-import { fixBigIntJSONSerialize } from "./polyfill";
-fixBigIntJSONSerialize();
-
-export * from "./types";
-export * from "./server";
-
-export * from "./core/request";
-export * from "./core/routeContext";
-export * from "./core/server";
-export * from "./core/http-types";
-export * from "./core/actionHandler";
-
-export * from "./utilities/jwtUtility";
-
-export * as bootstrapApplicationConfig from "./bootstrapApplicationConfig";
-
-export { default as MetaManagePlugin } from "./plugins/metaManage/MetaManagePlugin";
-
-export { default as DataManagePlugin } from "./plugins/dataManage/DataManagePlugin";
-
-export { default as RouteManagePlugin } from "./plugins/routeManage/RouteManagePlugin";
-
-export { default as SequencePlugin } from "./plugins/sequence/SequencePlugin";
-export * from "./plugins/sequence/SequencePluginTypes";
-
-export { default as WebhooksPlugin } from "./plugins/webhooks/WebhooksPlugin";
-
-export { default as AuthPlugin } from "./plugins/auth/AuthPlugin";
-
-export { default as FileManagePlugin } from "./plugins/fileManage/FileManagePlugin";
-
-export { default as ServerOperationPlugin } from "./plugins/serverOperation/ServerOperationPlugin";
-export * from "./plugins/serverOperation/ServerOperationPluginTypes";
-
-export { default as CronJobPlugin } from "./plugins/cronJob/CronJobPlugin";
-export * from "./plugins/cronJob/CronJobPluginTypes";
-
-export { default as StateMachinePlugin } from "./plugins/stateMachine/StateMachinePlugin";
-export * from "./plugins/stateMachine/StateMachinePluginTypes";
-
-export { default as EntityAccessControlPlugin } from "./plugins/entityAccessControl/EntityAccessControlPlugin";
+import { fixBigIntJSONSerialize } from "./polyfill";
+fixBigIntJSONSerialize();
+
+export * from "./types";
+export * from "./server";
+
+export * from "./core/request";
+export * from "./core/routeContext";
+export * from "./core/server";
+export * from "./core/http-types";
+export * from "./core/actionHandler";
+
+export * from "./utilities/jwtUtility";
+
+export * as bootstrapApplicationConfig from "./bootstrapApplicationConfig";
+
+export { default as MetaManagePlugin } from "./plugins/metaManage/MetaManagePlugin";
+
+export { default as DataManagePlugin } from "./plugins/dataManage/DataManagePlugin";
+
+export { default as RouteManagePlugin } from "./plugins/routeManage/RouteManagePlugin";
+
+export { default as SequencePlugin } from "./plugins/sequence/SequencePlugin";
+export * from "./plugins/sequence/SequencePluginTypes";
+
+export { default as WebhooksPlugin } from "./plugins/webhooks/WebhooksPlugin";
+
+export { default as AuthPlugin } from "./plugins/auth/AuthPlugin";
+
+export { default as FileManagePlugin } from "./plugins/fileManage/FileManagePlugin";
+
+export { default as ServerOperationPlugin } from "./plugins/serverOperation/ServerOperationPlugin";
+export * from "./plugins/serverOperation/ServerOperationPluginTypes";
+
+export { default as CronJobPlugin } from "./plugins/cronJob/CronJobPlugin";
+export * from "./plugins/cronJob/CronJobPluginTypes";
+
+export { default as StateMachinePlugin } from "./plugins/stateMachine/StateMachinePlugin";
+export * from "./plugins/stateMachine/StateMachinePluginTypes";
+
+export { default as EntityAccessControlPlugin } from "./plugins/entityAccessControl/EntityAccessControlPlugin";

package/src/plugins/auth/AuthPlugin.ts

@@ -3,7 +3,13 @@
  */
 
 import { RpdApplicationConfig } from "~/types";
-import { IRpdServer, RapidPlugin, RpdConfigurationItemOptions, RpdServerPluginConfigurableTargetOptions, RpdServerPluginExtendingAbilities } from "~/core/server";
+import {
+  IRpdServer,
+  RapidPlugin,
+  RpdConfigurationItemOptions,
+  RpdServerPluginConfigurableTargetOptions,
+  RpdServerPluginExtendingAbilities,
+} from "~/core/server";
 
 import pluginActionHandlers from "./actionHandlers";
 import pluginModels from "./models";

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 = {};
+}