@omerlo/omerlo-webkit 0.0.52 → 0.0.54

package/dist/omerlo/reader/server/hooks.js

@@ -1,7 +1,7 @@
 import { error } from '@sveltejs/kit';
 import { env } from '$env/dynamic/private';
 import { ApiError } from '../utils/api';
-import { clearAuthorizationCookies, clearAuthorizationUsingHeader, getAccessTokenFromCookie, getApplicationToken, getRefreshTokenFromCookie, setAuthorizationCookies } from './utils';
+import { clearAuthorizationCookies, clearAuthorizationUsingHeader, getAccessTokenFromCookie, getApplicationToken, getRefreshTokenFromCookie, setAuthorizationCookies, refreshAuthorizationUsingHeader } from './utils';
 import { refresh } from './token';
 // NOTE: inspired by https://sami.website/blog/sveltekit-api-reverse-proxy
 const handleApiProxy = async ({ event, ...tail }) => {
@@ -28,6 +28,7 @@ const handleApiProxy = async ({ event, ...tail }) => {
             event.locals.accessToken = undefined;
             resp = await handleApiProxy({ event, ...tail });
         }
+        refreshAuthorizationUsingHeader(headers, event.locals.refreshedToken);
         const responseOpts = {
             headers: headers,
             status: resp.status,
@@ -87,6 +88,7 @@ export const handleUserToken = async ({ event, resolve }) => {
         const token = await refresh(refreshToken);
         setAuthorizationCookies(event.cookies, token);
         event.locals.accessToken = token.accessToken;
+        event.locals.refreshedToken = token;
     }
     catch (err) {
         if (err instanceof ApiError && err.status == 401) {

package/dist/omerlo/reader/server/utils.d.ts

@@ -6,6 +6,7 @@ export declare function isAuthenticated(cookies: Cookies): boolean;
 export declare function setAuthorizationCookies(cookies: Cookies, token: OmerloToken): void;
 export declare function clearAuthorizationCookies(cookies: Cookies): void;
 export declare function clearAuthorizationUsingHeader(headers: Headers): void;
+export declare function refreshAuthorizationUsingHeader(headers: Headers, token?: OmerloToken): void;
 export declare function getAccessTokenFromCookie(cookies: Cookies): string | null;
 export declare function getRefreshTokenFromCookie(cookies: Cookies): string | null;
 /**

package/dist/omerlo/reader/server/utils.js

@@ -45,6 +45,13 @@ export function clearAuthorizationUsingHeader(headers) {
     headers.append('Set-Cookie', `logged_in=; Path=/; Secure; SameSite=Lax; Max-Age=0`);
     headers.append('x-logout', `true`);
 }
+export function refreshAuthorizationUsingHeader(headers, token) {
+    if (!token)
+        return;
+    headers.append('Set-Cookie', `logged_in=true; Path=/; SameSite=Lax; Max-Age=${THREE_MONTH}`);
+    headers.append('Set-Cookie', `${accessTokenCookieName}=${token.accessToken}; Path=/; HttpOnly; SameSite=Lax; Max-Age=${token.expiresIn - 60}`);
+    headers.append('Set-Cookie', `${refreshTokenCookieName}=${token.refreshToken}; Path=/; HttpOnly; SameSite=Lax; Max-Age=${THREE_MONTH}`);
+}
 export function getAccessTokenFromCookie(cookies) {
     return cookies.get(accessTokenCookieName) || null;
 }

package/dist/omerlo/reader/utils/api.js

@@ -1,15 +1,32 @@
 import { initAssocs, parseAssocs } from './assocs';
 export async function parseApiResponse(response, parser) {
-    const payload = await response.json();
-    let data = null, meta = null;
+    const text = await response.text();
     if (response.ok) {
+        const payload = JSON.parse(text);
         let assocs = initAssocs(payload.assocs);
         assocs = parseAssocs(assocs);
-        meta = payload.meta;
-        data = parser(payload.data, assocs);
+        const meta = payload.meta;
+        const data = parser(payload.data, assocs);
+        const errors = payload.errors || [];
+        return { ok: true, status: response.status, parser, meta, data, errors };
     }
-    const errors = payload.errors || [];
-    return { ok: response.ok, status: response.status, parser, meta, data, errors };
+    // Response not OK - try to parse JSON for API errors, fallback to generic error
+    let errors = [];
+    try {
+        const payload = JSON.parse(text);
+        errors = payload.errors || [];
+    }
+    catch {
+        console.error('[OmerloWebkit - parseApiResponse] Non-OK response with non-JSON body', {
+            url: response.url,
+            status: response.status,
+            statusText: response.statusText,
+            contentType: response.headers.get('content-type'),
+            body: text.slice(0, 1000)
+        });
+        errors = [{ message: `${response.status} ${response.statusText}`, body: text.slice(0, 500) }];
+    }
+    return { ok: false, status: response.status, parser, meta: null, data: null, errors };
 }
 export function parseMany(parser) {
     return (response, assocs) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omerlo/omerlo-webkit",
-  "version": "0.0.52",
+  "version": "0.0.54",
   "scripts": {
     "dev": "vite dev",
     "build": "vite build && npm run package",