@enterprisestandard/react 0.0.3-beta.2 → 0.0.3-beta.3

package/dist/index.js

@@ -45,10 +45,10 @@ function sso(config) {
       return;
     }
     try {
-      const token = await getTokenFromCookies(request);
-      if (!token)
+      const { tokens } = await getTokenFromCookies(request);
+      if (!tokens)
         return;
-      return await parseUser(token);
+      return await parseUser(tokens);
     } catch (error) {
       console.error("Error parsing user from cookies:", error);
       return;
@@ -334,7 +334,7 @@ function sso(config) {
     const refresh_token = getCookie("refresh", req);
     const control = getCookie("control", req, true);
     if (!access_token || !id_token || !refresh_token || !control) {
-      return;
+      return { tokens: undefined, refreshHeaders: [] };
     }
     let tokenResponse = {
       access_token,
@@ -344,14 +344,17 @@ function sso(config) {
     };
     if (control.expires && refresh_token && Date.now() > new Date(control.expires).getTime()) {
       tokenResponse = await refreshToken(refresh_token);
+      const user = await parseUser(tokenResponse);
+      const refreshHeaders = createJwtCookies(tokenResponse, user.sso.expires);
+      return { tokens: tokenResponse, refreshHeaders };
     }
-    return tokenResponse;
+    return { tokens: tokenResponse, refreshHeaders: [] };
   }
   async function getJwt(request) {
-    const tokenResponse = await getTokenFromCookies(request);
-    if (!tokenResponse)
+    const { tokens } = await getTokenFromCookies(request);
+    if (!tokens)
       return;
-    return tokenResponse.access_token;
+    return tokens.access_token;
   }
   function createCookie(name, value, expires) {
     name = `${configWithDefaults.cookiePrefix}.${name}`;
@@ -396,32 +399,39 @@ function sso(config) {
       return callbackHandler(request);
     }
     if (userUrl === path) {
-      const user = await getUser(request);
-      if (!user) {
+      const { tokens, refreshHeaders } = await getTokenFromCookies(request);
+      if (!tokens) {
         return new Response("User not logged in", { status: 401 });
       }
+      const user = await parseUser(tokens);
       return new Response(JSON.stringify(user), {
-        headers: [["Content-Type", "application/json"]]
+        headers: [["Content-Type", "application/json"], ...refreshHeaders]
       });
     }
     if (tokenUrl === path) {
-      const tokenResponse = await getTokenFromCookies(request);
-      if (!tokenResponse) {
+      const { tokens, refreshHeaders } = await getTokenFromCookies(request);
+      if (!tokens) {
         return new Response("User not logged in", { status: 401 });
       }
       return new Response(JSON.stringify({
-        token: tokenResponse.access_token,
-        expires: tokenResponse.expires
+        token: tokens.access_token,
+        expires: tokens.expires
       }), {
-        headers: [["Content-Type", "application/json"]]
+        headers: [["Content-Type", "application/json"], ...refreshHeaders]
       });
     }
     if (refreshUrl === path) {
-      const tokenResponse = await getTokenFromCookies(request);
-      if (!tokenResponse) {
+      const refresh_token = getCookie("refresh", request);
+      if (!refresh_token) {
         return new Response("User not logged in", { status: 401 });
       }
-      return new Response("Refresh Complete", { status: 200 });
+      const newTokenResponse = await refreshToken(refresh_token);
+      const user = await parseUser(newTokenResponse);
+      const refreshHeaders = createJwtCookies(newTokenResponse, user.sso.expires);
+      return new Response("Refresh Complete", {
+        status: 200,
+        headers: refreshHeaders
+      });
     }
     if (loginUrl === "*" || loginUrl === path) {
       return initiateLogin({
@@ -632,8 +642,8 @@ function SignedIn({ children }) {
 // src/ui/signed-out.tsx
 import { jsxDEV as jsxDEV3, Fragment as Fragment3 } from "react/jsx-dev-runtime";
 function SignedOut({ children }) {
-  const { user } = useUser();
-  if (user)
+  const { user, isLoading } = useUser();
+  if (user || isLoading)
     return null;
   return /* @__PURE__ */ jsxDEV3(Fragment3, {
     children

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enterprisestandard/react",
-  "version": "0.0.3-beta.2",
+  "version": "0.0.3-beta.3",
   "description": "Enterprise Standard React Components",
   "private": false,
   "main": "dist/index.js",
@@ -30,6 +30,7 @@
     "access": "public"
   },
   "devDependencies": {
+    "@types/react": "^18.0.0",
     "typescript": "^5.0.0"
   },
   "author": "enterprisestandard",