orcheo-studio 0.23.1 → 0.23.2

package/src/lib/auth-fetch.ts

@@ -1,35 +1,101 @@
 import {
   getAccessToken,
+  getAuthTokens,
   getDevAuthSessionHeaderValue,
 } from "@features/auth/lib/auth-session";
+import { refreshSession } from "@features/auth/lib/auth-api";
 import { getWorkspaceSelectionHeaders } from "./workspace-session";
 
-export const authFetch = async (
-  input: RequestInfo | URL,
-  init: RequestInit = {},
-  options: { includeWorkspaceHeaders?: boolean } = {},
-): Promise<Response> => {
-  const headers = new Headers(init.headers ?? {});
+const buildAuthHeaders = (
+  headers: Headers,
+  shouldAttachAuth: boolean,
+): string | null => {
   const token = getAccessToken();
-  if (token && !headers.has("Authorization")) {
+  if (token && shouldAttachAuth) {
     headers.set("Authorization", `Bearer ${token}`);
   }
   const devSession = getDevAuthSessionHeaderValue();
   if (devSession && !headers.has("X-Orcheo-Dev-Session")) {
     headers.set("X-Orcheo-Dev-Session", devSession);
   }
-  if (options.includeWorkspaceHeaders ?? true) {
-    for (const [name, value] of Object.entries(
-      getWorkspaceSelectionHeaders(),
-    )) {
-      if (!headers.has(name)) {
-        headers.set(name, value);
-      }
+  return shouldAttachAuth ? token : null;
+};
+
+const attachWorkspaceHeaders = (headers: Headers): void => {
+  for (const [name, value] of Object.entries(getWorkspaceSelectionHeaders())) {
+    if (!headers.has(name)) {
+      headers.set(name, value);
     }
   }
-  return globalThis.fetch(input, {
+};
+
+const fetchWithHeaders = (
+  input: RequestInfo | URL,
+  init: RequestInit,
+  headers: Headers,
+): Promise<Response> =>
+  globalThis.fetch(input, {
     ...init,
     credentials: init.credentials ?? "include",
     headers,
   });
+
+const buildRequestHeaders = (
+  init: RequestInit,
+  shouldAttachAuth: boolean,
+  includeWorkspaceHeaders: boolean,
+  headers = new Headers(init.headers ?? {}),
+): { headers: Headers; accessToken: string | null } => {
+  const accessToken = buildAuthHeaders(headers, shouldAttachAuth);
+  if (includeWorkspaceHeaders) {
+    attachWorkspaceHeaders(headers);
+  }
+  return { headers, accessToken };
+};
+
+export const authFetch = async (
+  input: RequestInfo | URL,
+  init: RequestInit = {},
+  options: { includeWorkspaceHeaders?: boolean } = {},
+): Promise<Response> => {
+  const originalHeaders = new Headers(init.headers ?? {});
+  const shouldAttachAuth = !originalHeaders.has("Authorization");
+  // getAccessToken includes the shared 60-second expiry skew, so nearly expired
+  // tokens are treated as missing and refreshed before protected requests.
+  if (shouldAttachAuth && !getAccessToken() && getAuthTokens()?.refreshToken) {
+    await refreshSession();
+  }
+
+  const includeWorkspaceHeaders = options.includeWorkspaceHeaders ?? true;
+  const { headers, accessToken: requestAccessToken } = buildRequestHeaders(
+    init,
+    shouldAttachAuth,
+    includeWorkspaceHeaders,
+    originalHeaders,
+  );
+  const response = await fetchWithHeaders(input, init, headers);
+  if (response.status !== 401 || !shouldAttachAuth) {
+    return response;
+  }
+
+  const currentAccessToken = getAccessToken();
+  if (currentAccessToken && currentAccessToken !== requestAccessToken) {
+    const { headers: retryHeaders } = buildRequestHeaders(
+      init,
+      shouldAttachAuth,
+      includeWorkspaceHeaders,
+    );
+    return fetchWithHeaders(input, init, retryHeaders);
+  }
+
+  if (!getAuthTokens()?.refreshToken || !(await refreshSession())) {
+    return response;
+  }
+
+  const { headers: retryHeaders } = buildRequestHeaders(
+    init,
+    shouldAttachAuth,
+    includeWorkspaceHeaders,
+  );
+  return fetchWithHeaders(input, init, retryHeaders);
 };

package/dist/assets/channel-FjxqoZWk.js

@@ -1 +0,0 @@
-import{ap as o,aq as n}from"./index-kH6EkBsZ.js";const t=(a,r)=>o.lang.round(n.parse(a)[r]);export{t as c};

package/dist/assets/classDiagram-2ON5EDUG-8JYNY9Ic.js

@@ -1 +0,0 @@
-import{s as a,c as s,a as e,C as t}from"./chunk-B4BG7PRW-DcErQhy9.js";import{_ as i}from"./index-kH6EkBsZ.js";import"./chunk-FMBD7UC4-XOcF0fgy.js";import"./chunk-55IACEB6-Cl075es2.js";import"./chunk-QN33PNHL-CjJH_Bvj.js";var p={parser:e,get db(){return new t},renderer:s,styles:a,init:i(r=>{r.class||(r.class={}),r.class.arrowMarkerAbsolute=r.arrowMarkerAbsolute},"init")};export{p as diagram};

package/dist/assets/classDiagram-v2-WZHVMYZB-8JYNY9Ic.js

@@ -1 +0,0 @@
-import{s as a,c as s,a as e,C as t}from"./chunk-B4BG7PRW-DcErQhy9.js";import{_ as i}from"./index-kH6EkBsZ.js";import"./chunk-FMBD7UC4-XOcF0fgy.js";import"./chunk-55IACEB6-Cl075es2.js";import"./chunk-QN33PNHL-CjJH_Bvj.js";var p={parser:e,get db(){return new t},renderer:s,styles:a,init:i(r=>{r.class||(r.class={}),r.class.arrowMarkerAbsolute=r.arrowMarkerAbsolute},"init")};export{p as diagram};

package/dist/assets/clone-NPVQC0Uc.js

@@ -1 +0,0 @@
-import{ay as r}from"./index-kH6EkBsZ.js";var a=4;function n(o){return r(o,a)}export{n as c};

package/dist/assets/stateDiagram-v2-4FDKWEC3-uDYn1wPF.js

@@ -1 +0,0 @@
-import{s as t,b as r,a,S as s}from"./chunk-DI55MBZ5-CFxCndOp.js";import{_ as i}from"./index-kH6EkBsZ.js";import"./chunk-55IACEB6-Cl075es2.js";import"./chunk-QN33PNHL-CjJH_Bvj.js";var l={parser:a,get db(){return new s(2)},renderer:r,styles:t,init:i(e=>{e.state||(e.state={}),e.state.arrowMarkerAbsolute=e.arrowMarkerAbsolute},"init")};export{l as diagram};