@fabriktor/client 0.0.12 → 0.0.14

package/dist/src/core/auth.d.ts

@@ -0,0 +1,2 @@
+export type TokenProvider = () => Promise<string>;
+export declare function requiredToken(getToken?: TokenProvider): Promise<string>;

package/dist/src/core/auth.js

@@ -0,0 +1,15 @@
+// Copyright (C) Fabriktor, Inc. 2025-present.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+export async function requiredToken(getToken) {
+    if (!getToken) {
+        throw new Error("Authenticated client method requires a token provider.");
+    }
+    const out = await getToken();
+    if (!out) {
+        throw new Error("Authenticated client method received an empty token.");
+    }
+    return out;
+}

package/dist/src/index.d.ts

@@ -1,3 +1,4 @@
+export * from "./core/auth.js";
 export * from "./core/err.js";
 export * from "./core/http.js";
 export * from "./core/path.js";

package/dist/src/index.js

@@ -1,3 +1,4 @@
+export * from "./core/auth.js";
 export * from "./core/err.js";
 export * from "./core/http.js";
 export * from "./core/path.js";

package/dist/src/users/tmp_phones.d.ts

@@ -1,20 +1,21 @@
 import type { PLUsersSendCode, PLUsersVerifyCode } from "@fabriktor/schema";
+import type { TokenProvider } from "../core/auth.js";
 import type { HTTPDoer } from "../core/http.js";
