Skip to content

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

Refactor helper utils and move to core/client for reuse between clients (#2413)

Leendert de Borst0944896a434d
diff --git a/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts b/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts
index c804b0edd..850610d6e 100644
--- a/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts
+++ b/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts
@@ -8,7 +8,7 @@ import { MasterPasswordService } from '@aliasvault/client/auth/MasterPasswordSer
import { VaultKeyService } from '@aliasvault/client/auth/VaultKeyService';
import { EncryptionUtility } from '@aliasvault/client/crypto/EncryptionUtility';
import { decryptVaultBlob, encryptVaultBlob } from '@aliasvault/client/crypto/VaultBlob';
-import { manifestForItemIn, scopedKey, type ItemRef } from '@aliasvault/client/database/ItemRef';
+import { isSameItem, manifestForItemIn, scopedKey, type ItemRef } from '@aliasvault/client/database/ItemRef';
import { SqliteClient } from '@aliasvault/client/database/SqliteClient';
import { FaviconService } from '@aliasvault/client/items/FaviconService';
import { generateTotpCode } from '@aliasvault/client/items/TotpUtility';
@@ -30,7 +30,6 @@ import { handleClearTwoFactorState } from '@/entrypoints/background/TwoFactorSta
import { AUTH_STORAGE_KEYS, dirtyScopeStorageKey, SESSION_STORAGE_KEYS, StorageKeys, vaultDataStorageKeys, VAULT_LOCK_STORAGE_KEYS } from '@/utils/constants/storageKeys';
import { devLog } from '@/utils/devLogger/DevLogger';
import { logExpected, logFailure } from '@/utils/Diagnostics';
-import { isSameItem } from '@/utils/ItemRoute';
import { LocalPreferencesService } from '@/utils/LocalPreferencesService';
import { sendMessage, type TotpSecret } from '@/utils/messaging/ExtensionMessaging';
import { RecentlySelectedItemService } from '@/utils/RecentlySelectedItemService';
diff --git a/apps/browser-extension/src/entrypoints/contentScript/Popup.ts b/apps/browser-extension/src/entrypoints/contentScript/Popup.ts
index bba485ea3..e0c5cd423 100644
--- a/apps/browser-extension/src/entrypoints/contentScript/Popup.ts
+++ b/apps/browser-extension/src/entrypoints/contentScript/Popup.ts
@@ -1,4 +1,4 @@
-import { scopedKey } from '@aliasvault/client/database/ItemRef';
+import { isSameItem, scopedKey } from '@aliasvault/client/database/ItemRef';
import { SqliteClient } from '@aliasvault/client/database/SqliteClient';
import { generateTotpCode, getTotpRemainingSeconds } from '@aliasvault/client/items/TotpUtility';
import { ItemTypeIconSvgs } from '@aliasvault/models/icons';
@@ -6,7 +6,6 @@ import { FieldKey, getFieldValue, normalizeTotpPeriod } from '@aliasvault/models
import { fillItem, fillTotpCode } from '@/entrypoints/contentScript/Form';
-import { isSameItem } from '@/utils/ItemRoute';
import { LocalPreferencesService } from '@/utils/LocalPreferencesService';
import { sendMessage, type TotpSecret } from '@/utils/messaging/ExtensionMessaging';
import { ClickValidator } from '@/utils/security/ClickValidator';
diff --git a/apps/browser-extension/src/entrypoints/popup/components/EmailPreview.tsx b/apps/browser-extension/src/entrypoints/popup/components/EmailPreview.tsx
index b172a23c7..1b35b2839 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/EmailPreview.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/EmailPreview.tsx
@@ -1,4 +1,5 @@
import { EncryptionUtility } from '@aliasvault/client/crypto/EncryptionUtility';
+import { SpamOkClient } from '@aliasvault/client/email/SpamOkClient';
import { AppInfo } from '@aliasvault/client/platform/AppInfo';
import { mailboxPollDelayMs } from '@aliasvault/client/utilities/PollBackoff';
import React, { useState, useEffect, useRef } from 'react';
@@ -16,6 +17,9 @@ import type { ApiErrorResponse, MailboxEmail } from '@aliasvault/models/webapi';
import { storage } from '#imports';
+/** Client for the SpamOK mailboxes of the public email domains. */
+const spamOk = new SpamOkClient('av-chrome', AppInfo.VERSION);
+
type EmailPreviewProps = {
email: string;
}
@@ -120,12 +124,7 @@ export const EmailPreview: React.FC<EmailPreviewProps> = ({ email }) => {
if (isPublic) {
// For public domains (SpamOK), use the SpamOK API directly
const emailPrefix = email.split('@')[0];
- const response = await fetch(`https://api.spamok.com/v2/EmailBox/${emailPrefix}`, {
- headers: {
- 'X-Asdasd-Platform-Id': 'av-chrome',
- 'X-Asdasd-Platform-Version': AppInfo.VERSION,
- }
- });
+ const response = await spamOk.request('GET', `EmailBox/${emailPrefix}`);
if (!response.ok) {
markPollFailed(`The mailbox request returned HTTP ${response.status}`);
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Layout/ServerSyncIndicator.tsx b/apps/browser-extension/src/entrypoints/popup/components/Layout/ServerSyncIndicator.tsx
index ad1ae02eb..8e5ceb859 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Layout/ServerSyncIndicator.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Layout/ServerSyncIndicator.tsx
@@ -1,3 +1,4 @@
+import { syncErrorMessage } from '@aliasvault/client/sync/SyncErrorMessage';
import React, { useState, useEffect, useRef, useCallback } from 'react';
import { useTranslation } from 'react-i18next';
@@ -6,7 +7,6 @@ import { useDb } from '@/entrypoints/popup/context/DbContext';
import { logFailure } from '@/utils/Diagnostics';
import { sendMessage } from '@/utils/messaging/ExtensionMessaging';
-import { syncErrorMessage } from '@/utils/SyncError';
/**
* Minimum time (ms) an in-flight indicator stays visible once it has appeared.
diff --git a/apps/browser-extension/src/entrypoints/popup/context/DbContext.tsx b/apps/browser-extension/src/entrypoints/popup/context/DbContext.tsx
index 09360779d..f9d2d5274 100644
--- a/apps/browser-extension/src/entrypoints/popup/context/DbContext.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/context/DbContext.tsx
@@ -1,6 +1,7 @@
import { AppErrorCode, formatErrorWithCode } from '@aliasvault/client/api/errors/AppErrorCodes';
import EncryptionUtility from '@aliasvault/client/crypto/EncryptionUtility';
import SqliteClient from '@aliasvault/client/database/SqliteClient';
+import { syncErrorMessage, toSyncErrorDetail } from '@aliasvault/client/sync/SyncErrorMessage';
import { hasUnsyncedUserChanges as hasUnsyncedUserChangesInStorage } from '@aliasvault/client/sync/VaultDirtyState';
import { vaultRequiresManifestMigration } from '@aliasvault/client/sync/VaultManifestMigration';
import React, { createContext, useContext, useState, useEffect, useCallback, useMemo, useRef } from 'react';
@@ -9,7 +10,6 @@ import { useTranslation } from 'react-i18next';
import { StorageKeys } from '@/utils/constants/storageKeys';
import { logFailure } from '@/utils/Diagnostics';
import { onMessage, sendMessage } from '@/utils/messaging/ExtensionMessaging';
-import { syncErrorMessage, toSyncErrorDetail } from '@/utils/SyncError';
import { markOwnUnlockKey, vaultStateEvents } from '@/events/VaultStateEvents';
import { t } from '@/i18n/StandaloneI18n';
diff --git a/apps/browser-extension/src/entrypoints/popup/hooks/useVaultSync.ts b/apps/browser-extension/src/entrypoints/popup/hooks/useVaultSync.ts
index 3b16a895b..1c95eb182 100644
--- a/apps/browser-extension/src/entrypoints/popup/hooks/useVaultSync.ts
+++ b/apps/browser-extension/src/entrypoints/popup/hooks/useVaultSync.ts
@@ -1,3 +1,4 @@
+import { syncErrorMessage } from '@aliasvault/client/sync/SyncErrorMessage';
import { useCallback } from 'react';
import { useTranslation } from 'react-i18next';
@@ -6,7 +7,6 @@ import { useDb } from '@/entrypoints/popup/context/DbContext';
import { logFailure } from '@/utils/Diagnostics';
import { sendMessage } from '@/utils/messaging/ExtensionMessaging';
-import { syncErrorMessage } from '@/utils/SyncError';
type VaultSyncOptions = {
onSuccess?: (hasNewVault: boolean) => void;
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/auth/Login.tsx b/apps/browser-extension/src/entrypoints/popup/pages/auth/Login.tsx
index cb7864963..baeccc1d6 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/auth/Login.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/auth/Login.tsx
@@ -7,6 +7,7 @@ import { SrpAuthService } from '@aliasvault/client/auth/SrpAuthService';
import { SrpLoginService } from '@aliasvault/client/auth/SrpLoginService';
import { VaultKeyService } from '@aliasvault/client/auth/VaultKeyService';
import { AppInfo } from '@aliasvault/client/platform/AppInfo';
+import { syncErrorMessage } from '@aliasvault/client/sync/SyncErrorMessage';
import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
@@ -27,7 +28,6 @@ import { PopoutUtility } from '@/entrypoints/popup/utils/PopoutUtility';
import { StorageKeys } from '@/utils/constants/storageKeys';
import { logFailure } from '@/utils/Diagnostics';
import { sendMessage } from '@/utils/messaging/ExtensionMessaging';
-import { syncErrorMessage } from '@/utils/SyncError';
import type { MobileLoginResult } from '@/utils/types/messaging/MobileLoginResult';
import { vaultStateEvents } from '@/events/VaultStateEvents';
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/auth/Upgrade.tsx b/apps/browser-extension/src/entrypoints/popup/pages/auth/Upgrade.tsx
index aee9bd9f2..b8f140759 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/auth/Upgrade.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/auth/Upgrade.tsx
@@ -1,4 +1,5 @@
import { AppInfo } from '@aliasvault/client/platform/AppInfo';
+import { syncErrorMessage } from '@aliasvault/client/sync/SyncErrorMessage';
import { VaultMigrationKind } from '@aliasvault/client/sync/VaultManifestMigration';
import { VaultSqlGenerator } from '@aliasvault/vault';
import React, { useState, useEffect, useCallback, useRef } from 'react';
@@ -23,7 +24,6 @@ import { PopoutUtility } from '@/entrypoints/popup/utils/PopoutUtility';
import { logFailure } from '@/utils/Diagnostics';
import { sendMessage } from '@/utils/messaging/ExtensionMessaging';
-import { syncErrorMessage } from '@/utils/SyncError';
import type { VaultVersion } from '@aliasvault/vault';
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailDetails.tsx b/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailDetails.tsx
index 837c3bc5d..2f949bb99 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailDetails.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailDetails.tsx
@@ -1,5 +1,6 @@
import EncryptionUtility, { type DecryptedEmail } from '@aliasvault/client/crypto/EncryptionUtility';
-import { decodeEmailSource, extractEmailAttachment, type ParsedEmailAttachment } from '@aliasvault/client/rust/RustCore';
+import { getEmailAttachmentBytes } from '@aliasvault/client/email/EmailAttachments';
+import { decodeEmailSource, type ParsedEmailAttachment } from '@aliasvault/client/rust/RustCore';
import React, { useEffect, useMemo, useRef, useState, useCallback } from 'react';
import { useTranslation } from 'react-i18next';
import { Link, useParams, useNavigate, useSearchParams } from 'react-router-dom';
@@ -226,20 +227,13 @@ const EmailDetails: React.FC = (): React.ReactElement => {
return;
}
- let detachedBody: Uint8Array | undefined;
- if (attachment.detached && attachment.partIndex !== null) {
- if (!dbContext?.sqliteClient || !email) {
- setError('Database context or email not available');
- return;
- }
-
- const encryptedPart = await webApi.downloadBlob(`Email/${id}/parts/${attachment.partIndex}`);
- const encryptionKeys = dbContext.sqliteClient.encryptionKeys.getAll();
-
- detachedBody = await EncryptionUtility.decryptAttachment(encryptedPart, email, encryptionKeys);
+ if (!dbContext?.sqliteClient || !email) {
+ setError('Database context or email not available');
+ return;
}
- const bytes = await extractEmailAttachment(sourceBytes, index, detachedBody);
+ const encryptionKeys = dbContext.sqliteClient.encryptionKeys.getAll();
+ const bytes = await getEmailAttachmentBytes(webApi, email, encryptionKeys, sourceBytes, index, attachment.detached ? attachment.partIndex : null);
triggerAttachmentDownload(bytes, attachment.mimeType, attachment.filename);
} catch (err) {
logFailure('[Email] Downloading the attachment failed', err);
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 ee8efdfe3..4248bce35 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx
@@ -1,4 +1,4 @@
-import { scopedKey } from '@aliasvault/client/database/ItemRef';
+import { isSameItem, scopedKey } from '@aliasvault/client/database/ItemRef';
import { canHaveSubfolders, getDescendantFolderIds, getFolderPath, getRecursiveItemCount, isItemInFolder, isSharedFolder } from '@aliasvault/client/items/FolderUtils';
import { applySearchFilter, applyTypeFilter, isItemTypeFilter, parseItemFilterType, type ItemFilterType } from '@aliasvault/client/items/ItemFilters';
import { multiManifestRendering } from '@aliasvault/client/sharing/MultiManifestRendering';
@@ -31,7 +31,7 @@ import { PopoutUtility } from '@/entrypoints/popup/utils/PopoutUtility';
import { devLog } from '@/utils/devLogger/DevLogger';
import { logFailure } from '@/utils/Diagnostics';
-import { isSameItem, itemRoute } from '@/utils/ItemRoute';
+import { itemRoute } from '@/utils/ItemRoute';
import { LocalPreferencesService } from '@/utils/LocalPreferencesService';
import { useMinDurationLoading } from '@/hooks/useMinDurationLoading';
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsx b/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsx
index 8216672fe..eaee5c121 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsx
@@ -1,4 +1,4 @@
-import { scopedKey } from '@aliasvault/client/database/ItemRef';
+import { isSameItem, scopedKey } from '@aliasvault/client/database/ItemRef';
import { manifestForItemIn, type ItemRef } from '@aliasvault/client/database/ItemRef';
import { extractDomain, filterItems, AutofillMatchingMode } from '@aliasvault/client/rust/RustCore';
import { FieldKey, ItemTypes, getFieldValue, createSystemField } from '@aliasvault/models/vault';
@@ -18,7 +18,6 @@ import { useVaultLockRedirect } from '@/entrypoints/popup/hooks/useVaultLockRedi
import { useVaultMutate } from '@/entrypoints/popup/hooks/useVaultMutate';
import { logFailure } from '@/utils/Diagnostics';
-import { isSameItem } from '@/utils/ItemRoute';
import { LocalPreferencesService } from '@/utils/LocalPreferencesService';
import { sendMessage } from '@/utils/messaging/ExtensionMessaging';
import { PasskeyAuthenticator } from '@/utils/passkey/PasskeyAuthenticator';
diff --git a/apps/browser-extension/src/utils/ItemRoute.ts b/apps/browser-extension/src/utils/ItemRoute.ts
index 6778feedd..84434a502 100644
--- a/apps/browser-extension/src/utils/ItemRoute.ts
+++ b/apps/browser-extension/src/utils/ItemRoute.ts
@@ -9,13 +9,3 @@ import type { ItemRef } from '@aliasvault/client/database/ItemRef';
export function itemRoute(item: ItemRef, edit: boolean = false): string {
return `/items/${encodeURIComponent(item.ManifestId)}/${encodeURIComponent(item.Id)}${edit ? '/edit' : ''}`;
}
-
-/**
- * Whether two references name the same item: same id inside the same manifest.
- * @param a - One item
- * @param b - The other item
- * @returns True when both halves match
- */
-export function isSameItem(a: ItemRef, b: ItemRef): boolean {
- return a.Id === b.Id && a.ManifestId === b.ManifestId;
-}
diff --git a/apps/mobile-app/app/(tabs)/emails/[id].tsx b/apps/mobile-app/app/(tabs)/emails/[id].tsx
index 560b54cbd..9e332065c 100644
--- a/apps/mobile-app/app/(tabs)/emails/[id].tsx
+++ b/apps/mobile-app/app/(tabs)/emails/[id].tsx
@@ -1,6 +1,7 @@
import { Buffer } from 'buffer';
-import { decodeEmailSource, extractEmailAttachment, type ParsedEmailAttachment } from '@aliasvault/client/rust/RustCore';
+import { getEmailAttachmentBytes } from '@aliasvault/client/email/EmailAttachments';
+import { decodeEmailSource, type ParsedEmailAttachment } from '@aliasvault/client/rust/RustCore';
import { Ionicons } from '@expo/vector-icons';
import { Paths } from 'expo-file-system';
import { useLocalSearchParams, useRouter, useNavigation, Stack } from 'expo-router';
@@ -185,14 +186,8 @@ export default function EmailDetailsScreen() : React.ReactNode {
return;
}
- let detachedBody: Uint8Array | undefined;
- if (attachment.detached && attachment.partIndex !== null) {
- const encryptedPart = await webApi.downloadBlob(`Email/${id}/parts/${attachment.partIndex}`);
- const encryptionKeys = await dbContext.sqliteClient.encryptionKeys.getAll();
- detachedBody = await EncryptionUtility.decryptAttachment(encryptedPart, email, encryptionKeys);
- }
-
- const decryptedBytes = await extractEmailAttachment(sourceBytes, index, detachedBody);
+ const encryptionKeys = await dbContext.sqliteClient.encryptionKeys.getAll();
+ const decryptedBytes = await getEmailAttachmentBytes(webApi, email, encryptionKeys, sourceBytes, index, attachment.detached ? attachment.partIndex : null);
const tempFile = getFileForFilename(Paths.cache, attachment.filename);
if (tempFile.exists) {
diff --git a/apps/mobile-app/components/items/details/EmailPreview.tsx b/apps/mobile-app/components/items/details/EmailPreview.tsx
index 1640c8f60..efbcb1784 100644
--- a/apps/mobile-app/components/items/details/EmailPreview.tsx
+++ b/apps/mobile-app/components/items/details/EmailPreview.tsx
@@ -4,6 +4,7 @@ import React, { useState, useEffect, useCallback, useRef } from 'react';
import { useTranslation } from 'react-i18next';
import { View, StyleSheet, TouchableOpacity, Linking, AppState } from 'react-native';
+import { SpamOkClient } from '@aliasvault/client/email/SpamOkClient';
import { AppInfo } from '@aliasvault/client/platform/AppInfo';
import { logExpected } from '@aliasvault/client/utilities/Diagnostics';
import { mailboxPollDelayMs } from '@aliasvault/client/utilities/PollBackoff';
@@ -18,6 +19,9 @@ import { ThemedView } from '@/components/themed/ThemedView';
import { useDb } from '@/context/DbContext';
import { useWebApi } from '@/context/WebApiContext';
+/** Client for the SpamOK mailboxes of the public email domains. */
+const spamOk = new SpamOkClient('av-mobile', AppInfo.VERSION);
+
type EmailPreviewProps = {
email: string | undefined;
};
@@ -157,12 +161,7 @@ export const EmailPreview: React.FC<EmailPreviewProps> = ({ email }) : React.Rea
if (isPublic) {
// For public domains (SpamOK), use the SpamOK API directly
const emailPrefix = email.split('@')[0];
- const response = await fetch(`https://api.spamok.com/v2/EmailBox/${emailPrefix}`, {
- headers: {
- 'X-Asdasd-Platform-Id': 'av-mobile',
- 'X-Asdasd-Platform-Version': AppInfo.VERSION,
- }
- });
+ const response = await spamOk.request('GET', `EmailBox/${emailPrefix}`);
if (!response.ok) {
markPollFailed(`The mailbox request returned HTTP ${response.status}`);
diff --git a/apps/web/src/components/email/EmailModal.tsx b/apps/web/src/components/email/EmailModal.tsx
index 1c4ffb752..4fed7a3ae 100644
--- a/apps/web/src/components/email/EmailModal.tsx
+++ b/apps/web/src/components/email/EmailModal.tsx
@@ -9,7 +9,7 @@ import { useDb } from '@/context/DbContext';
import { useNotifications } from '@/context/NotificationContext';
import { useWebApi } from '@/context/WebApiContext';
import { useEmailBody } from '@/hooks/useEmailBody';
-import { type EmailAttachmentViewModel, type EmailViewModel, getAttachmentBytes, spamOkRequest } from '@/utils/EmailViewModel';
+import { type EmailAttachmentViewModel, type EmailViewModel, getAttachmentBytes, spamOk } from '@/utils/EmailViewModel';
import { downloadBytes } from '@/utils/FileDownload';
import { itemRoute } from '@/utils/ItemRoute';
@@ -98,7 +98,7 @@ const EmailModal: React.FC<EmailModalProps> = ({ email, onClose, onEmailDeleted,
try {
if (email.isSpamOk) {
- const response = await spamOkRequest('DELETE', `Email/${email.toLocal}/${email.id}`);
+ const response = await spamOk.request('DELETE', `Email/${email.toLocal}/${email.id}`);
if (!response.ok) {
notifications.addErrorMessage(`${t('components.main.email.emailModal.EmailDeleteFailed')}: ${await response.text()}`, true);
return;
diff --git a/apps/web/src/components/email/EmailPreview.tsx b/apps/web/src/components/email/EmailPreview.tsx
index 07a58cb8c..cdff16c7a 100644
--- a/apps/web/src/components/email/EmailPreview.tsx
+++ b/apps/web/src/components/email/EmailPreview.tsx
@@ -6,7 +6,7 @@ import { useDb } from '@/context/DbContext';
import { useNotifications } from '@/context/NotificationContext';
import { useWebApi } from '@/context/WebApiContext';
import { useEmailBody } from '@/hooks/useEmailBody';
-import { type EmailAttachmentViewModel, type EmailViewModel, getAttachmentBytes, spamOkRequest } from '@/utils/EmailViewModel';
+import { type EmailAttachmentViewModel, type EmailViewModel, getAttachmentBytes, spamOk } from '@/utils/EmailViewModel';
import { downloadBytes } from '@/utils/FileDownload';
import type { ItemRef } from '@aliasvault/client/database/ItemRef';
@@ -43,7 +43,7 @@ const EmailPreview: React.FC<EmailPreviewProps> = ({ email, onEmailDeleted, item
try {
if (email.isSpamOk) {
- const response = await spamOkRequest('DELETE', `Email/${email.toLocal}/${email.id}`);
+ const response = await spamOk.request('DELETE', `Email/${email.toLocal}/${email.id}`);
if (!response.ok) {
notifications.addErrorMessage(`${t('components.main.email.emailPreview.EmailDeleteFailed')}: ${await response.text()}`, true);
return;
diff --git a/apps/web/src/components/email/RecentEmails.tsx b/apps/web/src/components/email/RecentEmails.tsx
index dd3377057..1d33c7bdc 100644
--- a/apps/web/src/components/email/RecentEmails.tsx
+++ b/apps/web/src/components/email/RecentEmails.tsx
@@ -10,7 +10,7 @@ import { useDb } from '@/context/DbContext';
import { useWebApi } from '@/context/WebApiContext';
import { useEmailDomains } from '@/hooks/useEmailDomains';
import { useMinDurationLoading } from '@/hooks/useMinDurationLoading';
-import { type EmailViewModel, loadAliasVaultEmail, loadSpamOkEmail, loadSpamOkMailbox } from '@/utils/EmailViewModel';
+import { type EmailViewModel, loadAliasVaultEmail, loadSpamOkEmail, spamOk } from '@/utils/EmailViewModel';
import type { MailboxBulkResponse, MailboxEmail } from '@aliasvault/models/webapi';
@@ -65,7 +65,7 @@ const RecentEmails: React.FC<RecentEmailsProps> = ({ emailAddress }) => {
}
try {
if (isSpamOk) {
- const mails = await loadSpamOkMailbox(emailPrefix);
+ const mails = await spamOk.getMailbox(emailPrefix);
if (mails) {
setMailboxEmails(mails);
}
diff --git a/apps/web/src/components/forms/EditPasswordFormRow.tsx b/apps/web/src/components/forms/EditPasswordFormRow.tsx
index aab4cdcde..8de6ba086 100644
--- a/apps/web/src/components/forms/EditPasswordFormRow.tsx
+++ b/apps/web/src/components/forms/EditPasswordFormRow.tsx
@@ -1,11 +1,11 @@
import { generatePassword } from '@aliasvault/client/rust/RustCore';
+import { lengthToSlider, SLIDER_MAX, SLIDER_MIN, sliderToLength } from '@aliasvault/client/utilities/PasswordLengthSlider';
import { MAX_WORD_COUNT, MIN_WORD_COUNT } from '@aliasvault/models/defaults';
import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import PasswordSettingsPopup from '@/components/settings/PasswordSettingsPopup';
import { useDb } from '@/context/DbContext';
-import { lengthToSlider, SLIDER_MAX, SLIDER_MIN, sliderToLength } from '@/utils/PasswordLengthSlider';
import type { PasswordSettings } from '@aliasvault/models/vault';
diff --git a/apps/web/src/components/settings/PasswordSettingsPopup.tsx b/apps/web/src/components/settings/PasswordSettingsPopup.tsx
index 3014f9cd9..45f65724d 100644
--- a/apps/web/src/components/settings/PasswordSettingsPopup.tsx
+++ b/apps/web/src/components/settings/PasswordSettingsPopup.tsx
@@ -1,3 +1,4 @@
+import { lengthToSlider, SLIDER_MAX, SLIDER_MIN, sliderToLength } from '@aliasvault/client/utilities/PasswordLengthSlider';
import { getLanguageInfo, MAX_WORD_COUNT, MIN_WORD_COUNT, resolveDefaultLanguage } from '@aliasvault/models/defaults';
import React, { useEffect, useMemo, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
@@ -9,7 +10,6 @@ import { useNotifications } from '@/context/NotificationContext';
import { useClickOutside } from '@/hooks/useClickOutside';
import { usePasswordConfig } from '@/hooks/usePasswordConfig';
import { useVaultMutate } from '@/hooks/useVaultMutate';
-import { lengthToSlider, SLIDER_MAX, SLIDER_MIN, sliderToLength } from '@/utils/PasswordLengthSlider';
import type { PasswordSettings } from '@aliasvault/models/vault';
diff --git a/core/client/src/database/ItemRef.ts b/core/client/src/database/ItemRef.ts
index a54d448cb..976dce4fc 100644
--- a/core/client/src/database/ItemRef.ts
+++ b/core/client/src/database/ItemRef.ts
@@ -10,6 +10,16 @@ export type ItemRef = {
ManifestId: string;
};
+/**
+ * Whether two references name the same item: same id inside the same manifest.
+ * @param a - One item
+ * @param b - The other item
+ * @returns True when both halves match
+ */
+export function isSameItem(a: ItemRef, b: ItemRef): boolean {
+ return a.Id === b.Id && a.ManifestId === b.ManifestId;
+}
+
/**
* The grouping key for a manifest-scoped row: its manifest and its id, separated by a pipe symbol.
* @param manifestId - The owning manifest's id
diff --git a/core/client/src/email/EmailAttachments.ts b/core/client/src/email/EmailAttachments.ts
new file mode 100644
index 000000000..bb5c60c25
--- /dev/null
+++ b/core/client/src/email/EmailAttachments.ts
@@ -0,0 +1,25 @@
+import EncryptionUtility from '../crypto/EncryptionUtility';
+import { extractEmailAttachment } from '../rust/RustCore';
+
+import type { WebApiService } from '../api/WebApiService';
+import type { EncryptionKey } from '@aliasvault/models/vault';
+import type { Email } from '@aliasvault/models/webapi';
+
+/**
+ * The bytes of an attachment of a decrypted AliasVault email.
+ * @param webApi - the WebAPI service, to fetch a detached body
+ * @param email - the email as the API returned it
+ * @param encryptionKeys - the vault's encryption keys, to decrypt a detached body
+ * @param sourceBytes - the decrypted source of the email
+ * @param index - the attachment's index in the parsed source
+ * @param partIndex - the index of the detached part on the server, or null when the body is in the source
+ * @returns The attachment bytes
+ */
+export async function getEmailAttachmentBytes(webApi: Pick<WebApiService, 'downloadBlob'>, email: Email, encryptionKeys: EncryptionKey[], sourceBytes: Uint8Array, index: number, partIndex: number | null): Promise<Uint8Array> {
+ let detachedBody: Uint8Array | undefined;
+ if (partIndex !== null) {
+ const encryptedPart = await webApi.downloadBlob(`Email/${email.id}/parts/${partIndex}`);
+ detachedBody = await EncryptionUtility.decryptAttachment(encryptedPart, email, encryptionKeys);
+ }
+ return extractEmailAttachment(sourceBytes, index, detachedBody);
+}
diff --git a/core/client/src/email/SpamOkClient.ts b/core/client/src/email/SpamOkClient.ts
new file mode 100644
index 000000000..7c247e3a9
--- /dev/null
+++ b/core/client/src/email/SpamOkClient.ts
@@ -0,0 +1,73 @@
+import type { MailboxEmail } from '@aliasvault/models/webapi';
+
+/**
+ * A SpamOK email as its API returns it.
+ */
+export type SpamOkEmail = {
+ id: number;
+ subject: string;
+ fromDisplay: string;
+ fromLocal: string;
+ fromDomain: string;
+ toLocal: string;
+ toDomain: string;
+ dateSystem: string;
+ messageHtml: string | null;
+ messagePlain: string | null;
+ messageSource: string | null;
+ attachments: { id: number; filename: string; mimeType: string; filesize: number }[];
+};
+
+/**
+ * Client for the public SpamOK API, which serves the mailboxes of the public email domains.
+ */
+export class SpamOkClient {
+ /**
+ * Create a client that identifies itself as the given platform.
+ * @param platformId - the platform id SpamOK expects, e.g. 'av-web'
+ * @param platformVersion - the app version
+ */
+ public constructor(private readonly platformId: string, private readonly platformVersion: string) {}
+
+ /**
+ * Send a request to the SpamOK API.
+ * @param method - the HTTP method
+ * @param path - the path below the API root, e.g. `EmailBox/{prefix}`
+ */
+ public request(method: 'GET' | 'DELETE', path: string): Promise<Response> {
+ return fetch(`https://api.spamok.com/v2/${path}`, { method, headers: { 'X-Asdasd-Platform-Id': this.platformId, 'X-Asdasd-Platform-Version': this.platformVersion } });
+ }
+
+ /**
+ * The mails in a mailbox, or null when the request failed.
+ * @param emailPrefix - the local part of the address
+ */
+ public async getMailbox(emailPrefix: string): Promise<MailboxEmail[] | null> {
+ const response = await this.request('GET', `EmailBox/${emailPrefix}`);
+ if (!response.ok) {
+ return null;
+ }
+ const mailbox = await response.json() as { mails?: MailboxEmail[] };
+ return mailbox.mails ?? [];
+ }
+
+ /**
+ * One email, or null when the request failed.
+ * @param emailPrefix - the local part of the address
+ * @param emailId - the email id
+ */
+ public async getEmail(emailPrefix: string, emailId: number): Promise<SpamOkEmail | null> {
+ const response = await this.request('GET', `Email/${emailPrefix}/${emailId}`);
+ return response.ok ? await response.json() as SpamOkEmail : null;
+ }
+
+ /**
+ * The bytes of an attachment, or null when the request failed.
+ * @param emailId - the email id
+ * @param attachmentId - the attachment id
+ */
+ public async getAttachment(emailId: number, attachmentId: number): Promise<Uint8Array | null> {
+ const response = await this.request('GET', `Attachment/${emailId}/${attachmentId}/download`);
+ return response.ok ? new Uint8Array(await response.arrayBuffer()) : null;
+ }
+}
diff --git a/apps/browser-extension/src/utils/SyncError.ts b/core/client/src/sync/SyncErrorMessage.ts
similarity index 78%
rename from apps/browser-extension/src/utils/SyncError.ts
rename to core/client/src/sync/SyncErrorMessage.ts
index 5cd5ccfa2..080a08fd8 100644
--- a/apps/browser-extension/src/utils/SyncError.ts
+++ b/core/client/src/sync/SyncErrorMessage.ts
@@ -1,7 +1,6 @@
-import { AppErrorCode, formatErrorWithCode, getErrorTranslationKey, isErrorCode } from '@aliasvault/client/api/errors/AppErrorCodes';
-import { hasSyncError, type SyncErrorDetail } from '@aliasvault/client/sync/VaultSync';
+import { AppErrorCode, formatErrorWithCode, getErrorTranslationKey, isErrorCode } from '../api/errors/AppErrorCodes';
-import type { TFunction } from 'i18next';
+import { hasSyncError, type SyncErrorDetail } from './VaultSync';
/**
* The stored sync error, tolerating the plain string an older build left behind.
@@ -23,7 +22,7 @@ export function toSyncErrorDetail(value: unknown): SyncErrorDetail | null {
* @param detail - the sync outcome
* @param t - the renderer's translation function
*/
-export function syncErrorMessage(detail: SyncErrorDetail, t: TFunction): string | undefined {
+export function syncErrorMessage(detail: SyncErrorDetail, t: (key: string) => string): string | undefined {
if (detail.errorKey) {
return t('common.errors.' + detail.errorKey);
}