@ruiapp/rapid-core 0.7.2 → 0.7.3

package/dist/helpers/licenseHelper.d.ts

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

package/dist/index.js

@@ -6652,18 +6652,16 @@ var changePassword$1 = /*#__PURE__*/Object.freeze({
   handler: handler$e
 });
 
-function validateLicense(logger, server) {
+function validateLicense(server) {
     const licenseService = server.getService("licenseService");
     const license = licenseService.getLicense();
     if (!license) {
         const errorMessage = `无法获取系统授权信息。`;
-        logger.error(errorMessage);
         throw new Error(errorMessage);
     }
     if (licenseService.isExpired()) {
         const expireDate = lodash.get(license.authority, "expireDate");
         const errorMessage = `您的系统授权已于${expireDate}过期。`;
-        logger.error(errorMessage);
         throw new Error(errorMessage);
     }
 }
@@ -6673,7 +6671,7 @@ async function handler$d(plugin, ctx, options) {
     const { server, input, routerContext: routeContext, logger } = ctx;
     const { response } = routeContext;
     const { account, password } = input;
-    validateLicense(logger, server);
+    validateLicense(server);
     const userDataAccessor = server.getDataAccessor({
         singularCode: "oc_user",
     });
@@ -8516,7 +8514,7 @@ class CronJobPlugin {
     async executeJob(server, job) {
         const logger = server.getLogger();
         try {
-            validateLicense(logger, server);
+            validateLicense(server);
             let handlerContext = {
                 logger,
                 routerContext: null,

package/package.json

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

package/src/helpers/licenseHelper.ts

@@ -3,18 +3,27 @@ import { IRpdServer } from "~/core/server";
 import { Logger } from "~/facilities/log/LogFacility";
 import LicenseService from "~/plugins/license/LicenseService";
 
-export function validateLicense(logger: Logger, server: IRpdServer) {
+export function validateLicense(server: IRpdServer) {
   const licenseService = server.getService<LicenseService>("licenseService");
   const license = licenseService.getLicense();
   if (!license) {
     const errorMessage = `无法获取系统授权信息。`;
-    logger.error(errorMessage);
     throw new Error(errorMessage);
   }
   if (licenseService.isExpired()) {
     const expireDate = get(license.authority, "expireDate");
     const errorMessage = `您的系统授权已于${expireDate}过期。`;
-    logger.error(errorMessage);
     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/plugins/auth/actionHandlers/createSession.ts

@@ -12,7 +12,7 @@ export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, op
   const { response } = routeContext;
   const { account, password } = input;
 
-  validateLicense(logger, server);
+  validateLicense(server);
 
   const userDataAccessor = server.getDataAccessor({
     singularCode: "oc_user",

package/src/plugins/cronJob/CronJobPlugin.ts

@@ -91,7 +91,7 @@ class CronJobPlugin implements RapidPlugin {
   async executeJob(server: IRpdServer, job: CronJobConfiguration) {
     const logger = server.getLogger();
     try {
-      validateLicense(logger, server);
+      validateLicense(server);
 
       let handlerContext: ActionHandlerContext = {
         logger,