@fabriktor/fx 0.0.144 → 0.0.146

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

@@ -65,7 +65,7 @@ export type MyChatRoomMembersOptions = {
 export type ChatRoomParticipantsOptions = {
     chat_room_ids: string[];
 };
-export type ChatRoomParticipant = Pick<User, "id" | "full_name" | "username">;
+export type ChatRoomParticipant = Pick<User, "id" | "full_name" | "username" | "account_identity">;
 export type ChatRoomParticipants = {
     members: ChatRoomMember[];
     users: ChatRoomParticipant[];

package/dist/src/chat/chat.js

@@ -6,8 +6,9 @@
 import { queryParam, queryParams, } from "@fabriktor/client";
 import { IDKey, OwnerIDKey, } from "@fabriktor/schema";
 import { errRequired, errResolveFailed, errValidation } from "../core/err.js";
-import { requiredOperationID } from "../core/id.js";
+import { requiredOperationID, normalizeIDs } from "../core/id.js";
 import { normalizeSearchPage, normalizeSearchPerPage, normalizeSearchQuery, runSearch, } from "../core/search.js";
+import { isFabriktorUser } from "../users/users.js";
 import { ChatSendQueue } from "./send-queue.js";
 const closeCodeNormal = 1000;
 const wsRefreshMilliseconds = 40 * 60 * 1000;
@@ -19,6 +20,7 @@ const msgEnsuredChatRoomIDMissing = "Ensured chat room response did not contain
 const msgChatMissing = "Chat could not be resolved after the mutation.";
 const msgSearchQueryRequired = "Search query is required.";
 const msgChatObjectsUploading = "Cannot react to a chat while objects are still uploading.";
+const msgChatRecipients = "Chat recipients must have a Fabriktor account. External contacts cannot receive messages or forms.";
 const msgParticipantMissing = "Chat room participant could not be resolved.";
 export class ChatFX {
     chat;
@@ -36,7 +38,22 @@ export class ChatFX {
         return await this.findChat(id);
     }
     async ensureChatRoom(opts) {
-        const out = await this.chat.ensureChatRoom(opts);
+        const members = normalizeIDs(opts.members);
+        if (!members.length)
+            throw errRequired({
+                field: "members",
+                msg: msgParticipantMissing,
+            });
+        const users = await Promise.all(members.map(async (id) => {
+            const user = (await this.users.findOneUser({ id })).value;
+            return user?.id === id ? user : undefined;
+        }));
+        if (users.some((user) => !isFabriktorUser(user))) {
+            throw errValidation({
+                msg: msgChatRecipients,
+            });
+        }
+        const out = await this.chat.ensureChatRoom({ ...opts, members });
         return requiredOperationID(out, msgEnsuredChatRoomIDMissing);
     }
     async markChatObjectsUploaded(opts) {
@@ -456,6 +473,7 @@ export class ChatFX {
             id: user.id,
             full_name: user.full_name,
             username: user.username,
+            account_identity: user.account_identity,
         };
     }
     async findChat(id, signal) {

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

@@ -0,0 +1,9 @@
+import type { User } from "@fabriktor/schema";
+import type { EmploymentActor } from "../contacts/scope.js";
+export type ChatFormRecipient = Pick<User, "id" | "account_identity">;
+export type ChatFormPolicy = {
+    readonly sender_modes: readonly User["active_mode"][];
+    readonly recipient_identities: readonly User["account_identity"][];
+    readonly allow_group: boolean;
+};
+export declare function canSendChatForm(policy: ChatFormPolicy, actor: EmploymentActor, recipients: readonly ChatFormRecipient[]): boolean;

package/dist/src/chat/forms.js

@@ -0,0 +1,15 @@
+import { normalizeIDs, resolvedID } from "../core/id.js";
+import { isFabriktorUser } from "../users/users.js";
+// Recipients are all other members of the conversation, resolved before use.
+// Recipient eligibility uses account identity, never their transient active mode.
+export function canSendChatForm(policy, actor, recipients) {
+    return (!!resolvedID(actor.owner_id) &&
+        policy.sender_modes.includes(actor.active_mode) &&
+        recipients.length > 0 &&
+        (policy.allow_group || recipients.length === 1) &&
+        normalizeIDs(recipients.map((recipient) => recipient.id)).length ===
+            recipients.length &&
+        recipients.every((recipient) => recipient.id !== actor.owner_id &&
+            isFabriktorUser(recipient) &&
+            policy.recipient_identities.includes(recipient.account_identity)));
+}

package/dist/src/index.d.ts

@@ -3,6 +3,7 @@ export * from "./billable/billable.js";
 export * from "./calls/calls.js";
 export * from "./chat/chat.js";
 export * from "./chat/data.js";
+export * from "./chat/forms.js";
 export * from "./chat/optimistic.js";
 export * from "./chat/send-queue.js";
 export * from "./contacts/contacts.js";

package/dist/src/index.js

@@ -3,6 +3,7 @@ export * from "./billable/billable.js";
 export * from "./calls/calls.js";
 export * from "./chat/chat.js";
 export * from "./chat/data.js";
+export * from "./chat/forms.js";
 export * from "./chat/optimistic.js";
 export * from "./chat/send-queue.js";
 export * from "./contacts/contacts.js";

package/dist/src/routes/availability.d.ts

@@ -2,8 +2,14 @@ import type { JobsOperator, RoutesOperator, UsersOperator } from "@fabriktor/cli
 import { type ClientAvailability, type InClientAvailability, type Location, type PrefCompany, type User } from "@fabriktor/schema";
 import type { PreferencesFXOperator } from "../preferences/preferences.js";
 import { type ChatData } from "../chat/data.js";
+import { type ChatFormRecipient } from "../chat/forms.js";
 import { type RoutesActor } from "./workspace.js";
 export declare const clientAvailabilityMinimumWindows = 3;
+export declare const availabilityRequestPolicy: {
+    readonly sender_modes: readonly ["employer"];
+    readonly recipient_identities: readonly ["client"];
+    readonly allow_group: false;
+};
 export declare const RoutesChatDataType: {
     readonly AvailabilityRequest: "routes.availability.request";
     readonly AvailabilitySubmitted: "routes.availability.submitted";
@@ -14,6 +20,7 @@ export type AvailabilityReference = Pick<InClientAvailability, "employer_id" | "
 export type AvailabilityContext = {
     location: Location;
     employer: User;
+    client: User;
     company: PrefCompany;
     timezone: string;
 };
@@ -24,6 +31,7 @@ export type AvailabilityReaders = {
 };
 export declare function availabilityReference(data: ChatData): AvailabilityReference | undefined;
 export declare function availabilityRequest(location: Location, actor: RoutesActor): ChatData;
+export declare function canSendAvailabilityRequest(data: ChatData, actor: RoutesActor, recipients: readonly ChatFormRecipient[]): boolean;
 export declare function availabilitySubmission(reference: AvailabilityReference, request_id: string, ids: readonly string[]): ChatData;
 export declare function loadAvailabilityContext(readers: AvailabilityReaders, actor: RoutesActor, reference: AvailabilityReference, signal?: AbortSignal): Promise<AvailabilityContext>;
 export declare function validateAvailabilityWindows(inputs: readonly InClientAvailability[], context: AvailabilityContext, minimum?: number): void;

package/dist/src/routes/availability.js

@@ -1,12 +1,19 @@
 import { UserTypeClient, UserTypeEmployer, } from "@fabriktor/schema";
+import { isFabriktorUser } from "../users/users.js";
 import { addressTimezone } from "../core/address.js";
 import { hoursPerDay, minutesOfDay, minutesPerHour, sameCalendarDay, } from "../core/date.js";
 import { errValidation } from "../core/err.js";
 import { normalizeIDs, resolvedID } from "../core/id.js";
 import { newChatData } from "../chat/data.js";
+import { canSendChatForm, } from "../chat/forms.js";
 import { routeCanPlan } from "./workspace.js";
 import { validateClientAvailabilityInput } from "./validation.js";
 export const clientAvailabilityMinimumWindows = 3;
+export const availabilityRequestPolicy = {
+    sender_modes: [UserTypeEmployer],
+    recipient_identities: [UserTypeClient],
+    allow_group: false,
+};
 export const RoutesChatDataType = {
     AvailabilityRequest: "routes.availability.request",
     AvailabilitySubmitted: "routes.availability.submitted",
@@ -15,6 +22,7 @@ const msgAvailabilityAccess = "This availability does not match the client and e
 const msgAvailabilityTimezone = "The location needs a valid saved address timezone.";
 const msgAvailabilityHours = "The employer's working hours must form a valid same-day window.";
 const msgAvailabilityWindows = "Provide enough distinct, non-overlapping availability windows within the employer's working hours.";
+const msgAvailabilityClient = "Visit times can only be requested from clients with a Fabriktor account. Arrange external contacts’ visit times directly.";
 const msgAvailabilityData = "The availability request is invalid.";
 export function availabilityReference(data) {
     if (data.type !== RoutesChatDataType.AvailabilityRequest &&
@@ -53,6 +61,14 @@ export function availabilityRequest(location, actor) {
         location_id: location.id,
     });
 }
+export function canSendAvailabilityRequest(data, actor, recipients) {
+    const reference = availabilityReference(data);
+    return (data.type === RoutesChatDataType.AvailabilityRequest &&
+        !!reference &&
+        reference.employer_id === actor.owner_id &&
+        canSendChatForm(availabilityRequestPolicy, actor, recipients) &&
+        reference.client_id === recipients[0].id);
+}
 export function availabilitySubmission(reference, request_id, ids) {
     const data = newChatData(RoutesChatDataType.AvailabilitySubmitted, {
         ...reference,
@@ -74,8 +90,9 @@ export async function loadAvailabilityContext(readers, actor, reference, signal)
             ? actor.owner_id !== reference.client_id
             : !routeCanPlan(actor) || actor.owner_id !== reference.employer_id))
         throw errValidation({ msg: msgAvailabilityAccess });
-    const [result, company] = await Promise.all([
+    const [result, clientResult, company] = await Promise.all([
         readers.users.findOneUser({ id: reference.employer_id, signal }),
+        readers.users.findOneUser({ id: reference.client_id, signal }),
         readers.preferences.getPrefCompany({ owner_id: reference.employer_id }),
     ]);
     const employer = result.value;
@@ -83,6 +100,11 @@ export async function loadAvailabilityContext(readers, actor, reference, signal)
         employer.id !== reference.employer_id ||
         employer.account_identity !== UserTypeEmployer)
         throw errValidation({ msg: msgAvailabilityAccess });
+    const client = clientResult.value;
+    if (!client || client.id !== reference.client_id || !isFabriktorUser(client))
+        throw errValidation({
+            msg: msgAvailabilityClient,
+        });
     const timezone = addressTimezone(location);
     if (!timezone)
         throw errValidation({ msg: msgAvailabilityTimezone });
@@ -90,7 +112,7 @@ export async function loadAvailabilityContext(readers, actor, reference, signal)
     if (![start, end].every((hour) => Number.isInteger(hour) && hour >= 0 && hour < hoursPerDay) ||
         start >= end)
         throw errValidation({ msg: msgAvailabilityHours });
-    return { location, employer, company, timezone };
+    return { location, employer, client, company, timezone };
 }
 export function validateAvailabilityWindows(inputs, context, minimum = clientAvailabilityMinimumWindows) {
     if (inputs.length < minimum)

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

@@ -10,6 +10,13 @@ export type ExternalUserInput = Omit<InUser, "account_identity" | "active_mode"
 export type CreateExternalUserOptions = {
     in: ExternalUserInput;
 };
+export type UpdateExternalUserOptions = {
+    id: string;
+    owner_id: string;
+    in: ExternalUserInput;
+};
+export declare function isFabriktorUser(user: Pick<User, "account_identity"> | null | undefined): boolean;
+export declare function canManageExternalUser(user: User | null | undefined, owner_id: string): boolean;
 export type SearchExternalUsersOptions = SearchUsersOptions;
 export type SearchExternalUsersPage = SearchUsersPage;
 export type UserProfileInput = Pick<InUser, "first_name" | "last_name" | "phone" | "company_name" | "privacy"> & InAddress;
@@ -43,6 +50,7 @@ export type UsersFXOptions = {
 export interface UsersFXOperator {
     searchUsers(opts: SearchUsersOptions): Promise<SearchUsersPage>;
     createExternalUser(opts: CreateExternalUserOptions): Promise<User>;
+    updateExternalUser(opts: UpdateExternalUserOptions): Promise<User>;
     searchExternalUsers(opts: SearchExternalUsersOptions): Promise<SearchExternalUsersPage>;
     updateUserProfile(opts: UpdateUserProfileOptions): Promise<User>;
     updateUserPhone(opts: UpdateUserPhoneOptions): Promise<User>;
@@ -61,6 +69,7 @@ export declare class UsersFX implements UsersFXOperator {
     constructor(opts: UsersFXOptions);
     searchUsers(opts: SearchUsersOptions): Promise<SearchUsersPage>;
     createExternalUser(opts: CreateExternalUserOptions): Promise<User>;
+    updateExternalUser(opts: UpdateExternalUserOptions): Promise<User>;
     searchExternalUsers(opts: SearchExternalUsersOptions): Promise<SearchExternalUsersPage>;
     updateUserProfile(opts: UpdateUserProfileOptions): Promise<User>;
     updateUserPhone(opts: UpdateUserPhoneOptions): Promise<User>;

package/dist/src/users/users.js

@@ -5,7 +5,7 @@
 // a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 import { UserTypeClient, UserTypeEmployee, UserTypeEmployer, UserTypeExternal, } from "@fabriktor/schema";
 import { errRequired, errResolveFailed, errValidation, } from "../core/err.js";
-import { requiredOperationID } from "../core/id.js";
+import { requiredOperationID, resolvedID } from "../core/id.js";
 import { runSearch, } from "../core/search.js";
 import { normalizePhone, normalizePhoneCode, validatePhone, validatePhoneCode, } from "./phone.js";
 import { normalizeEmail, isValidEmail } from "./email.js";
@@ -20,12 +20,24 @@ const msgEmailInvalid = "Email address is invalid.";
 const msgAddressRequired = "A complete address is required.";
 const msgUserMissingAfterUpdate = "User could not be resolved after the account update.";
 const msgCreatedExternalUserIDMissing = "Created external user response did not contain an ID.";
+const msgExternalUserAccess = "Only the owner can edit an external contact.";
 const msgExternalUserMissing = "External user could not be resolved after creation.";
 const msgInvalidActiveMode = "Active mode is not available for this account identity.";
 const msgWorkIdentityRequiresClient = "A work identity can only be established from a client account.";
 const msgInvalidWorkIdentity = "Work identity must be employee or employer.";
 const resourceUsername = "username";
 const resourceUser = "user";
+// External records are private contacts, not messaging accounts.
+export function isFabriktorUser(user) {
+    return (user?.account_identity === UserTypeClient ||
+        user?.account_identity === UserTypeEmployee ||
+        user?.account_identity === UserTypeEmployer);
+}
+export function canManageExternalUser(user, owner_id) {
+    return (!!resolvedID(owner_id) &&
+        user?.account_identity === UserTypeExternal &&
+        user.external_owner_id === owner_id);
+}
 export class UsersFX {
     users;
     tmp_usernames;
@@ -62,6 +74,38 @@ export class UsersFX {
         const id = requiredOperationID(out, msgCreatedExternalUserIDMissing);
         return await this.findExternalUser(id);
     }
+    async updateExternalUser(opts) {
+        const current = await this.findExternalUser(opts.id);
+        if (!canManageExternalUser(current, opts.owner_id)) {
+            throw errValidation({
+                msg: msgExternalUserAccess,
+            });
+        }
+        const input = normalizeExternalUserInput(opts.in);
+        validateExternalUserInput(input);
+        // Only editable contact fields; preserve identity, privacy and account metadata.
+        await this.users.replaceOneUser({
+            id: current.id,
+            in: {
+                first_name: input.first_name,
+                last_name: input.last_name,
+                email: input.email,
+                phone: input.phone,
+                company_name: input.company_name,
+                lat: input.lat,
+                lon: input.lon,
+                street: input.street,
+                city: input.city,
+                state: input.state,
+                postal_code: input.postal_code,
+                country: input.country,
+                formatted_address: input.formatted_address,
+                place_name: input.place_name,
+                place_id: input.place_id,
+            },
+        });
+        return await this.findExternalUser(current.id);
+    }
     async searchExternalUsers(opts) {
         const { uid, ...searchOpts } = opts;
         return await runSearch({
@@ -181,7 +225,7 @@ export class UsersFX {
     async findExternalUser(id) {
         const out = await this.users.findOneUser({ id });
         const user = out.value;
-        if (user === undefined) {
+        if (!user || user.id !== id || user.account_identity !== UserTypeExternal) {
             throw errResolveFailed({
                 resource: resourceUser,
                 msg: msgExternalUserMissing,

package/package.json

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