dn-react-router-toolkit 0.3.3 → 0.3.6

package/dist/api/create_handler.d.mts

@@ -2,7 +2,8 @@ import { LoaderFunctionArgs, ActionFunctionArgs } from 'react-router';
 import { AuthService, PasswordRecoveryService, ThirdpartyAuth } from 'dn-react-toolkit/auth/server';
 import { FileService } from 'dn-react-toolkit/file/server';
 
-declare const createAPIHandler: <TFile>({ authService, fileService, passwordRecoveryService, getThirdPartyAuth, signupTokenSecret, }: {
+declare const createAPIHandler: <TFile>({ siteOrigin, authService, fileService, passwordRecoveryService, getThirdPartyAuth, signupTokenSecret, }: {
+    siteOrigin: string;
     authService: AuthService<TFile>;
     fileService: FileService<TFile>;
     passwordRecoveryService: PasswordRecoveryService;

package/dist/api/create_handler.d.ts

@@ -2,7 +2,8 @@ import { LoaderFunctionArgs, ActionFunctionArgs } from 'react-router';
 import { AuthService, PasswordRecoveryService, ThirdpartyAuth } from 'dn-react-toolkit/auth/server';
 import { FileService } from 'dn-react-toolkit/file/server';
 
-declare const createAPIHandler: <TFile>({ authService, fileService, passwordRecoveryService, getThirdPartyAuth, signupTokenSecret, }: {
+declare const createAPIHandler: <TFile>({ siteOrigin, authService, fileService, passwordRecoveryService, getThirdPartyAuth, signupTokenSecret, }: {
+    siteOrigin: string;
     authService: AuthService<TFile>;
     fileService: FileService<TFile>;
     passwordRecoveryService: PasswordRecoveryService;

package/dist/api/create_handler.js

@@ -41,14 +41,23 @@ __export(auth_exports, {
 __reExport(auth_exports, require("dn-react-toolkit/auth"));
 
 // src/auth/with_auth.ts
-function createWithAuthHandler({ authService }) {
+function createWithAuthHandler({
+  siteOrigin,
+  authService
+}) {
   return function(fn) {
     const handler = async function(arg) {
-      const respond = async (auth) => {
+      const respond = async (auth, headers) => {
         const userAgent = arg.request.headers.get("User-Agent") || "";
         const res = await fn(auth)(arg);
         if (typeof res === "object" && res !== null && !Array.isArray(res)) {
           if (res instanceof Response) {
+            const mergedHeaders = new Headers(res.headers);
+            if (headers) {
+              headers.forEach((value, key) => {
+                mergedHeaders.set(key, value);
+              });
+            }
             if (res.status < 300 && res.headers.get("Content-Type")?.includes("application/json")) {
               const data = await res.json();
               return new Response(
@@ -59,19 +68,25 @@ function createWithAuthHandler({ authService }) {
                 }),
                 {
                   status: res.status,
-                  headers: res.headers
+                  headers: mergedHeaders
                 }
               );
             }
-            return res;
+            return new Response(res.body, {
+              status: res.status,
+              headers: mergedHeaders
+            });
           }
-          return {
-            AUTH: auth,
-            userAgent,
-            ...res
-          };
+          return new Response(
+            JSON.stringify({
+              AUTH: auth,
+              userAgent,
+              ...res
+            }),
+            { status: 200, headers }
+          );
         }
-        return res;
+        return new Response(JSON.stringify(res), { status: 200, headers });
       };
       const accessToken = await authService.getAccessTokenFromRequest(
         arg.request
@@ -97,11 +112,11 @@ function createWithAuthHandler({ authService }) {
           );
           const headers = new Headers();
           headers.append("Set-Cookie", setCookieHeader);
-          headers.append("Location", arg.request.url);
-          return new Response("Temporary Redirect", {
-            status: 307,
-            headers
-          });
+          headers.append("Location", new URL(arg.request.url, siteOrigin).href);
+          const payload = authService.jwtManager.decode(
+            newAccessToken
+          );
+          return respond(payload, headers);
         } catch (e) {
           if (e instanceof Error) {
             console.log(e.message);
@@ -111,11 +126,8 @@ function createWithAuthHandler({ authService }) {
           );
           const headers = new Headers();
           headers.append("Set-Cookie", setCookieHeader);
-          headers.append("Location", arg.request.url);
-          return new Response("Temporary Redirect", {
-            status: 307,
-            headers
-          });
+          headers.append("Location", new URL(arg.request.url, siteOrigin).href);
+          return respond(void 0, headers);
         }
       }
       return respond(void 0);
@@ -148,6 +160,7 @@ var ReactRouterCookieStore = class {
 // src/api/create_handler.ts
 var import_server2 = require("dn-react-toolkit/file/server");
 var createAPIHandler = ({
+  siteOrigin,
   authService,
   fileService,
   passwordRecoveryService,
@@ -158,7 +171,7 @@ var createAPIHandler = ({
     const { request, params } = args;
     const method = request.method.toUpperCase();
     const slug = params["*"] ? params["*"].split("/") : [];
-    const withAuth = createWithAuthHandler({ authService });
+    const withAuth = createWithAuthHandler({ siteOrigin, authService });
     switch (slug[0]) {
       case "auth": {
         switch (slug[1]) {

package/dist/api/create_handler.mjs

@@ -45,14 +45,23 @@ __reExport(auth_exports, auth_star);
 import * as auth_star from "dn-react-toolkit/auth";
 
 // src/auth/with_auth.ts
-function createWithAuthHandler({ authService }) {
+function createWithAuthHandler({
+  siteOrigin,
+  authService
+}) {
   return function(fn) {
     const handler = async function(arg) {
-      const respond = async (auth) => {
+      const respond = async (auth, headers) => {
         const userAgent = arg.request.headers.get("User-Agent") || "";
         const res = await fn(auth)(arg);
         if (typeof res === "object" && res !== null && !Array.isArray(res)) {
           if (res instanceof Response) {
+            const mergedHeaders = new Headers(res.headers);
+            if (headers) {
+              headers.forEach((value, key) => {
+                mergedHeaders.set(key, value);
+              });
+            }
             if (res.status < 300 && res.headers.get("Content-Type")?.includes("application/json")) {
               const data = await res.json();
               return new Response(
@@ -63,19 +72,25 @@ function createWithAuthHandler({ authService }) {
                 }),
                 {
                   status: res.status,
-                  headers: res.headers
+                  headers: mergedHeaders
                 }
               );
             }
-            return res;
+            return new Response(res.body, {
+              status: res.status,
+              headers: mergedHeaders
+            });
           }
-          return {
-            AUTH: auth,
-            userAgent,
-            ...res
-          };
+          return new Response(
+            JSON.stringify({
+              AUTH: auth,
+              userAgent,
+              ...res
+            }),
+            { status: 200, headers }
+          );
         }
-        return res;
+        return new Response(JSON.stringify(res), { status: 200, headers });
       };
       const accessToken = await authService.getAccessTokenFromRequest(
         arg.request
@@ -101,11 +116,11 @@ function createWithAuthHandler({ authService }) {
           );
           const headers = new Headers();
           headers.append("Set-Cookie", setCookieHeader);
-          headers.append("Location", arg.request.url);
-          return new Response("Temporary Redirect", {
-            status: 307,
-            headers
-          });
+          headers.append("Location", new URL(arg.request.url, siteOrigin).href);
+          const payload = authService.jwtManager.decode(
+            newAccessToken
+          );
+          return respond(payload, headers);
         } catch (e) {
           if (e instanceof Error) {
             console.log(e.message);
@@ -115,11 +130,8 @@ function createWithAuthHandler({ authService }) {
           );
           const headers = new Headers();
           headers.append("Set-Cookie", setCookieHeader);
-          headers.append("Location", arg.request.url);
-          return new Response("Temporary Redirect", {
-            status: 307,
-            headers
-          });
+          headers.append("Location", new URL(arg.request.url, siteOrigin).href);
+          return respond(void 0, headers);
         }
       }
       return respond(void 0);
@@ -155,6 +167,7 @@ import {
   uploadFileHandler
 } from "dn-react-toolkit/file/server";
 var createAPIHandler = ({
+  siteOrigin,
   authService,
   fileService,
   passwordRecoveryService,
@@ -165,7 +178,7 @@ var createAPIHandler = ({
     const { request, params } = args;
     const method = request.method.toUpperCase();
     const slug = params["*"] ? params["*"].split("/") : [];
-    const withAuth = createWithAuthHandler({ authService });
+    const withAuth = createWithAuthHandler({ siteOrigin, authService });
     switch (slug[0]) {
       case "auth": {
         switch (slug[1]) {

package/dist/api/index.js

@@ -41,14 +41,23 @@ __export(auth_exports, {
 __reExport(auth_exports, require("dn-react-toolkit/auth"));
 
 // src/auth/with_auth.ts
-function createWithAuthHandler({ authService }) {
+function createWithAuthHandler({
+  siteOrigin,
+  authService
+}) {
   return function(fn) {
     const handler = async function(arg) {
-      const respond = async (auth) => {
+      const respond = async (auth, headers) => {
         const userAgent = arg.request.headers.get("User-Agent") || "";
         const res = await fn(auth)(arg);
         if (typeof res === "object" && res !== null && !Array.isArray(res)) {
           if (res instanceof Response) {
+            const mergedHeaders = new Headers(res.headers);
+            if (headers) {
+              headers.forEach((value, key) => {
+                mergedHeaders.set(key, value);
+              });
+            }
             if (res.status < 300 && res.headers.get("Content-Type")?.includes("application/json")) {
               const data = await res.json();
               return new Response(
@@ -59,19 +68,25 @@ function createWithAuthHandler({ authService }) {
                 }),
                 {
                   status: res.status,
-                  headers: res.headers
+                  headers: mergedHeaders
                 }
               );
             }
-            return res;
+            return new Response(res.body, {
+              status: res.status,
+              headers: mergedHeaders
+            });
           }
-          return {
-            AUTH: auth,
-            userAgent,
-            ...res
-          };
+          return new Response(
+            JSON.stringify({
+              AUTH: auth,
+              userAgent,
+              ...res
+            }),
+            { status: 200, headers }
+          );
         }
-        return res;
+        return new Response(JSON.stringify(res), { status: 200, headers });
       };
       const accessToken = await authService.getAccessTokenFromRequest(
         arg.request
@@ -97,11 +112,11 @@ function createWithAuthHandler({ authService }) {
           );
           const headers = new Headers();
           headers.append("Set-Cookie", setCookieHeader);
-          headers.append("Location", arg.request.url);
-          return new Response("Temporary Redirect", {
-            status: 307,
-            headers
-          });
+          headers.append("Location", new URL(arg.request.url, siteOrigin).href);
+          const payload = authService.jwtManager.decode(
+            newAccessToken
+          );
+          return respond(payload, headers);
         } catch (e) {
           if (e instanceof Error) {
             console.log(e.message);
@@ -111,11 +126,8 @@ function createWithAuthHandler({ authService }) {
           );
           const headers = new Headers();
           headers.append("Set-Cookie", setCookieHeader);
-          headers.append("Location", arg.request.url);
-          return new Response("Temporary Redirect", {
-            status: 307,
-            headers
-          });
+          headers.append("Location", new URL(arg.request.url, siteOrigin).href);
+          return respond(void 0, headers);
         }
       }
       return respond(void 0);
@@ -148,6 +160,7 @@ var ReactRouterCookieStore = class {
 // src/api/create_handler.ts
 var import_server2 = require("dn-react-toolkit/file/server");
 var createAPIHandler = ({
+  siteOrigin,
   authService,
   fileService,
   passwordRecoveryService,
@@ -158,7 +171,7 @@ var createAPIHandler = ({
     const { request, params } = args;
     const method = request.method.toUpperCase();
     const slug = params["*"] ? params["*"].split("/") : [];
-    const withAuth = createWithAuthHandler({ authService });
+    const withAuth = createWithAuthHandler({ siteOrigin, authService });
     switch (slug[0]) {
       case "auth": {
         switch (slug[1]) {

package/dist/api/index.mjs

@@ -45,14 +45,23 @@ __reExport(auth_exports, auth_star);
 import * as auth_star from "dn-react-toolkit/auth";
 
 // src/auth/with_auth.ts
-function createWithAuthHandler({ authService }) {
+function createWithAuthHandler({
+  siteOrigin,
+  authService
+}) {
   return function(fn) {
     const handler = async function(arg) {
-      const respond = async (auth) => {
+      const respond = async (auth, headers) => {
         const userAgent = arg.request.headers.get("User-Agent") || "";
         const res = await fn(auth)(arg);
         if (typeof res === "object" && res !== null && !Array.isArray(res)) {
           if (res instanceof Response) {
+            const mergedHeaders = new Headers(res.headers);
+            if (headers) {
+              headers.forEach((value, key) => {
+                mergedHeaders.set(key, value);
+              });
+            }
             if (res.status < 300 && res.headers.get("Content-Type")?.includes("application/json")) {
               const data = await res.json();
               return new Response(
@@ -63,19 +72,25 @@ function createWithAuthHandler({ authService }) {
                 }),
                 {
                   status: res.status,
-                  headers: res.headers
+                  headers: mergedHeaders
                 }
               );
             }
-            return res;
+            return new Response(res.body, {
+              status: res.status,
+              headers: mergedHeaders
+            });
           }
-          return {
-            AUTH: auth,
-            userAgent,
-            ...res
-          };
+          return new Response(
+            JSON.stringify({
+              AUTH: auth,
+              userAgent,
+              ...res
+            }),
+            { status: 200, headers }
+          );
         }
-        return res;
+        return new Response(JSON.stringify(res), { status: 200, headers });
       };
       const accessToken = await authService.getAccessTokenFromRequest(
         arg.request
@@ -101,11 +116,11 @@ function createWithAuthHandler({ authService }) {
           );
           const headers = new Headers();
           headers.append("Set-Cookie", setCookieHeader);
-          headers.append("Location", arg.request.url);
-          return new Response("Temporary Redirect", {
-            status: 307,
-            headers
-          });
+          headers.append("Location", new URL(arg.request.url, siteOrigin).href);
+          const payload = authService.jwtManager.decode(
+            newAccessToken
+          );
+          return respond(payload, headers);
         } catch (e) {
           if (e instanceof Error) {
             console.log(e.message);
@@ -115,11 +130,8 @@ function createWithAuthHandler({ authService }) {
           );
           const headers = new Headers();
           headers.append("Set-Cookie", setCookieHeader);
-          headers.append("Location", arg.request.url);
-          return new Response("Temporary Redirect", {
-            status: 307,
-            headers
-          });
+          headers.append("Location", new URL(arg.request.url, siteOrigin).href);
+          return respond(void 0, headers);
         }
       }
       return respond(void 0);
@@ -155,6 +167,7 @@ import {
   uploadFileHandler
 } from "dn-react-toolkit/file/server";
 var createAPIHandler = ({
+  siteOrigin,
   authService,
   fileService,
   passwordRecoveryService,
@@ -165,7 +178,7 @@ var createAPIHandler = ({
     const { request, params } = args;
     const method = request.method.toUpperCase();
     const slug = params["*"] ? params["*"].split("/") : [];
-    const withAuth = createWithAuthHandler({ authService });
+    const withAuth = createWithAuthHandler({ siteOrigin, authService });
     switch (slug[0]) {
       case "auth": {
         switch (slug[1]) {

package/dist/auth/index.js

@@ -28,14 +28,23 @@ module.exports = __toCommonJS(auth_exports);
 __reExport(auth_exports, require("dn-react-toolkit/auth"), module.exports);
 
 // src/auth/with_auth.ts
-function createWithAuthHandler({ authService }) {
+function createWithAuthHandler({
+  siteOrigin,
+  authService
+}) {
   return function(fn) {
     const handler = async function(arg) {
-      const respond = async (auth) => {
+      const respond = async (auth, headers) => {
         const userAgent = arg.request.headers.get("User-Agent") || "";
         const res = await fn(auth)(arg);
         if (typeof res === "object" && res !== null && !Array.isArray(res)) {
           if (res instanceof Response) {
+            const mergedHeaders = new Headers(res.headers);
+            if (headers) {
+              headers.forEach((value, key) => {
+                mergedHeaders.set(key, value);
+              });
+            }
             if (res.status < 300 && res.headers.get("Content-Type")?.includes("application/json")) {
               const data = await res.json();
               return new Response(
@@ -46,19 +55,25 @@ function createWithAuthHandler({ authService }) {
                 }),
                 {
                   status: res.status,
-                  headers: res.headers
+                  headers: mergedHeaders
                 }
               );
             }
-            return res;
+            return new Response(res.body, {
+              status: res.status,
+              headers: mergedHeaders
+            });
           }
-          return {
-            AUTH: auth,
-            userAgent,
-            ...res
-          };
+          return new Response(
+            JSON.stringify({
+              AUTH: auth,
+              userAgent,
+              ...res
+            }),
+            { status: 200, headers }
+          );
         }
-        return res;
+        return new Response(JSON.stringify(res), { status: 200, headers });
       };
       const accessToken = await authService.getAccessTokenFromRequest(
         arg.request
@@ -84,11 +99,11 @@ function createWithAuthHandler({ authService }) {
           );
           const headers = new Headers();
           headers.append("Set-Cookie", setCookieHeader);
-          headers.append("Location", arg.request.url);
-          return new Response("Temporary Redirect", {
-            status: 307,
-            headers
-          });
+          headers.append("Location", new URL(arg.request.url, siteOrigin).href);
+          const payload = authService.jwtManager.decode(
+            newAccessToken
+          );
+          return respond(payload, headers);
         } catch (e) {
           if (e instanceof Error) {
             console.log(e.message);
@@ -98,11 +113,8 @@ function createWithAuthHandler({ authService }) {
           );
           const headers = new Headers();
           headers.append("Set-Cookie", setCookieHeader);
-          headers.append("Location", arg.request.url);
-          return new Response("Temporary Redirect", {
-            status: 307,
-            headers
-          });
+          headers.append("Location", new URL(arg.request.url, siteOrigin).href);
+          return respond(void 0, headers);
         }
       }
       return respond(void 0);

package/dist/auth/index.mjs

@@ -2,14 +2,23 @@
 export * from "dn-react-toolkit/auth";
 
 // src/auth/with_auth.ts
-function createWithAuthHandler({ authService }) {
+function createWithAuthHandler({
+  siteOrigin,
+  authService
+}) {
   return function(fn) {
     const handler = async function(arg) {
-      const respond = async (auth) => {
+      const respond = async (auth, headers) => {
         const userAgent = arg.request.headers.get("User-Agent") || "";
         const res = await fn(auth)(arg);
         if (typeof res === "object" && res !== null && !Array.isArray(res)) {
           if (res instanceof Response) {
+            const mergedHeaders = new Headers(res.headers);
+            if (headers) {
+              headers.forEach((value, key) => {
+                mergedHeaders.set(key, value);
+              });
+            }
             if (res.status < 300 && res.headers.get("Content-Type")?.includes("application/json")) {
               const data = await res.json();
               return new Response(
@@ -20,19 +29,25 @@ function createWithAuthHandler({ authService }) {
                 }),
                 {
                   status: res.status,
-                  headers: res.headers
+                  headers: mergedHeaders
                 }
               );
             }
-            return res;
+            return new Response(res.body, {
+              status: res.status,
+              headers: mergedHeaders
+            });
           }
-          return {
-            AUTH: auth,
-            userAgent,
-            ...res
-          };
+          return new Response(
+            JSON.stringify({
+              AUTH: auth,
+              userAgent,
+              ...res
+            }),
+            { status: 200, headers }
+          );
         }
-        return res;
+        return new Response(JSON.stringify(res), { status: 200, headers });
       };
       const accessToken = await authService.getAccessTokenFromRequest(
         arg.request
@@ -58,11 +73,11 @@ function createWithAuthHandler({ authService }) {
           );
           const headers = new Headers();
           headers.append("Set-Cookie", setCookieHeader);
-          headers.append("Location", arg.request.url);
-          return new Response("Temporary Redirect", {
-            status: 307,
-            headers
-          });
+          headers.append("Location", new URL(arg.request.url, siteOrigin).href);
+          const payload = authService.jwtManager.decode(
+            newAccessToken
+          );
+          return respond(payload, headers);
         } catch (e) {
           if (e instanceof Error) {
             console.log(e.message);
@@ -72,11 +87,8 @@ function createWithAuthHandler({ authService }) {
           );
           const headers = new Headers();
           headers.append("Set-Cookie", setCookieHeader);
-          headers.append("Location", arg.request.url);
-          return new Response("Temporary Redirect", {
-            status: 307,
-            headers
-          });
+          headers.append("Location", new URL(arg.request.url, siteOrigin).href);
+          return respond(void 0, headers);
         }
       }
       return respond(void 0);

package/dist/auth/with_auth.d.mts

@@ -5,7 +5,8 @@ import { LoaderFunctionArgs, ActionFunctionArgs } from 'react-router';
 type Handler<T extends LoaderFunctionArgs | ActionFunctionArgs> = (arg: T) => Promise<unknown> | unknown;
 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 }: {
+declare function createWithAuthHandler<T extends LoaderFunctionArgs | ActionFunctionArgs>({ siteOrigin, authService, }: {
+    siteOrigin: string;
     authService: AuthService;
 }): <THandler extends Handler<T>>(fn: (auth?: AccessTokenPayload) => THandler) => THandler;
 

package/dist/auth/with_auth.d.ts

@@ -5,7 +5,8 @@ import { LoaderFunctionArgs, ActionFunctionArgs } from 'react-router';
 type Handler<T extends LoaderFunctionArgs | ActionFunctionArgs> = (arg: T) => Promise<unknown> | unknown;
 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 }: {
+declare function createWithAuthHandler<T extends LoaderFunctionArgs | ActionFunctionArgs>({ siteOrigin, authService, }: {
+    siteOrigin: string;
     authService: AuthService;
 }): <THandler extends Handler<T>>(fn: (auth?: AccessTokenPayload) => THandler) => THandler;
 

package/dist/auth/with_auth.js

@@ -23,14 +23,23 @@ __export(with_auth_exports, {
   createWithAuthHandler: () => createWithAuthHandler
 });
 module.exports = __toCommonJS(with_auth_exports);
-function createWithAuthHandler({ authService }) {
+function createWithAuthHandler({
+  siteOrigin,
+  authService
+}) {
   return function(fn) {
     const handler = async function(arg) {
-      const respond = async (auth) => {
+      const respond = async (auth, headers) => {
         const userAgent = arg.request.headers.get("User-Agent") || "";
         const res = await fn(auth)(arg);
         if (typeof res === "object" && res !== null && !Array.isArray(res)) {
           if (res instanceof Response) {
+            const mergedHeaders = new Headers(res.headers);
+            if (headers) {
+              headers.forEach((value, key) => {
+                mergedHeaders.set(key, value);
+              });
+            }
             if (res.status < 300 && res.headers.get("Content-Type")?.includes("application/json")) {
               const data = await res.json();
               return new Response(
@@ -41,19 +50,25 @@ function createWithAuthHandler({ authService }) {
                 }),
                 {
                   status: res.status,
-                  headers: res.headers
+                  headers: mergedHeaders
                 }
               );
             }
-            return res;
+            return new Response(res.body, {
+              status: res.status,
+              headers: mergedHeaders
+            });
           }
-          return {
-            AUTH: auth,
-            userAgent,
-            ...res
-          };
+          return new Response(
+            JSON.stringify({
+              AUTH: auth,
+              userAgent,
+              ...res
+            }),
+            { status: 200, headers }
+          );
         }
-        return res;
+        return new Response(JSON.stringify(res), { status: 200, headers });
       };
       const accessToken = await authService.getAccessTokenFromRequest(
         arg.request
@@ -79,11 +94,11 @@ function createWithAuthHandler({ authService }) {
           );
           const headers = new Headers();
           headers.append("Set-Cookie", setCookieHeader);
-          headers.append("Location", arg.request.url);
-          return new Response("Temporary Redirect", {
-            status: 307,
-            headers
-          });
+          headers.append("Location", new URL(arg.request.url, siteOrigin).href);
+          const payload = authService.jwtManager.decode(
+            newAccessToken
+          );
+          return respond(payload, headers);
         } catch (e) {
           if (e instanceof Error) {
             console.log(e.message);
@@ -93,11 +108,8 @@ function createWithAuthHandler({ authService }) {
           );
           const headers = new Headers();
           headers.append("Set-Cookie", setCookieHeader);
-          headers.append("Location", arg.request.url);
-          return new Response("Temporary Redirect", {
-            status: 307,
-            headers
-          });
+          headers.append("Location", new URL(arg.request.url, siteOrigin).href);
+          return respond(void 0, headers);
         }
       }
       return respond(void 0);

package/dist/auth/with_auth.mjs

@@ -1,12 +1,21 @@
 // src/auth/with_auth.ts
-function createWithAuthHandler({ authService }) {
+function createWithAuthHandler({
+  siteOrigin,
+  authService
+}) {
   return function(fn) {
     const handler = async function(arg) {
-      const respond = async (auth) => {
+      const respond = async (auth, headers) => {
         const userAgent = arg.request.headers.get("User-Agent") || "";
         const res = await fn(auth)(arg);
         if (typeof res === "object" && res !== null && !Array.isArray(res)) {
           if (res instanceof Response) {
+            const mergedHeaders = new Headers(res.headers);
+            if (headers) {
+              headers.forEach((value, key) => {
+                mergedHeaders.set(key, value);
+              });
+            }
             if (res.status < 300 && res.headers.get("Content-Type")?.includes("application/json")) {
               const data = await res.json();
               return new Response(
@@ -17,19 +26,25 @@ function createWithAuthHandler({ authService }) {
                 }),
                 {
                   status: res.status,
-                  headers: res.headers
+                  headers: mergedHeaders
                 }
               );
             }
-            return res;
+            return new Response(res.body, {
+              status: res.status,
+              headers: mergedHeaders
+            });
           }
-          return {
-            AUTH: auth,
-            userAgent,
-            ...res
-          };
+          return new Response(
+            JSON.stringify({
+              AUTH: auth,
+              userAgent,
+              ...res
+            }),
+            { status: 200, headers }
+          );
         }
-        return res;
+        return new Response(JSON.stringify(res), { status: 200, headers });
       };
       const accessToken = await authService.getAccessTokenFromRequest(
         arg.request
@@ -55,11 +70,11 @@ function createWithAuthHandler({ authService }) {
           );
           const headers = new Headers();
           headers.append("Set-Cookie", setCookieHeader);
-          headers.append("Location", arg.request.url);
-          return new Response("Temporary Redirect", {
-            status: 307,
-            headers
-          });
+          headers.append("Location", new URL(arg.request.url, siteOrigin).href);
+          const payload = authService.jwtManager.decode(
+            newAccessToken
+          );
+          return respond(payload, headers);
         } catch (e) {
           if (e instanceof Error) {
             console.log(e.message);
@@ -69,11 +84,8 @@ function createWithAuthHandler({ authService }) {
           );
           const headers = new Headers();
           headers.append("Set-Cookie", setCookieHeader);
-          headers.append("Location", arg.request.url);
-          return new Response("Temporary Redirect", {
-            status: 307,
-            headers
-          });
+          headers.append("Location", new URL(arg.request.url, siteOrigin).href);
+          return respond(void 0, headers);
         }
       }
       return respond(void 0);

package/dist/client/env.d.mts

@@ -0,0 +1,3 @@
+declare function env(key: string): string;
+
+export { env };

package/dist/client/env.d.ts

@@ -0,0 +1,3 @@
+declare function env(key: string): string;
+
+export { env };

package/dist/client/env.js

@@ -0,0 +1,35 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/client/env.ts
+var env_exports = {};
+__export(env_exports, {
+  env: () => env
+});
+module.exports = __toCommonJS(env_exports);
+function env(key) {
+  if (typeof window === "undefined") {
+    return process.env[key] || "";
+  }
+  return window.ENV?.[key] || "";
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  env
+});

package/dist/client/env.mjs

@@ -0,0 +1,10 @@
+// src/client/env.ts
+function env(key) {
+  if (typeof window === "undefined") {
+    return process.env[key] || "";
+  }
+  return window.ENV?.[key] || "";
+}
+export {
+  env
+};

package/dist/client/env_loader.d.mts

@@ -0,0 +1,7 @@
+import React from 'react';
+
+declare function EnvLoader({ dataKey }: {
+    dataKey?: string;
+}): React.JSX.Element | undefined;
+
+export { EnvLoader };

package/dist/client/env_loader.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+
+declare function EnvLoader({ dataKey }: {
+    dataKey?: string;
+}): React.JSX.Element | undefined;
+
+export { EnvLoader };

package/dist/client/{client_env.js → env_loader.js}

@@ -27,28 +27,29 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/client/client_env.tsx
-var client_env_exports = {};
-__export(client_env_exports, {
-  ClientEnv: () => ClientEnv
+// src/client/env_loader.tsx
+var env_loader_exports = {};
+__export(env_loader_exports, {
+  EnvLoader: () => EnvLoader
 });
-module.exports = __toCommonJS(client_env_exports);
+module.exports = __toCommonJS(env_loader_exports);
 var import_react = __toESM(require("react"));
 var import_react_router = require("react-router");
-function ClientEnv({ dataKey = "ENV" }) {
+function EnvLoader({ dataKey = "ENV" }) {
   const data = (0, import_react_router.useRouteLoaderData)("root");
-  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, data && /* @__PURE__ */ import_react.default.createElement(
+  if (!data) {
+    return;
+  }
+  return /* @__PURE__ */ import_react.default.createElement(
     "script",
     {
       dangerouslySetInnerHTML: {
-        __html: `window.process = ${JSON.stringify({
-          env: data?.[dataKey]
-        })}`
+        __html: `window.ENV = ${JSON.stringify(data[dataKey])};`
       }
     }
-  ));
+  );
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ClientEnv
+  EnvLoader
 });

package/dist/client/env_loader.mjs

@@ -0,0 +1,20 @@
+// src/client/env_loader.tsx
+import React from "react";
+import { useRouteLoaderData } from "react-router";
+function EnvLoader({ dataKey = "ENV" }) {
+  const data = useRouteLoaderData("root");
+  if (!data) {
+    return;
+  }
+  return /* @__PURE__ */ React.createElement(
+    "script",
+    {
+      dangerouslySetInnerHTML: {
+        __html: `window.ENV = ${JSON.stringify(data[dataKey])};`
+      }
+    }
+  );
+}
+export {
+  EnvLoader
+};

package/dist/client/index.d.mts

@@ -1,3 +1,4 @@
-export { ClientEnv } from './client_env.mjs';
+export { env } from './env.mjs';
+export { EnvLoader } from './env_loader.mjs';
 export { useUserAgent } from './use_user_agent.mjs';
 import 'react';

package/dist/client/index.d.ts

@@ -1,3 +1,4 @@
-export { ClientEnv } from './client_env.js';
+export { env } from './env.js';
+export { EnvLoader } from './env_loader.js';
 export { useUserAgent } from './use_user_agent.js';
 import 'react';

package/dist/client/index.js

@@ -30,26 +30,36 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/client/index.ts
 var client_exports = {};
 __export(client_exports, {
-  ClientEnv: () => ClientEnv,
+  EnvLoader: () => EnvLoader,
+  env: () => env,
   useUserAgent: () => useUserAgent
 });
 module.exports = __toCommonJS(client_exports);
 
-// src/client/client_env.tsx
+// src/client/env.ts
+function env(key) {
+  if (typeof window === "undefined") {
+    return process.env[key] || "";
+  }
+  return window.ENV?.[key] || "";
+}
+
+// src/client/env_loader.tsx
 var import_react = __toESM(require("react"));
 var import_react_router = require("react-router");
-function ClientEnv({ dataKey = "ENV" }) {
+function EnvLoader({ dataKey = "ENV" }) {
   const data = (0, import_react_router.useRouteLoaderData)("root");
-  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, data && /* @__PURE__ */ import_react.default.createElement(
+  if (!data) {
+    return;
+  }
+  return /* @__PURE__ */ import_react.default.createElement(
     "script",
     {
       dangerouslySetInnerHTML: {
-        __html: `window.process = ${JSON.stringify({
-          env: data?.[dataKey]
-        })}`
+        __html: `window.ENV = ${JSON.stringify(data[dataKey])};`
       }
     }
-  ));
+  );
 }
 
 // src/client/use_user_agent.tsx
@@ -64,6 +74,7 @@ function useUserAgent() {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ClientEnv,
+  EnvLoader,
+  env,
   useUserAgent
 });

package/dist/client/index.mjs

@@ -1,18 +1,27 @@
-// src/client/client_env.tsx
+// src/client/env.ts
+function env(key) {
+  if (typeof window === "undefined") {
+    return process.env[key] || "";
+  }
+  return window.ENV?.[key] || "";
+}
+
+// src/client/env_loader.tsx
 import React from "react";
 import { useRouteLoaderData } from "react-router";
-function ClientEnv({ dataKey = "ENV" }) {
+function EnvLoader({ dataKey = "ENV" }) {
   const data = useRouteLoaderData("root");
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, data && /* @__PURE__ */ React.createElement(
+  if (!data) {
+    return;
+  }
+  return /* @__PURE__ */ React.createElement(
     "script",
     {
       dangerouslySetInnerHTML: {
-        __html: `window.process = ${JSON.stringify({
-          env: data?.[dataKey]
-        })}`
+        __html: `window.ENV = ${JSON.stringify(data[dataKey])};`
       }
     }
-  ));
+  );
 }
 
 // src/client/use_user_agent.tsx
@@ -26,6 +35,7 @@ function useUserAgent() {
   return { userAgent, isMobile, isTablet, isDesktop };
 }
 export {
-  ClientEnv,
+  EnvLoader,
+  env,
   useUserAgent
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dn-react-router-toolkit",
-  "version": "0.3.3",
+  "version": "0.3.6",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.mjs",
   "module": "./dist/index.js",

package/dist/client/client_env.d.mts

@@ -1,7 +0,0 @@
-import React from 'react';
-
-declare function ClientEnv({ dataKey }: {
-    dataKey?: string;
-}): React.JSX.Element;
-
-export { ClientEnv };

package/dist/client/client_env.d.ts

@@ -1,7 +0,0 @@
-import React from 'react';
-
-declare function ClientEnv({ dataKey }: {
-    dataKey?: string;
-}): React.JSX.Element;
-
-export { ClientEnv };

package/dist/client/client_env.mjs

@@ -1,19 +0,0 @@
-// src/client/client_env.tsx
-import React from "react";
-import { useRouteLoaderData } from "react-router";
-function ClientEnv({ dataKey = "ENV" }) {
-  const data = useRouteLoaderData("root");
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, data && /* @__PURE__ */ React.createElement(
-    "script",
-    {
-      dangerouslySetInnerHTML: {
-        __html: `window.process = ${JSON.stringify({
-          env: data?.[dataKey]
-        })}`
-      }
-    }
-  ));
-}
-export {
-  ClientEnv
-};