Skip to content

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

Add browser extension save URL to existing credential popup and flow (#1729)

Leendert de Borst68cdfdb3420b
diff --git a/apps/browser-extension/src/entrypoints/content.ts b/apps/browser-extension/src/entrypoints/content.ts
index fda669a78..f73bee80d 100644
--- a/apps/browser-extension/src/entrypoints/content.ts
+++ b/apps/browser-extension/src/entrypoints/content.ts
@@ -7,13 +7,13 @@ import { onMessage, sendMessage } from "webext-bridge/content-script";
import { injectIcon, popupDebounceTimeHasPassed, validateInputField } from '@/entrypoints/contentScript/Form';
import { isAutoShowPopupEnabled, openAutofillPopup, openTotpPopup, removeExistingPopup, createUpgradeRequiredPopup } from '@/entrypoints/contentScript/Popup';
-import { showSavePrompt, isSavePromptVisible, updateSavePromptLogin, getPersistedSavePromptState, restoreSavePromptFromState } from '@/entrypoints/contentScript/SavePrompt';
+import { showSavePrompt, showAddUrlPrompt, isSavePromptVisible, updateSavePromptLogin, getPersistedSavePromptState, restoreSavePromptFromState } from '@/entrypoints/contentScript/SavePrompt';
import { initializeWebAuthnInterceptor } from '@/entrypoints/contentScript/WebAuthnInterceptor';
import { FormDetector } from '@/utils/formDetector/FormDetector';
import { DetectedFieldType } from '@/utils/formDetector/types/FormFields';
import { LoginDetector } from '@/utils/loginDetector';
-import type { CapturedLogin } from '@/utils/loginDetector';
+import type { CapturedLogin, LastAutofilledCredential } from '@/utils/loginDetector';
import { BoolResponse as messageBoolResponse } from '@/utils/types/messaging/BoolResponse';
import { t } from '@/i18n/StandaloneI18n';
@@ -43,6 +43,9 @@ async function handleSaveLogin(login: CapturedLogin, serviceName: string): Promi
if (!response.success) {
console.error('[AliasVault] Failed to save login:', response.error);
}
+
+ // Clear the last autofilled state after save
+ await sendMessage('CLEAR_LAST_AUTOFILLED', {}, 'background');
} catch (error) {
console.error('[AliasVault] Error saving login:', error);
}
@@ -68,8 +71,32 @@ async function handleNeverSaveForDomain(domain: string): Promise<void> {
/**
* Handle save prompt dismissal.
*/
-function handleSavePromptDismiss(): void {
- // No action needed on dismiss
+async function handleSavePromptDismiss(): Promise<void> {
+ // Clear the last autofilled state on dismiss
+ await sendMessage('CLEAR_LAST_AUTOFILLED', {}, 'background');
+}
+
+/**
+ * Handle adding URL to an existing credential.
+ * @param itemId - The ID of the credential to add the URL to.
+ * @param url - The URL to add.
+ */
+async function handleAddUrlToCredential(itemId: string, url: string): Promise<void> {
+ try {
+ const response = await sendMessage('ADD_URL_TO_CREDENTIAL', {
+ itemId,
+ url,
+ }, 'background') as { success: boolean; error?: string };
+
+ if (!response.success) {
+ console.error('[AliasVault] Failed to add URL to credential:', response.error);
+ }
+
+ // Clear the last autofilled state after successful add
+ await sendMessage('CLEAR_LAST_AUTOFILLED', {}, 'background');
+ } catch (error) {
+ console.error('[AliasVault] Error adding URL to credential:', error);
+ }
}
/**
@@ -295,7 +322,7 @@ function initializeLoginDetector(container: HTMLElement): void {
return;
}
- // Check if the login already exists in the vault
+ // Check if the login already exists in the vault (exact URL + username match)
if (await isLoginDuplicate(login.domain, login.username)) {
return;
}
@@ -314,6 +341,31 @@ function initializeLoginDetector(container: HTMLElement): void {
// Use default
}
+ /*
+ * Check if user recently autofilled from an existing credential.
+ * If so, offer to add the current URL to that credential instead of creating a new one.
+ */
+ try {
+ const lastAutofilledResponse = await sendMessage('GET_LAST_AUTOFILLED', {
+ domain: login.domain,
+ username: login.username,
+ }, 'background') as { success: boolean; credential: LastAutofilledCredential | null };
+
+ if (lastAutofilledResponse.success && lastAutofilledResponse.credential) {
+ // User used an existing credential: offer to add URL to it
+ showAddUrlPrompt(container, {
+ login,
+ existingCredential: lastAutofilledResponse.credential,
+ onAddUrl: handleAddUrlToCredential,
+ onDismiss: handleSavePromptDismiss,
+ autoDismissMs,
+ });
+ return;
+ }
+ } catch {
+ // If check fails, fall back to normal save prompt
+ }
+
// Show save prompt to offer saving the credentials
showSavePrompt(container, {
login,
diff --git a/apps/browser-extension/src/entrypoints/contentScript/Form.ts b/apps/browser-extension/src/entrypoints/contentScript/Form.ts
index 59880e933..bee3345a8 100644
--- a/apps/browser-extension/src/entrypoints/contentScript/Form.ts
+++ b/apps/browser-extension/src/entrypoints/contentScript/Form.ts
@@ -4,9 +4,10 @@ import { openAutofillPopup } from '@/entrypoints/contentScript/Popup';
import { LOGO_MARK_SVG } from '@/utils/constants/logo';
import type { Item } from '@/utils/dist/core/models/vault';
-import { itemToCredential } from '@/utils/dist/core/models/vault';
+import { itemToCredential, FieldKey } from '@/utils/dist/core/models/vault';
import { FormDetector } from '@/utils/formDetector/FormDetector';
import { FormFiller } from '@/utils/formDetector/FormFiller';
+import type { LastAutofilledCredential } from '@/utils/loginDetector';
import { ClickValidator } from '@/utils/security/ClickValidator';
/**
@@ -114,6 +115,24 @@ export async function fillItem(item: Item, input: HTMLInputElement): Promise<voi
const credential = itemToCredential(item);
const formFiller = new FormFiller(form, triggerInputEvents);
await formFiller.fillFields(credential);
+
+ // Track this autofill for the "Add URL to existing credential" feature
+ const usernameField = item.Fields?.find(f => f.FieldKey === FieldKey.LoginUsername);
+ const emailField = item.Fields?.find(f => f.FieldKey === FieldKey.LoginEmail);
+ const usernameValue = usernameField?.Value ?? emailField?.Value;
+ const username = typeof usernameValue === 'string' ? usernameValue : '';
+
+ const lastAutofilled: LastAutofilledCredential = {
+ itemId: item.Id,
+ itemName: item.Name || '',
+ username,
+ domain: window.location.hostname,
+ timestamp: Date.now(),
+ };
+
+ sendMessage('STORE_LAST_AUTOFILLED', lastAutofilled, 'background').catch(() => {
+ // Ignore errors as background script might not be ready
+ });
}
/**
diff --git a/apps/browser-extension/src/entrypoints/contentScript/SavePrompt.ts b/apps/browser-extension/src/entrypoints/contentScript/SavePrompt.ts
index f6ba15d40..b03587bb2 100644
--- a/apps/browser-extension/src/entrypoints/contentScript/SavePrompt.ts
+++ b/apps/browser-extension/src/entrypoints/contentScript/SavePrompt.ts
@@ -6,7 +6,7 @@
import { sendMessage } from 'webext-bridge/content-script';
import { getLogoMarkSvg } from '@/utils/constants/logo';
-import type { CapturedLogin, SavePromptOptions, SavePromptPersistedState } from '@/utils/loginDetector';
+import type { CapturedLogin, SavePromptOptions, SavePromptPersistedState, AddUrlPromptOptions } from '@/utils/loginDetector';
import { t } from '@/i18n/StandaloneI18n';
@@ -404,18 +404,40 @@ export function updateSavePromptLogin(login: CapturedLogin): void {
}
/**
- * Create the HTML for the save prompt.
+ * Button configuration for the prompt template.
*/
-async function createPromptHTML(login: CapturedLogin): Promise<string> {
- const escapedUsername = escapeHtml(login.username);
- const escapedSuggestedName = escapeHtml(login.suggestedName);
- const escapedDomain = escapeHtml(login.domain);
- const maskedPassword = '•'.repeat(12); // Static 12 characters for password display
+interface IPromptButton {
+ className: string;
+ label: string;
+}
- const titleText = await t('content.savePrompt.title');
- const saveText = await t('common.save');
- const neverText = await t('content.savePrompt.neverForThisSite');
+/**
+ * Configuration for creating a prompt using the generic template.
+ */
+interface IPromptTemplateConfig {
+ title: string;
+ content: string;
+ buttons: IPromptButton[];
+}
+
+/**
+ * Create the HTML for a prompt using the generic template.
+ * @param config - The prompt configuration with title, content, and buttons.
+ * @returns The HTML string for the prompt.
+ */
+async function createPromptFromTemplate(config: IPromptTemplateConfig): Promise<string> {
const dismissText = await t('common.dismiss');
+ const dismissButton = `
+ <button class="av-save-prompt__btn av-save-prompt__btn--dismiss" aria-label="${dismissText}">
+ <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+ <path d="M18 6L6 18M6 6l12 12"/>
+ </svg>
+ </button>
+ `;
+
+ const buttonsHtml = config.buttons
+ .map(btn => `<button class="av-save-prompt__btn ${btn.className}">${btn.label}</button>`)
+ .join('\n');
return `
<div class="av-save-prompt__countdown">
@@ -425,29 +447,47 @@ async function createPromptHTML(login: CapturedLogin): Promise<string> {
<div class="av-save-prompt__icon">
${getLogoMarkSvg(24, 24)}
</div>
- <div class="av-save-prompt__title">${titleText}</div>
- <div class="av-save-prompt__fields">
- <input type="text" class="av-save-prompt__service-input" value="${escapedSuggestedName}" data-domain="${escapedDomain}" placeholder="Service name" />
- <span class="av-save-prompt__username">${escapedUsername}</span>
- <span class="av-save-prompt__password">${maskedPassword}</span>
- </div>
+ <div class="av-save-prompt__title">${config.title}</div>
+ ${config.content}
<div class="av-save-prompt__actions">
- <button class="av-save-prompt__btn av-save-prompt__btn--save">
- ${saveText}
- </button>
- <button class="av-save-prompt__btn av-save-prompt__btn--never">
- ${neverText}
- </button>
- <button class="av-save-prompt__btn av-save-prompt__btn--dismiss" aria-label="${dismissText}">
- <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
- <path d="M18 6L6 18M6 6l12 12"/>
- </svg>
- </button>
+ ${buttonsHtml}
+ ${dismissButton}
</div>
</div>
`;
}
+/**
+ * Create the HTML for the save prompt.
+ */
+async function createPromptHTML(login: CapturedLogin): Promise<string> {
+ const escapedUsername = escapeHtml(login.username);
+ const escapedSuggestedName = escapeHtml(login.suggestedName);
+ const escapedDomain = escapeHtml(login.domain);
+ const maskedPassword = '•'.repeat(12); // Static 12 characters for password display
+
+ const titleText = await t('content.savePrompt.title');
+ const saveText = await t('common.save');
+ const neverText = await t('content.savePrompt.neverForThisSite');
+
+ const content = `
+ <div class="av-save-prompt__fields">
+ <input type="text" class="av-save-prompt__service-input" value="${escapedSuggestedName}" data-domain="${escapedDomain}" placeholder="Service name" />
+ <span class="av-save-prompt__username">${escapedUsername}</span>
+ <span class="av-save-prompt__password">${maskedPassword}</span>
+ </div>
+ `;
+
+ return createPromptFromTemplate({
+ title: titleText,
+ content,
+ buttons: [
+ { className: 'av-save-prompt__btn--save', label: saveText },
+ { className: 'av-save-prompt__btn--never', label: neverText },
+ ],
+ });
+}
+
/**
* Set up event listeners for the prompt buttons.
*/
@@ -638,3 +678,132 @@ function getBaseDomain(hostname: string): string {
return parts.slice(-2).join('.');
}
+/**
+ * Create and show the "Add URL to existing credential" prompt banner.
+ * This is shown when a user logs in using an autofilled credential that doesn't have a URL match.
+ * @param container - The shadow DOM container to append the prompt to.
+ * @param options - Configuration options for the prompt.
+ */
+export async function showAddUrlPrompt(container: HTMLElement, options: AddUrlPromptOptions): Promise<void> {
+ // Remove any existing prompt first
+ removeSavePrompt();
+
+ const { login, existingCredential, onAddUrl, onDismiss, autoDismissMs = 10000 } = options;
+
+ // Store current login
+ currentLogin = login;
+
+ // Create prompt element
+ const prompt = document.createElement('div');
+ prompt.className = 'av-save-prompt';
+ prompt.innerHTML = await createAddUrlPromptHTML(login, existingCredential);
+
+ // Add to container
+ container.appendChild(prompt);
+ currentPrompt = prompt;
+
+ // Trigger slide-in animation
+ requestAnimationFrame(() => {
+ prompt.classList.add('av-save-prompt--visible');
+ });
+
+ // Set up auto-dismiss with countdown bar
+ if (autoDismissMs > 0) {
+ // Initialize countdown state
+ initialAutoDismissMs = autoDismissMs;
+ currentAutoDismissMs = autoDismissMs;
+ remainingTimeMs = autoDismissMs;
+ countdownStartTime = Date.now();
+ isAutoDismissPaused = false;
+ onAutoDismissCallback = onDismiss;
+
+ // Create and start countdown bar animation
+ countdownBar = prompt.querySelector('.av-save-prompt__countdown-bar') as HTMLElement;
+ startCountdownAnimation(autoDismissMs);
+
+ autoDismissTimer = window.setTimeout(() => {
+ removeSavePrompt();
+ onDismiss();
+ }, autoDismissMs);
+
+ // Set up hover/focus listeners to pause countdown
+ setupPauseListeners(prompt);
+ }
+
+ // Set up event listeners for add URL prompt
+ setupAddUrlEventListeners(prompt, login, existingCredential, onAddUrl, onDismiss);
+}
+
+/**
+ * Create the HTML for the "Add URL" prompt.
+ */
+async function createAddUrlPromptHTML(login: CapturedLogin, existingCredential: { itemName: string }): Promise<string> {
+ const escapedCredentialName = escapeHtml(existingCredential.itemName);
+
+ // Show origin (protocol + hostname) for clarity
+ const urlObj = new URL(login.url);
+ const escapedUrl = escapeHtml(urlObj.origin);
+
+ // Use favicon from login if available
+ const faviconHtml = login.faviconUrl
+ ? `<img class="av-save-prompt__credential-favicon" src="${escapeHtml(login.faviconUrl)}" alt="" width="14" height="14" />`
+ : '';
+
+ const addUrlTitleText = await t('content.savePrompt.addUrlTitle');
+ const addUrlText = await t('common.confirm');
+
+ const content = `
+ <div class="av-save-prompt__add-url-info">
+ <span class="av-save-prompt__url-pill">
+ <svg class="av-save-prompt__plus-icon" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5">
+ <path d="M12 5v14M5 12h14"/>
+ </svg>
+ ${escapedUrl}
+ </span>
+ <span class="av-save-prompt__url-arrow">→</span>
+ <span class="av-save-prompt__credential-pill">${faviconHtml}${escapedCredentialName}</span>
+ </div>
+ `;
+
+ return createPromptFromTemplate({
+ title: addUrlTitleText,
+ content,
+ buttons: [
+ { className: 'av-save-prompt__btn--add-url', label: addUrlText },
+ ],
+ });
+}
+
+/**
+ * Set up event listeners for the "Add URL" prompt buttons.
+ */
+function setupAddUrlEventListeners(
+ prompt: HTMLElement,
+ login: CapturedLogin,
+ existingCredential: { itemId: string; itemName: string },
+ onAddUrl: (itemId: string, url: string) => void,
+ onDismiss: () => void
+): void {
+ const addUrlBtn = prompt.querySelector('.av-save-prompt__btn--add-url');
+ const dismissBtn = prompt.querySelector('.av-save-prompt__btn--dismiss');
+
+ addUrlBtn?.addEventListener('click', () => {
+ const loginToUse = currentLogin || login;
+ removeSavePrompt();
+ onAddUrl(existingCredential.itemId, loginToUse.url);
+ });
+
+ dismissBtn?.addEventListener('click', () => {
+ removeSavePrompt();
+ onDismiss();
+ });
+
+ // Handle Escape key anywhere in the prompt
+ prompt.addEventListener('keydown', (e: KeyboardEvent) => {
+ if (e.key === 'Escape') {
+ removeSavePrompt();
+ onDismiss();
+ }
+ });
+}
+
diff --git a/apps/browser-extension/src/entrypoints/contentScript/style.css b/apps/browser-extension/src/entrypoints/contentScript/style.css
index 4f4720950..8e1a98e3a 100644
--- a/apps/browser-extension/src/entrypoints/contentScript/style.css
+++ b/apps/browser-extension/src/entrypoints/contentScript/style.css
@@ -1450,4 +1450,72 @@ body {
height: 100%;
width: 100%;
background: #d68338;
+}
+
+/* Add URL Prompt Specific Styles */
+.av-save-prompt__add-url-info {
+ display: flex;
+ align-items: center;
+ gap: 10px;
+ flex: 1;
+ min-width: 0;
+}
+
+.av-save-prompt__url-pill {
+ display: inline-flex;
+ align-items: center;
+ gap: 6px;
+ padding: 4px 10px;
+ background: #065f46;
+ border: 1px solid #059669;
+ border-radius: 16px;
+ color: #6ee7b7;
+ font-size: 13px;
+ font-weight: 500;
+ max-width: 200px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.av-save-prompt__plus-icon {
+ flex-shrink: 0;
+ color: #6ee7b7;
+}
+
+.av-save-prompt__url-arrow {
+ color: #6b7280;
+ font-size: 16px;
+ flex-shrink: 0;
+}
+
+.av-save-prompt__credential-pill {
+ display: inline-flex;
+ align-items: center;
+ gap: 6px;
+ padding: 4px 10px;
+ background: #374151;
+ border: 1px solid #4b5563;
+ border-radius: 16px;
+ color: #f3f4f6;
+ font-size: 13px;
+ font-weight: 500;
+ max-width: 250px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.av-save-prompt__credential-favicon {
+ flex-shrink: 0;
+ border-radius: 2px;
+}
+
+.av-save-prompt__btn--add-url {
+ background: #059669;
+ color: white;
+}
+
+.av-save-prompt__btn--add-url:hover {
+ background: #047857;
}
\ No newline at end of file
diff --git a/apps/browser-extension/src/i18n/locales/en.json b/apps/browser-extension/src/i18n/locales/en.json
index d5b9715b9..1300ad80d 100644
--- a/apps/browser-extension/src/i18n/locales/en.json
+++ b/apps/browser-extension/src/i18n/locales/en.json
@@ -172,7 +172,9 @@
"close": "Close",
"savePrompt": {
"title": "Save to AliasVault?",
- "neverForThisSite": "Never for this site"
+ "neverForThisSite": "Never for this site",
+ "addUrlTitle": "Add URL to credential?",
+ "addUrl": "Add URL"
}
},
"items": {
diff --git a/apps/browser-extension/src/utils/loginDetector/index.ts b/apps/browser-extension/src/utils/loginDetector/index.ts
index c2b4eca3c..3d541d684 100644
--- a/apps/browser-extension/src/utils/loginDetector/index.ts
+++ b/apps/browser-extension/src/utils/loginDetector/index.ts
@@ -9,8 +9,10 @@ export type {
LoginSubmissionEvent,
SavePromptConfig,
SavePromptOptions,
+ AddUrlPromptOptions,
SitePreference,
LoginSaveSettings,
LoginCaptureCallback,
SavePromptPersistedState,
+ LastAutofilledCredential,
} from './types';
diff --git a/apps/browser-extension/src/utils/loginDetector/types.ts b/apps/browser-extension/src/utils/loginDetector/types.ts
index 59381fa4f..bb48ea289 100644
--- a/apps/browser-extension/src/utils/loginDetector/types.ts
+++ b/apps/browser-extension/src/utils/loginDetector/types.ts
@@ -67,6 +67,22 @@ export type SavePromptOptions = {
autoDismissMs?: number;
};
+/**
+ * Options for showing the "Add URL to existing credential" prompt.
+ */
+export type AddUrlPromptOptions = {
+ /** The captured login credentials */
+ login: CapturedLogin;
+ /** The existing credential that was autofilled */
+ existingCredential: LastAutofilledCredential;
+ /** Callback when user clicks "Add URL" */
+ onAddUrl: (itemId: string, url: string) => void;
+ /** Callback when prompt is dismissed */
+ onDismiss: () => void;
+ /** Auto-dismiss timeout in milliseconds (default: 15000) */
+ autoDismissMs?: number;
+};
+
/**
* Site preferences for login saving.
*/
@@ -110,3 +126,21 @@ export type SavePromptPersistedState = {
/** The domain where the prompt was shown (to validate on restore) */
domain: string;
};
+
+/**
+ * Tracks the last credential that was autofilled in a tab.
+ * Used to offer "Add URL to existing credential" when the user logs in
+ * with a credential that was manually selected (no URL match).
+ */
+export type LastAutofilledCredential = {
+ /** The ID of the item that was autofilled */
+ itemId: string;
+ /** The name of the item (for display in the prompt) */
+ itemName: string;
+ /** The username that was filled */
+ username: string;
+ /** The domain where the autofill occurred */
+ domain: string;
+ /** Timestamp when the autofill happened */
+ timestamp: number;
+};