@nocobase/auth 0.17.0-alpha.7 → 0.18.0-alpha.8

package/lib/auth-manager.d.ts

@@ -1,11 +1,15 @@
 import { Context, Next } from '@nocobase/actions';
-import { Model } from '@nocobase/database';
 import { Registry } from '@nocobase/utils';
 import { Auth, AuthExtend } from './auth';
 import { JwtOptions, JwtService } from './base/jwt-service';
 import { ITokenBlacklistService } from './base/token-blacklist-service';
+export interface Authenticator {
+    authType: string;
+    options: Record<string, any>;
+    [key: string]: any;
+}
 export interface Storer {
-    get: (name: string) => Promise<Model>;
+    get: (name: string) => Promise<Authenticator>;
 }
 export type AuthManagerOptions = {
     authKey: string;

package/lib/auth-manager.js

@@ -96,7 +96,7 @@ const _AuthManager = class _AuthManager {
         ctx.auth = authenticator;
       } catch (err) {
         ctx.auth = {};
-        ctx.app.logger.warn(`auth, ${err.message}`);
+        ctx.logger.warn(err.message, { method: "check", authenticator: name });
         return next();
       }
       if (authenticator) {

package/lib/auth.d.ts

@@ -1,7 +1,8 @@
 import { Context } from '@nocobase/actions';
 import { Model } from '@nocobase/database';
+import { Authenticator } from './auth-manager';
 export type AuthConfig = {
-    authenticator: Model;
+    authenticator: Authenticator;
     options: {
         [key: string]: any;
     };
@@ -17,13 +18,13 @@ interface IAuth {
 }
 export declare abstract class Auth implements IAuth {
     abstract user: Model;
-    protected authenticator: Model;
+    protected authenticator: Authenticator;
     protected options: {
         [key: string]: any;
     };
     protected ctx: Context;
     constructor(config: AuthConfig);
-    abstract check(): any;
+    abstract check(): Promise<Model>;
     signIn(): Promise<any>;
     signUp(): Promise<any>;
     signOut(): Promise<any>;

package/lib/base/auth.js

@@ -68,7 +68,7 @@ const _BaseAuth = class _BaseAuth extends import_auth.Auth {
         })
       );
     } catch (err) {
-      this.ctx.logger.error(err);
+      this.ctx.logger.error(err, { method: "check" });
       return null;
     }
   }

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/auth",
-  "version": "0.17.0-alpha.7",
+  "version": "0.18.0-alpha.8",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "0.17.0-alpha.7",
-    "@nocobase/cache": "0.17.0-alpha.7",
-    "@nocobase/database": "0.17.0-alpha.7",
-    "@nocobase/resourcer": "0.17.0-alpha.7",
-    "@nocobase/utils": "0.17.0-alpha.7",
+    "@nocobase/actions": "0.18.0-alpha.8",
+    "@nocobase/cache": "0.18.0-alpha.8",
+    "@nocobase/database": "0.18.0-alpha.8",
+    "@nocobase/resourcer": "0.18.0-alpha.8",
+    "@nocobase/utils": "0.18.0-alpha.8",
     "@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": "91377a3abd1124f79fb3819f2d0e80905e091a32"
+  "gitHead": "727d42f6f14e5f863831da3dbf3255ba1165b567"
 }