Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-06-25 10:25:36 +02:00
Code Issues Projects Releases Wiki Activity

Revert "make clipboardRead optional permission"

Browse Source 
This reverts commit a797f18b78.
This commit is contained in:
Kyle Spearrin 2019-03-06 20:28:49 -05:00
parent 9ee5d1af41
commit 16185ffa76
3 changed files with 5 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/browser/browserApi.ts
View File

@ -295,32 +295,4 @@ export class BrowserApi {
return chrome.runtime.reload();
}
}
static hasPermission(permissionName: string): Promise<boolean> {
return new Promise((resolve) => {
if (BrowserApi.isSafariApi) {
resolve(true);
} else {
chrome.permissions.contains({
permissions: [permissionName],
}, (granted: boolean) => {
resolve(granted);
});
}
});
}
static requestPermission(permissionName: string): Promise<boolean> {
return new Promise((resolve) => {
if (BrowserApi.isSafariApi) {
resolve(true);
} else {
chrome.permissions.request({
permissions: [permissionName],
}, (granted: boolean) => {
resolve(granted);
});
}
});
}
}

4
src/manifest.json
View File

@ -71,6 +71,7 @@
"contextMenus",
"storage",
"unlimitedStorage",
"clipboardRead",
"clipboardWrite",
"idle",
"http://*/*",
@ -78,9 +79,6 @@
"webRequest",
"webRequestBlocking"
],
"optional_permissions": [
"clipboardRead"
],
"content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'",
"commands": {
"autofill_login": {

24
src/popup/settings/options.component.ts
View File

@ -16,8 +16,6 @@ import { TotpService } from 'jslib/abstractions/totp.service';
import { ConstantsService } from 'jslib/services/constants.service';
import { BrowserApi } from '../../browser/browserApi';
@Component({
selector: 'app-options',
templateUrl: 'options.component.html',
@ -37,7 +35,6 @@ export class OptionsComponent implements OnInit {
themeOptions: any[];
defaultUriMatch = UriMatchType.Domain;
uriMatchOptions: any[];
clearClipboardOriginalValue: number;
clearClipboard: number;
clearClipboardOptions: any[];
@ -97,7 +94,6 @@ export class OptionsComponent implements OnInit {
this.defaultUriMatch = defaultUriMatch == null ? UriMatchType.Domain : defaultUriMatch;
this.clearClipboard = await this.storageService.get<number>(ConstantsService.clearClipboardKey);
this.clearClipboardOriginalValue = this.clearClipboard;
}
async updateAddLoginNotification() {
@ -159,22 +155,10 @@ export class OptionsComponent implements OnInit {
}
async saveClearClipboard() {
if (!this.showClearClipboard) {
return;
}
let hasClipboardPermission = await BrowserApi.hasPermission('clipboardRead');
if (!hasClipboardPermission) {
hasClipboardPermission = await BrowserApi.requestPermission('clipboardRead');
}
if (hasClipboardPermission) {
this.clearClipboardOriginalValue = this.clearClipboard;
await this.storageService.save(ConstantsService.clearClipboardKey, this.clearClipboard);
this.analytics.eventTrack.next({
action: 'Set Clear Clipboard ' + (this.clearClipboard == null ? 'Disabled' : this.clearClipboard),
});
} else {
this.clearClipboard = this.clearClipboardOriginalValue;
}
await this.storageService.save(ConstantsService.clearClipboardKey, this.clearClipboard);
this.analytics.eventTrack.next({
action: 'Set Clear Clipboard ' + (this.clearClipboard == null ? 'Disabled' : this.clearClipboard),
});
}
private callAnalytics(name: string, enabled: boolean) {