@sylphx/sdk 0.12.2 → 0.13.8

package/dist/nextjs/index.mjs

@@ -681,6 +681,33 @@ function authCookieJsonResponse(ctx, data) {
   setAuthCookiesMiddleware(response, ctx.namespace, data);
   return response;
 }
+function sessionMetadataBody(sessionToken, user) {
+  const payload = decodeJwtPayload(sessionToken);
+  const userId = payload?.sub ?? user.id;
+  const expiresAt = typeof payload?.exp === "number" ? new Date(payload.exp * 1e3).toISOString() : new Date(Date.now() + SESSION_TOKEN_LIFETIME * 1e3).toISOString();
+  return {
+    success: true,
+    session: {
+      id: `platform:${userId}`,
+      userId,
+      expiresAt
+    },
+    user
+  };
+}
+function setRestoredSessionCookies(response, ctx, restored) {
+  setAuthCookiesMiddleware(response, ctx.namespace, restored.tokens);
+  if (restored.activeOrganization) {
+    setActiveOrganizationCookies(response, ctx, restored.activeOrganization);
+  }
+}
+async function refreshSessionFromCookie(request, ctx, previousSessionToken) {
+  const refreshToken = request.cookies.get(ctx.cookieNames.REFRESH)?.value;
+  if (!refreshToken) return null;
+  const refreshedTokens = await refreshTokens(refreshToken, ctx);
+  if (!refreshedTokens) return null;
+  return restoreOrganizationScopeAfterRefresh(request, ctx, refreshedTokens, previousSessionToken);
+}
 function headersForProjectAuth(ctx) {
   return {
     "Content-Type": "application/json",
@@ -768,35 +795,28 @@ async function handleVerifyTwoFactor(request, ctx) {
   }
   return authCookieJsonResponse(ctx, data);
 }
-function handleSession(request, ctx) {
+async function handleSession(request, ctx) {
   if (request.method !== "GET") {
     return NextResponse.json({ error: "Method not allowed" }, { status: 405 });
   }
   const sessionToken = request.cookies.get(ctx.cookieNames.SESSION)?.value;
-  const userCookieValue = request.cookies.get(ctx.cookieNames.USER)?.value;
-  let userCookie = userCookieValue ? parseUserCookie2(userCookieValue) : null;
-  if (!userCookie && userCookieValue) {
-    try {
-      userCookie = parseUserCookie2(decodeURIComponent(userCookieValue));
-    } catch {
-      userCookie = null;
-    }
+  const userCookie = parseUserCookie2(request.cookies.get(ctx.cookieNames.USER)?.value);
+  if (sessionToken && !isTokenExpired(sessionToken) && userCookie?.user) {
+    return NextResponse.json(sessionMetadataBody(sessionToken, userCookie.user));
+  }
+  const restored = await refreshSessionFromCookie(request, ctx, sessionToken);
+  if (restored) {
+    const response2 = NextResponse.json(
+      sessionMetadataBody(restored.tokens.accessToken, restored.tokens.user)
+    );
+    setRestoredSessionCookies(response2, ctx, restored);
+    return response2;
   }
-  if (!sessionToken || isTokenExpired(sessionToken) || !userCookie?.user) {
-    return NextResponse.json({ success: true, session: null, user: null });
+  const response = NextResponse.json({ success: true, session: null, user: null });
+  if (sessionToken || request.cookies.has(ctx.cookieNames.REFRESH) || userCookie) {
+    clearAuthCookiesMiddleware(response, ctx.namespace);
   }
-  const payload = decodeJwtPayload(sessionToken);
-  const userId = payload?.sub ?? userCookie.user.id;
-  const expiresAt = typeof payload?.exp === "number" ? new Date(payload.exp * 1e3).toISOString() : new Date(userCookie.expiresAt).toISOString();
-  return NextResponse.json({
-    success: true,
-    session: {
-      id: `platform:${userId}`,
-      userId,
-      expiresAt
-    },
-    user: userCookie.user
-  });
+  return response;
 }
 async function handleOAuthProviders(ctx) {
   const res = await fetch(`${ctx.platformUrl}/v1/auth/oauth-providers`, {
@@ -999,19 +1019,29 @@ async function handleSignOut(request, ctx) {
   ctx.log("Signout complete");
   return response;
 }
-function handleToken(request, ctx) {
+async function handleToken(request, ctx) {
   ctx.log("Token request");
   const sessionToken = request.cookies.get(ctx.cookieNames.SESSION)?.value;
-  if (!sessionToken) {
-    ctx.log("No session token");
-    return NextResponse.json({ error: "Not authenticated", accessToken: null }, { status: 401 });
-  }
-  if (isTokenExpired(sessionToken)) {
-    ctx.log("Session token expired");
-    return NextResponse.json({ error: "Session expired", accessToken: null }, { status: 401 });
+  if (sessionToken && !isTokenExpired(sessionToken)) {
+    ctx.log("Token returned");
+    return NextResponse.json({ accessToken: sessionToken });
+  }
+  const restored = await refreshSessionFromCookie(request, ctx, sessionToken);
+  if (restored) {
+    ctx.log("Token refreshed and returned");
+    const response2 = NextResponse.json({ accessToken: restored.tokens.accessToken });
+    setRestoredSessionCookies(response2, ctx, restored);
+    return response2;
+  }
+  ctx.log(sessionToken ? "Session token expired" : "No session token");
+  const response = NextResponse.json(
+    { error: sessionToken ? "Session expired" : "Not authenticated", accessToken: null },
+    { status: 401 }
+  );
+  if (sessionToken || request.cookies.has(ctx.cookieNames.REFRESH)) {
+    clearAuthCookiesMiddleware(response, ctx.namespace);
   }
-  ctx.log("Token returned");
-  return NextResponse.json({ accessToken: sessionToken });
+  return response;
 }
 function resolveOrgScopedTokenExpiresIn(data) {
   if (typeof data.expiresIn === "number") return data.expiresIn;