@fabriktor/fx 0.0.46 → 0.0.48

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

@@ -2,12 +2,14 @@ export type AuthEmailOptions = {
     email: string;
     password: string;
 };
+export type UpdateAuthEmailOptions = Pick<AuthEmailOptions, "email">;
 export type AuthSession = {
     token: string;
 };
 export interface AuthOperator {
     signUp(opts: AuthEmailOptions): Promise<AuthSession>;
     signIn(opts: AuthEmailOptions): Promise<AuthSession>;
+    updateEmail(opts: UpdateAuthEmailOptions): Promise<void>;
     getToken(): Promise<string>;
     refreshToken(): Promise<string>;
     emailVerified(): boolean;

package/dist/src/chat/chat.d.ts

@@ -1,5 +1,5 @@
-import type { ChatOperator, UsersOperator, WSCloseHandler, WSConnection, WSErrorHandler, WSMessageHandler } from "@fabriktor/client";
-import type { Chat, ChatRoom, ChatRoomMember, User } from "@fabriktor/schema";
+import type { ChatOperator, WSCloseHandler, WSConnection, WSErrorHandler, WSMessageHandler } from "@fabriktor/client";
+import type { Chat, ChatRoom, ChatRoomMember } from "@fabriktor/schema";
 import { type SearchPage } from "../core/search.js";
 type ChatInsertOptions = Parameters<ChatOperator["insertOneChat"]>[0];
 type ChatReplaceOptions = Parameters<ChatOperator["replaceOneChat"]>[0];
@@ -10,7 +10,6 @@ export type MarkChatObjectsUploadedOptions = {
 export type ReactChatOptions = Parameters<ChatOperator["reactChat"]>[0];
 export type ChatFXOptions = {
     chat: ChatOperator;
-    users: UsersOperator;
 };
 type SearchChatsScope = {
     chat_room_id: string;
@@ -61,13 +60,6 @@ export type ChatRoomMembersOptions = {
 export type MyChatRoomMembersOptions = {
     owner_id: string;
 };
-export type ChatRoomParticipantsOptions = {
-    chat_room_ids: string[];
-};
-export type ChatRoomParticipants = {
-    members: ChatRoomMember[];
-    users: User[];
-};
 export type OpenChatRoomOptions = {
     owner_id: string;
     chat_room_id: string;
@@ -110,14 +102,12 @@ export interface ChatFXOperator {
     searchChatRoomMembers(opts: SearchChatRoomMembersOptions): Promise<SearchChatRoomMembersPage>;
     chatRoomMembers(opts: ChatRoomMembersOptions): Promise<ChatRoomMember[]>;
     myChatRoomMembers(opts: MyChatRoomMembersOptions): Promise<ChatRoomMember[]>;
-    chatRoomParticipants(opts: ChatRoomParticipantsOptions): Promise<ChatRoomParticipants>;
     openChatRoom(opts: OpenChatRoomOptions): Promise<ChatRoomSession>;
     openGlobalChatRooms(opts: OpenGlobalChatRoomsOptions): Promise<GlobalChatRoomsSession>;
     reactUploadedChat(opts: ReactUploadedChatOptions): Promise<void>;
 }
 export declare class ChatFX implements ChatFXOperator {
     private chat;
-    private users;
     constructor(opts: ChatFXOptions);
     createChat(opts: CreateChatOptions): Promise<Chat>;
     markChatObjectsUploaded(opts: MarkChatObjectsUploadedOptions): Promise<Chat>;
@@ -128,7 +118,6 @@ export declare class ChatFX implements ChatFXOperator {
     searchChatRoomMembers(opts: SearchChatRoomMembersOptions): Promise<SearchChatRoomMembersPage>;
     chatRoomMembers(opts: ChatRoomMembersOptions): Promise<ChatRoomMember[]>;
     myChatRoomMembers(opts: MyChatRoomMembersOptions): Promise<ChatRoomMember[]>;
-    chatRoomParticipants(opts: ChatRoomParticipantsOptions): Promise<ChatRoomParticipants>;
     openChatRoom(opts: OpenChatRoomOptions): Promise<ChatRoomSession>;
     openGlobalChatRooms(opts: OpenGlobalChatRoomsOptions): Promise<GlobalChatRoomsSession>;
     reactUploadedChat(opts: ReactUploadedChatOptions): Promise<void>;

package/dist/src/chat/chat.js

@@ -16,10 +16,8 @@ const msgSearchQueryRequired = "Search query is required.";
 const msgChatObjectsUploading = "Cannot react to a chat while objects are still uploading.";
 export class ChatFX {
     chat;
-    users;
     constructor(opts) {
         this.chat = opts.chat;
-        this.users = opts.users;
     }
     async createChat(opts) {
         const out = await this.chat.insertOneChat(opts);
@@ -113,29 +111,6 @@ export class ChatFX {
         });
         return out.value ?? [];
     }
-    async chatRoomParticipants(opts) {
-        const chat_room_ids = normalizeIDs(opts.chat_room_ids);
-        if (chat_room_ids.length === 0) {
-            return { members: [], users: [] };
-        }
-        const memberGroups = await Promise.all(chat_room_ids.map((chat_room_id) => this.chatRoomMembers({
-            chat_room_id,
-        })));
-        const members = uniqueChatRoomMembers(memberGroups.flat());
-        const owner_ids = normalizeIDs(members.map((member) => member.owner_id));
-        if (owner_ids.length === 0) {
-            return { members, users: [] };
-        }
-        const out = await this.users.queryUsers({
-            query: {
-                id: owner_ids,
-            },
-        });
-        return {
-            members,
-            users: out.value ?? [],
-        };
-    }
     async openChatRoom(opts) {
         const latest = await this.latestChats({
             chat_room_id: opts.chat_room_id,
@@ -414,12 +389,6 @@ export class ChatFX {
 export function newChatFX(opts) {
     return new ChatFX(opts);
 }
-function normalizeIDs(ids) {
-    return [...new Set(ids.map((id) => id.trim()).filter((id) => id !== ""))];
-}
-function uniqueChatRoomMembers(members) {
-    return [...new Map(members.map((member) => [member.id, member])).values()];
-}
 function latestChatsPage(opts) {
     return {
         chats: opts.raw.results,

package/dist/src/fx.js

@@ -53,7 +53,6 @@ export class FX {
         });
         this.chat = newChatFX({
             chat: opts.chat,
-            users: opts.users,
         });
         this.contacts = newContactsFX({
             contacts: opts.contacts,

package/dist/src/session/session.d.ts

@@ -4,6 +4,7 @@ import type { UsersFXOperator } from "../users/users.js";
 type ConnectionInsert = Parameters<ConnectionsOperator["insertOneConnection"]>[0]["in"];
 type BootstrapInput = Parameters<UsersOperator["bootstrap"]>[0]["in"];
 type BootstrapResult = Awaited<ReturnType<UsersOperator["bootstrap"]>>;
+type UpdateEmailOptions = Parameters<AuthOperator["updateEmail"]>[0];
 export declare const SignInMode: {
     readonly Email: "email";
     readonly Username: "username";
@@ -31,6 +32,7 @@ export interface SessionFXOperator {
     signUpAndBootstrap(opts: SignUpAndBootstrapOptions): Promise<BootstrapResult>;
     signIn(opts: SignInOptions): Promise<void>;
     signInWithEmail(opts: SignInWithEmailOptions): Promise<void>;
+    updateEmail(opts: UpdateEmailOptions): Promise<void>;
     checkEmailVerification(): Promise<boolean>;
 }
 export declare class SessionFX implements SessionFXOperator {
@@ -42,6 +44,7 @@ export declare class SessionFX implements SessionFXOperator {
     signUpAndBootstrap(opts: SignUpAndBootstrapOptions): Promise<BootstrapResult>;
     signIn(opts: SignInOptions): Promise<void>;
     signInWithEmail(opts: SignInWithEmailOptions): Promise<void>;
+    updateEmail(opts: UpdateEmailOptions): Promise<void>;
     checkEmailVerification(): Promise<boolean>;
 }
 export declare function newSessionFX(opts: SessionFXOptions): SessionFX;

package/dist/src/session/session.js

@@ -49,6 +49,11 @@ export class SessionFX {
         });
         await this.users.sync();
     }
+    async updateEmail(opts) {
+        await this.auth.updateEmail(opts);
+        await this.auth.refreshToken();
+        await this.users.sync();
+    }
     async checkEmailVerification() {
         await this.auth.reloadUser();
         if (!this.auth.emailVerified()) {

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

@@ -1,11 +1,21 @@
 import type { GetByUIDOptions, OperationResultOf, TmpPhonesOperator, TmpUsernamesOperator, UsernameVerification, UsersOperator } from "@fabriktor/client";
-import type { User } from "@fabriktor/schema";
+import type { InAddress, InUser, User } from "@fabriktor/schema";
 import { type RunSearchOptions, type SearchPage } from "../core/search.js";
 export type ResolveUsernameOptions = Parameters<UsersOperator["resolveUsername"]>[0];
 export type VerifyUsernameOptions = Parameters<TmpUsernamesOperator["verify"]>[0];
 export type GenerateUsernamesOptions = VerifyUsernameOptions;
 export type SearchUsersOptions = GetByUIDOptions & Omit<RunSearchOptions<User>, "search">;
 export type SearchUsersPage = SearchPage<User>;
+export type UserProfileInput = Pick<InUser, "first_name" | "last_name" | "phone" | "company_name" | "privacy"> & InAddress;
+export type UpdateUserProfileOptions = GetByUIDOptions & {
+    id: string;
+    in: UserProfileInput;
+};
+export type UpdateUserPhoneOptions = GetByUIDOptions & {
+    id: string;
+    phone: string;
+    code: string;
+};
 export type SendPhoneCodeOptions = Parameters<TmpPhonesOperator["send"]>[0];
 export type VerifyPhoneCodeOptions = Parameters<TmpPhonesOperator["verify"]>[0];
 export type UsersFXOptions = {
@@ -15,6 +25,8 @@ export type UsersFXOptions = {
 };
 export interface UsersFXOperator {
     searchUsers(opts: SearchUsersOptions): Promise<SearchUsersPage>;
+    updateUserProfile(opts: UpdateUserProfileOptions): Promise<User>;
+    updateUserPhone(opts: UpdateUserPhoneOptions): Promise<User>;
     resolveUsername(opts: ResolveUsernameOptions): Promise<string>;
     verifyUsername(opts: VerifyUsernameOptions): Promise<OperationResultOf<UsernameVerification>>;
     generateUsernames(opts: GenerateUsernamesOptions): Promise<OperationResultOf<UsernameVerification>>;
@@ -27,10 +39,13 @@ export declare class UsersFX implements UsersFXOperator {
     private tmp_phones;
     constructor(opts: UsersFXOptions);
     searchUsers(opts: SearchUsersOptions): Promise<SearchUsersPage>;
+    updateUserProfile(opts: UpdateUserProfileOptions): Promise<User>;
+    updateUserPhone(opts: UpdateUserPhoneOptions): Promise<User>;
     resolveUsername(opts: ResolveUsernameOptions): Promise<string>;
     verifyUsername(opts: VerifyUsernameOptions): Promise<OperationResultOf<UsernameVerification>>;
     generateUsernames(opts: GenerateUsernamesOptions): Promise<OperationResultOf<UsernameVerification>>;
     sendPhoneCode(opts: SendPhoneCodeOptions): Promise<void>;
     verifyPhoneCode(opts: VerifyPhoneCodeOptions): Promise<void>;
+    private updatedUser;
 }
 export declare function newUsersFX(opts: UsersFXOptions): UsersFX;

package/dist/src/users/users.js

@@ -10,7 +10,12 @@ import { normalizeUsername, validateUsernameFormat } from "./username.js";
 const msgUnableToResolveUsername = "Unable to resolve username.";
 const msgPhoneRequired = "Phone number is required.";
 const msgPhoneCodeRequired = "Verification code is required.";
+const msgFirstNameRequired = "First name is required.";
+const msgLastNameRequired = "Last name is required.";
+const msgAddressRequired = "A complete address is required.";
+const msgUserMissingAfterUpdate = "User could not be resolved after the profile update.";
 const resourceUsername = "username";
+const resourceUser = "user";
 export class UsersFX {
     users;
     tmp_usernames;
@@ -30,6 +35,31 @@ export class UsersFX {
             }),
         });
     }
+    async updateUserProfile(opts) {
+        const input = normalizeUserProfileInput(opts.in);
+        validateUserProfileInput(input);
+        await this.users.replaceOneUser({
+            id: opts.id,
+            in: input,
+        });
+        return await this.updatedUser(opts.uid);
+    }
+    async updateUserPhone(opts) {
+        const phone = normalizePhone(opts.phone);
+        const code = normalizePhoneCode(opts.code);
+        if (!validatePhone(phone)) {
+            throw errPhoneRequired("phone");
+        }
+        if (!validatePhoneCode(code)) {
+            throw errPhoneCodeRequired("code");
+        }
+        await this.tmp_phones.verify({ phone, code });
+        await this.users.replaceOneUser({
+            id: opts.id,
+            in: { phone },
+        });
+        return await this.updatedUser(opts.uid);
+    }
     async resolveUsername(opts) {
         const username = normalizeUsername(opts.username);
         const out = await this.users.resolveUsername({
@@ -81,10 +111,81 @@ export class UsersFX {
             code,
         });
     }
+    async updatedUser(uid) {
+        const out = await this.users.getByUID({ uid });
+        const user = out.value?.[0];
+        if (!user) {
+            throw errResolveFailed({
+                resource: resourceUser,
+                msg: msgUserMissingAfterUpdate,
+            });
+        }
+        return user;
+    }
 }
 export function newUsersFX(opts) {
     return new UsersFX(opts);
 }
+function normalizeUserProfileInput(input) {
+    return {
+        first_name: input.first_name.trim(),
+        last_name: input.last_name.trim(),
+        phone: input.phone.trim(),
+        company_name: input.company_name.trim(),
+        privacy: {
+            is_searchable: input.privacy.is_searchable,
+            is_messageable: input.privacy.is_messageable,
+        },
+        lat: input.lat,
+        lon: input.lon,
+        street: input.street.trim(),
+        city: input.city.trim(),
+        state: input.state.trim(),
+        postal_code: input.postal_code.trim(),
+        country: input.country.trim(),
+        formatted_address: input.formatted_address.trim(),
+        place_name: input.place_name.trim(),
+        place_id: input.place_id.trim(),
+    };
+}
+function validateUserProfileInput(input) {
+    if (!input.first_name) {
+        throw errRequired({
+            field: "first_name",
+            msg: msgFirstNameRequired,
+        });
+    }
+    if (!input.last_name) {
+        throw errRequired({
+            field: "last_name",
+            msg: msgLastNameRequired,
+        });
+    }
+    if (input.phone && !validatePhone(input.phone)) {
+        throw errValidation({
+            field: "phone",
+            msg: msgPhoneRequired,
+        });
+    }
+    if (!hasCompleteAddress(input)) {
+        throw errValidation({
+            field: "formatted_address",
+            msg: msgAddressRequired,
+        });
+    }
+}
+function hasCompleteAddress(input) {
+    return (input.lat !== 0 &&
+        input.lon !== 0 &&
+        input.street.length > 0 &&
+        input.city.length > 0 &&
+        input.state.length > 0 &&
+        input.postal_code.length > 0 &&
+        input.country.length > 0 &&
+        input.formatted_address.length > 0 &&
+        input.place_name.length > 0 &&
+        input.place_id.length > 0);
+}
 function errUsernameResolveFailed(field) {
     return errResolveFailed({
         resource: resourceUsername,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabriktor/fx",
-  "version": "0.0.46",
+  "version": "0.0.48",
   "description": "![Fabriktor Logo](./img/fabriktor-character.gif)",
   "type": "module",
   "exports": {