dn-react-router-toolkit 0.2.1 → 0.2.3

package/dist/auth/apple_auth.d.mts

@@ -1,8 +1,8 @@
 import { ThirdpartyAuth, ThirdpartyAuthService } from './thirdparty_auth.mjs';
 import './auth_service.mjs';
 import 'jose';
-import 'react-router';
 import './jwt_manager.mjs';
+import 'react-router';
 import '../file/object_storage.mjs';
 import '@aws-sdk/client-s3';
 import './auth_repository.mjs';

package/dist/auth/apple_auth.d.ts

@@ -1,8 +1,8 @@
 import { ThirdpartyAuth, ThirdpartyAuthService } from './thirdparty_auth.js';
 import './auth_service.js';
 import 'jose';
-import 'react-router';
 import './jwt_manager.js';
+import 'react-router';
 import '../file/object_storage.js';
 import '@aws-sdk/client-s3';
 import './auth_repository.js';

package/dist/auth/auth_service.d.mts

@@ -1,6 +1,6 @@
 import * as jose from 'jose';
+import { JWTManager, AccessTokenPayload } from './jwt_manager.mjs';
 import * as react_router from 'react-router';
-import { JWTManager } from './jwt_manager.mjs';
 import { ObjectStorage } from '../file/object_storage.mjs';
 import { AuthRepository } from './auth_repository.mjs';
 import '@aws-sdk/client-s3';
@@ -18,8 +18,8 @@ declare class AuthService<TFile = unknown> {
         jwtManager: JWTManager;
         objectStorage: ObjectStorage;
     });
-    verify(request: Request): Promise<jose.JWTPayload | undefined>;
-    verifyOrRefresh(request: Request): Promise<jose.JWTPayload | undefined>;
+    verify(request: Request): Promise<AccessTokenPayload | undefined>;
+    verifyOrRefresh(request: Request): Promise<jose.JWTPayload | AccessTokenPayload | undefined>;
     getAccessTokenFromRequest(request: Request): Promise<any>;
     getAccessTokenFromCookies(request: Request): Promise<any>;
     getRefreshTokenFromCookies(request: Request): Promise<any>;

package/dist/auth/auth_service.d.ts

@@ -1,6 +1,6 @@
 import * as jose from 'jose';
+import { JWTManager, AccessTokenPayload } from './jwt_manager.js';
 import * as react_router from 'react-router';
-import { JWTManager } from './jwt_manager.js';
 import { ObjectStorage } from '../file/object_storage.js';
 import { AuthRepository } from './auth_repository.js';
 import '@aws-sdk/client-s3';
@@ -18,8 +18,8 @@ declare class AuthService<TFile = unknown> {
         jwtManager: JWTManager;
         objectStorage: ObjectStorage;
     });
-    verify(request: Request): Promise<jose.JWTPayload | undefined>;
-    verifyOrRefresh(request: Request): Promise<jose.JWTPayload | undefined>;
+    verify(request: Request): Promise<AccessTokenPayload | undefined>;
+    verifyOrRefresh(request: Request): Promise<jose.JWTPayload | AccessTokenPayload | undefined>;
     getAccessTokenFromRequest(request: Request): Promise<any>;
     getAccessTokenFromCookies(request: Request): Promise<any>;
     getRefreshTokenFromCookies(request: Request): Promise<any>;

package/dist/auth/client/provider.d.mts

@@ -1,9 +1,9 @@
 import React from 'react';
