@nocobase/auth 0.17.0-alpha.4 → 0.17.0-alpha.6

package/lib/auth-manager.d.ts

@@ -4,9 +4,9 @@ import { Registry } from '@nocobase/utils';
 import { Auth, AuthExtend } from './auth';
 import { JwtOptions, JwtService } from './base/jwt-service';
 import { ITokenBlacklistService } from './base/token-blacklist-service';
-type Storer = {
+export interface Storer {
     get: (name: string) => Promise<Model>;
-};
+}
 export type AuthManagerOptions = {
     authKey: string;
     default?: string;
@@ -29,8 +29,8 @@ export declare class AuthManager {
      * @description Add a new authenticate type and the corresponding authenticator.
      * The types will show in the authenticators list of the admin panel.
      *
-     * @param {string} authType - The type of the authenticator. It is required to be unique.
-     * @param {AuthConfig} authConfig - Configurations of the kind of authenticator.
+     * @param authType - The type of the authenticator. It is required to be unique.
+     * @param authConfig - Configurations of the kind of authenticator.
      */
     registerTypes(authType: string, authConfig: AuthConfig): void;
     listTypes(): {
@@ -41,8 +41,8 @@ export declare class AuthManager {
     /**
      * get
      * @description Get authenticator instance by name.
-     * @param {string} name - The name of the authenticator.
-     * @return {Promise<Auth>} authenticator instance.
+     * @param name - The name of the authenticator.
+     * @return authenticator instance.
      */
     get(name: string, ctx: Context): Promise<Auth>;
     /**

package/lib/auth-manager.js

@@ -44,8 +44,8 @@ const _AuthManager = class _AuthManager {
    * @description Add a new authenticate type and the corresponding authenticator.
    * The types will show in the authenticators list of the admin panel.
    *
-   * @param {string} authType - The type of the authenticator. It is required to be unique.
-   * @param {AuthConfig} authConfig - Configurations of the kind of authenticator.
+   * @param authType - The type of the authenticator. It is required to be unique.
+   * @param authConfig - Configurations of the kind of authenticator.
    */
   registerTypes(authType, authConfig) {
     this.authTypes.register(authType, authConfig);
@@ -62,8 +62,8 @@ const _AuthManager = class _AuthManager {
   /**
    * get
    * @description Get authenticator instance by name.
-   * @param {string} name - The name of the authenticator.
-   * @return {Promise<Auth>} authenticator instance.
+   * @param name - The name of the authenticator.
+   * @return authenticator instance.
    */
   async get(name, ctx) {
     if (!this.storer) {

package/lib/base/auth.d.ts

@@ -14,6 +14,7 @@ export declare class BaseAuth extends Auth {
     get jwt(): JwtService;
     set user(user: Model);
     get user(): Model;
+    getCacheKey(userId: number): string;
     validateUsername(username: string): boolean;
     check(): Promise<any>;
     validate(): Promise<Model>;

package/lib/base/auth.js

@@ -41,6 +41,9 @@ const _BaseAuth = class _BaseAuth extends import_auth.Auth {
   get user() {
     return this.ctx.state.currentUser;
   }
+  getCacheKey(userId) {
+    return `auth:${userId}`;
+  }
   validateUsername(username) {
     return /^[^@.<>"'/]{2,16}$/.test(username);
   }
@@ -54,11 +57,16 @@ const _BaseAuth = class _BaseAuth extends import_auth.Auth {
       if (roleName) {
         this.ctx.headers["x-role"] = roleName;
       }
-      return await this.userRepository.findOne({
-        filter: {
-          id: userId
-        }
-      });
+      const cache = this.ctx.cache;
+      return await cache.wrap(
+        this.getCacheKey(userId),
+        () => this.userRepository.findOne({
+          filter: {
+            id: userId
+          },
+          raw: true
+        })
+      );
     } catch (err) {
       this.ctx.logger.error(err);
       return null;
@@ -72,7 +80,6 @@ const _BaseAuth = class _BaseAuth extends import_auth.Auth {
     try {
       user = await this.validate();
     } catch (err) {
-      console.log(err);
       this.ctx.throw(401, err.message);
     }
     if (!user) {
@@ -91,6 +98,9 @@ const _BaseAuth = class _BaseAuth extends import_auth.Auth {
     if (!token) {
       return;
     }
+    const { userId } = await this.jwt.decode(token);
+    await this.ctx.app.emitAsync("beforeSignOut", { userId });
+    await this.ctx.cache.del(this.getCacheKey(userId));
     return await this.jwt.block(token);
   }
 };

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "@nocobase/auth",
-  "version": "0.17.0-alpha.4",
+  "version": "0.17.0-alpha.6",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "0.17.0-alpha.4",
-    "@nocobase/database": "0.17.0-alpha.4",
-    "@nocobase/resourcer": "0.17.0-alpha.4",
-    "@nocobase/utils": "0.17.0-alpha.4",
+    "@nocobase/actions": "0.17.0-alpha.6",
+    "@nocobase/cache": "0.17.0-alpha.6",
+    "@nocobase/database": "0.17.0-alpha.6",
+    "@nocobase/resourcer": "0.17.0-alpha.6",
+    "@nocobase/utils": "0.17.0-alpha.6",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^8.5.1"
   },
@@ -18,5 +19,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/auth"
   },
-  "gitHead": "663b03a3799a70ba1a2bc6a0d686e679331a50ad"
+  "gitHead": "f92f8bcdf6d5baf07566381e9425ebca11e19626"
 }