@enterprisestandard/react 0.0.3-beta.1 → 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;
@@ -232,8 +232,9 @@ function sso(config) {
   }
   async function fetchJwks() {
     const url = configWithDefaults.jwks_uri || `${configWithDefaults.authority}/protocol/openid-connect/certs`;
-    if (jwksCache.has(url))
-      return jwksCache.get(url);
+    const cached = jwksCache.get(url);
+    if (cached)
+      return cached;
     return retryWithBackoff(async () => {
       if (!configWithDefaults)
         throw new Error("SSO Manager not initialized");
@@ -333,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,
@@ -343,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}`;
@@ -395,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({
@@ -616,7 +627,7 @@ function SignInLoading({ complete = false, children }) {
     return /* @__PURE__ */ jsxDEV(Fragment, {
       children
     }, undefined, false, undefined, this);
-  return /* @__PURE__ */ jsxDEV(Fragment, {}, undefined, false, undefined, this);
+  return null;
 }
 // src/ui/signed-in.tsx
 import { jsxDEV as jsxDEV2, Fragment as Fragment2 } from "react/jsx-dev-runtime";
@@ -626,14 +637,14 @@ function SignedIn({ children }) {
     return /* @__PURE__ */ jsxDEV2(Fragment2, {
       children
     }, undefined, false, undefined, this);
-  return /* @__PURE__ */ jsxDEV2(Fragment2, {}, undefined, false, undefined, this);
+  return null;
 }
 // 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)
-    return /* @__PURE__ */ jsxDEV3(Fragment3, {}, undefined, false, undefined, this);
+  const { user, isLoading } = useUser();
+  if (user || isLoading)
+    return null;
   return /* @__PURE__ */ jsxDEV3(Fragment3, {
     children
   }, undefined, false, undefined, this);
@@ -707,6 +718,12 @@ function SSOProvider({
     setIsLoading(true);
     try {
       const response = await fetch(userUrl);
+      if (response.status === 401) {
+        setUserState(null);
+        saveUserToStorage(null);
+        setIsLoading(false);
+        return;
+      }
       if (!response.ok) {
         throw new Error(`Failed to fetch user: ${response.status} ${response.statusText}`);
       }
@@ -728,8 +745,8 @@ function SSOProvider({
     const storedUser = loadUserFromStorage();
     if (storedUser) {
       setUserState(storedUser);
-      setIsLoading(false);
-    } else if (userUrl) {
+    }
+    if (userUrl) {
       fetchUserFromUrl();
     } else {
       setIsLoading(false);
@@ -799,6 +816,13 @@ function useToken() {
     setError(null);
     try {
       const response = await fetch(url);
+      if (response.status === 401) {
+        context.setUser(null);
+        setToken(null);
+        setExpires(null);
+        setIsLoading(false);
+        return;
+      }
       if (!response.ok) {
         throw new Error(`Failed to fetch JWT: ${response.status} ${response.statusText}`);
       }
@@ -814,7 +838,7 @@ function useToken() {
     } finally {
       setIsLoading(false);
     }
-  }, []);
+  }, [context]);
   const refresh = useCallback(async () => {
     const url = refreshUrl || tokenUrl;
     if (!url) {

package/dist/ui/sign-in-loading.d.ts

@@ -1,4 +1,4 @@
 import type { PropsWithChildren } from 'react';
 export declare function SignInLoading({ complete, children }: {
     complete?: boolean;
-} & PropsWithChildren): import("react/jsx-runtime").JSX.Element;
+} & PropsWithChildren): import("react/jsx-runtime").JSX.Element | null;

package/dist/ui/signed-in.d.ts

@@ -1,2 +1,2 @@
 import type { PropsWithChildren } from 'react';
-export declare function SignedIn({ children }: PropsWithChildren): import("react/jsx-runtime").JSX.Element;
+export declare function SignedIn({ children }: PropsWithChildren): import("react/jsx-runtime").JSX.Element | null;

package/dist/ui/signed-out.d.ts

@@ -1,2 +1,2 @@
 import type { PropsWithChildren } from 'react';
-export declare function SignedOut({ children }: PropsWithChildren): import("react/jsx-runtime").JSX.Element;
+export declare function SignedOut({ children }: PropsWithChildren): import("react/jsx-runtime").JSX.Element | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enterprisestandard/react",
-  "version": "0.0.3-beta.1",
+  "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",