@nocobase/auth 2.0.0-alpha.9 → 2.0.0-beta.2

package/lib/auth-manager.d.ts

@@ -71,5 +71,6 @@ export declare class AuthManager {
     middleware(): (ctx: Context & {
         auth: Auth;
     }, next: Next) => Promise<any>;
+    private getDefaultJWTSecret;
 }
 export {};

package/lib/auth-manager.js

@@ -7,9 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -24,6 +26,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var auth_manager_exports = {};
 __export(auth_manager_exports, {
@@ -32,6 +42,9 @@ __export(auth_manager_exports, {
 module.exports = __toCommonJS(auth_manager_exports);
 var import_utils = require("@nocobase/utils");
 var import_jwt_service = require("./base/jwt-service");
+var import_path = __toESM(require("path"));
+var import_fs = __toESM(require("fs"));
+var import_crypto = __toESM(require("crypto"));
 const _AuthManager = class _AuthManager {
   /**
    * @internal
@@ -44,7 +57,11 @@ const _AuthManager = class _AuthManager {
   storer;
   constructor(options) {
     this.options = options;
-    this.jwt = new import_jwt_service.JwtService(options.jwt);
+    const jwtOptions = options.jwt || {};
+    if (!jwtOptions.secret) {
+      jwtOptions.secret = this.getDefaultJWTSecret();
+    }
+    this.jwt = new import_jwt_service.JwtService(jwtOptions);
   }
   setStorer(storer) {
     this.storer = storer;
@@ -125,6 +142,25 @@ const _AuthManager = class _AuthManager {
       await next();
     }, "AuthManagerMiddleware");
   }
+  getDefaultJWTSecret() {
+    const jwtSecretPath = import_path.default.resolve(process.cwd(), "storage", "apps", "main", "jwt_secret.dat");
+    const jwtSecretExists = import_fs.default.existsSync(jwtSecretPath);
+    if (jwtSecretExists) {
+      const key2 = import_fs.default.readFileSync(jwtSecretPath);
+      if (key2.length !== 32) {
+        throw new Error("Invalid api key length in file");
+      }
+      return key2;
+    }
+    const envKey = process.env.APP_KEY;
+    if (envKey && envKey !== "your-secret-key" && envKey !== "test-key") {
+      return envKey;
+    }
+    const key = import_crypto.default.randomBytes(32);
+    import_fs.default.mkdirSync(import_path.default.dirname(jwtSecretPath), { recursive: true });
+    import_fs.default.writeFileSync(jwtSecretPath, key, { mode: 384 });
+    return key;
+  }
 };
 __name(_AuthManager, "AuthManager");
 let AuthManager = _AuthManager;

package/lib/auth.js

@@ -73,7 +73,7 @@ const _Auth = class _Auth {
     }
     const { resourceName, actionName } = this.ctx.action;
     const acl = this.ctx.dataSource.acl;
-    const isPublic = await acl.allowManager.isAllowed(resourceName, actionName, this.ctx);
+    const isPublic = await acl.allowManager.isPublic(resourceName, actionName, this.ctx);
     return isPublic;
   }
   // The following methods are mainly designed for user authentications.

package/lib/base/jwt-service.d.ts

@@ -6,16 +6,17 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
+/// <reference types="node" />
 import jwt, { JwtPayload, SignOptions } from 'jsonwebtoken';
 import { ITokenBlacklistService } from './token-blacklist-service';
 export interface JwtOptions {
-    secret: string;
+    secret: Buffer | string;
     expiresIn?: string;
 }
 export type SignPayload = Parameters<typeof jwt.sign>[0];
 export declare class JwtService {
     protected options: JwtOptions;
-    constructor(options?: JwtOptions);
+    constructor(options: JwtOptions);
     blacklist: ITokenBlacklistService;
     private expiresIn;
     private secret;

package/lib/base/jwt-service.js

@@ -42,13 +42,11 @@ __export(jwt_service_exports, {
 module.exports = __toCommonJS(jwt_service_exports);
 var import_jsonwebtoken = __toESM(require("jsonwebtoken"));
 const _JwtService = class _JwtService {
-  constructor(options = {
-    secret: process.env.APP_KEY
-  }) {
+  constructor(options) {
     this.options = options;
     const { secret, expiresIn } = options;
     this.options = {
-      secret: secret || process.env.APP_KEY,
+      secret,
       expiresIn: expiresIn || process.env.JWT_EXPIRES_IN || "7d"
     };
   }

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/auth",
-  "version": "2.0.0-alpha.9",
+  "version": "2.0.0-beta.2",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "2.0.0-alpha.9",
-    "@nocobase/cache": "2.0.0-alpha.9",
-    "@nocobase/database": "2.0.0-alpha.9",
-    "@nocobase/resourcer": "2.0.0-alpha.9",
-    "@nocobase/utils": "2.0.0-alpha.9",
+    "@nocobase/actions": "2.0.0-beta.2",
+    "@nocobase/cache": "2.0.0-beta.2",
+    "@nocobase/database": "2.0.0-beta.2",
+    "@nocobase/resourcer": "2.0.0-beta.2",
+    "@nocobase/utils": "2.0.0-beta.2",
     "@types/jsonwebtoken": "^9.0.9",
     "jsonwebtoken": "^9.0.2"
   },
@@ -19,5 +19,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/auth"
   },
-  "gitHead": "4a9acf96f21a3aa35bccbd188b942595b09da0a9"
+  "gitHead": "b77a33ee933ae6e09d2d5dce017ca15d8552d57b"
 }