Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-27 12:36:14 +01:00
Code Issues Projects Releases Wiki Activity

Disable browser integration on Mac for non MAS version (for now)

Browse Source
This commit is contained in:
Hinton 2020-12-16 21:49:05 +01:00
parent d20aaeb0e5
commit 02a3fbde99
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -317,9 +317,18 @@ export class SettingsComponent implements OnInit {
}
async saveBrowserIntegration() {
if (process.platform ==='darwin' && !this.platformUtilsService.isMacAppStore()) {
await this.platformUtilsService.showDialog(
this.i18nService.t('browserIntegrationMasOnlyDesc'),
this.i18nService.t('browserIntegrationMasOnlyTitle'),
this.i18nService.t('ok'), null, 'warning');
this.enableBrowserIntegration = false;
return;
}
await this.storageService.save(ElectronConstants.enableBrowserIntegration, this.enableBrowserIntegration);
this.messagingService.send(
this.enableBrowserIntegration ? 'enableBrowserIntegration' : 'disableBrowserIntegration');
this.messagingService.send(this.enableBrowserIntegration ? 'enableBrowserIntegration' : 'disableBrowserIntegration');
}
private callAnalytics(name: string, enabled: boolean) {

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

@ -1447,6 +1447,12 @@
"enableBrowserIntegrationDesc": {
"message": "Browser integration is used for biometrics in browser."
},
"browserIntegrationMasOnlyTitle": {
"message": "Browser integration not supported"
},
"browserIntegrationMasOnlyDesc": {
"message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
},
"approve": {
"message": "Approve"
},

6
src/proxy/nativemessage.ts
View File

@ -83,7 +83,11 @@ export default class NativeMessage {
chunks.push(chunk);
}
processData();
try {
processData();
} catch(e) {
console.error(e);
}
});
}
}