@ruiapp/rapid-core 0.3.4 → 0.3.5

package/dist/helpers/licenseHelper.d.ts

@@ -0,0 +1,4 @@
+import { IRpdServer } from "../core/server";
+import { Logger } from "../facilities/log/LogFacility";
+export declare function validateLicense(server: IRpdServer): void;
+export declare function tryValidateLicense(logger: Logger, server: IRpdServer): boolean;

package/dist/index.d.ts

@@ -9,6 +9,7 @@ export * from "./utilities/accessControlUtility";
 export * from "./utilities/entityUtility";
 export * from "./utilities/jwtUtility";
 export * from "./utilities/timeUtility";
+export * from "./helpers/licenseHelper";
 export { mapDbRowToEntity } from "./dataAccess/entityMapper";
 export * as bootstrapApplicationConfig from "./bootstrapApplicationConfig";
 export { default as MetaManagePlugin } from "./plugins/metaManage/MetaManagePlugin";

package/dist/index.js

@@ -4361,6 +4361,30 @@ async function generateJwtSecretKey() {
     return encode(exportedKey);
 }
 
+function validateLicense(server) {
+    const licenseService = server.getService("licenseService");
+    const license = licenseService.getLicense();
+    if (!license) {
+        const errorMessage = `无法获取系统授权信息。`;
+        throw new Error(errorMessage);
+    }
+    if (licenseService.isExpired()) {
+        const expireDate = lodash.get(license.authority, "expireDate");
+        const errorMessage = `您的系统授权已于${expireDate}过期。`;
+        throw new Error(errorMessage);
+    }
+}
+function tryValidateLicense(logger, server) {
+    try {
+        validateLicense(server);
+        return true;
+    }
+    catch (err) {
+        logger.error("授权验证失败：%s", err.message || "");
+    }
+    return false;
+}
+
 const code$u = "listMetaModels";
 async function handler$u(plugin, ctx, options) {
     const { applicationConfig } = ctx;
@@ -6043,18 +6067,10 @@ var changePassword$1 = /*#__PURE__*/Object.freeze({
 
 const code$d = "createSession";
 async function handler$d(plugin, ctx, options) {
-    const { server, input, routerContext } = ctx;
-    const { response } = routerContext;
+    const { server, input, routerContext: routeContext, logger } = ctx;
+    const { response } = routeContext;
     const { account, password } = input;
-    const licenseService = server.getService("licenseService");
-    const license = licenseService.getLicense();
-    if (!license) {
-        throw new Error(`登录失败，无法获取系统授权信息。`);
-    }
-    if (licenseService.isExpired()) {
-        const expireDate = lodash.get(license.authority, "expireDate");
-        throw new Error(`登录失败，系统授权已于${expireDate}过期。`);
-    }
+    validateLicense(server);
     const userDataAccessor = server.getDataAccessor({
         singularCode: "oc_user",
     });
@@ -7869,6 +7885,7 @@ class CronJobPlugin {
     async executeJob(server, job) {
         const logger = server.getLogger();
         try {
+            validateLicense(server);
             let handlerContext = {
                 logger,
                 routerContext: null,
@@ -8304,4 +8321,6 @@ exports.getNowString = getNowString;
 exports.getNowStringWithTimezone = getNowStringWithTimezone;
 exports.isAccessAllowed = isAccessAllowed;
 exports.mapDbRowToEntity = mapDbRowToEntity;
+exports.tryValidateLicense = tryValidateLicense;
+exports.validateLicense = validateLicense;
 exports.verifyJwt = verifyJwt;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/helpers/licenseHelper.ts

@@ -0,0 +1,29 @@
+import { get } from "lodash";
+import { IRpdServer } from "~/core/server";
+import { Logger } from "~/facilities/log/LogFacility";
+import LicenseService from "~/plugins/license/LicenseService";
+
+export function validateLicense(server: IRpdServer) {
+  const licenseService = server.getService<LicenseService>("licenseService");
+  const license = licenseService.getLicense();
+  if (!license) {
+    const errorMessage = `无法获取系统授权信息。`;
+    throw new Error(errorMessage);
+  }
+  if (licenseService.isExpired()) {
+    const expireDate = get(license.authority, "expireDate");
+    const errorMessage = `您的系统授权已于${expireDate}过期。`;
+    throw new Error(errorMessage);
+  }
+}
+
+export function tryValidateLicense(logger: Logger, server: IRpdServer) {
+  try {
+    validateLicense(server);
+    return true;
+  } catch (err: any) {
+    logger.error("授权验证失败：%s", err.message || "");
+  }
+
+  return false;
+}

package/src/index.ts

@@ -15,6 +15,8 @@ export * from "./utilities/entityUtility";
 export * from "./utilities/jwtUtility";
 export * from "./utilities/timeUtility";
 
+export * from "./helpers/licenseHelper";
+
 export { mapDbRowToEntity } from "./dataAccess/entityMapper";
 
 export * as bootstrapApplicationConfig from "./bootstrapApplicationConfig";

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

@@ -3,8 +3,7 @@ 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";
+import { validateLicense } from "~/helpers/licenseHelper";
 
 export interface UserAccessToken {
   sub: "userAccessToken";
@@ -14,19 +13,11 @@ export interface UserAccessToken {
 export const code = "createSession";
 
 export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any) {
-  const { server, input, routerContext } = ctx;
-  const { response } = routerContext;
+  const { server, input, routerContext: routeContext, logger } = ctx;
+  const { response } = routeContext;
   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}过期。`);
-  }
+  validateLicense(server);
 
   const userDataAccessor = server.getDataAccessor({
     singularCode: "oc_user",

package/src/plugins/cronJob/CronJobPlugin.ts

@@ -12,6 +12,7 @@ import {
 } from "~/core/server";
 import { ActionHandlerContext } from "~/core/actionHandler";
 import { find } from "lodash";
+import { validateLicense } from "~/helpers/licenseHelper";
 
 class CronJobPlugin implements RapidPlugin {
   #jobs: CronJobConfiguration[];
@@ -89,6 +90,8 @@ class CronJobPlugin implements RapidPlugin {
   async executeJob(server: IRpdServer, job: CronJobConfiguration) {
     const logger = server.getLogger();
     try {
+      validateLicense(server);
+
       let handlerContext: ActionHandlerContext = {
         logger,
         routerContext: null,