@ruiapp/rapid-core 0.3.0 → 0.3.2

package/src/helpers/runCollectionEntityActionHandler.ts

@@ -1,27 +1,27 @@
-import { RunEntityActionHandlerOptions } from "~/types";
-import { mergeInput } from "./inputHelper";
-import { ActionHandlerContext } from "~/core/actionHandler";
-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,
-) {
-  const { logger, server, input } = ctx;
-
-  const { defaultInput, fixedInput } = options;
-  const mergedInput = mergeInput(defaultInput, input, fixedInput);
-  logger.debug(`Running ${code} handler...`, { defaultInput, fixedInput, mergedInput });
-
-  const entityManager = server.getEntityManager(options.singularCode);
-  const result = handleEntityAction(entityManager, mergedInput);
-  if (result instanceof Promise) {
-    ctx.output = await result;
-  } else {
-    ctx.output = result;
-  }
-}
+import { RunEntityActionHandlerOptions } from "~/types";
+import { mergeInput } from "./inputHelper";
+import { ActionHandlerContext } from "~/core/actionHandler";
+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,
+) {
+  const { logger, server, input } = ctx;
+
+  const { defaultInput, fixedInput } = options;
+  const mergedInput = mergeInput(defaultInput, input, fixedInput);
+  logger.debug(`Running ${code} handler...`, { defaultInput, fixedInput, mergedInput });
+
+  const entityManager = server.getEntityManager(options.singularCode);
+  const result = handleEntityAction(entityManager, mergedInput);
+  if (result instanceof Promise) {
+    ctx.output = await result;
+  } else {
+    ctx.output = result;
+  }
+}

package/src/index.ts

@@ -1,54 +1,57 @@
-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 { mapDbRowToEntity } from "./dataAccess/entityMapper";
-
-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 MailPlugin } from "./plugins/mail/MailPlugin";
-export * from "./plugins/mail/MailPluginTypes";
-
-export { default as NotificationPlugin } from "./plugins/notification/NotificationPlugin";
-export * from "./plugins/notification/NotificationPluginTypes";
-
-export { default as ServerOperationPlugin } from "./plugins/serverOperation/ServerOperationPlugin";
-export * from "./plugins/serverOperation/ServerOperationPluginTypes";
-
-export { default as SettingPlugin } from "./plugins/setting/SettingPlugin";
-export * from "./plugins/setting/SettingPluginTypes";
-
-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";
-
-export * from "./facilities/log/LogFacility";
+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 { mapDbRowToEntity } from "./dataAccess/entityMapper";
+
+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 LicensePlugin } from "./plugins/license/LicensePlugin";
+export * from "./plugins/license/LicensePluginTypes";
+
+export { default as MailPlugin } from "./plugins/mail/MailPlugin";
+export * from "./plugins/mail/MailPluginTypes";
+
+export { default as NotificationPlugin } from "./plugins/notification/NotificationPlugin";
+export * from "./plugins/notification/NotificationPluginTypes";
+
+export { default as ServerOperationPlugin } from "./plugins/serverOperation/ServerOperationPlugin";
+export * from "./plugins/serverOperation/ServerOperationPluginTypes";
+
+export { default as SettingPlugin } from "./plugins/setting/SettingPlugin";
+export * from "./plugins/setting/SettingPluginTypes";
+
+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";
+
+export * from "./facilities/log/LogFacility";

package/src/plugins/auth/AuthPlugin.ts

