diff --git a/apps/desktop/resources/entitlements.mas.inherit.plist b/apps/desktop/resources/entitlements.mas.inherit.plist index 3634c84f81a..380c2fbbcc9 100644 --- a/apps/desktop/resources/entitlements.mas.inherit.plist +++ b/apps/desktop/resources/entitlements.mas.inherit.plist @@ -1,16 +1,18 @@ - - com.apple.security.app-sandbox - - com.apple.security.inherit - - com.apple.security.cs.allow-unsigned-executable-memory - - com.apple.security.cs.disable-library-validation - - com.apple.developer.authentication-services.autofill-credential-provider - - - + + com.apple.security.app-sandbox + + com.apple.security.inherit + + com.apple.security.cs.allow-unsigned-executable-memory + + com.apple.security.cs.disable-library-validation + + + + \ No newline at end of file diff --git a/apps/desktop/resources/entitlements.mas.plist b/apps/desktop/resources/entitlements.mas.plist index 9ab2d3824a8..7afaf15b9a9 100644 --- a/apps/desktop/resources/entitlements.mas.plist +++ b/apps/desktop/resources/entitlements.mas.plist @@ -1,36 +1,38 @@ - - com.apple.application-identifier - LTZ2PFU5D6.com.bitwarden.desktop - com.apple.developer.team-identifier - LTZ2PFU5D6 - com.apple.security.app-sandbox - - com.apple.security.application-groups - + + com.apple.application-identifier LTZ2PFU5D6.com.bitwarden.desktop - - com.apple.security.network.client - - com.apple.security.files.user-selected.read-write - - com.apple.developer.authentication-services.autofill-credential-provider - - com.apple.security.temporary-exception.files.home-relative-path.read-write - - /Library/Application Support/Mozilla/NativeMessagingHosts/ - /Library/Application Support/Google/Chrome/NativeMessagingHosts/ - /Library/Application Support/Google/Chrome Beta/NativeMessagingHosts/ - /Library/Application Support/Google/Chrome Dev/NativeMessagingHosts/ - /Library/Application Support/Google/Chrome Canary/NativeMessagingHosts/ - /Library/Application Support/Chromium/NativeMessagingHosts/ - /Library/Application Support/Microsoft Edge/NativeMessagingHosts/ - /Library/Application Support/Microsoft Edge Beta/NativeMessagingHosts/ - /Library/Application Support/Microsoft Edge Dev/NativeMessagingHosts/ - /Library/Application Support/Microsoft Edge Canary/NativeMessagingHosts/ - /Library/Application Support/Vivaldi/NativeMessagingHosts/ - - - + com.apple.developer.team-identifier + LTZ2PFU5D6 + com.apple.security.app-sandbox + + com.apple.security.application-groups + + LTZ2PFU5D6.com.bitwarden.desktop + + com.apple.security.network.client + + com.apple.security.files.user-selected.read-write + + + com.apple.security.temporary-exception.files.home-relative-path.read-write + + /Library/Application Support/Mozilla/NativeMessagingHosts/ + /Library/Application Support/Google/Chrome/NativeMessagingHosts/ + /Library/Application Support/Google/Chrome Beta/NativeMessagingHosts/ + /Library/Application Support/Google/Chrome Dev/NativeMessagingHosts/ + /Library/Application Support/Google/Chrome Canary/NativeMessagingHosts/ + /Library/Application Support/Chromium/NativeMessagingHosts/ + /Library/Application Support/Microsoft Edge/NativeMessagingHosts/ + /Library/Application Support/Microsoft Edge Beta/NativeMessagingHosts/ + /Library/Application Support/Microsoft Edge Dev/NativeMessagingHosts/ + /Library/Application Support/Microsoft Edge Canary/NativeMessagingHosts/ + /Library/Application Support/Vivaldi/NativeMessagingHosts/ + + + \ No newline at end of file diff --git a/apps/desktop/src/autofill/services/desktop-autofill.service.ts b/apps/desktop/src/autofill/services/desktop-autofill.service.ts index 48f4d3b95e4..f4a6a390723 100644 --- a/apps/desktop/src/autofill/services/desktop-autofill.service.ts +++ b/apps/desktop/src/autofill/services/desktop-autofill.service.ts @@ -8,6 +8,7 @@ import { mergeMap, switchMap, takeUntil, + EMPTY, } from "rxjs"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; @@ -57,9 +58,9 @@ export class DesktopAutofillService implements OnDestroy { .pipe( distinctUntilChanged(), switchMap((enabled) => { - /*if (!enabled) { + if (!enabled) { return EMPTY; - }*/ + } return this.cipherService.cipherViews$; }), diff --git a/enable-passkeys.patch b/enable-passkeys.patch deleted file mode 100644 index 4fec564f8ee..00000000000 --- a/enable-passkeys.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff --git a/apps/desktop/resources/entitlements.mas.inherit.plist b/apps/desktop/resources/entitlements.mas.inherit.plist -index 7e957fce7c..e9a28f8f32 100644 ---- a/apps/desktop/resources/entitlements.mas.inherit.plist -+++ b/apps/desktop/resources/entitlements.mas.inherit.plist -@@ -8,9 +8,7 @@ - - com.apple.security.cs.allow-jit - -- - - -diff --git a/apps/desktop/resources/entitlements.mas.plist b/apps/desktop/resources/entitlements.mas.plist -index 0450111beb..5bb95f76af 100644 ---- a/apps/desktop/resources/entitlements.mas.plist -+++ b/apps/desktop/resources/entitlements.mas.plist -@@ -16,10 +16,8 @@ - - com.apple.security.files.user-selected.read-write - -- - com.apple.security.temporary-exception.files.home-relative-path.read-write - - /Library/Application Support/Mozilla/NativeMessagingHosts/ -diff --git a/apps/desktop/src/autofill/services/desktop-autofill.service.ts b/apps/desktop/src/autofill/services/desktop-autofill.service.ts -index 1ce58596b3..86f7ef0a43 100644 ---- a/apps/desktop/src/autofill/services/desktop-autofill.service.ts -+++ b/apps/desktop/src/autofill/services/desktop-autofill.service.ts -@@ -1,14 +1,13 @@ - import { Injectable, OnDestroy } from "@angular/core"; - import { autofill } from "desktop_native/napi"; - import { -- EMPTY, - Subject, - distinctUntilChanged, - firstValueFrom, - map, - mergeMap, - switchMap, -- takeUntil, -+ takeUntil - } from "rxjs"; - - import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; -@@ -56,9 +55,9 @@ export class DesktopAutofillService implements OnDestroy { - .pipe( - distinctUntilChanged(), - switchMap((enabled) => { -- if (!enabled) { -+ /*if (!enabled) { - return EMPTY; -- } -+ }*/ - - return this.cipherService.cipherViews$; - }), -diff --git a/apps/desktop/src/utils.ts b/apps/desktop/src/utils.ts -index c798faac36..d203998ed4 100644 ---- a/apps/desktop/src/utils.ts -+++ b/apps/desktop/src/utils.ts -@@ -20,11 +20,7 @@ export function invokeMenu(menu: RendererMenuItem[]) { - } - - export function isDev() { -- // ref: https://github.com/sindresorhus/electron-is-dev -- if ("ELECTRON_IS_DEV" in process.env) { -- return parseInt(process.env.ELECTRON_IS_DEV, 10) === 1; -- } -- return process.defaultApp || /node_modules[\\/]electron[\\/]/.test(process.execPath); -+ return true; - } - - export function isLinux() {