Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Show keyboard shortcuts button in Safari browser extension (#2257)
Leendert de Borst6dcd08546d50
diff --git a/apps/browser-extension/safari-xcode/AliasVault Extension/SafariWebExtensionHandler.swift b/apps/browser-extension/safari-xcode/AliasVault Extension/SafariWebExtensionHandler.swiftindex ab89c7ff8..72655d202 100644--- a/apps/browser-extension/safari-xcode/AliasVault Extension/SafariWebExtensionHandler.swift+++ b/apps/browser-extension/safari-xcode/AliasVault Extension/SafariWebExtensionHandler.swift@@ -22,6 +22,12 @@ class SafariWebExtensionHandler: NSObject, NSExtensionRequestHandling {os_log(.default, "Received message from browser.runtime.sendNativeMessage: %@ (profile: %@)", String(describing: message), profile?.uuidString ?? "none")+ if let messageDict = message as? [String: Any],+ messageDict["action"] as? String == "openShortcutSettings" {+ openShortcutSettings(context: context)+ return+ }+let response = NSExtensionItem()if #available(iOS 15.0, macOS 11.0, *) {response.userInfo = [ SFExtensionMessageKey: [ "echo": message ] ]@@ -32,4 +38,26 @@ class SafariWebExtensionHandler: NSObject, NSExtensionRequestHandling {context.completeRequest(returningItems: [ response ], completionHandler: nil)}+ /// Open Safari Settings → Extensions for this extension, which lists its keyboard shortcuts.+ private func openShortcutSettings(context: NSExtensionContext) {+ var success = false+ #if os(macOS)+ let identifier = Bundle.main.bundleIdentifier ?? "net.aliasvault.safari.extension"+ SFSafariApplication.showPreferencesForExtension(withIdentifier: identifier) { error in+ if let error = error {+ os_log(.error, "Failed to open Safari extension preferences: %@", error.localizedDescription)+ }+ }+ success = true+ #endif++ let response = NSExtensionItem()+ if #available(iOS 15.0, macOS 11.0, *) {+ response.userInfo = [ SFExtensionMessageKey: [ "success": success ] ]+ } else {+ response.userInfo = [ "message": [ "success": success ] ]+ }+ context.completeRequest(returningItems: [ response ], completionHandler: nil)+ }+}diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsxindex 0631d8824..159f18d49 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx@@ -116,6 +116,14 @@ const Settings: React.FC = () => {}}+ if (import.meta.env.SAFARI) {+ // The native SafariWebExtensionHandler opens Safari Settings → Extensions for this extension.+ return async (): Promise<void> => {+ await browser.runtime.sendNativeMessage('application.id', { action: 'openShortcutSettings' });+ window.close();+ };+ }+return null;})();diff --git a/apps/browser-extension/wxt.config.ts b/apps/browser-extension/wxt.config.tsindex 2024b1f1b..759fa8e70 100644--- a/apps/browser-extension/wxt.config.ts+++ b/apps/browser-extension/wxt.config.ts@@ -47,6 +47,11 @@ export default defineConfig({permissions.push("offscreen");}+ // Safari: allow messaging the native app (e.g. to open Safari's extension shortcut settings)+ if (browser === 'safari') {+ permissions.push("nativeMessaging");+ }+return {name: "AliasVault",description: "AliasVault Browser AutoFill Extension. Keeping your personal information private.",