@@ -1,85 +1,85 @@
-/**
- * Auth manager plugin
- */
-
-import { RpdApplicationConfig } from "~/types";
-import {
-  IRpdServer,
-  RapidPlugin,
-  RpdConfigurationItemOptions,
-  RpdServerPluginConfigurableTargetOptions,
-  RpdServerPluginExtendingAbilities,
-} from "~/core/server";
-
-import pluginActionHandlers from "./actionHandlers";
-import pluginModels from "./models";
-import pluginRoutes from "./routes";
-import { RouteContext } from "~/core/routeContext";
-import { verifyJwt } from "~/utilities/jwtUtility";
-
-class AuthPlugin implements RapidPlugin {
-  get code(): string {
-    return "authManager";
-  }
-
-  get description(): string {
-    return null;
-  }
-
-  get extendingAbilities(): RpdServerPluginExtendingAbilities[] {
-    return [];
-  }
-
-  get configurableTargets(): RpdServerPluginConfigurableTargetOptions[] {
-    return [];
-  }
-
-  get configurations(): RpdConfigurationItemOptions[] {
-    return [];
-  }
-
-  async registerActionHandlers(server: IRpdServer): Promise<any> {
-    for (const actionHandler of pluginActionHandlers) {
-      server.registerActionHandler(this, actionHandler);
-    }
-  }
-
-  async configureModels(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any> {
-    server.appendApplicationConfig({ models: pluginModels });
-  }
-
-  async configureRoutes(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any> {
-    server.appendApplicationConfig({ routes: pluginRoutes });
-  }
-
-  async onPrepareRouteContext(server: IRpdServer, routeContext: RouteContext) {
-    const request = routeContext.request;
-    let token: string;
-
-    const headers = request.headers;
-    // No Authorization header
-    if (headers.has("Authorization")) {
-      // Authorization header has no Bearer or no token
-      const authHeader = headers.get("Authorization")!;
-      if (!authHeader.startsWith("Bearer ") || authHeader.length <= 7) {
-        throw new Error("AUTHORIZATION_HEADER_INVALID");
-      }
-
-      token = authHeader.slice(7);
-    } else {
-      token = request.cookies[server.config.sessionCookieName];
-    }
-
-    try {
-      const secretKey = Buffer.from(server.config.jwtKey, "base64");
-      const tokenPayload = verifyJwt(token, secretKey);
-      routeContext.state.userId = tokenPayload.aud as string;
-      routeContext.state.userLogin = tokenPayload.act as string;
-    } catch (error) {
-      const logger = server.getLogger();
-      logger.debug("Verify JWT failed.", { error });
-    }
-  }
-}
-
-export default AuthPlugin;
+/**
+ * Auth manager plugin
+ */
+
+import { RpdApplicationConfig } from "~/types";
+import {
+  IRpdServer,
+  RapidPlugin,
+  RpdConfigurationItemOptions,
+  RpdServerPluginConfigurableTargetOptions,
+  RpdServerPluginExtendingAbilities,
+} from "~/core/server";
+
+import pluginActionHandlers from "./actionHandlers";
+import pluginModels from "./models";
+import pluginRoutes from "./routes";
+import { RouteContext } from "~/core/routeContext";
+import { verifyJwt } from "~/utilities/jwtUtility";
+
+class AuthPlugin implements RapidPlugin {
+  get code(): string {
+    return "authManager";
+  }
+
+  get description(): string {
+    return null;
+  }
+
+  get extendingAbilities(): RpdServerPluginExtendingAbilities[] {
+    return [];
+  }
+
+  get configurableTargets(): RpdServerPluginConfigurableTargetOptions[] {
+    return [];
+  }
+
+  get configurations(): RpdConfigurationItemOptions[] {
+    return [];
+  }
+
+  async registerActionHandlers(server: IRpdServer): Promise<any> {
+    for (const actionHandler of pluginActionHandlers) {
+      server.registerActionHandler(this, actionHandler);
+    }
+  }
+
+  async configureModels(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any> {
+    server.appendApplicationConfig({ models: pluginModels });
+  }
+
+  async configureRoutes(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any> {
+    server.appendApplicationConfig({ routes: pluginRoutes });
+  }
+
+  async onPrepareRouteContext(server: IRpdServer, routeContext: RouteContext) {
+    const request = routeContext.request;
+    let token: string;
+
+    const headers = request.headers;
+    // No Authorization header
+    if (headers.has("Authorization")) {
+      // Authorization header has no Bearer or no token
+      const authHeader = headers.get("Authorization")!;
+      if (!authHeader.startsWith("Bearer ") || authHeader.length <= 7) {
+        throw new Error("AUTHORIZATION_HEADER_INVALID");
+      }
+
+      token = authHeader.slice(7);
+    } else {
+      token = request.cookies[server.config.sessionCookieName];
+    }
+
+    try {
+      const secretKey = Buffer.from(server.config.jwtKey, "base64");
+      const tokenPayload = verifyJwt(token, secretKey);
+      routeContext.state.userId = tokenPayload.aud as string;
+      routeContext.state.userLogin = tokenPayload.act as string;
+    } catch (error) {
+      const logger = server.getLogger();
+      logger.debug("Verify JWT failed.", { error });
+    }
+  }
+}
+
+export default AuthPlugin;

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,75 @@
-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";
+import LicenseService from "~/plugins/license/LicenseService";
+import { get } from "lodash";
+
+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 licenseService = server.getService<LicenseService>("licenseService");
+  const license = licenseService.getLicense();
+  if (!license) {
+    throw new Error(`登录失败，无法获取系统授权信息。`);
+  }
+  if (licenseService.isExpired()) {
+    const expireDate = get(license.authority, "expireDate");
+    throw new Error(`登录失败，系统授权已于${expireDate}过期。`);
+  }
+
+  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/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 = {};
+}