@omerlo/omerlo-webkit 0.0.3 → 0.0.4

package/dist/omerlo/reader/endpoints/notification.js

@@ -27,14 +27,18 @@ export function parseTopicSummary(data, _assocs) {
 export function subscribeToTopic(f) {
     return (params) => {
         const body = { push_token: params.pushToken };
-        const opts = { method: 'post', body };
+        const headers = new Headers();
+        headers.set('Content-Type', 'application/json');
+        const opts = { method: 'post', body, headers };
         return request(f, `/topics/${params.topicId}/subscribe`, opts);
     };
 }
 export function unsubscribeFromTopic(f) {
     return (params) => {
         const body = { push_token: params.pushToken };
-        const opts = { method: 'post', body };
+        const headers = new Headers();
+        headers.set('Content-Type', 'application/json');
+        const opts = { method: 'post', body, headers };
         return request(f, `/topics/${params.topicId}/unsubscribe`, opts);
     };
 }

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

@@ -7,17 +7,19 @@ import { refresh } from "./token";
 const handleApiProxy = async ({ event, ...tail }) => {
     event.url.host = env.PRIVATE_OMERLO_HOST;
     event.url.protocol = env.PRIVATE_OMERLO_PROTOCOL;
-    event.request.headers.delete('cookie');
-    event.request.headers.set('x-omerlo-media-id', env.PRIVATE_OMERLO_MEDIA_ID);
+    event.url.port = ''; // This to prevent custom posts when working with localhost
     let accessToken = event.locals.accessToken;
     if (!accessToken) {
         accessToken = await getApplicationToken();
     }
-    event.request.headers.set('Authorization', `Bearer ${accessToken}`);
+    const body = event.request.body;
+    const method = event.request.method;
+    const headers = new Headers();
+    headers.set('Content-Type', event.request.headers.get('content-type') ?? 'application/json');
+    headers.set('x-omerlo-media-id', env.PRIVATE_OMERLO_MEDIA_ID ?? '');
+    headers.set('Authorization', `Bearer ${accessToken}`);
     return await fetch(event.url.toString(), {
-        body: event.request.body,
-        method: event.request.method,
-        headers: event.request.headers,
+        body, headers, method,
         duplex: 'half'
     })
         .then(async (resp) => {

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

@@ -2,14 +2,16 @@ import type { ApiAssocs, ApiData, ApiResponse } from './api';
 type FetchOptions<T> = {
     parser?: (data: ApiData, assocs: ApiAssocs) => T;
     queryParams?: ApiData;
-    method?: string;
+    method?: 'get' | 'post' | 'put' | 'delete';
     body?: ApiData;
+    headers?: Headers;
 };
 export declare function request<T>(f: typeof fetch, path: string, opts: FetchOptions<T>): Promise<ApiResponse<T>>;
 type DirtyFetchOptions = {
     queryParams?: ApiData;
-    method?: string;
+    method?: 'get' | 'post' | 'put' | 'delete';
     body?: ApiData;
+    headers?: Headers;
 };
-export declare function dirtyRequest(f: typeof fetch, path: string, opts?: DirtyFetchOptions): Promise<Response>;
+export declare function dirtyRequest(f: typeof fetch, path: string, opts: DirtyFetchOptions): Promise<Response>;
 export {};

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

@@ -2,7 +2,17 @@ import { parseApiResponse } from './api';
 import { BROWSER } from 'esm-env';
 export async function request(f, path, opts) {
     const parser = opts.parser || ((data) => data);
-    return dirtyRequest(f, path, opts).then(async (resp) => {
+    const body = JSON.stringify(opts.body);
+    const headers = opts.headers;
+    const method = opts.method ?? 'get';
+    const queryParams = opts.queryParams;
+    // Enforce JSON content type for posts
+    if (!opts.headers) {
+        opts.headers = new Headers();
+    }
+    if (['post', 'put'].includes(method) && !opts.headers.get('Content-Type'))
+        opts.headers.set('Content-Type', 'application/json');
+    return dirtyRequest(f, path, { body, headers, method, queryParams }).then(async (resp) => {
         return parseApiResponse(resp, parser);
     });
 }
@@ -15,8 +25,7 @@ export async function dirtyRequest(f, path, opts) {
         });
         path = `${path}?${queryParams}`;
     }
-    const headers = { 'Content-Type': 'application/json' };
-    const resp = await f(path.toString(), { method: opts.method, body: JSON.stringify(opts.body), headers });
+    const resp = await f(path.toString(), opts);
     if (BROWSER && resp.headers.get('x-logout') == 'true') {
         const webkitComponent = document.getElementById('omerlo-webkit');
         if (webkitComponent) {

package/package.json

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