@thinkingcat/auth-utils 2.0.9 → 2.0.11

package/dist/core/jwt.js

@@ -49,7 +49,7 @@ async function verifyToken(accessToken, secret) {
     try {
         const secretBytes = new TextEncoder().encode(secret);
         const { payload } = await (0, jose_1.jwtVerify)(accessToken, secretBytes);
-        if (payload && typeof payload === 'object' && payload.email) {
+        if (payload && typeof payload === 'object' && (payload.id || payload.sub)) {
             return { payload: payload };
         }
         return null;
@@ -174,7 +174,7 @@ function isValidToken(token) {
         return false;
     if (isTokenExpired(token))
         return false;
-    if (!token.email || !token.id)
+    if (!token.id)
         return false;
     return true;
 }

package/dist/core/verify.js

@@ -19,7 +19,7 @@ async function verifyAndRefreshToken(req, secret, options) {
         try {
             const secretBytes = new TextEncoder().encode(secret);
             const { payload } = await (0, jose_1.jwtVerify)(accessToken, secretBytes);
-            if (payload && typeof payload === 'object' && payload.email) {
+            if (payload && typeof payload === 'object' && (payload.id || payload.sub)) {
                 return { isValid: true, payload: payload };
             }
         }
@@ -44,7 +44,7 @@ async function verifyAndRefreshToken(req, secret, options) {
                     let payload;
                     const secretBytes = new TextEncoder().encode(secret);
                     const { payload: tokenPayload } = await (0, jose_1.jwtVerify)(refreshResult.accessToken, secretBytes);
-                    if (tokenPayload && typeof tokenPayload === 'object' && tokenPayload.email) {
+                    if (tokenPayload && typeof tokenPayload === 'object' && (tokenPayload.id || tokenPayload.sub)) {
                         payload = tokenPayload;
                     }
                     const { NextResponse: NextResponseClass } = await (0, server_1.getNextServer)();
@@ -117,7 +117,7 @@ async function verifyAndRefreshTokenWithNextAuth(req, nextAuthToken, secret, opt
         try {
             const secretBytes = new TextEncoder().encode(secret);
             const { payload } = await (0, jose_1.jwtVerify)(accessToken, secretBytes);
-            if (payload && typeof payload === 'object' && payload.email) {
+            if (payload && typeof payload === 'object' && (payload.id || payload.sub)) {
                 hasValidAccessToken = true;
             }
         }

package/dist/middleware/handler.js

@@ -198,7 +198,7 @@ async function handleMiddleware(req, config, options) {
             const ssoBaseURL = options.ssoBaseURL;
             return await (0, redirect_js_1.redirectToSSOLogin)(req, serviceId, ssoBaseURL);
         }
-        if (!finalToken.role || !finalToken.email) {
+        if (!finalToken.role || !finalToken.id) {
             const ssoBaseURL = options.ssoBaseURL;
             return await (0, redirect_js_1.redirectToSSOLogin)(req, serviceId, ssoBaseURL);
         }

package/dist/types/index.d.ts

@@ -14,6 +14,8 @@ export interface ResponseLike {
 export interface ServiceInfo {
     serviceId: string;
     role: string;
+    joinedAt: string;
+    lastAccessAt?: string;
     expiredAt?: string;
     status: string;
     isFree?: boolean;
@@ -59,8 +61,8 @@ export interface SSORegisterResponse {
 export interface JWTPayload {
     sub?: string;
     id?: string;
-    email: string;
-    name: string;
+    email?: string | null;
+    name?: string | null;
     role?: string;
     iat?: number;
     exp?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thinkingcat/auth-utils",
-  "version": "2.0.9",
+  "version": "2.0.11",
   "description": "Authentication utilities for ThinkingCat SSO services with conditional logging",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",