Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Add family sharing management UI and capability integration to web app (#2413)
Leendert de Borst7941eadbf8a2
diff --git a/apps/web/src/App.tsx b/apps/web/src/App.tsxindex 972216791..54c5d6535 100644--- a/apps/web/src/App.tsx+++ b/apps/web/src/App.tsx@@ -1,6 +1,8 @@+import { CapabilityKeys } from '@aliasvault/models/webapi';import React from 'react';import { BrowserRouter, Route, Routes } from 'react-router-dom';+import { RequireCapability } from '@/context/CapabilityContext';import AuthLayout from '@/layouts/AuthLayout';import MainLayout from '@/layouts/MainLayout';import ForgotPassword from '@/pages/auth/ForgotPassword';@@ -17,6 +19,7 @@ import RecentlyDeleted from '@/pages/items/RecentlyDeleted';import ItemView from '@/pages/items/View';import NotFound from '@/pages/NotFound';import AppsSettings from '@/pages/settings/Apps';+import FamilySharing from '@/pages/settings/FamilySharing';import GeneralSettings from '@/pages/settings/General';import ImportExport from '@/pages/settings/importexport/ImportExport';import ResetVault from '@/pages/settings/importexport/ResetVault';@@ -67,6 +70,7 @@ const App: React.FC = () => (<Route path="/settings/security/disable-2fa" element={<Disable2Fa />} /><Route path="/settings/security/delete-account" element={<DeleteAccount />} /><Route path="/settings/storage-insights" element={<StorageInsights />} />+ <Route path="/settings/family-sharing" element={<RequireCapability capability={CapabilityKeys.VaultSharing}><FamilySharing /></RequireCapability>} /><Route path="/settings/import-export" element={<ImportExport />} /><Route path="/settings/import-export/reset-vault" element={<ResetVault />} /><Route path="/settings/apps" element={<AppsSettings />} />diff --git a/apps/web/src/components/layout/TopMenu.tsx b/apps/web/src/components/layout/TopMenu.tsxindex 4666414f0..8765eff29 100644--- a/apps/web/src/components/layout/TopMenu.tsx+++ b/apps/web/src/components/layout/TopMenu.tsx@@ -1,3 +1,5 @@+import { familySharingText } from '@aliasvault/client/sharing/FamilySharingView';+import { CapabilityKeys } from '@aliasvault/models/webapi';import React, { useCallback, useEffect, useRef, useState } from 'react';import { useTranslation } from 'react-i18next';import { NavLink, useLocation } from 'react-router-dom';@@ -7,6 +9,7 @@ import DbLockButton from '@/components/layout/DbLockButton';import DbStatusIndicator from '@/components/layout/DbStatusIndicator';import SearchWidget from '@/components/layout/SearchWidget';import { useAuth } from '@/context/AuthContext';+import { useCapabilities } from '@/context/CapabilityContext';import { useTheme } from '@/context/ThemeContext';import { useClickOutside } from '@/hooks/useClickOutside';@@ -28,6 +31,7 @@ const TopMenu: React.FC = () => {const location = useLocation();const { username } = useAuth();const { isDarkMode, toggleTheme } = useTheme();+ const hasCapability = useCapabilities();const [isMobileMenuOpen, setIsMobileMenuOpen] = useState(false);const menuRef = useRef<HTMLDivElement>(null);const toggleRef = useRef<HTMLButtonElement>(null);@@ -97,6 +101,18 @@ const TopMenu: React.FC = () => {<div className="py-3 px-4"><span className="block text-sm font-semibold text-gray-900 dark:text-white">{username}</span></div>+ {hasCapability(CapabilityKeys.VaultSharing) && (+ <ul className="py-1 text-gray-700 dark:text-gray-400">+ <li>+ <NavLink to="/settings/family-sharing" end className={({ isActive }) => navLinkClass(isActive, DROPDOWN_LINK)}>+ {familySharingText.title}+ <span className="ml-2 inline-flex items-center justify-center px-2 py-0.5 text-xs font-medium rounded bg-primary-100 text-primary-800 dark:bg-primary-900 dark:text-primary-200">+ {familySharingText.beta}+ </span>+ </NavLink>+ </li>+ </ul>+ )}<ul className="py-1 text-gray-700 dark:text-gray-400"><li><NavLink to="/settings/general" end className={({ isActive }) => navLinkClass(isActive, DROPDOWN_LINK)}>@@ -121,9 +137,6 @@ const TopMenu: React.FC = () => {<li className="border-t border-b border-gray-100 dark:border-gray-600"><NavLink to="/settings/apps" end className={({ isActive }) => navLinkClass(isActive, DROPDOWN_LINK)}>{t('layout.topMenu.ExtensionsAppsNav')}- <span className="ml-2 inline-flex items-center justify-center px-2 py-0.5 text-xs font-medium rounded bg-primary-100 text-primary-800 dark:bg-primary-900 dark:text-primary-200">- {t('layout.topMenu.NewLabel')}- </span></NavLink></li><li>diff --git a/apps/web/src/components/shared/Card.tsx b/apps/web/src/components/shared/Card.tsxindex a04d66df8..279004ad8 100644--- a/apps/web/src/components/shared/Card.tsx+++ b/apps/web/src/components/shared/Card.tsx@@ -1,7 +1,7 @@import React from 'react';-/** Card layouts: `page` for settings pages (side margin), `section` for item page grids, `plain` for neither. */-export type CardVariant = 'page' | 'section' | 'plain';+/** Card layouts: `page` for settings pages (side margin), `section` for item page grids, `plain` for neither, `tile` for a grid cell (no margin). */+export type CardVariant = 'page' | 'section' | 'plain' | 'tile';type CardProps = {children: React.ReactNode;@@ -9,12 +9,13 @@ type CardProps = {className?: string;};-const BASE_CLASSES = 'mb-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 dark:bg-gray-800';+const BASE_CLASSES = 'bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 dark:bg-gray-800';const VARIANT_CLASSES: Record<CardVariant, string> = {- page: 'p-4 sm:p-6 mx-4',- section: 'p-4 sm:p-5 2xl:col-span-2',- plain: 'p-4 sm:p-6',+ page: 'mb-4 p-4 sm:p-6 mx-4',+ section: 'mb-4 p-4 sm:p-5 2xl:col-span-2',+ plain: 'mb-4 p-4 sm:p-6',+ tile: 'p-4 sm:p-5',};/**diff --git a/apps/web/src/components/shared/SmallButton.tsx b/apps/web/src/components/shared/SmallButton.tsxnew file mode 100644index 000000000..82bcb04ec--- /dev/null+++ b/apps/web/src/components/shared/SmallButton.tsx@@ -0,0 +1,29 @@+import React from 'react';++/** Small button colors. */+export type SmallButtonColor = 'primary' | 'danger' | 'neutral';++type SmallButtonProps = {+ children: React.ReactNode;+ onClick: () => void;+ color?: SmallButtonColor;+ isDisabled?: boolean;+ title?: string;+};++const COLOR_CLASSES: Record<SmallButtonColor, string> = {+ primary: 'bg-primary-600 hover:bg-primary-700 text-white',+ danger: 'text-red-600 dark:text-red-400 hover:bg-red-50 dark:hover:bg-red-900/30',+ neutral: 'text-gray-600 dark:text-gray-400 hover:bg-gray-100 dark:hover:bg-gray-700',+};++/**+ * Compact button for an inline action on a list row.+ */+const SmallButton: React.FC<SmallButtonProps> = ({ children, onClick, color = 'neutral', isDisabled = false, title }) => (+ <button type="button" disabled={isDisabled} title={title} onClick={onClick} className={`shrink-0 px-2 py-1 text-xs font-medium rounded-md disabled:opacity-50 ${COLOR_CLASSES[color]}`}>+ {children}+ </button>+);++export default SmallButton;diff --git a/apps/web/src/pages/settings/FamilySharing.tsx b/apps/web/src/pages/settings/FamilySharing.tsxnew file mode 100644index 000000000..a1144e237--- /dev/null+++ b/apps/web/src/pages/settings/FamilySharing.tsx@@ -0,0 +1,576 @@+import { apiErrorCodeOf } from '@aliasvault/client/api/errors/ApiRequestError';+import { AppErrorCode, formatErrorWithCode } from '@aliasvault/client/api/errors/AppErrorCodes';+import { MasterPasswordService } from '@aliasvault/client/auth/MasterPasswordService';+import { canAdministerGroup, describeMemberAccess, familySharingText, holdsManifestKey, ownUserIdIn, roleLabel, sharingErrorMessage } from '@aliasvault/client/sharing/FamilySharingView';+import { multiManifestRendering } from '@aliasvault/client/sharing/MultiManifestRendering';+import { SharingService } from '@aliasvault/client/sharing/SharingService';+import React, { useCallback, useEffect, useState } from 'react';+import { useTranslation } from 'react-i18next';+import { Link } from 'react-router-dom';++import AlertMessageError from '@/components/alerts/AlertMessageError';+import AlertMessageSuccess from '@/components/alerts/AlertMessageSuccess';+import FolderIcon from '@/components/folders/FolderIcon';+import FolderModal from '@/components/folders/FolderModal';+import LoadingIndicator from '@/components/loading/LoadingIndicator';+import Button from '@/components/shared/Button';+import Card from '@/components/shared/Card';+import InputTextField from '@/components/shared/InputTextField';+import PageContent from '@/components/shared/PageContent';+import PageHeader from '@/components/shared/PageHeader';+import PasswordConfirmationModal from '@/components/shared/PasswordConfirmationModal';+import RefreshButton from '@/components/shared/RefreshButton';+import SmallButton from '@/components/shared/SmallButton';+import { useAuth } from '@/context/AuthContext';+import { useConfirmModal } from '@/context/ConfirmModalContext';+import { useDb } from '@/context/DbContext';+import { useWebApi } from '@/context/WebApiContext';+import { usePageTitle } from '@/hooks/usePageTitle';+import { useVaultSync } from '@/hooks/useVaultSync';+import { folderRoute } from '@/utils/ItemRoute';+import { vaultStore } from '@/vault/VaultStore';++import type { SharingOperationResult } from '@aliasvault/client/sync/VaultSync';+import type { GroupInfo, GroupMemberInfo, GroupOverviewResponse, ReceivedManifestInvitation, SharedManifestInfo } from '@aliasvault/models/webapi';+type ManifestTarget = { group: GroupInfo; manifest: SharedManifestInfo };+class SharingOperationError extends Error {}++type InvitationCardProps = {+ vaultName: string;+ inviterUsername: string;+ isDisabled: boolean;+ onAccept: () => void;+ onDecline: () => void;+};++/**+ * An invitation to a shared manifest, highlighted as something that waits for the user to answer.+ */+const InvitationCard: React.FC<InvitationCardProps> = ({ vaultName, inviterUsername, isDisabled, onAccept, onDecline }) => (+ <Card variant="tile" className="flex flex-col gap-4 border-primary-400 ring-2 ring-primary-200 dark:border-primary-500 dark:ring-primary-900/60">+ <div className="flex items-center gap-2 min-w-0">+ <FolderIcon isShared className="w-5 h-5 text-orange-500" />+ <div className="min-w-0">+ <p className="text-lg font-medium text-gray-900 dark:text-white truncate" title={vaultName}>{vaultName}</p>+ <p className="text-sm text-gray-500 dark:text-gray-400">{familySharingText.invitedBy(inviterUsername)}</p>+ </div>+ </div>+ <div className="flex justify-end gap-2">+ <Button color="secondary" isDisabled={isDisabled} onClick={onDecline}>{familySharingText.decline}</Button>+ <Button isDisabled={isDisabled} onClick={onAccept}>{familySharingText.accept}</Button>+ </div>+ </Card>+);++/**+ * Family sharing page: create a family's shared manifests, invite its members to them, and answer invitations.+ */+const FamilySharing: React.FC = () => {+ const { t } = useTranslation();+ const webApi = useWebApi();+ const { username } = useAuth();+ const { sqliteClient, loadStoredDatabase } = useDb();+ const { syncVault } = useVaultSync();+ const { showConfirmation } = useConfirmModal();+ usePageTitle(familySharingText.title);++ const [overview, setOverview] = useState<GroupOverviewResponse | null>(null);+ const [isLoading, setIsLoading] = useState(true);+ const [error, setError] = useState<string | null>(null);+ const [notice, setNotice] = useState<string | null>(null);+ const [busy, setBusy] = useState(false);+ const [newVaultNames, setNewVaultNames] = useState<Record<string, string>>({});+ const [vaultNames, setVaultNames] = useState<Record<string, string>>({});+ const [invitationNames, setInvitationNames] = useState<Record<string, string>>({});+ const [openVaultMenuId, setOpenVaultMenuId] = useState<string | null>(null);+ const [pendingVaultRename, setPendingVaultRename] = useState<ManifestTarget | null>(null);+ const [pendingVaultDelete, setPendingVaultDelete] = useState<ManifestTarget | null>(null);+ const [deletePasswordError, setDeletePasswordError] = useState('');++ const loadOverview = useCallback(async (): Promise<void> => {+ try {+ const loaded = await SharingService.getOverview(webApi);+ setOverview(loaded);+ setInvitationNames(await SharingService.openInvitationNames(loaded.receivedInvitations));+ setVaultNames(sqliteClient ? multiManifestRendering.displayNames(sqliteClient) : {});+ setError(null);+ } catch {+ setError(familySharingText.errors.loadFailed);+ } finally {+ setIsLoading(false);+ }+ }, [webApi, sqliteClient, setIsLoading]);++ useEffect(() => {+ void loadOverview();+ }, [loadOverview]);++ /**+ * The message to show for a failed action.+ * @param actionError - the error thrown by the call.+ * @param fallback - the message for everything else.+ */+ const apiErrorMessage = (actionError: unknown, fallback: string): string => {+ if (actionError instanceof SharingOperationError) {+ return actionError.message;+ }++ const code = apiErrorCodeOf(actionError);+ const knownError = sharingErrorMessage(code);+ if (knownError) {+ return knownError;+ }++ return code !== null ? `${fallback} [${code}]` : fallback;+ };++ /**+ * Run one action, then reload so the page shows what the server holds now.+ * @param action - the action to run.+ * @param failureMessage - what to show when it fails without a more specific reason.+ */+ const run = async (action: () => Promise<void>, failureMessage: string): Promise<void> => {+ setBusy(true);+ setError(null);+ setNotice(null);++ let failure: string | null = null;+ try {+ await action();+ } catch (actionError) {+ failure = apiErrorMessage(actionError, failureMessage);+ }++ await loadOverview();++ if (failure !== null) {+ setError(failure);+ }++ setBusy(false);+ };++ /**+ * Throw the error a failed sync engine sharing operation stands for.+ * @param result - what the operation returned.+ * @param fallback - the message for a failure without a more specific reason.+ */+ const unwrap = (result: SharingOperationResult, fallback: string): void => {+ if (result.success) {+ return;+ }++ if (result.vaultUpgradeRequired) {+ throw new SharingOperationError(familySharingText.errors.vaultUpgradeRequired);+ }++ if (result.errorCode === AppErrorCode.VAULT_LOCKED) {+ throw new SharingOperationError(formatErrorWithCode(t('common.errors.vaultIsLocked'), AppErrorCode.VAULT_LOCKED));+ }++ const knownError = sharingErrorMessage(result.apiErrorCode);+ const code = result.apiErrorCode ?? result.error;+ throw new SharingOperationError(knownError ?? (code ? `${fallback} [${code}]` : fallback));+ };++ /**+ * Sync, then reopen the stored vault so shared manifest folders and names show the change.+ */+ const syncAndReload = async (): Promise<void> => {+ await syncVault();+ await loadStoredDatabase();+ };++ /**+ * Sync the vault and reload the overview, to pick up what other family members changed.+ */+ const refresh = async (): Promise<void> => {+ setIsLoading(true);+ try {+ await syncAndReload();+ await loadOverview();+ } finally {+ setIsLoading(false);+ }+ };++ /**+ * Create another shared manifest for the family. The sync that follows pushes it to the server.+ * @param group - the family to create it for.+ */+ const createSharedVault = (group: GroupInfo): Promise<void> => {+ const name = (newVaultNames[group.groupId] ?? '').trim();+ if (name.length === 0) {+ return Promise.resolve();+ }++ return run(async () => {+ unwrap(await vaultStore.createSharedManifest(group.groupId, name), familySharingText.errors.createVaultFailed);+ setNewVaultNames(previous => ({ ...previous, [group.groupId]: '' }));+ await syncAndReload();+ }, familySharingText.errors.createVaultFailed);+ };++ /**+ * Rename a shared manifest, which only an administrator of the family may do. Throws so the modal shows the error.+ * @param name - the new name.+ */+ const renameSharedVault = async (name: string): Promise<void> => {+ const target = pendingVaultRename;+ if (!target) {+ return;+ }++ try {+ unwrap(await vaultStore.updateSharedManifest(target.group.groupId, target.manifest.manifestId, { name }), t('common.errors.unknownErrorTryAgain'));+ } catch (renameError) {+ throw new Error(apiErrorMessage(renameError, t('common.errors.unknownErrorTryAgain')));+ }++ await syncAndReload();+ await loadOverview();+ };++ /**+ * Invite one member to one shared manifest.+ * @param group - the family the shared manifest belongs to.+ * @param manifest - the shared manifest.+ * @param member - the member being invited.+ */+ const inviteMember = (group: GroupInfo, manifest: SharedManifestInfo, member: GroupMemberInfo): Promise<void> => run(async () => {+ unwrap(await vaultStore.inviteToSharedManifest(group.groupId, manifest.manifestId, member.userId), familySharingText.errors.inviteFailed);+ await loadStoredDatabase();+ setNotice(familySharingText.invitationSent(member.username));+ }, familySharingText.errors.inviteFailed);++ /**+ * Accept an invitation; the sync that follows pulls the joined shared manifest.+ * @param invitationId - the invitation to accept.+ */+ const acceptInvitation = (invitationId: string): Promise<void> => run(async () => {+ await SharingService.acceptInvitation(webApi, invitationId);+ await syncAndReload();+ }, familySharingText.errors.invitationGone);++ /**+ * Ask for confirmation, then take a member's access to a shared manifest away, or hand back one's own.+ * @param group - the family.+ * @param manifest - the shared manifest.+ * @param member - the member losing access.+ * @param isSelf - whether the member is the current user.+ */+ const removeAccess = async (group: GroupInfo, manifest: SharedManifestInfo, member: GroupMemberInfo, isSelf: boolean): Promise<void> => {+ const vault = vaultLabel(manifest);+ const confirmed = isSelf+ ? await showConfirmation(familySharingText.leaveVault, familySharingText.leaveVaultConfirm(vault), familySharingText.leaveVault, t('sharedResources.Cancel'))+ : await showConfirmation(familySharingText.revoke, `${familySharingText.revokeAccessConfirm(member.username, vault)}\n\n${familySharingText.revokeAccessWarning}`, familySharingText.revoke, t('sharedResources.Cancel'));+ if (!confirmed) {+ return;+ }++ await run(async () => {+ await SharingService.revokeAccess(webApi, group.groupId, manifest.manifestId, member.userId);+ await syncAndReload();+ }, familySharingText.errors.revokeAccessFailed);+ };++ /**+ * Ask for confirmation, then for the master password, before deleting a shared manifest.+ * @param target - the shared manifest to delete.+ */+ const startVaultDelete = async (target: ManifestTarget): Promise<void> => {+ const confirmed = await showConfirmation(familySharingText.deleteVault, familySharingText.deleteVaultConfirm(vaultLabel(target.manifest)), t('sharedResources.Delete'), t('sharedResources.Cancel'));+ if (confirmed) {+ setDeletePasswordError('');+ setPendingVaultDelete(target);+ }+ };++ /**+ * Delete a shared manifest with the entered master password.+ * @param password - the entered master password.+ */+ const deleteSharedVault = async (password: string): Promise<void> => {+ const target = pendingVaultDelete;+ if (!target) {+ return;+ }++ setBusy(true);+ try {+ await SharingService.deleteSharedManifest(webApi, target.group.groupId, target.manifest.manifestId, async challenge => (await MasterPasswordService.answerSrpChallenge(challenge, password)).proof);+ } catch (deleteError) {+ setDeletePasswordError(apiErrorCodeOf(deleteError) === 'PASSWORD_MISMATCH' ? t('common.errors.wrongPassword') : apiErrorMessage(deleteError, familySharingText.errors.deleteVaultFailed));+ setBusy(false);+ return;+ }++ setPendingVaultDelete(null);+ await run(async () => {+ await syncAndReload();+ setNotice(familySharingText.vaultDeleted);+ }, familySharingText.errors.deleteVaultFailed);+ };++ /**+ * What to call a shared manifest on screen.+ * @param manifest - the shared manifest.+ */+ const vaultLabel = (manifest: SharedManifestInfo): string => vaultNames[manifest.manifestId.toLowerCase()] ?? familySharingText.sharedVault;++ const receivedInvitations = overview?.receivedInvitations ?? [];+ const groups = overview?.groups ?? [];+ // An invitation shows in its family's shared vaults; one for a family this overview does not list shows on its own.+ const orphanInvitations = receivedInvitations.filter(invitation => !groups.some(group => group.groupId.toLowerCase() === invitation.groupId.toLowerCase()));++ /**+ * The card of one received invitation.+ * @param invitation - the invitation.+ */+ const invitationCard = (invitation: ReceivedManifestInvitation): React.ReactNode => (+ <InvitationCard+ key={invitation.id}+ vaultName={invitationNames[invitation.id] ?? familySharingText.sharedVault}+ inviterUsername={invitation.inviterUsername}+ isDisabled={busy}+ onAccept={() => void acceptInvitation(invitation.id)}+ onDecline={() => void run(() => SharingService.declineInvitation(webApi, invitation.id), familySharingText.errors.invitationGone)}+ />+ );++ return (+ <>+ <PageHeader+ breadcrumbItems={[{ displayName: familySharingText.title }]}+ title={familySharingText.title}+ description={familySharingText.description}+ customActions={<RefreshButton onClick={refresh} buttonText={t('sharedResources.Refresh')} />}+ titleSuffix={<span className="px-2 py-0.5 text-xs font-semibold rounded-full bg-primary-100 dark:bg-primary-900 text-primary-700 dark:text-primary-300 uppercase tracking-wide">{familySharingText.beta}</span>}+ />++ <FolderModal+ isOpen={pendingVaultRename !== null}+ onClose={() => setPendingVaultRename(null)}+ onSave={renameSharedVault}+ initialName={pendingVaultRename ? vaultLabel(pendingVaultRename.manifest) : ''}+ mode="edit"+ />++ <PasswordConfirmationModal+ isOpen={pendingVaultDelete !== null}+ title={familySharingText.deleteVault}+ description={familySharingText.deleteVaultPasswordPrompt(pendingVaultDelete ? vaultLabel(pendingVaultDelete.manifest) : '')}+ errorMessage={deletePasswordError}+ onPasswordSubmitted={password => void deleteSharedVault(password)}+ onClose={() => setPendingVaultDelete(null)}+ />++ <PageContent>+ <div className="mx-4">+ {error && <div className="mb-4"><AlertMessageError message={error} hasTopMargin={false} /></div>}+ {notice && <AlertMessageSuccess message={notice} />}+ </div>++ {isLoading && <LoadingIndicator />}++ {!isLoading && orphanInvitations.length > 0 && (+ <section className="mx-4 mb-6">+ <h3 className="mb-4 text-lg font-semibold text-gray-900 dark:text-white">{familySharingText.invitations}</h3>+ <div className="grid grid-cols-1 items-start gap-4 md:grid-cols-2 xl:grid-cols-3">+ {orphanInvitations.map(invitationCard)}+ </div>+ </section>+ )}++ {!isLoading && overview && groups.length === 0 && receivedInvitations.length === 0 && (+ <Card><p className="text-sm text-gray-600 dark:text-gray-400">{familySharingText.notAvailable}</p></Card>+ )}++ {!isLoading && groups.map(group => {+ const canAdminister = canAdministerGroup(group);+ const myUserId = ownUserIdIn(group, username);+ const groupInvitations = receivedInvitations.filter(invitation => invitation.groupId.toLowerCase() === group.groupId.toLowerCase());+ const invitedManifestIds = new Set(groupInvitations.map(invitation => invitation.manifestId.toLowerCase()));++ return (+ <section key={group.groupId} className="mx-4 mb-6 space-y-6">+ {/* The family's members. */}+ <Card variant="tile">+ <h3 className="mb-3 text-lg font-medium text-gray-900 dark:text-white">{familySharingText.members} ({group.members.length})</h3>+ <ul className="flex flex-wrap gap-x-10 gap-y-3">+ {group.members.map(member => (+ <li key={member.userId} className="min-w-0">+ <p className="text-sm text-gray-900 dark:text-white truncate">{member.username}{member.userId === myUserId && ` (${familySharingText.you})`}</p>+ <p className="text-xs text-gray-500 dark:text-gray-400">{roleLabel(member)}</p>+ </li>+ ))}+ </ul>+ </Card>++ <div className="min-w-0">+ <h3 className="text-lg font-semibold text-gray-900 dark:text-white">{familySharingText.sharedVaults}</h3>+ <p className="mt-1 mb-4 text-sm text-gray-500 dark:text-gray-400">{familySharingText.sharedVaultsHint}</p>++ {/* One card per shared manifest, each with the members who can open it. */}+ <div className="grid grid-cols-1 items-start gap-4 md:grid-cols-2 xl:grid-cols-3">+ {/* Invitations first: they wait for an answer, and stand in for the vault's own card until accepted. */}+ {groupInvitations.map(invitationCard)}++ {group.manifests.filter(manifest => !invitedManifestIds.has(manifest.manifestId.toLowerCase())).map(manifest => {+ const iHoldKey = holdsManifestKey(manifest, myUserId);+ // The shared manifest's folder exists in this vault once the manifest itself does.+ const folderId = manifest.manifestId.toLowerCase();+ const hasFolder = vaultNames[folderId] !== undefined;++ return (+ <Card key={manifest.manifestId} variant="tile">+ <div className="flex items-center gap-1 -mx-2 -mt-2 mb-2">+ {hasFolder ? (+ <Link to={folderRoute({ Id: folderId, ManifestId: folderId })} className="flex flex-1 items-center gap-2 min-w-0 px-2 py-1.5 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">+ <FolderIcon isShared className="w-5 h-5 text-orange-500" />+ <span className="text-lg font-medium text-gray-900 dark:text-white truncate" title={vaultLabel(manifest)}>{vaultLabel(manifest)}</span>+ <svg className="w-4 h-4 ml-auto shrink-0 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">+ <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M9 5l7 7-7 7" />+ </svg>+ </Link>+ ) : (+ <div className="flex flex-1 items-center gap-2 min-w-0 px-2 py-1.5">+ <FolderIcon isShared className="w-5 h-5 text-orange-500" />+ <span className="text-lg font-medium text-gray-900 dark:text-white truncate" title={vaultLabel(manifest)}>{vaultLabel(manifest)}</span>+ </div>+ )}+ {canAdminister && (+ <div className="relative shrink-0">+ <button+ disabled={busy}+ onClick={() => setOpenVaultMenuId(previous => (previous === manifest.manifestId ? null : manifest.manifestId))}+ aria-label={t('sharedResources.Edit')}+ className="p-1.5 rounded-md text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-700 disabled:opacity-50"+ >+ <svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">+ <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z" />+ <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />+ </svg>+ </button>++ {openVaultMenuId === manifest.manifestId && (+ <>+ <div className="fixed inset-0 z-10" onClick={() => setOpenVaultMenuId(null)} />+ <div className="absolute right-0 top-full mt-1 w-48 py-1 bg-white dark:bg-gray-700 border border-gray-200 dark:border-gray-600 rounded-lg shadow-xl z-20">+ {/* Renaming encrypts the name with the shared manifest's key, so it takes a member who holds it. */}+ {iHoldKey && (+ <button+ onClick={() => {+ setOpenVaultMenuId(null);+ setPendingVaultRename({ group, manifest });+ }}+ className="w-full px-4 py-2 text-left text-sm text-gray-700 dark:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-600"+ >+ {t('components.folders.folderModal.EditFolderTitle')}+ </button>+ )}+ <button+ onClick={() => {+ setOpenVaultMenuId(null);+ void startVaultDelete({ group, manifest });+ }}+ className="w-full px-4 py-2 text-left text-sm text-red-600 dark:text-red-400 hover:bg-gray-100 dark:hover:bg-gray-600"+ >+ {familySharingText.deleteVault}+ </button>+ </div>+ </>+ )}+ </div>+ )}+ </div>++ {/* Inviting somebody encrypts this shared manifest's key for them, which an admin without a grant on it cannot do. */}+ {canAdminister && !iHoldKey && (+ <p className="mb-3 text-sm text-gray-500 dark:text-gray-400">{familySharingText.cannotInviteWithoutAccess}</p>+ )}++ <ul className="divide-y divide-gray-100 dark:divide-gray-700">+ {group.members.map(member => {+ const access = describeMemberAccess(group, manifest, member, myUserId);+ const { isSelf, invitation } = access;++ return (+ <li key={member.userId} className="flex items-center justify-between gap-2 py-2 first:pt-0 last:pb-0">+ <div className="min-w-0">+ <p className="text-sm text-gray-900 dark:text-white truncate">{member.username}{isSelf && ` (${familySharingText.you})`}</p>+ <p className="text-xs text-gray-500 dark:text-gray-400">{access.statusText}</p>+ </div>++ {access.canLeave && (+ <SmallButton color="danger" isDisabled={busy} onClick={() => void removeAccess(group, manifest, member, isSelf)}>{familySharingText.leaveVault}</SmallButton>+ )}++ {access.canRevoke && (+ <SmallButton color="danger" isDisabled={busy} onClick={() => void removeAccess(group, manifest, member, isSelf)}>{familySharingText.revoke}</SmallButton>+ )}++ {access.canWithdraw && invitation && (+ <SmallButton isDisabled={busy} onClick={() => void run(() => SharingService.withdrawInvitation(webApi, invitation.id), familySharingText.errors.invitationGone)}>{familySharingText.withdraw}</SmallButton>+ )}++ {access.canInvite && (+ <SmallButton+ color="primary"+ isDisabled={busy || !access.isReadyForInvite}+ title={access.isReadyForInvite ? undefined : familySharingText.errors.userNotReady}+ onClick={() => void inviteMember(group, manifest, member)}+ >+ {familySharingText.invite}+ </SmallButton>+ )}+ </li>+ );+ })}+ </ul>+ </Card>+ );+ })}++ {/* Creating another shared manifest. */}+ {(canAdminister || group.manifests.length === 0) && (+ <Card variant="tile" className="border-dashed">+ {group.manifests.length === 0 && (+ <p className="mb-3 text-sm text-gray-600 dark:text-gray-400">{canAdminister ? familySharingText.noSharedVaultAdmin : familySharingText.noSharedVaultMember}</p>+ )}++ {canAdminister && (+ <>+ <h4 className="mb-3 text-base font-medium text-gray-900 dark:text-white">{familySharingText.createSharedVault}</h4>+ <form+ className="flex gap-2"+ onSubmit={event => {+ event.preventDefault();+ void createSharedVault(group);+ }}+ >+ <div className="flex-1 min-w-0">+ <InputTextField+ id={`new-vault-name-${group.groupId}`}+ value={newVaultNames[group.groupId] ?? ''}+ onValueChange={value => setNewVaultNames(previous => ({ ...previous, [group.groupId]: value }))}+ placeholder={familySharingText.vaultNamePlaceholder}+ />+ </div>+ <Button type="submit" isDisabled={busy}>{familySharingText.create}</Button>+ </form>+ </>+ )}+ </Card>+ )}+ </div>+ </div>+ </section>+ );+ })}+ </PageContent>+ </>+ );+};++export default FamilySharing;diff --git a/apps/web/src/vault/VaultStore.ts b/apps/web/src/vault/VaultStore.tsindex 80e67d6f9..f3aa177d3 100644--- a/apps/web/src/vault/VaultStore.ts+++ b/apps/web/src/vault/VaultStore.ts@@ -10,7 +10,7 @@ import { getPlatform } from '@aliasvault/client/platform';import { clearDirtyScopes, getDirtyScopes } from '@aliasvault/client/sync/VaultDirtyState';import { vaultRequiresManifestMigration, VaultMigrationKind } from '@aliasvault/client/sync/VaultManifestMigration';import { DEFAULT_VAULT_MUTATION_SCOPE, hasUserVisibleScope, type VaultMutationScope } from '@aliasvault/client/sync/VaultMutationScope';-import { hasSyncError, syncResult, VaultSync, type FullVaultSyncResult, type VaultManifestMigrationResult } from '@aliasvault/client/sync/VaultSync';+import { hasSyncError, syncResult, VaultSync, type FullVaultSyncResult, type SharedManifestDetails, type SharingOperationResult, type VaultManifestMigrationResult } from '@aliasvault/client/sync/VaultSync';import { type IVaultSyncEngineHost, type VaultSyncOptions, type VaultSyncPhase as EngineSyncPhase, type VaultSyncStoreOutcome, type VaultSyncStoreRequest } from '@aliasvault/client/sync/VaultSyncEngine';import { getVaultSyncHoldReason } from '@aliasvault/client/sync/VaultSyncHold';@@ -497,4 +497,33 @@ export const vaultStore = {migrateVaultManifest(): Promise<VaultManifestMigrationResult> {return vaultSync.migrateVaultManifest();},++ /**+ * Create a group's shared manifest. Leaves the vault dirty, so the next sync pushes it.+ * @param groupId - the group+ * @param name - the shared manifest's name+ */+ createSharedManifest(groupId: string, name: string): Promise<SharingOperationResult> {+ return vaultSync.createSharedManifest(groupId, name);+ },++ /**+ * Invite a group member to one of its shared manifests.+ * @param groupId - the group+ * @param manifestId - the shared manifest+ * @param userId - the member being invited+ */+ inviteToSharedManifest(groupId: string, manifestId: string, userId: string): Promise<SharingOperationResult> {+ return vaultSync.inviteToSharedManifest(groupId, manifestId, userId);+ },++ /**+ * Change the details of a shared manifest (group administrators only).+ * @param groupId - the group+ * @param manifestId - the shared manifest+ * @param details - the details to change+ */+ updateSharedManifest(groupId: string, manifestId: string, details: SharedManifestDetails): Promise<SharingOperationResult> {+ return vaultSync.updateSharedManifest(groupId, manifestId, details);+ },};diff --git a/core/client/src/sharing/FamilySharingView.ts b/core/client/src/sharing/FamilySharingView.tsindex 4847dacfe..3050a98a5 100644--- a/core/client/src/sharing/FamilySharingView.ts+++ b/core/client/src/sharing/FamilySharingView.ts@@ -25,9 +25,10 @@ export const familySharingText = {you: 'You',noSharedVaultAdmin: 'This family has no shared vault yet. Once created, it shows up as a folder for every member you invite.',noSharedVaultMember: 'Nobody has created a shared vault for this family yet.',- createSharedVault: 'Create a shared vault',+ createSharedVault: 'Create a new shared vault',sharedVault: 'Shared vault',sharedVaults: 'Shared vaults',+ sharedVaultsHint: 'Each shared vault you have access to shows up as a folder in your vault. Everything you put in that folder is shared with its members.',hasAccess: 'Has access',invited: 'Invited',noAccess: 'No access',