+import { AccessTokenPayload } from '../jwt_manager.mjs';
+import 'jose';
 
 type AuthContextValue = {
-    auth?: {
-        userId: string;
-    };
+    auth: AccessTokenPayload | undefined;
     login: (id: string, password: string) => Promise<void>;
     loginWithGoogle: (redirectUrl?: string) => Promise<void>;
     logout: () => Promise<void>;
@@ -15,7 +15,7 @@ type AuthContextValue = {
 };
 declare const AuthContext: React.Context<AuthContextValue>;
 declare const useAuth: () => AuthContextValue;
-declare function AuthProvider({ children, googleAuth }: {
+declare function AuthProvider({ children, googleAuth, }: {
     children: React.ReactNode;
     googleAuth?: {
         googleClientId: string;

package/dist/auth/client/provider.d.ts

@@ -1,9 +1,9 @@
 import React from 'react';
+import { AccessTokenPayload } from '../jwt_manager.js';
+import 'jose';
 
 type AuthContextValue = {
-    auth?: {
-        userId: string;
-    };
+    auth: AccessTokenPayload | undefined;
     login: (id: string, password: string) => Promise<void>;
     loginWithGoogle: (redirectUrl?: string) => Promise<void>;
     logout: () => Promise<void>;
@@ -15,7 +15,7 @@ type AuthContextValue = {
 };
 declare const AuthContext: React.Context<AuthContextValue>;
 declare const useAuth: () => AuthContextValue;
-declare function AuthProvider({ children, googleAuth }: {
+declare function AuthProvider({ children, googleAuth, }: {
     children: React.ReactNode;
     googleAuth?: {
         googleClientId: string;

package/dist/auth/client/provider.js

@@ -42,7 +42,10 @@ var AuthContext = (0, import_react2.createContext)({});
 var useAuth = () => {
   return (0, import_react2.useContext)(AuthContext);
 };
-function AuthProvider({ children, googleAuth }) {
+function AuthProvider({
+  children,
+  googleAuth
+}) {
   const data = (0, import_react_router.useRouteLoaderData)("root");
   const auth = data?.AUTH;
   const navigate = (0, import_react_router.useNavigate)();

package/dist/auth/client/provider.mjs

@@ -6,7 +6,10 @@ var AuthContext = createContext({});
 var useAuth = () => {
   return useContext(AuthContext);
 };
-function AuthProvider({ children, googleAuth }) {
+function AuthProvider({
+  children,
+  googleAuth
+}) {
   const data = useRouteLoaderData("root");
   const auth = data?.AUTH;
   const navigate = useNavigate();

package/dist/auth/google_auth.d.mts

@@ -1,8 +1,8 @@
 import { ThirdpartyAuth, ThirdpartyAuthService } from './thirdparty_auth.mjs';
 import './auth_service.mjs';
 import 'jose';
-import 'react-router';
 import './jwt_manager.mjs';
+import 'react-router';
 import '../file/object_storage.mjs';
 import '@aws-sdk/client-s3';
 import './auth_repository.mjs';

package/dist/auth/google_auth.d.ts

@@ -1,8 +1,8 @@
 import { ThirdpartyAuth, ThirdpartyAuthService } from './thirdparty_auth.js';
 import './auth_service.js';
 import 'jose';
-import 'react-router';
 import './jwt_manager.js';
+import 'react-router';
 import '../file/object_storage.js';
 import '@aws-sdk/client-s3';
 import './auth_repository.js';

package/dist/auth/handlers/find_auth.d.mts

@@ -1,7 +1,7 @@
 import { AuthService } from '../auth_service.mjs';
 import 'jose';
-import 'react-router';
 import '../jwt_manager.mjs';
+import 'react-router';
 import '../../file/object_storage.mjs';
 import '@aws-sdk/client-s3';
 import '../auth_repository.mjs';

package/dist/auth/handlers/find_auth.d.ts

@@ -1,7 +1,7 @@
 import { AuthService } from '../auth_service.js';
 import 'jose';
-import 'react-router';
 import '../jwt_manager.js';
+import 'react-router';
 import '../../file/object_storage.js';
 import '@aws-sdk/client-s3';
 import '../auth_repository.js';

package/dist/auth/handlers/login.d.mts

@@ -1,7 +1,7 @@
 import { AuthService } from '../auth_service.mjs';
 import 'jose';
-import 'react-router';
 import '../jwt_manager.mjs';
+import 'react-router';
 import '../../file/object_storage.mjs';
 import '@aws-sdk/client-s3';
 import '../auth_repository.mjs';

package/dist/auth/handlers/login.d.ts

@@ -1,7 +1,7 @@
 import { AuthService } from '../auth_service.js';
 import 'jose';
-import 'react-router';
 import '../jwt_manager.js';
+import 'react-router';
 import '../../file/object_storage.js';
 import '@aws-sdk/client-s3';
 import '../auth_repository.js';

package/dist/auth/handlers/login_with_thirdparty.d.mts

@@ -1,8 +1,8 @@
 import { ThirdpartyAuth } from '../thirdparty_auth.mjs';
 import '../auth_service.mjs';
 import 'jose';
-import 'react-router';
 import '../jwt_manager.mjs';
+import 'react-router';
 import '../../file/object_storage.mjs';
 import '@aws-sdk/client-s3';
 import '../auth_repository.mjs';

package/dist/auth/handlers/login_with_thirdparty.d.ts

@@ -1,8 +1,8 @@
 import { ThirdpartyAuth } from '../thirdparty_auth.js';
 import '../auth_service.js';
 import 'jose';
-import 'react-router';
 import '../jwt_manager.js';
+import 'react-router';
 import '../../file/object_storage.js';
 import '@aws-sdk/client-s3';
 import '../auth_repository.js';

package/dist/auth/handlers/logout.d.mts

@@ -1,7 +1,7 @@
 import { AuthService } from '../auth_service.mjs';
 import 'jose';
-import 'react-router';
 import '../jwt_manager.mjs';
+import 'react-router';
 import '../../file/object_storage.mjs';
 import '@aws-sdk/client-s3';
 import '../auth_repository.mjs';

package/dist/auth/handlers/logout.d.ts

@@ -1,7 +1,7 @@
 import { AuthService } from '../auth_service.js';
 import 'jose';
-import 'react-router';
 import '../jwt_manager.js';
+import 'react-router';
 import '../../file/object_storage.js';
 import '@aws-sdk/client-s3';
 import '../auth_repository.js';

package/dist/auth/handlers/refresh.d.mts

@@ -1,7 +1,7 @@
 import { AuthService } from '../auth_service.mjs';
 import 'jose';
-import 'react-router';
 import '../jwt_manager.mjs';
+import 'react-router';
 import '../../file/object_storage.mjs';
 import '@aws-sdk/client-s3';
 import '../auth_repository.mjs';

package/dist/auth/handlers/refresh.d.ts

@@ -1,7 +1,7 @@
 import { AuthService } from '../auth_service.js';
 import 'jose';
-import 'react-router';
 import '../jwt_manager.js';
+import 'react-router';
 import '../../file/object_storage.js';
 import '@aws-sdk/client-s3';
 import '../auth_repository.js';

package/dist/auth/handlers/signup.d.mts

@@ -1,8 +1,8 @@
 import { AuthService } from '../auth_service.mjs';
 import { FileRepository } from '../../file/file_repository.mjs';
 import 'jose';
-import 'react-router';
 import '../jwt_manager.mjs';
+import 'react-router';
 import '../../file/object_storage.mjs';
 import '@aws-sdk/client-s3';
 import '../auth_repository.mjs';

package/dist/auth/handlers/signup.d.ts

@@ -1,8 +1,8 @@
 import { AuthService } from '../auth_service.js';
 import { FileRepository } from '../../file/file_repository.js';
 import 'jose';
-import 'react-router';
 import '../jwt_manager.js';
+import 'react-router';
 import '../../file/object_storage.js';
 import '@aws-sdk/client-s3';
 import '../auth_repository.js';

package/dist/auth/handlers/signup_with_thirdparty.d.mts

@@ -1,8 +1,8 @@
 import { AuthService } from '../auth_service.mjs';
 import { FileService } from '../../file/file_service.mjs';
 import 'jose';
-import 'react-router';
 import '../jwt_manager.mjs';
+import 'react-router';
 import '../../file/object_storage.mjs';
 import '@aws-sdk/client-s3';
 import '../auth_repository.mjs';

package/dist/auth/handlers/signup_with_thirdparty.d.ts

@@ -1,8 +1,8 @@
 import { AuthService } from '../auth_service.js';
 import { FileService } from '../../file/file_service.js';
 import 'jose';
-import 'react-router';
 import '../jwt_manager.js';
+import 'react-router';
 import '../../file/object_storage.js';
 import '@aws-sdk/client-s3';
 import '../auth_repository.js';

package/dist/auth/handlers/thirdparty_auth_callback.d.mts

@@ -1,8 +1,8 @@
 import { AuthService } from '../auth_service.mjs';
 import { ThirdpartyAuth } from '../thirdparty_auth.mjs';
 import 'jose';
-import 'react-router';
 import '../jwt_manager.mjs';
+import 'react-router';
 import '../../file/object_storage.mjs';
 import '@aws-sdk/client-s3';
 import '../auth_repository.mjs';

package/dist/auth/handlers/thirdparty_auth_callback.d.ts

@@ -1,8 +1,8 @@
 import { AuthService } from '../auth_service.js';
 import { ThirdpartyAuth } from '../thirdparty_auth.js';
 import 'jose';
-import 'react-router';
 import '../jwt_manager.js';
+import 'react-router';
 import '../../file/object_storage.js';
 import '@aws-sdk/client-s3';
 import '../auth_repository.js';

package/dist/auth/jwt_manager.d.mts

@@ -1,5 +1,15 @@
 import { JWTPayload } from 'jose';
 
+type AccessTokenPayload = {
+    userId: string;
+    role: string;
+    name: string;
+};
+type RefreshTokenPayload = {
+    userId: string;
+    role: string;
+    name: string;
+};
 declare class JWTManager {
     siteOrigin?: string;
     accessTokenSecret: string;
@@ -14,15 +24,15 @@ declare class JWTManager {
         refreshTokenExpiresIn?: string;
     });
     verify(token: string, secret: string): Promise<JWTPayload | undefined>;
-    verifyAccessToken(token: string): Promise<JWTPayload | undefined>;
-    verifyRefreshToken(token: string): Promise<JWTPayload | undefined>;
+    verifyAccessToken(token: string): Promise<AccessTokenPayload | undefined>;
+    verifyRefreshToken(token: string): Promise<RefreshTokenPayload | undefined>;
     sign(payload: JWTPayload, secret: string, { expiresIn }?: {
         expiresIn?: string;
     }): Promise<string>;
-    signAccessToken(payload: JWTPayload): Promise<string>;
-    signRefreshToken(payload: JWTPayload): Promise<string>;
+    signAccessToken(payload: AccessTokenPayload): Promise<string>;
+    signRefreshToken(payload: RefreshTokenPayload): Promise<string>;
     decode(token: string): JWTPayload;
     getExpirationTime(token: string): Date;
 }
 
-export { JWTManager };
+export { type AccessTokenPayload, JWTManager, type RefreshTokenPayload };

package/dist/auth/jwt_manager.d.ts

@@ -1,5 +1,15 @@
 import { JWTPayload } from 'jose';
 
+type AccessTokenPayload = {
+    userId: string;
+    role: string;
+    name: string;
+};
+type RefreshTokenPayload = {
+    userId: string;
+    role: string;
+    name: string;
+};
 declare class JWTManager {
     siteOrigin?: string;
     accessTokenSecret: string;
@@ -14,15 +24,15 @@ declare class JWTManager {
         refreshTokenExpiresIn?: string;
     });
     verify(token: string, secret: string): Promise<JWTPayload | undefined>;
-    verifyAccessToken(token: string): Promise<JWTPayload | undefined>;
-    verifyRefreshToken(token: string): Promise<JWTPayload | undefined>;
+    verifyAccessToken(token: string): Promise<AccessTokenPayload | undefined>;
+    verifyRefreshToken(token: string): Promise<RefreshTokenPayload | undefined>;
     sign(payload: JWTPayload, secret: string, { expiresIn }?: {
         expiresIn?: string;
     }): Promise<string>;
-    signAccessToken(payload: JWTPayload): Promise<string>;
-    signRefreshToken(payload: JWTPayload): Promise<string>;
+    signAccessToken(payload: AccessTokenPayload): Promise<string>;
+    signRefreshToken(payload: RefreshTokenPayload): Promise<string>;
     decode(token: string): JWTPayload;
     getExpirationTime(token: string): Date;
 }
 
-export { JWTManager };
+export { type AccessTokenPayload, JWTManager, type RefreshTokenPayload };

package/dist/auth/jwt_manager.js

@@ -35,7 +35,7 @@ var JWTManager = class {
     accessTokenSecret,
     accessTokenExpiresIn = "10s",
     refreshTokenSecret,
-    refreshTokenExpiresIn = "1h"
+    refreshTokenExpiresIn = "1y"
   }) {
     this.siteOrigin = siteOrigin;
     this.accessTokenSecret = accessTokenSecret;
@@ -52,10 +52,10 @@ var JWTManager = class {
     }
   }
   async verifyAccessToken(token) {
-    return this.verify(token, this.accessTokenSecret);
+    return await this.verify(token, this.accessTokenSecret);
   }
   async verifyRefreshToken(token) {
-    return this.verify(token, this.refreshTokenSecret);
+    return await this.verify(token, this.refreshTokenSecret);
   }
   async sign(payload, secret, { expiresIn } = {}) {
     let builder = new import_jose.SignJWT(payload).setProtectedHeader({ alg: "HS256", typ: "JWT" }).setIssuedAt();

package/dist/auth/jwt_manager.mjs

@@ -11,7 +11,7 @@ var JWTManager = class {
     accessTokenSecret,
     accessTokenExpiresIn = "10s",
     refreshTokenSecret,
-    refreshTokenExpiresIn = "1h"
+    refreshTokenExpiresIn = "1y"
   }) {
     this.siteOrigin = siteOrigin;
     this.accessTokenSecret = accessTokenSecret;
@@ -28,10 +28,10 @@ var JWTManager = class {
     }
   }
   async verifyAccessToken(token) {
-    return this.verify(token, this.accessTokenSecret);
+    return await this.verify(token, this.accessTokenSecret);
   }
   async verifyRefreshToken(token) {
-    return this.verify(token, this.refreshTokenSecret);
+    return await this.verify(token, this.refreshTokenSecret);
   }
   async sign(payload, secret, { expiresIn } = {}) {
     let builder = new SignJWT(payload).setProtectedHeader({ alg: "HS256", typ: "JWT" }).setIssuedAt();

package/dist/auth/kakao_auth.d.mts

@@ -1,8 +1,8 @@
 import { ThirdpartyAuth, ThirdpartyAuthService } from './thirdparty_auth.mjs';
 import './auth_service.mjs';
 import 'jose';
-import 'react-router';
 import './jwt_manager.mjs';
+import 'react-router';
 import '../file/object_storage.mjs';
 import '@aws-sdk/client-s3';
 import './auth_repository.mjs';

package/dist/auth/kakao_auth.d.ts

@@ -1,8 +1,8 @@
 import { ThirdpartyAuth, ThirdpartyAuthService } from './thirdparty_auth.js';
 import './auth_service.js';
 import 'jose';
-import 'react-router';
 import './jwt_manager.js';
+import 'react-router';
 import '../file/object_storage.js';
 import '@aws-sdk/client-s3';
 import './auth_repository.js';

package/dist/auth/thirdparty_auth.d.mts

@@ -1,7 +1,7 @@
 import { AuthService } from './auth_service.mjs';
 import 'jose';
-import 'react-router';
 import './jwt_manager.mjs';
+import 'react-router';
 import '../file/object_storage.mjs';
 import '@aws-sdk/client-s3';
 import './auth_repository.mjs';

package/dist/auth/thirdparty_auth.d.ts

@@ -1,7 +1,7 @@
 import { AuthService } from './auth_service.js';
 import 'jose';
-import 'react-router';
 import './jwt_manager.js';
+import 'react-router';
 import '../file/object_storage.js';
 import '@aws-sdk/client-s3';
 import './auth_repository.js';

package/dist/auth/with_auth.d.mts

@@ -1,16 +1,16 @@
 import { LoaderFunctionArgs, ActionFunctionArgs } from 'react-router';
 import { AuthService } from './auth_service.mjs';
-import { JWTPayload } from 'jose';
-import './jwt_manager.mjs';
+import { AccessTokenPayload } from './jwt_manager.mjs';
+import 'jose';
 import '../file/object_storage.mjs';
 import '@aws-sdk/client-s3';
 import './auth_repository.mjs';
 
 type Handler<T extends LoaderFunctionArgs | ActionFunctionArgs> = (arg: T) => Promise<unknown> | unknown;
-type InputFN = (auth?: JWTPayload) => Handler<LoaderFunctionArgs> | Handler<ActionFunctionArgs>;
+type InputFN = (auth?: AccessTokenPayload) => Handler<LoaderFunctionArgs> | Handler<ActionFunctionArgs>;
 type WithAuthHandler<T extends LoaderFunctionArgs | ActionFunctionArgs> = (fn: InputFN) => Handler<T>;
 declare function createWithAuthHandler<T extends LoaderFunctionArgs | ActionFunctionArgs>({ authService }: {
     authService: AuthService;
-}): <THandler extends Handler<T>>(fn: (auth?: JWTPayload) => THandler) => THandler;
+}): <THandler extends Handler<T>>(fn: (auth?: AccessTokenPayload) => THandler) => THandler;
 
 export { type WithAuthHandler, createWithAuthHandler };

package/dist/auth/with_auth.d.ts

@@ -1,16 +1,16 @@
 import { LoaderFunctionArgs, ActionFunctionArgs } from 'react-router';
 import { AuthService } from './auth_service.js';
-import { JWTPayload } from 'jose';
-import './jwt_manager.js';
+import { AccessTokenPayload } from './jwt_manager.js';
+import 'jose';
 import '../file/object_storage.js';
 import '@aws-sdk/client-s3';
 import './auth_repository.js';
 
 type Handler<T extends LoaderFunctionArgs | ActionFunctionArgs> = (arg: T) => Promise<unknown> | unknown;
-type InputFN = (auth?: JWTPayload) => Handler<LoaderFunctionArgs> | Handler<ActionFunctionArgs>;
+type InputFN = (auth?: AccessTokenPayload) => Handler<LoaderFunctionArgs> | Handler<ActionFunctionArgs>;
 type WithAuthHandler<T extends LoaderFunctionArgs | ActionFunctionArgs> = (fn: InputFN) => Handler<T>;
 declare function createWithAuthHandler<T extends LoaderFunctionArgs | ActionFunctionArgs>({ authService }: {
     authService: AuthService;
-}): <THandler extends Handler<T>>(fn: (auth?: JWTPayload) => THandler) => THandler;
+}): <THandler extends Handler<T>>(fn: (auth?: AccessTokenPayload) => THandler) => THandler;
 
 export { type WithAuthHandler, createWithAuthHandler };

package/dist/auth/with_auth.js

@@ -30,10 +30,20 @@ function createWithAuthHandler({ authService }) {
         const res = await fn(auth)(arg);
         if (typeof res === "object" && res !== null && !Array.isArray(res)) {
           if (res instanceof Response) {
-            if (res.status < 300 && res.body) {
-              console.log(res.body);
-              return res;
+            if (res.status < 300 && res.headers.get("Content-Type")?.includes("application/json")) {
+              const data = await res.json();
+              return new Response(
+                JSON.stringify({
+                  AUTH: auth,
+                  ...data
+                }),
+                {
+                  status: res.status,
+                  headers: res.headers
+                }
+              );
             }
+            return res;
           }
           return {
             AUTH: auth,
@@ -42,17 +52,25 @@ function createWithAuthHandler({ authService }) {
         }
         return res;
       };
-      const accessToken = await authService.getAccessTokenFromRequest(arg.request);
+      const accessToken = await authService.getAccessTokenFromRequest(
+        arg.request
+      );
       if (accessToken) {
-        const payload = await authService.jwtManager.verifyAccessToken(accessToken);
+        const payload = await authService.jwtManager.verifyAccessToken(
+          accessToken
+        );
         if (payload) {
           return respond(payload);
         }
       }
-      const refreshToken = await authService.getRefreshTokenFromCookies(arg.request);
+      const refreshToken = await authService.getRefreshTokenFromCookies(
+        arg.request
+      );
       if (refreshToken) {
         try {
-          const newAccessToken = await authService.refreshAccessToken(refreshToken);
+          const newAccessToken = await authService.refreshAccessToken(
+            refreshToken
+          );
           const setCookieHeader = await authService.getAccessTokenSetCookie(
             newAccessToken
           );
@@ -67,7 +85,9 @@ function createWithAuthHandler({ authService }) {
           if (e instanceof Error) {
             console.log(e.message);
           }
-          const setCookieHeader = await authService.getRefreshTokenSetCookie(null);
+          const setCookieHeader = await authService.getRefreshTokenSetCookie(
+            null
+          );
           const headers = new Headers();
           headers.append("Set-Cookie", setCookieHeader);
           headers.append("Location", arg.request.url);

package/dist/auth/with_auth.mjs

@@ -6,10 +6,20 @@ function createWithAuthHandler({ authService }) {
         const res = await fn(auth)(arg);
         if (typeof res === "object" && res !== null && !Array.isArray(res)) {
           if (res instanceof Response) {
-            if (res.status < 300 && res.body) {
-              console.log(res.body);
-              return res;
+            if (res.status < 300 && res.headers.get("Content-Type")?.includes("application/json")) {
+              const data = await res.json();
+              return new Response(
+                JSON.stringify({
+                  AUTH: auth,
+                  ...data
+                }),
+                {
+                  status: res.status,
+                  headers: res.headers
+                }
+              );
             }
+            return res;
           }
           return {
             AUTH: auth,
@@ -18,17 +28,25 @@ function createWithAuthHandler({ authService }) {
         }
         return res;
       };
-      const accessToken = await authService.getAccessTokenFromRequest(arg.request);
+      const accessToken = await authService.getAccessTokenFromRequest(
+        arg.request
+      );
       if (accessToken) {
-        const payload = await authService.jwtManager.verifyAccessToken(accessToken);
+        const payload = await authService.jwtManager.verifyAccessToken(
+          accessToken
+        );
         if (payload) {
           return respond(payload);
         }
       }
-      const refreshToken = await authService.getRefreshTokenFromCookies(arg.request);
+      const refreshToken = await authService.getRefreshTokenFromCookies(
+        arg.request
+      );
       if (refreshToken) {
         try {
-          const newAccessToken = await authService.refreshAccessToken(refreshToken);
+          const newAccessToken = await authService.refreshAccessToken(
+            refreshToken
+          );
           const setCookieHeader = await authService.getAccessTokenSetCookie(
             newAccessToken
           );
@@ -43,7 +61,9 @@ function createWithAuthHandler({ authService }) {
           if (e instanceof Error) {
             console.log(e.message);
           }
-          const setCookieHeader = await authService.getRefreshTokenSetCookie(null);
+          const setCookieHeader = await authService.getRefreshTokenSetCookie(
+            null
+          );
           const headers = new Headers();
           headers.append("Set-Cookie", setCookieHeader);
           headers.append("Location", arg.request.url);

package/dist/file/handlers/delete_file.d.mts

@@ -1,8 +1,8 @@
 import { AuthService } from '../../auth/auth_service.mjs';
 import { FileRepository } from '../file_repository.mjs';
 import 'jose';
-import 'react-router';
 import '../../auth/jwt_manager.mjs';
+import 'react-router';
 import '../object_storage.mjs';
 import '@aws-sdk/client-s3';
 import '../../auth/auth_repository.mjs';

package/dist/file/handlers/delete_file.d.ts

@@ -1,8 +1,8 @@
 import { AuthService } from '../../auth/auth_service.js';
 import { FileRepository } from '../file_repository.js';
 import 'jose';
-import 'react-router';
 import '../../auth/jwt_manager.js';
+import 'react-router';
 import '../object_storage.js';
 import '@aws-sdk/client-s3';
 import '../../auth/auth_repository.js';

package/dist/file/handlers/upload_file.d.mts

@@ -1,8 +1,8 @@
 import { AuthService } from '../../auth/auth_service.mjs';
 import { FileService } from '../file_service.mjs';
 import 'jose';
-import 'react-router';
 import '../../auth/jwt_manager.mjs';
+import 'react-router';
 import '../object_storage.mjs';
 import '@aws-sdk/client-s3';
 import '../../auth/auth_repository.mjs';

package/dist/file/handlers/upload_file.d.ts

@@ -1,8 +1,8 @@
 import { AuthService } from '../../auth/auth_service.js';
 import { FileService } from '../file_service.js';
 import 'jose';
-import 'react-router';
 import '../../auth/jwt_manager.js';
+import 'react-router';
 import '../object_storage.js';
 import '@aws-sdk/client-s3';
 import '../../auth/auth_repository.js';

package/package.json

@@ -1,85 +1,85 @@
 {
-    "name": "dn-react-router-toolkit",
-    "version": "0.2.1",
-    "types": "./dist/index.d.ts",
-    "main": "./dist/index.mjs",
-    "module": "./dist/index.js",
-    "exports": {
-        ".": {
-            "types": "./dist/index.d.ts",
-            "import": "./dist/index.mjs",
-            "require": "./dist/index.js"
-        },
-        "./auth/*": {
-            "types": "./dist/auth/*.d.ts",
-            "import": "./dist/auth/*.mjs",
-            "require": "./dist/auth/*.js"
-        },
-        "./file/*": {
-            "types": "./dist/file/*.d.ts",
-            "import": "./dist/file/*.mjs",
-            "require": "./dist/file/*.js"
-        },
-        "./route/*": {
-            "types": "./dist/route/*.d.ts",
-            "import": "./dist/route/*.mjs",
-            "require": "./dist/route/*.js"
-        },
-        "./components/*": {
-            "types": "./dist/components/*.d.ts",
-            "import": "./dist/components/*.mjs",
-            "require": "./dist/components/*.js"
-        },
-        "./http/*": {
-            "types": "./dist/http/*.d.ts",
-            "import": "./dist/http/*.mjs",
-            "require": "./dist/http/*.js"
-        },
-        "./seo/*": {
-            "types": "./dist/seo/*.d.ts",
-            "import": "./dist/seo/*.mjs",
-            "require": "./dist/seo/*.js"
-        }
+  "name": "dn-react-router-toolkit",
+  "version": "0.2.3",
+  "types": "./dist/index.d.ts",
+  "main": "./dist/index.mjs",
+  "module": "./dist/index.js",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.js"
     },
-    "scripts": {
-        "build": "tsup",
-        "dev": "tsup --watch"
+    "./auth/*": {
+      "types": "./dist/auth/*.d.ts",
+      "import": "./dist/auth/*.mjs",
+      "require": "./dist/auth/*.js"
     },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/dndnsoft/dn-react-router-toolkit.git"
+    "./file/*": {
+      "types": "./dist/file/*.d.ts",
+      "import": "./dist/file/*.mjs",
+      "require": "./dist/file/*.js"
     },
-    "author": "",
-    "license": "MIT",
-    "bugs": {
-        "url": "https://github.com/dndnsoft/dn-react-router-toolkit/issues"
+    "./route/*": {
+      "types": "./dist/route/*.d.ts",
+      "import": "./dist/route/*.mjs",
+      "require": "./dist/route/*.js"
     },
-    "homepage": "https://github.com/dndnsoft/dn-react-router-toolkit#readme",
-    "description": "",
-    "devDependencies": {
-        "@types/node": "^24.10.1",
-        "@types/nodemailer": "^7.0.4",
-        "@types/react": "^19",
-        "@types/react-dom": "^19",
-        "rimraf": "^6.0.1",
-        "schema-dts": "^1.1.5",
-        "tsup": "^8.5.1",
-        "typescript": "^5.7.3"
+    "./components/*": {
+      "types": "./dist/components/*.d.ts",
+      "import": "./dist/components/*.mjs",
+      "require": "./dist/components/*.js"
     },
-    "dependencies": {
-        "@aws-sdk/client-s3": "^3.940.0",
-        "@aws-sdk/s3-request-presigner": "^3.940.0",
-        "bcryptjs": "^3.0.3",
-        "jose": "^6.1.2",
-        "moment-timezone": "^0.6.0",
-        "nodemailer": "^7.0.11",
-        "react-icons": "^5.5.0",
-        "uuid": "^13.0.0"
+    "./http/*": {
+      "types": "./dist/http/*.d.ts",
+      "import": "./dist/http/*.mjs",
+      "require": "./dist/http/*.js"
     },
-    "peerDependencies": {
-        "drizzle-orm": "^0.44",
-        "react": "^19",
-        "react-dom": "^19",
-        "react-router": "^7"
+    "./seo/*": {
+      "types": "./dist/seo/*.d.ts",
+      "import": "./dist/seo/*.mjs",
+      "require": "./dist/seo/*.js"
     }
+  },
+  "scripts": {
+    "build": "tsup",
+    "dev": "tsup --watch"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/dndnsoft/dn-react-router-toolkit.git"
+  },
+  "author": "",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/dndnsoft/dn-react-router-toolkit/issues"
+  },
+  "homepage": "https://github.com/dndnsoft/dn-react-router-toolkit#readme",
+  "description": "",
+  "devDependencies": {
+    "@types/node": "^24.10.1",
+    "@types/nodemailer": "^7.0.4",
+    "@types/react": "^19",
+    "@types/react-dom": "^19",
+    "rimraf": "^6.0.1",
+    "schema-dts": "^1.1.5",
+    "tsup": "^8.5.1",
+    "typescript": "^5.7.3"
+  },
+  "dependencies": {
+    "@aws-sdk/client-s3": "^3.940.0",
+    "@aws-sdk/s3-request-presigner": "^3.940.0",
+    "bcryptjs": "^3.0.3",
+    "jose": "^6.1.2",
+    "moment-timezone": "^0.6.0",
+    "nodemailer": "^7.0.11",
+    "react-icons": "^5.5.0",
+    "uuid": "^13.0.0"
+  },
+  "peerDependencies": {
+    "drizzle-orm": "^0.44",
+    "react": "^19",
+    "react-dom": "^19",
+    "react-router": "^7"
+  }
 }