@nocobase/auth 1.6.0-beta.10 → 1.6.0-beta.12

package/lib/auth.js

@@ -64,6 +64,9 @@ const _Auth = class _Auth {
     this.ctx = ctx;
   }
   async skipCheck() {
+    if (this.ctx.skipAuthCheck === true) {
+      return true;
+    }
     const token = this.ctx.getBearerToken();
     if (!token && this.ctx.app.options.acl === false) {
       return true;

package/lib/base/auth.js

@@ -83,6 +83,7 @@ const _BaseAuth = class _BaseAuth extends import_auth.Auth {
   async check() {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     const token = this.ctx.getBearerToken();
+    const cache = this.ctx.cache;
     if (!token) {
       this.ctx.throw(401, {
         message: this.ctx.t("Unauthenticated. Please sign in to continue.", { ns: localeNamespace }),
@@ -107,15 +108,17 @@ const _BaseAuth = class _BaseAuth extends import_auth.Auth {
       }
     }
     const { userId, roleName, iat, temp, jti, exp, signInTime } = payload ?? {};
-    const tokenPolicy = await this.tokenController.getConfig();
-    if (signInTime && Date.now() - signInTime > tokenPolicy.sessionExpirationTime) {
-      this.ctx.throw(401, {
-        message: this.ctx.t("Your session has expired. Please sign in again.", { ns: localeNamespace }),
-        code: import_auth.AuthErrorCode.EXPIRED_SESSION
-      });
-    }
-    if (tokenStatus === "valid" && Date.now() - iat * 1e3 > tokenPolicy.tokenExpirationTime) {
-      tokenStatus = "expired";
+    const user = userId ? await cache.wrap(
+      this.getCacheKey(userId),
+      () => this.userRepository.findOne({
+        filter: {
+          id: userId
+        },
+        raw: true
+      })
+    ) : null;
+    if (roleName) {
+      this.ctx.headers["x-role"] = roleName;
     }
     const blocked = await this.jwt.blacklist.has(jti ?? token);
     if (blocked) {
@@ -124,25 +127,26 @@ const _BaseAuth = class _BaseAuth extends import_auth.Auth {
         code: import_auth.AuthErrorCode.BLOCKED_TOKEN
       });
     }
-    if (roleName) {
-      this.ctx.headers["x-role"] = roleName;
+    if (!temp) {
+      if (tokenStatus === "valid") {
+        return user;
+      } else {
+        this.ctx.throw(401, {
+          message: this.ctx.t("Your session has expired. Please sign in again.", { ns: localeNamespace }),
+          code: import_auth.AuthErrorCode.INVALID_TOKEN
+        });
+      }
     }
-    const cache = this.ctx.cache;
-    const user = await cache.wrap(
-      this.getCacheKey(userId),
-      () => this.userRepository.findOne({
-        filter: {
-          id: userId
-        },
-        raw: true
-      })
-    );
-    if (!temp && tokenStatus !== "valid") {
+    const tokenPolicy = await this.tokenController.getConfig();
+    if (signInTime && Date.now() - signInTime > tokenPolicy.sessionExpirationTime) {
       this.ctx.throw(401, {
         message: this.ctx.t("Your session has expired. Please sign in again.", { ns: localeNamespace }),
-        code: import_auth.AuthErrorCode.INVALID_TOKEN
+        code: import_auth.AuthErrorCode.EXPIRED_SESSION
       });
     }
+    if (tokenStatus === "valid" && Date.now() - iat * 1e3 > tokenPolicy.tokenExpirationTime) {
+      tokenStatus = "expired";
+    }
     if (tokenStatus === "valid" && user.passwordChangeTz && iat * 1e3 < user.passwordChangeTz) {
       this.ctx.throw(401, {
         message: this.ctx.t("User password changed, please signin again.", { ns: localeNamespace }),

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/auth",
-  "version": "1.6.0-beta.10",
+  "version": "1.6.0-beta.12",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "1.6.0-beta.10",
-    "@nocobase/cache": "1.6.0-beta.10",
-    "@nocobase/database": "1.6.0-beta.10",
-    "@nocobase/resourcer": "1.6.0-beta.10",
-    "@nocobase/utils": "1.6.0-beta.10",
+    "@nocobase/actions": "1.6.0-beta.12",
+    "@nocobase/cache": "1.6.0-beta.12",
+    "@nocobase/database": "1.6.0-beta.12",
+    "@nocobase/resourcer": "1.6.0-beta.12",
+    "@nocobase/utils": "1.6.0-beta.12",
     "@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": "72684ad7261e46b67969ecc4db0f1bcbea545a8d"
+  "gitHead": "d150a1853eb5e44b1f772b5f3f0463f6c7f061ba"
 }