-export type SendPhoneVerificationOptions = {
-    base_url: string;
-} & PLUsersSendCode;
-export type VerifyPhoneOptions = {
-    base_url: string;
-} & PLUsersVerifyCode;
+export type SendPhoneVerificationOptions = PLUsersSendCode;
+export type VerifyPhoneOptions = PLUsersVerifyCode;
 export interface TmpPhonesOperator {
     send(opts: SendPhoneVerificationOptions): Promise<void>;
     verify(opts: VerifyPhoneOptions): Promise<void>;
 }
 export type TmpPhonesClientOptions = {
     http: HTTPDoer;
+    base_url: string;
+    get_token?: TokenProvider;
 };
 export declare class TmpPhonesClient implements TmpPhonesOperator {
     private http;
+    private base_url;
+    private get_token?;
     constructor(opts: TmpPhonesClientOptions);
     send(opts: SendPhoneVerificationOptions): Promise<void>;
     verify(opts: VerifyPhoneOptions): Promise<void>;

package/dist/src/users/tmp_phones.js

@@ -4,27 +4,36 @@
 // not use this file except in compliance with the License. You may obtain
 // a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 import { ColUsersTmpPhones, HTTPMethodPost, PathUsersSend, PathUsersVerify, SvcUsers, } from "@fabriktor/schema";
+import { requiredToken } from "../core/auth.js";
 import { buildPath } from "../core/path.js";
 export class TmpPhonesClient {
     http;
+    base_url;
+    get_token;
     constructor(opts) {
         this.http = opts.http;
+        this.base_url = opts.base_url;
+        this.get_token = opts.get_token;
     }
     async send(opts) {
+        const token = await requiredToken(this.get_token);
         return await this.http.do({
-            base_url: opts.base_url,
+            base_url: this.base_url,
             path: tmpPhonePath(PathUsersSend),
             method: HTTPMethodPost,
+            token,
             body: {
                 phone: opts.phone,
             },
         });
     }
     async verify(opts) {
+        const token = await requiredToken(this.get_token);
         return await this.http.do({
-            base_url: opts.base_url,
+            base_url: this.base_url,
             path: tmpPhonePath(PathUsersVerify),
             method: HTTPMethodPost,
+            token,
             body: {
                 phone: opts.phone,
                 code: opts.code,

package/dist/src/users/tmp_usernames.d.ts

@@ -1,8 +1,7 @@
 import type { PLUsersUsername } from "@fabriktor/schema";
+import type { TokenProvider } from "../core/auth.js";
 import type { HTTPDoer, Op } from "../core/http.js";
-export type VerifyUsernameOptions = {
-    base_url: string;
-} & PLUsersUsername;
+export type VerifyUsernameOptions = PLUsersUsername;
 export type UsernameVerification = {
     username: string;
     suggestions: string[];
@@ -12,9 +11,13 @@ export interface TmpUsernamesOperator {
 }
 export type TmpUsernamesClientOptions = {
     http: HTTPDoer;
+    base_url: string;
+    get_token?: TokenProvider;
 };
 export declare class TmpUsernamesClient implements TmpUsernamesOperator {
     private http;
+    private base_url;
+    private get_token?;
     constructor(opts: TmpUsernamesClientOptions);
     verify(opts: VerifyUsernameOptions): Promise<Op<UsernameVerification>>;
 }

package/dist/src/users/tmp_usernames.js

@@ -4,17 +4,24 @@
 // not use this file except in compliance with the License. You may obtain
 // a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 import { ColUsersTmpUsernames, HTTPMethodPost, PathUsersVerify, SvcUsers, } from "@fabriktor/schema";
+import { requiredToken } from "../core/auth.js";
 import { buildPath } from "../core/path.js";
 export class TmpUsernamesClient {
     http;
+    base_url;
+    get_token;
     constructor(opts) {
         this.http = opts.http;
+        this.base_url = opts.base_url;
+        this.get_token = opts.get_token;
     }
     async verify(opts) {
+        const token = await requiredToken(this.get_token);
         return await this.http.do({
-            base_url: opts.base_url,
+            base_url: this.base_url,
             path: tmpUsernamePath(PathUsersVerify),
             method: HTTPMethodPost,
+            token,
             body: {
                 words: opts.words,
                 to_validate: opts.to_validate,

package/dist/src/users/users.d.ts

@@ -1,36 +1,27 @@
 import type { InUser, OperationResult, PLUsersContactList, PLUsersForgotPassword, PLUsersResolveUsername, PLUsersSignInLink, UpsertResult, User } from "@fabriktor/schema";
+import type { TokenProvider } from "../core/auth.js";
 import type { HTTPDoer, Op } from "../core/http.js";
-export type AuthOptions = {
-    base_url: string;
-    token: string;
-};
-export type BootstrapOptions = AuthOptions & {
+export type BootstrapOptions = {
     in: InUser;
 };
-export type ResolveUsernameOptions = {
-    base_url: string;
-} & PLUsersResolveUsername;
-export type ForgotPasswordOptions = {
-    base_url: string;
-} & PLUsersForgotPassword;
-export type SendSignInLinkOptions = {
-    base_url: string;
-} & PLUsersSignInLink;
-export type MatchOptions = AuthOptions & PLUsersContactList;
+export type ResolveUsernameOptions = PLUsersResolveUsername;
+export type ForgotPasswordOptions = PLUsersForgotPassword;
+export type SendSignInLinkOptions = PLUsersSignInLink;
+export type MatchOptions = PLUsersContactList;
 export type MatchResult = {
     users: User[];
 };
-export type SearchOptions = AuthOptions & {
+export type SearchOptions = {
     q: string;
     limit?: number;
 };
-export type GetByUIDOptions = AuthOptions & {
+export type GetByUIDOptions = {
     uid: string;
 };
 export interface UsersOperator {
     bootstrap(opts: BootstrapOptions): Promise<Op<UpsertResult>>;
-    sync(opts: AuthOptions): Promise<OperationResult>;
-    sendEmailVerification(opts: AuthOptions): Promise<void>;
+    sync(): Promise<OperationResult>;
+    sendEmailVerification(): Promise<void>;
     forgotPassword(opts: ForgotPasswordOptions): Promise<void>;
     sendSignInLink(opts: SendSignInLinkOptions): Promise<void>;
     resolveUsername(opts: ResolveUsernameOptions): Promise<Op<string>>;
@@ -40,13 +31,17 @@ export interface UsersOperator {
 }
 export type UsersClientOptions = {
     http: HTTPDoer;
+    base_url: string;
+    get_token?: TokenProvider;
 };
 export declare class UsersClient implements UsersOperator {
     private http;
+    private base_url;
+    private get_token?;
     constructor(opts: UsersClientOptions);
     bootstrap(opts: BootstrapOptions): Promise<Op<UpsertResult>>;
-    sync(opts: AuthOptions): Promise<OperationResult>;
-    sendEmailVerification(opts: AuthOptions): Promise<void>;
+    sync(): Promise<OperationResult>;
+    sendEmailVerification(): Promise<void>;
     forgotPassword(opts: ForgotPasswordOptions): Promise<void>;
     sendSignInLink(opts: SendSignInLinkOptions): Promise<void>;
     resolveUsername(opts: ResolveUsernameOptions): Promise<Op<string>>;

package/dist/src/users/users.js

@@ -4,40 +4,48 @@
 // not use this file except in compliance with the License. You may obtain
 // a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 import { ColUsersUsers, HTTPMethodGet, HTTPMethodPost, PathSearch, PathUsersBootstrap, PathUsersForgotPassword, PathUsersMatch, PathUsersResolveUsername, PathUsersSendEmailVerification, PathUsersSendSignInLink, PathUsersSync, SvcUsers, } from "@fabriktor/schema";
+import { requiredToken } from "../core/auth.js";
 import { buildPath } from "../core/path.js";
 export class UsersClient {
     http;
+    base_url;
+    get_token;
     constructor(opts) {
         this.http = opts.http;
+        this.base_url = opts.base_url;
+        this.get_token = opts.get_token;
     }
     async bootstrap(opts) {
+        const token = await requiredToken(this.get_token);
         return await this.http.do({
-            base_url: opts.base_url,
+            base_url: this.base_url,
             path: userPath(PathUsersBootstrap),
             method: HTTPMethodPost,
-            token: opts.token,
+            token,
             body: opts.in,
         });
     }
-    async sync(opts) {
+    async sync() {
+        const token = await requiredToken(this.get_token);
         return await this.http.do({
-            base_url: opts.base_url,
+            base_url: this.base_url,
             path: userPath(PathUsersSync),
             method: HTTPMethodPost,
-            token: opts.token,
+            token,
         });
     }
-    async sendEmailVerification(opts) {
+    async sendEmailVerification() {
+        const token = await requiredToken(this.get_token);
         return await this.http.do({
-            base_url: opts.base_url,
+            base_url: this.base_url,
             path: userPath(PathUsersSendEmailVerification),
             method: HTTPMethodPost,
-            token: opts.token,
+            token,
         });
     }
     async forgotPassword(opts) {
         return await this.http.do({
-            base_url: opts.base_url,
+            base_url: this.base_url,
             path: userPath(PathUsersForgotPassword),
             method: HTTPMethodPost,
             body: {
@@ -47,7 +55,7 @@ export class UsersClient {
     }
     async sendSignInLink(opts) {
         return await this.http.do({
-            base_url: opts.base_url,
+            base_url: this.base_url,
             path: userPath(PathUsersSendSignInLink),
             method: HTTPMethodPost,
             body: {
@@ -57,7 +65,7 @@ export class UsersClient {
     }
     async resolveUsername(opts) {
         return await this.http.do({
-            base_url: opts.base_url,
+            base_url: this.base_url,
             path: userPath(PathUsersResolveUsername),
             method: HTTPMethodPost,
             body: {
@@ -66,31 +74,37 @@ export class UsersClient {
         });
     }
     async match(opts) {
+        const token = await requiredToken(this.get_token);
         return await this.http.do({
-            base_url: opts.base_url,
+            base_url: this.base_url,
             path: userPath(PathUsersMatch),
             method: HTTPMethodPost,
-            token: opts.token,
+            token,
             body: {
                 contacts: opts.contacts,
             },
         });
     }
     async search(opts) {
+        const token = await requiredToken(this.get_token);
         return await this.http.do({
-            base_url: opts.base_url,
+            base_url: this.base_url,
             path: userPath(PathSearch),
             method: HTTPMethodPost,
-            token: opts.token,
-            body: opts,
+            token,
+            body: {
+                q: opts.q,
+                limit: opts.limit,
+            },
         });
     }
     async getByUID(opts) {
+        const token = await requiredToken(this.get_token);
         return await this.http.do({
-            base_url: opts.base_url,
+            base_url: this.base_url,
             path: `${collectionPath()}?uid=${encodeURIComponent(opts.uid)}`,
             method: HTTPMethodGet,
-            token: opts.token,
+            token,
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabriktor/client",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "description": "![Fabriktor Logo](./img/fabriktor-character.gif)",
   "type": "module",
   "exports": {
@@ -17,6 +17,6 @@
     "typescript": "^6.0.3"
   },
   "dependencies": {
-    "@fabriktor/schema": "^0.0.11"
+    "@fabriktor/schema": "^0.0.12"
   }
 }