Upstream/bitwarden-desktop
1
0
Fork 0
mirror of https://github.com/bitwarden/desktop.git synced 2024-11-28 12:35:40 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #678 from bitwarden/hotfix/mas-entitlements

Browse Source 
Add entitlements to mac, disable browser integration on Windows Store
This commit is contained in:
Oscar Hinton 2021-01-25 16:20:14 +01:00 committed by GitHub
commit 15583748fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/entitlements.mas.plist
View File

@ -8,5 +8,10 @@
<true/> <true/>
<key>com.apple.security.files.user-selected.read-write</key> <key>com.apple.security.files.user-selected.read-write</key>
<true/> <true/>
<key>com.apple.security.temporary-exception.files.home-relative-path.read-write</key>
<array>
<string>/Library/Application Support/Mozilla/NativeMessagingHosts/</string>
<string>/Library/Application Support/Google/Chrome/NativeMessagingHosts/</string>
</array>
</dict> </dict>
</plist> </plist>

9
src/app/accounts/settings.component.ts
View File

@ -23,6 +23,7 @@ import { ConstantsService } from 'jslib/services/constants.service';
import { ElectronConstants } from 'jslib/electron/electronConstants'; import { ElectronConstants } from 'jslib/electron/electronConstants';
import { Utils } from 'jslib/misc/utils'; import { Utils } from 'jslib/misc/utils';
import { isWindowsStore } from 'jslib/electron/utils';
@Component({ @Component({
selector: 'app-settings', selector: 'app-settings',
@ -356,6 +357,14 @@ export class SettingsComponent implements OnInit {
this.i18nService.t('browserIntegrationMasOnlyTitle'), this.i18nService.t('browserIntegrationMasOnlyTitle'),
this.i18nService.t('ok'), null, 'warning'); this.i18nService.t('ok'), null, 'warning');
this.enableBrowserIntegration = false;
return;
} else if (isWindowsStore()) {
await this.platformUtilsService.showDialog(
this.i18nService.t('browserIntegrationWindowsStoreDesc'),
this.i18nService.t('browserIntegrationWindowsStoreTitle'),
this.i18nService.t('ok'), null, 'warning');
this.enableBrowserIntegration = false; this.enableBrowserIntegration = false;
return; return;
} }

6
src/locales/en/messages.json
View File

@ -1462,6 +1462,12 @@
"browserIntegrationMasOnlyDesc": { "browserIntegrationMasOnlyDesc": {
"message": "Unfortunately browser integration is only supported in the Mac App Store version for now." "message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
}, },
"browserIntegrationWindowsStoreTitle": {
"message": "Browser integration not supported"
},
"browserIntegrationWindowsStoreDesc": {
"message": "Unfortunately browser integration is currently not supported in the Windows Store version."
},
"enableBrowserIntegrationFingerprint": { "enableBrowserIntegrationFingerprint": {
"message": "Require verification for browser integration" "message": "Require verification for browser integration"
}, },