@omerlo/omerlo-webkit 0.0.15 → 0.0.17

package/dist/omerlo/index.d.ts

@@ -38,6 +38,4 @@ export declare const useReader: (f: typeof fetch) => {
     registerDevice: (params: import("./reader").DeviceParams) => Promise<import("./reader/utils/api").ApiResponse<unknown>>;
     userInfo: () => Promise<import("./reader/utils/api").ApiResponse<import("./reader").UserInfo>>;
     userEntitlements: () => Promise<import("./reader/utils/api").ApiResponse<import("./reader").UserEntitlement[]>>;
-    verifyAccount: (params: import("./reader").VerifyAccountParams) => void;
-    validateAccount: (params: import("./reader").ValidateAccountParams) => void;
 };

package/dist/omerlo/reader/endpoints/accounts.d.ts

@@ -1,18 +1,7 @@
 export declare const accountsFetchers: (f: typeof fetch) => {
     userInfo: () => Promise<import("../utils/api").ApiResponse<UserInfo>>;
     userEntitlements: () => Promise<import("../utils/api").ApiResponse<UserEntitlement[]>>;
-    verifyAccount: (params: VerifyAccountParams) => void;
-    validateAccount: (params: ValidateAccountParams) => void;
 };
-export interface ValidateAccountParams {
-    email: string;
-    callbackUrl: string;
-}
-export declare function validateAccount(f: typeof fetch): (params: ValidateAccountParams) => void;
-export interface VerifyAccountParams {
-    verification_token: string;
-}
-export declare function verifyAccount(f: typeof fetch): (params: VerifyAccountParams) => void;
 export declare function getUserInfo(f: typeof fetch): () => Promise<import("../utils/api").ApiResponse<UserInfo>>;
 export interface UserInfo {
     name: string;

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

@@ -3,31 +3,10 @@ import { request } from '../utils/request';
 export const accountsFetchers = (f) => {
     return {
         userInfo: getUserInfo(f),
-        userEntitlements: getUserEntitlements(f),
-        verifyAccount: verifyAccount(f),
-        validateAccount: validateAccount(f)
+        userEntitlements: getUserEntitlements(f)
     };
 };
 //
-// Validate an account using the bearer token.
-//
-export function validateAccount(f) {
-    return (params) => {
-        const queryParams = { email: params.email, callback_url: params.callbackUrl };
-        const opts = { queryParams, method: 'post' };
-        request(f, '/account/validate', opts);
-    };
-}
-//
-// Verify an account using the signed JWT token generate on account validation.
-//
-export function verifyAccount(f) {
-    return (params) => {
-        const opts = { queryParams: params };
-        request(f, '/account/verify', opts);
-    };
-}
-//
 // Get user's informations associated to the bearer token.
 //
 export function getUserInfo(f) {

package/dist/omerlo/reader/endpoints/contents.d.ts

@@ -73,7 +73,7 @@ export type ContentBlockQuote = {
 };
 export type ContentBlockRelatedContents = {
     id: string;
-    kind: 'related-contents';
+    kind: 'related_contents';
     contents: ContentSummary[];
     visual: Visual | null;
     template: ContentBlockTemplate | null;
@@ -115,7 +115,7 @@ export type ContentBlockVideo = {
     template: ContentBlockTemplate | null;
 };
 export type ContentBlock = ContentBlockRichtext | ContentBlockData | ContentBlockHTML | ContentBlockQuote | ContentBlockRelatedContents | ContentBlockQuestion | ContentBlockImage | ContentBlockSlideshow | ContentBlockVideo;
-export type ContentBlockType = 'richtext' | 'data' | 'html' | 'quote' | 'related-contents' | 'question' | 'image' | 'slideshow' | 'video';
+export type ContentBlockType = 'richtext' | 'data' | 'html' | 'quote' | 'related_contents' | 'question' | 'image' | 'slideshow' | 'video';
 export declare function getContent(f: typeof fetch): (id: string) => Promise<import("../utils/api").ApiResponse<Content>>;
 export declare function listContents(f: typeof fetch): (params?: Partial<PagingParams>) => Promise<import("../utils/api").ApiResponse<ContentSummary[]>>;
 export declare function parseContentSummary(data: ApiData, assocs: ApiAssocs): ContentSummary;

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

@@ -22,6 +22,8 @@ export function getContent(f) {
     return async (id) => {
         const opts = { parser: parseContent };
         return requestPublisher(f, `media/contents/${id}`, opts);
+        // TODO: switch to Reader API (this API is already completed and documented)
+        // return request(f, `/contents/${id}`, opts)
     };
 }
 export function listContents(f) {
@@ -49,7 +51,7 @@ export function parseContentSummary(data, assocs) {
             leadText: data.localized.lead_text,
             subtitleHtml: data.localized.subtitle_html,
             subtitleText: data.localized.subtitle_text,
-            visual: parseVisual(data.visual, assocs),
+            visual: parseVisual(data.localized.visual, assocs),
             meta: buildMeta(data.localized.locale),
             metadata: {},
             authors: getAssocs(assocs, 'profiles', data.localized.author_ids)
@@ -101,7 +103,7 @@ const ContentBlockParser = {
     data: parseContentBlockData,
     html: parseContentBlockHTML,
     quote: parseContentBlockQuote,
-    'related-contents': parseContentBlockRelatedContents,
+    related_contents: parseContentBlockRelatedContents,
     question: parseContentBlockQuestion,
     image: parseContentBlockImage,
     slideshow: parseContentBlockSlideshow,
@@ -117,9 +119,7 @@ function getBlockTemplate(data, assocs) {
         : null;
 }
 function getBlockContents(data, assocs) {
-    return data.related_contents
-        ? getAssocs(assocs, 'contents', data.related_contents)
-        : [];
+    return data.content_ids ? getAssocs(assocs, 'contents', data.content_ids) : [];
 }
 function parseContentBlockRichtext(data, assocs) {
     return {

package/dist/omerlo/reader/endpoints/distributions.d.ts

@@ -1,12 +1,12 @@
 import { type ApiAssocs, type ApiData, type PagingParams } from '../utils/api';
-import type { Issue } from './magazines';
+import type { IssueSummary } from './magazines';
 export declare const distributionFetchers: (f: typeof fetch) => {
     listReleases: (distributionId: string, params?: Partial<PagingParams>) => Promise<import("../utils/api").ApiResponse<Release[]>>;
 };
 export declare function releasesFetcher(f: typeof fetch): (distributionId: string, params?: Partial<PagingParams>) => Promise<import("../utils/api").ApiResponse<Release[]>>;
 export interface Release {
     id: string;
-    issue: Issue;
+    issue: IssueSummary;
     startsAt: Date;
     endsAt: Date | null;
     updatedAt: Date;

package/dist/omerlo/reader/fetchers.d.ts

@@ -38,6 +38,4 @@ export declare const fetchers: (f: typeof fetch) => {
     registerDevice: (params: import("./endpoints/device").DeviceParams) => Promise<import("./utils/api").ApiResponse<unknown>>;
     userInfo: () => Promise<import("./utils/api").ApiResponse<import("./endpoints/accounts").UserInfo>>;
     userEntitlements: () => Promise<import("./utils/api").ApiResponse<import("./endpoints/accounts").UserEntitlement[]>>;
-    verifyAccount: (params: import("./endpoints/accounts").VerifyAccountParams) => void;
-    validateAccount: (params: import("./endpoints/accounts").ValidateAccountParams) => void;
 };

package/dist/omerlo/reader/index.js

@@ -16,6 +16,9 @@ export function initReader() {
     registerAssocParser('contents', parseContentSummary);
     registerAssocParser('issue_types', parseIssueType);
     registerAssocParser('issue_block_configurations', parseIssueBlockConfiguration);
-    // NOTE: This one is for retro compatibility with publisher public api v2
+    // NOTE: Those ones are for retro compatibility with publisher public api v2
+    // Reason is we renamed some assocs keys in Reader API that are different
+    // from Publisher public API V2
     registerAssocParser('templates', parseContentTemplate);
+    registerAssocParser('block_templates', parseContentBlockTemplate);
 }

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

@@ -3,3 +3,4 @@ export declare const handleUserToken: import("@sveltejs/kit").Handle;
 export * from './token';
 export * from './utils';
 export * from './email';
+export * from './oauth';

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

@@ -4,3 +4,4 @@ export const handleUserToken = Hooks.handleUserToken;
 export * from './token';
 export * from './utils';
 export * from './email';
+export * from './oauth';

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

@@ -0,0 +1 @@
+export declare function verifyOauth(email: string, oauthUserId: string): Promise<void>;

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

@@ -0,0 +1,23 @@
+import { env } from '$env/dynamic/private';
+import { ApiError } from '../utils/api';
+import { getApplicationToken } from './utils';
+export async function verifyOauth(email, oauthUserId) {
+    const url = getOmerloEndpoint();
+    const accessToken = await getApplicationToken();
+    const headers = new Headers({
+        'x-omerlo-media-id': env.PRIVATE_OMERLO_MEDIA_ID,
+        Authorization: `Bearer ${accessToken}`
+    });
+    url.pathname = '/api/media/v1/oauth/verify';
+    url.searchParams.append('oauth_user_id', oauthUserId);
+    url.searchParams.append('email', email);
+    const resp = await fetch(url, { method: 'POST', headers });
+    if (resp.ok) {
+        return;
+    }
+    const payload = await resp.json();
+    throw new ApiError(resp.status, payload.error, resp.statusText);
+}
+function getOmerloEndpoint() {
+    return new URL(`${env.PRIVATE_OMERLO_PROTOCOL}://${env.PRIVATE_OMERLO_HOST}`);
+}

package/package.json

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