@nocobase/auth 1.6.0-alpha.21 → 1.6.0-alpha.23

package/lib/base/auth.js

@@ -81,7 +81,7 @@ const _BaseAuth = class _BaseAuth extends import_auth.Auth {
     return /^[^@.<>"'/]{1,50}$/.test(username);
   }
   async check() {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     const token = this.ctx.getBearerToken();
     if (!token) {
       this.ctx.throw(401, {
@@ -108,7 +108,7 @@ 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) {
+    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
@@ -162,7 +162,7 @@ const _BaseAuth = class _BaseAuth extends import_auth.Auth {
           url: this.ctx.originalUrl,
           headers: JSON.stringify((_b = (_a = this.ctx) == null ? void 0 : _a.req) == null ? void 0 : _b.headers)
         });
-        const isStreamRequest = this.ctx.req.headers["accept"] === "text/event-stream";
+        const isStreamRequest = ((_e = (_d = (_c = this.ctx) == null ? void 0 : _c.req) == null ? void 0 : _d.headers) == null ? void 0 : _e.accept) === "text/event-stream";
         if (isStreamRequest) {
           this.ctx.throw(401, {
             message: "Stream api not allow renew token.",
@@ -173,7 +173,7 @@ const _BaseAuth = class _BaseAuth extends import_auth.Auth {
         this.ctx.logger.info("token renewed", {
           method: "auth.check",
           url: this.ctx.originalUrl,
-          headers: JSON.stringify((_d = (_c = this.ctx) == null ? void 0 : _c.req) == null ? void 0 : _d.headers)
+          headers: JSON.stringify((_g = (_f = this.ctx) == null ? void 0 : _f.req) == null ? void 0 : _g.headers)
         });
         const expiresIn = Math.floor(tokenPolicy.tokenExpirationTime / 1e3);
         const newToken = this.jwt.sign({ userId, roleName, temp, signInTime }, { jwtid: renewedResult.jti, expiresIn });
@@ -184,7 +184,7 @@ const _BaseAuth = class _BaseAuth extends import_auth.Auth {
           method: "auth.check",
           url: this.ctx.originalUrl,
           err,
-          headers: JSON.stringify((_f = (_e = this.ctx) == null ? void 0 : _e.req) == null ? void 0 : _f.headers)
+          headers: JSON.stringify((_i = (_h = this.ctx) == null ? void 0 : _h.req) == null ? void 0 : _i.headers)
         });
         const options = err instanceof import_auth.AuthError ? { code: err.code, message: err.message } : { message: err.message, code: err.code ?? import_auth.AuthErrorCode.INVALID_TOKEN };
         this.ctx.throw(401, {

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/auth",
-  "version": "1.6.0-alpha.21",
+  "version": "1.6.0-alpha.23",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "1.6.0-alpha.21",
-    "@nocobase/cache": "1.6.0-alpha.21",
-    "@nocobase/database": "1.6.0-alpha.21",
-    "@nocobase/resourcer": "1.6.0-alpha.21",
-    "@nocobase/utils": "1.6.0-alpha.21",
+    "@nocobase/actions": "1.6.0-alpha.23",
+    "@nocobase/cache": "1.6.0-alpha.23",
+    "@nocobase/database": "1.6.0-alpha.23",
+    "@nocobase/resourcer": "1.6.0-alpha.23",
+    "@nocobase/utils": "1.6.0-alpha.23",
     "@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": "873cbaec9554e684781b8dc6cfd4386bb5cfa5b0"
+  "gitHead": "34e9bab601ea8364f10730f6da9f132e906b1908"
 }