mirror of
https://github.com/bitwarden/browser.git
synced 2024-12-22 16:29:09 +01:00
Remove biometric from firefox
This commit is contained in:
parent
a971fc3960
commit
ab759a4746
12
gulpfile.js
12
gulpfile.js
@ -65,6 +65,7 @@ function dist(browserName, manifest) {
|
||||
function distFirefox() {
|
||||
return dist('firefox', (manifest) => {
|
||||
delete manifest.content_security_policy;
|
||||
delete manifest.optional_permissions;
|
||||
removeShortcuts(manifest);
|
||||
return manifest;
|
||||
});
|
||||
@ -75,7 +76,6 @@ function distOpera() {
|
||||
delete manifest.applications;
|
||||
delete manifest.content_security_policy;
|
||||
removeShortcuts(manifest);
|
||||
moveNativeMessagingToOptional(manifest);
|
||||
return manifest;
|
||||
});
|
||||
}
|
||||
@ -86,7 +86,6 @@ function distChrome() {
|
||||
delete manifest.content_security_policy;
|
||||
delete manifest.sidebar_action;
|
||||
delete manifest.commands._execute_sidebar_action;
|
||||
moveNativeMessagingToOptional(manifest);
|
||||
return manifest;
|
||||
});
|
||||
}
|
||||
@ -97,7 +96,6 @@ function distEdge() {
|
||||
delete manifest.content_security_policy;
|
||||
delete manifest.sidebar_action;
|
||||
delete manifest.commands._execute_sidebar_action;
|
||||
moveNativeMessagingToOptional(manifest);
|
||||
return manifest;
|
||||
});
|
||||
}
|
||||
@ -111,14 +109,6 @@ function removeShortcuts(manifest) {
|
||||
}
|
||||
}
|
||||
|
||||
function moveNativeMessagingToOptional(manifest) {
|
||||
const index = manifest.permissions.indexOf("nativeMessaging");
|
||||
index > -1 ? manifest.permissions.splice(index, 1) : false
|
||||
manifest.optional_permissions = [
|
||||
"nativeMessaging"
|
||||
];
|
||||
}
|
||||
|
||||
function distSafariMas(cb) {
|
||||
return distSafariApp(cb, 'mas');
|
||||
}
|
||||
|
@ -89,7 +89,9 @@
|
||||
"http://*/*",
|
||||
"https://*/*",
|
||||
"webRequest",
|
||||
"webRequestBlocking",
|
||||
"webRequestBlocking"
|
||||
],
|
||||
"optional_permissions": [
|
||||
"nativeMessaging"
|
||||
],
|
||||
"content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'",
|
||||
|
@ -42,7 +42,7 @@
|
||||
<label for="pin">{{'unlockWithPin' | i18n}}</label>
|
||||
<input id="pin" type="checkbox" (change)="updatePin()" [(ngModel)]="pin">
|
||||
</div>
|
||||
<div class="box-content-row box-content-row-checkbox" appBoxRow>
|
||||
<div class="box-content-row box-content-row-checkbox" appBoxRow *ngIf="supportsBiometric">
|
||||
<label for="biometric">{{'unlockWithBiometrics' | i18n}}</label>
|
||||
<input id="biometric" type="checkbox" (change)="updateBiometric()" [(ngModel)]="biometric">
|
||||
</div>
|
||||
|
@ -52,6 +52,7 @@ export class SettingsComponent implements OnInit {
|
||||
vaultTimeoutActions: any[];
|
||||
vaultTimeoutAction: string;
|
||||
pin: boolean = null;
|
||||
supportsBiometric: boolean;
|
||||
biometric: boolean = false;
|
||||
previousVaultTimeout: number = null;
|
||||
|
||||
@ -102,6 +103,8 @@ export class SettingsComponent implements OnInit {
|
||||
|
||||
const pinSet = await this.vaultTimeoutService.isPinLockSet();
|
||||
this.pin = pinSet[0] || pinSet[1];
|
||||
|
||||
this.supportsBiometric = await this.platformUtilsService.supportsBiometric();
|
||||
this.biometric = await this.vaultTimeoutService.isBiometricLockSet();
|
||||
}
|
||||
|
||||
@ -208,7 +211,7 @@ export class SettingsComponent implements OnInit {
|
||||
}
|
||||
|
||||
async updateBiometric() {
|
||||
if (this.biometric) {
|
||||
if (this.biometric && this.supportsBiometric) {
|
||||
|
||||
// Request permission to use the optional permission for nativeMessaging
|
||||
if (!this.platformUtilsService.isFirefox()) {
|
||||
|
@ -290,7 +290,7 @@ export default class BrowserPlatformUtilsService implements PlatformUtilsService
|
||||
}
|
||||
|
||||
supportsBiometric() {
|
||||
return Promise.resolve(true);
|
||||
return Promise.resolve(!this.isFirefox() && !this.isSafari());
|
||||
}
|
||||
|
||||
authenticateBiometric() {
|
||||
|
Loading…
Reference in New Issue
Block a user