@nocobase/auth 0.20.0-alpha.9 → 0.21.0-alpha.10

package/lib/actions.js

@@ -20,6 +20,7 @@ __export(actions_exports, {
   actions: () => actions
 });
 module.exports = __toCommonJS(actions_exports);
+/* istanbul ignore file -- @preserve */
 const actions = {
   signIn: async (ctx, next) => {
     ctx.body = await ctx.auth.signIn();

package/lib/auth-manager.d.ts

@@ -21,6 +21,9 @@ type AuthConfig = {
     title?: string;
 };
 export declare class AuthManager {
+    /**
+     * @internal
+     */
     jwt: JwtService;
     protected options: AuthManagerOptions;
     protected authTypes: Registry<AuthConfig>;

package/lib/auth-manager.js

@@ -24,6 +24,9 @@ module.exports = __toCommonJS(auth_manager_exports);
 var import_utils = require("@nocobase/utils");
 var import_jwt_service = require("./base/jwt-service");
 const _AuthManager = class _AuthManager {
+  /**
+   * @internal
+   */
   jwt;
   options;
   authTypes = new import_utils.Registry();
@@ -73,9 +76,9 @@ const _AuthManager = class _AuthManager {
     if (!authenticator) {
       throw new Error(`Authenticator [${name}] is not found.`);
     }
-    const { auth } = this.authTypes.get(authenticator.authType);
+    const { auth } = this.authTypes.get(authenticator.authType) || {};
     if (!auth) {
-      throw new Error(`AuthType [${name}] is not found.`);
+      throw new Error(`AuthType [${authenticator.authType}] is not found.`);
     }
     return new auth({ authenticator, options: authenticator.options, ctx });
   }

package/lib/base/auth.d.ts

@@ -11,10 +11,19 @@ export declare class BaseAuth extends Auth {
         userCollection: Collection;
     });
     get userRepository(): import("@nocobase/database").Repository<any, any>;
+    /**
+     * @internal
+     */
     get jwt(): JwtService;
     set user(user: Model);
     get user(): Model;
+    /**
+     * @internal
+     */
     getCacheKey(userId: number): string;
+    /**
+     * @internal
+     */
     validateUsername(username: string): boolean;
     check(): Promise<any>;
     validate(): Promise<Model>;

package/lib/base/auth.js

@@ -32,6 +32,9 @@ const _BaseAuth = class _BaseAuth extends import_auth.Auth {
   get userRepository() {
     return this.userCollection.repository;
   }
+  /**
+   * @internal
+   */
   get jwt() {
     return this.ctx.app.authManager.jwt;
   }
@@ -41,9 +44,15 @@ const _BaseAuth = class _BaseAuth extends import_auth.Auth {
   get user() {
     return this.ctx.state.currentUser;
   }
+  /**
+   * @internal
+   */
   getCacheKey(userId) {
     return `auth:${userId}`;
   }
+  /**
+   * @internal
+   */
   validateUsername(username) {
     return /^[^@.<>"'/]{2,16}$/.test(username);
   }
@@ -80,7 +89,7 @@ const _BaseAuth = class _BaseAuth extends import_auth.Auth {
     try {
       user = await this.validate();
     } catch (err) {
-      this.ctx.throw(401, err.message);
+      this.ctx.throw(err.status || 401, err.message);
     }
     if (!user) {
       this.ctx.throw(401, "Unauthorized");

package/lib/base/jwt-service.js

@@ -50,6 +50,7 @@ const _JwtService = class _JwtService {
   secret() {
     return this.options.secret;
   }
+  /* istanbul ignore next -- @preserve */
   sign(payload, options) {
     const opt = { expiresIn: this.expiresIn(), ...options };
     if (opt.expiresIn === "never") {
@@ -57,6 +58,7 @@ const _JwtService = class _JwtService {
     }
     return import_jsonwebtoken.default.sign(payload, this.secret(), opt);
   }
+  /* istanbul ignore next -- @preserve */
   decode(token) {
     return new Promise((resolve, reject) => {
       import_jsonwebtoken.default.verify(token, this.secret(), (err, decoded) => {

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/auth",
-  "version": "0.20.0-alpha.9",
+  "version": "0.21.0-alpha.10",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "0.20.0-alpha.9",
-    "@nocobase/cache": "0.20.0-alpha.9",
-    "@nocobase/database": "0.20.0-alpha.9",
-    "@nocobase/resourcer": "0.20.0-alpha.9",
-    "@nocobase/utils": "0.20.0-alpha.9",
+    "@nocobase/actions": "0.21.0-alpha.10",
+    "@nocobase/cache": "0.21.0-alpha.10",
+    "@nocobase/database": "0.21.0-alpha.10",
+    "@nocobase/resourcer": "0.21.0-alpha.10",
+    "@nocobase/utils": "0.21.0-alpha.10",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^8.5.1"
   },
@@ -19,5 +19,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/auth"
   },
-  "gitHead": "5473d9039cfdb649a8c8c625edefc9a3ac464be5"
+  "gitHead": "98adf5ec996a4f359c6ca1c4a6ac837c43b6e268"
 }