Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Refactor shared manifest render as folder logic to make it pure client-side (#2159)

Leendert de Borst9cea46277db9
diff --git a/apps/browser-extension/src/entrypoints/background.ts b/apps/browser-extension/src/entrypoints/background.ts
index 266df0cf6..787c4e549 100644
--- a/apps/browser-extension/src/entrypoints/background.ts
+++ b/apps/browser-extension/src/entrypoints/background.ts
@@ -11,7 +11,7 @@ import { handleGetWebAuthnSettings, handleWebAuthnCreate, handleWebAuthnGet, han
import { handleOpenPopup, handlePopupWithItem, handleOpenPopupCreateCredential, handleToggleContextMenu } from '@/entrypoints/background/PopupMessageHandler';
import { handleStoreSavePromptState, handleGetSavePromptState, handleClearSavePromptState, handleStoreLastAutofilled, handleGetLastAutofilled, handleClearLastAutofilled } from '@/entrypoints/background/SavePromptStateHandler';
import { handleStoreTwoFactorState, handleGetTwoFactorState, handleClearTwoFactorState } from '@/entrypoints/background/TwoFactorStateHandler';
-import { handleCheckAuthStatus, handleClearPersistedFormValues, handleClearSession, handleClearVaultData, handleLockVault, handleGetFilteredItems, handleGetSearchItems, handleGetDefaultEmailDomain, handleGetDefaultIdentitySettings, handleGetEncryptionKey, handleGetUnlockKeyDerivationParams, handleGetPasswordSettings, handleGeneratePassword, handleGetPersistedFormValues, handleGetVault, handleGetVaultMigrationStatus, handlePersistFormValues, handleStoreUnlockKey, handleStoreUnlockKeyDerivationParams, handleGetEncryptedVault, handleStoreEncryptedVault, handleGetSyncState, handleMarkVaultClean, handleMigrateVaultManifest, handleFullVaultSync, handleGroupCreateVault, handleGroupInviteMember, handleGroupRevokeAccess, handleCheckLoginDuplicate, handleSaveLoginCredential, handleAddUrlToCredential, handleIsUrlLinkedToCredential, handleGetLoginSaveSettings, handleSetLoginSaveEnabled, handleGetItemsWithTotp, handleSearchItemsWithTotp, handleGetTotpSecrets, handleGenerateTotpCode, handleSetRecentlySelected, handleGetRecentlySelected, handleRecordItemUsage } from '@/entrypoints/background/VaultMessageHandler';
+import { handleCheckAuthStatus, handleClearPersistedFormValues, handleClearSession, handleClearVaultData, handleLockVault, handleGetFilteredItems, handleGetSearchItems, handleGetDefaultEmailDomain, handleGetDefaultIdentitySettings, handleGetEncryptionKey, handleGetUnlockKeyDerivationParams, handleGetPasswordSettings, handleGeneratePassword, handleGetPersistedFormValues, handleGetVault, handleGetVaultMigrationStatus, handlePersistFormValues, handleStoreUnlockKey, handleStoreUnlockKeyDerivationParams, handleGetEncryptedVault, handleStoreEncryptedVault, handleGetSyncState, handleMarkVaultClean, handleMigrateVaultManifest, handleFullVaultSync, handleGroupCreateVault, handleGroupInviteMember, handleGroupUpdateVault, handleGroupRevokeAccess, handleCheckLoginDuplicate, handleSaveLoginCredential, handleAddUrlToCredential, handleIsUrlLinkedToCredential, handleGetLoginSaveSettings, handleSetLoginSaveEnabled, handleGetItemsWithTotp, handleSearchItemsWithTotp, handleGetTotpSecrets, handleGenerateTotpCode, handleSetRecentlySelected, handleGetRecentlySelected, handleRecordItemUsage } from '@/entrypoints/background/VaultMessageHandler';
import { LocalPreferencesService } from '@/utils/LocalPreferencesService';
import { onMessage, sendMessage } from "@/utils/messaging/ExtensionMessaging";
@@ -274,6 +274,7 @@ export default defineBackground({
onMessage('GET_VAULT_MIGRATION_STATUS', () => handleGetVaultMigrationStatus());
onMessage('MIGRATE_VAULT_MANIFEST', () => handleMigrateVaultManifest());
onMessage('GROUP_CREATE_VAULT', ({ data, sender }) => isTrustedExtensionSender(sender) ? handleGroupCreateVault(data) : { success: false });
+ onMessage('GROUP_UPDATE_VAULT', ({ data, sender }) => isTrustedExtensionSender(sender) ? handleGroupUpdateVault(data) : { success: false });
onMessage('GROUP_INVITE_MEMBER', ({ data, sender }) => isTrustedExtensionSender(sender) ? handleGroupInviteMember(data) : { success: false });
onMessage('GROUP_REVOKE_ACCESS', ({ data, sender }) => isTrustedExtensionSender(sender) ? handleGroupRevokeAccess(data) : { success: false });
onMessage('LOCK_VAULT', () => handleLockVault());
diff --git a/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts b/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts
index a11f65b5e..f94563788 100644
--- a/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts
+++ b/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts
@@ -16,7 +16,7 @@ import { SharingService } from '@aliasvault/client/sharing/SharingService';
import { clearDirtyScopes, getDirtyScopes } from '@aliasvault/client/sync/VaultDirtyState';
import { vaultRequiresManifestMigration, VaultMigrationKind } from '@aliasvault/client/sync/VaultManifestMigration';
import { type VaultMutationScope, DEFAULT_VAULT_MUTATION_SCOPE, hasUserVisibleScope } from '@aliasvault/client/sync/VaultMutationScope';
-import { hasSyncError, syncResult, VaultSync, type FullVaultSyncResult, type SharingOperationResult, 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';
import { base64ToBytes, bytesToBase64 } from '@aliasvault/client/utilities/Base64';
@@ -1549,6 +1549,16 @@ export async function handleGroupCreateVault(message: { groupId: string; name: s
return sharingActionResponse(result, 'sharing.family.errors.createVaultFailed');
}
+/**
+ * Change the details of one of a family's shared manifests. The server only accepts it from an administrator of the
+ * family.
+ *
+ * @param message - the family, the manifest, and the details to change.
+ */
+export async function handleGroupUpdateVault(message: { groupId: string; manifestId: string; details: SharedManifestDetails }): Promise<SharingActionResponse> {
+ return sharingActionResponse(await vaultSync.updateSharedManifest(message.groupId, message.manifestId, message.details), 'common.errors.unknownErrorTryAgain');
+}
+
/**
* Invite a member of a family to one of its shared manifests, handing them the manifest's key encrypted to their
* account keypair. The sync engine does the work, so every client invites the same way.
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Folders/DeleteFolderModal.tsx b/apps/browser-extension/src/entrypoints/popup/components/Folders/DeleteFolderModal.tsx
index b1a1c96cd..425ff57b5 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Folders/DeleteFolderModal.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Folders/DeleteFolderModal.tsx
@@ -9,7 +9,7 @@ type DeleteFolderModalProps = {
onDeleteFolderOnly: () => Promise<void>;
onDeleteFolderAndContents: () => Promise<void>;
itemCount: number;
- sharedVault?: boolean;
+ virtualFolder?: boolean;
};
/**
@@ -21,7 +21,7 @@ const DeleteFolderModal: React.FC<DeleteFolderModalProps> = ({
onDeleteFolderOnly,
onDeleteFolderAndContents,
itemCount,
- sharedVault = false
+ virtualFolder = false
}) => {
const { t } = useTranslation();
const [isSubmitting, setIsSubmitting] = useState(false);
@@ -84,15 +84,15 @@ const DeleteFolderModal: React.FC<DeleteFolderModalProps> = ({
}
>
<div className="space-y-4">
- {/* A shared manifest: no delete options, only the hint */}
- {sharedVault && (
+ {/* A virtual folder (today: a shared manifest): no delete options, only the hint */}
+ {virtualFolder && (
<p className="pt-2 text-sm text-gray-600 dark:text-gray-400">
{t('items.deleteSharedFolderHint')}
</p>
)}
{/* Option buttons */}
- {!sharedVault && (
+ {!virtualFolder && (
<div className="space-y-3 pt-2">
{/* Delete folder only - move items to root */}
<button
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx
index 4f2e57401..c3834ebeb 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx
@@ -178,8 +178,8 @@ const ItemsList: React.FC = () => {
return dbContext.sqliteClient.folders.getById(currentFolderRef);
}, [currentFolderRef, dbContext?.sqliteClient, folderRefreshKey]);
- // Whether it is the folder a shared manifest is rendered as: left or revoked in Family Sharing, never deleted here
- const currentFolderIsSharedVaultRoot = currentFolder !== null && multiManifestRendering.isManifestRoot(currentFolder);
+ // A virtual folder (today: a shared manifest) is drawn by this client, so it is not editable or deletable here
+ const currentFolderIsVirtual = currentFolder !== null && multiManifestRendering.isVirtualFolder(currentFolder);
// Get current folder's full path (for relative path computation in search results)
const currentFolderPath = useMemo(() => {
@@ -827,8 +827,8 @@ const ItemsList: React.FC = () => {
}}
onSelectRecentlyDeleted={() => navigate('/items/deleted')}
/>
- {/* Edit and Delete buttons when inside a folder */}
- {currentFolderId && (
+ {/* Edit and Delete buttons, only for a folder the vault actually stores */}
+ {currentFolderId && !currentFolderIsVirtual && (
<div className="flex items-center gap-1 shrink-0">
<button
onClick={() => setShowEditFolderModal(true)}
@@ -1177,7 +1177,7 @@ const ItemsList: React.FC = () => {
onDeleteFolderOnly={handleDeleteFolderOnly}
onDeleteFolderAndContents={handleDeleteFolderAndContents}
itemCount={totalItemCountInFolderTree}
- sharedVault={currentFolderIsSharedVaultRoot}
+ virtualFolder={currentFolderIsVirtual}
/>
</div>
);
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/FamilySharingSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/FamilySharingSettings.tsx
index 158fd5b57..72e2392a7 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/FamilySharingSettings.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/FamilySharingSettings.tsx
@@ -9,6 +9,7 @@ import { useTranslation } from 'react-i18next';
import AlertMessage from '@/entrypoints/popup/components/AlertMessage';
import ConfirmDeleteModal from '@/entrypoints/popup/components/Dialogs/ConfirmDeleteModal';
import ConfirmPasswordModal from '@/entrypoints/popup/components/Dialogs/ConfirmPasswordModal';
+import FolderModal from '@/entrypoints/popup/components/Folders/FolderModal';
import { HeaderIcon, HeaderIconType } from '@/entrypoints/popup/components/Icons/HeaderIcons';
import PageTitle from '@/entrypoints/popup/components/PageTitle';
import { useApp } from '@/entrypoints/popup/context/AppContext';
@@ -57,6 +58,7 @@ const FamilySharingSettings: React.FC = () => {
const [pendingVaultDelete, setPendingVaultDelete] = useState<PendingVaultDelete | null>(null);
const [expandedRosters, setExpandedRosters] = useState<Record<string, boolean>>({});
const [openVaultMenuId, setOpenVaultMenuId] = useState<string | null>(null);
+ const [pendingVaultRename, setPendingVaultRename] = useState<{ group: GroupInfo; manifest: SharedManifestInfo } | null>(null);
const [invitationNames, setInvitationNames] = useState<Record<string, string>>({});
const loadOverview = useCallback(async (): Promise<void> => {
@@ -64,9 +66,7 @@ const FamilySharingSettings: React.FC = () => {
const loaded = await SharingService.getOverview(webApi);
setOverview(loaded);
setInvitationNames(sqliteClient ? await SharingService.openInvitationNames(sqliteClient, loaded.receivedInvitations) : {});
- const records = await SharingService.getSharedManifestRecords();
- const names = Object.fromEntries(Object.values(records).filter(record => record.name).map(record => [record.manifestId.toLowerCase(), record.name as string]));
- setVaultNames({ ...names, ...(sqliteClient ? multiManifestRendering.displayNames(sqliteClient) : {}) });
+ setVaultNames(sqliteClient ? multiManifestRendering.displayNames(sqliteClient) : {});
setError(null);
} catch {
setError(t('sharing.family.errors.loadFailed'));
@@ -157,6 +157,19 @@ const FamilySharingSettings: React.FC = () => {
}, t('sharing.family.errors.createVaultFailed'));
};
+ /**
+ * Rename a shared manifest, which only an administrator of the family may do.
+ * @param name - the new name.
+ */
+ const renameSharedVault = async (name: string): Promise<void> => {
+ if (!pendingVaultRename) {
+ return;
+ }
+
+ unwrap(await sendMessage('GROUP_UPDATE_VAULT', { groupId: pendingVaultRename.group.groupId, manifestId: pendingVaultRename.manifest.manifestId, details: { name } }));
+ await loadStoredDatabase();
+ };
+
/**
* Invite one member to one shared manifest.
* @param group - the family the vault belongs to.
@@ -282,6 +295,14 @@ const FamilySharingSettings: React.FC = () => {
warning={dialog.warning}
/>
+ <FolderModal
+ isOpen={pendingVaultRename !== null}
+ onClose={() => setPendingVaultRename(null)}
+ onSave={renameSharedVault}
+ initialName={pendingVaultRename ? vaultLabel(pendingVaultRename.manifest) : ''}
+ mode="edit"
+ />
+
<ConfirmDeleteModal
isOpen={pendingVaultDelete?.stage === 'confirm'}
onClose={() => setPendingVaultDelete(null)}
@@ -414,6 +435,18 @@ const FamilySharingSettings: React.FC = () => {
<>
<div className="fixed inset-0 z-10" onClick={() => setOpenVaultMenuId(null)} />
<div className="absolute right-0 top-full mt-1 w-44 py-1 bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-lg shadow-xl z-20">
+ {/* Renaming encrypts the name with the vault's key, so it takes a member who holds it. */}
+ {iHoldKey && (
+ <button
+ onClick={() => {
+ setOpenVaultMenuId(null);
+ setPendingVaultRename({ group, manifest });
+ }}
+ className="w-full px-3 py-2 text-left text-sm text-gray-700 dark:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-700"
+ >
+ {t('items.editFolder')}
+ </button>
+ )}
<button
onClick={() => {
setOpenVaultMenuId(null);
diff --git a/apps/browser-extension/src/platform/ExtensionPlatform.ts b/apps/browser-extension/src/platform/ExtensionPlatform.ts
index 34cfebd77..0f08c855e 100644
--- a/apps/browser-extension/src/platform/ExtensionPlatform.ts
+++ b/apps/browser-extension/src/platform/ExtensionPlatform.ts
@@ -44,7 +44,6 @@ function detectClientName(): 'chrome' | 'firefox' | 'edge' | 'safari' | 'browser
* TODO: refactor this to use centralized translation system instead (on to-do list) once that is implemented.
*/
const TRANSLATION_KEYS: Record<TranslatableMessage, string> = {
- [TranslatableMessage.UnnamedSharedVault]: 'sharing.family.unnamedVault',
[TranslatableMessage.ClientOutdated]: 'common.errors.browserExtensionOutdated',
[TranslatableMessage.SharedFolderDeleteRefused]: 'items.deleteSharedFolderHint',
[TranslatableMessage.VaultUpgradeRequired]: 'content.vaultUpgradeRequired',
diff --git a/apps/browser-extension/src/utils/messaging/ExtensionMessaging.ts b/apps/browser-extension/src/utils/messaging/ExtensionMessaging.ts
index ea4a2ec2a..aa3c431c7 100644
--- a/apps/browser-extension/src/utils/messaging/ExtensionMessaging.ts
+++ b/apps/browser-extension/src/utils/messaging/ExtensionMessaging.ts
@@ -37,7 +37,7 @@ import type { ItemUsageAction } from '@aliasvault/client/database';
import type { ItemRef } from '@aliasvault/client/database/ItemRef';
import type { VaultMigrationKind } from '@aliasvault/client/sync/VaultManifestMigration';
import type { VaultMutationScope } from '@aliasvault/client/sync/VaultMutationScope';
-import type { FullVaultSyncResult, VaultManifestMigrationResult } from '@aliasvault/client/sync/VaultSync';
+import type { FullVaultSyncResult, SharedManifestDetails, VaultManifestMigrationResult } from '@aliasvault/client/sync/VaultSync';
import type { UnlockKeyDerivationParams } from '@aliasvault/models/metadata';
import type { PasswordSettings } from '@aliasvault/models/vault';
import type { LoginResponse } from '@aliasvault/models/webapi';
@@ -94,6 +94,7 @@ export interface IExtensionMessageProtocol {
GET_VAULT_MIGRATION_STATUS(): VaultMigrationKind;
GET_WEBAUTHN_SETTINGS(data: any): WebAuthnSettingsResponse;
GROUP_CREATE_VAULT(data: { groupId: string; name: string }): { success: boolean; error?: string; apiErrorCode?: string };
+ GROUP_UPDATE_VAULT(data: { groupId: string; manifestId: string; details: SharedManifestDetails }): { success: boolean; error?: string; apiErrorCode?: string };
GROUP_INVITE_MEMBER(data: { groupId: string; manifestId: string; userId: string }): { success: boolean; error?: string; apiErrorCode?: string };
GROUP_REVOKE_ACCESS(data: { groupId: string; manifestId: string; userId: string }): { success: boolean; error?: string; apiErrorCode?: string };
IS_URL_LINKED_TO_CREDENTIAL(data: { itemId: string; manifestId: string; url: string }): { linked: boolean };