From ee43b685481c5eb765c9b9294b0f304aa821abf4 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 14 Apr 2020 15:41:31 -0400 Subject: [PATCH 1/6] update lunr types (#1206) --- jslib | 2 +- package-lock.json | 6 +++--- package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jslib b/jslib index 72e3893f8e..8438cafbd0 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 72e3893f8eee79f1e3678839aa194f1096c343ea +Subproject commit 8438cafbd08c1c9b1440e0c5385e15e8fb5ac524 diff --git a/package-lock.json b/package-lock.json index 6f4968c8f7..4a9318a64e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -904,9 +904,9 @@ "dev": true }, "@types/lunr": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@types/lunr/-/lunr-2.1.6.tgz", - "integrity": "sha512-Bz6fUhX1llTa7ygQJN3ttoVkkrpW7xxSEP7D7OYFO/FCBKqKqruRUZtJzTtYA0GkQX13lxU5u+8LuCviJlAXkQ==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/lunr/-/lunr-2.3.3.tgz", + "integrity": "sha512-09sXZZVsB3Ib41U0fC+O1O+4UOZT1bl/e+/QubPxpqDWHNEchvx/DEb1KJMOwq6K3MTNzZFoNSzVdR++o1DVnw==", "dev": true }, "@types/mousetrap": { diff --git a/package.json b/package.json index 370bd99a22..f52b62d163 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "@ngtools/webpack": "^7.2.2", "@types/chrome": "^0.0.73", "@types/jasmine": "^3.3.12", - "@types/lunr": "^2.1.6", + "@types/lunr": "^2.3.3", "@types/mousetrap": "^1.6.0", "@types/node-forge": "^0.7.5", "@types/papaparse": "^4.5.3", From f636e3a9573b784eeedaa8716685cf5ec524813c Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 21 Apr 2020 08:46:22 -0400 Subject: [PATCH 2/6] try adding check-by-audit-token entitlement --- jslib | 2 +- src/safari/safari/safari.entitlements | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/jslib b/jslib index 8438cafbd0..2de8c5ed16 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 8438cafbd08c1c9b1440e0c5385e15e8fb5ac524 +Subproject commit 2de8c5ed165f00e5d3a2b1dd92763176d6150782 diff --git a/src/safari/safari/safari.entitlements b/src/safari/safari/safari.entitlements index 6340f1cb86..331158f637 100644 --- a/src/safari/safari/safari.entitlements +++ b/src/safari/safari/safari.entitlements @@ -12,5 +12,7 @@ com.apple.security.automation.apple-events + com.apple.private.tcc.manager.check-by-audit-token + From 0b5cb901aafb074a26633772a51d7a05e3dad82c Mon Sep 17 00:00:00 2001 From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com> Date: Sat, 25 Apr 2020 09:13:00 -0500 Subject: [PATCH 3/6] Added warning dialog for log out confirmation (#1216) --- src/_locales/en/messages.json | 6 ++++++ src/popup/settings/settings.component.html | 4 ++-- src/popup/settings/settings.component.ts | 15 +++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index 4bdb0c6edd..dbd60de8ae 100644 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -1257,5 +1257,11 @@ "lock": { "message": "Lock", "description": "Verb form: to make secure or inaccesible by" + }, + "vaultTimeoutLogOutConfirmation": { + "message": "Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?" + }, + "vaultTimeoutLogOutConfirmationTitle": { + "message": "Timeout Action Confirmation" } } diff --git a/src/popup/settings/settings.component.html b/src/popup/settings/settings.component.html index d96e3fe972..61e8d7088d 100644 --- a/src/popup/settings/settings.component.html +++ b/src/popup/settings/settings.component.html @@ -33,8 +33,8 @@
-
diff --git a/src/popup/settings/settings.component.ts b/src/popup/settings/settings.component.ts index 6bc8c679ef..b7c2a072a2 100644 --- a/src/popup/settings/settings.component.ts +++ b/src/popup/settings/settings.component.ts @@ -45,6 +45,7 @@ const RateUrls = { }) export class SettingsComponent implements OnInit { @ViewChild('vaultTimeoutSelect', { read: ElementRef }) vaultTimeoutSelectRef: ElementRef; + @ViewChild('vaultTimeoutActionSelect', { read: ElementRef }) vaultTimeoutActionSelectRef: ElementRef; vaultTimeouts: any[]; vaultTimeout: number = null; vaultTimeoutActions: any[]; @@ -126,6 +127,20 @@ export class SettingsComponent implements OnInit { } async saveVaultTimeoutAction(newValue: string) { + if (newValue === 'logOut') { + const confirmed = await this.platformUtilsService.showDialog( + this.i18nService.t('vaultTimeoutLogOutConfirmation'), + this.i18nService.t('vaultTimeoutLogOutConfirmationTitle'), + this.i18nService.t('yes'), this.i18nService.t('cancel'), 'warning'); + if (!confirmed) { + this.vaultTimeoutActions.forEach((option: any, i) => { + if (option.value === this.vaultTimeoutAction) { + this.vaultTimeoutActionSelectRef.nativeElement.value = i + ': ' + this.vaultTimeoutAction; + } + }); + return; + } + } this.vaultTimeoutAction = newValue; await this.vaultTimeoutService.setVaultTimeoutOptions(this.vaultTimeout != null ? this.vaultTimeout : null, this.vaultTimeoutAction); From dd00151469509e18351514ac96bbcbf2e402d15d Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 5 May 2020 16:32:20 -0400 Subject: [PATCH 4/6] color updates + jslib --- jslib | 2 +- src/popup/scss/variables.scss | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/jslib b/jslib index 2de8c5ed16..0092aac275 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 2de8c5ed165f00e5d3a2b1dd92763176d6150782 +Subproject commit 0092aac275e8efca66838a8c266eec1d455883aa diff --git a/src/popup/scss/variables.scss b/src/popup/scss/variables.scss index 6aa0f97762..8d29409eb8 100644 --- a/src/popup/scss/variables.scss +++ b/src/popup/scss/variables.scss @@ -17,15 +17,14 @@ $gray: #555; $gray-light: #777; $text-muted: $gray-light; -$brand-primary: #3c8dbc; +$brand-primary: #175DDC; $brand-danger: #dd4b39; $brand-success: #00a65a; $brand-info: #555555; $brand-warning: #bf7e16; -$brand-primary-accent: #286090; +$brand-primary-accent: #1252A3; -$background-color: #efeff4; -$background-color-alt: #ecf0f5; +$background-color: #f0f0f0; $box-background-color: white; $box-background-hover-color: $list-item-hover; From 166573dafbecaacffef9ab0dcdff7d758af9e86c Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 5 May 2020 16:59:20 -0400 Subject: [PATCH 5/6] brand color updates --- src/notification/bar.scss | 8 ++++---- src/services/autofill.service.ts | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/notification/bar.scss b/src/notification/bar.scss index 6b5088ded3..1f673d5255 100644 --- a/src/notification/bar.scss +++ b/src/notification/bar.scss @@ -15,7 +15,7 @@ table { .outter-table > tbody > tr > td { padding: 0 0 0 10px; - border-bottom: 2px solid #3c8dbc; + border-bottom: 2px solid #175DDC; height: 40px; } @@ -56,7 +56,7 @@ img { } button:not(.link) { - background-color: #3c8dbc; + background-color: #175DDC; padding: 5px 15px; border-radius: 3px; color: #ffffff; @@ -65,13 +65,13 @@ button:not(.link) { button:not(.link):hover { cursor: pointer; - background-color: #3681ad; + background-color: #1751bd; } button.link { background: none; padding: 5px 15px; - color: #3c8dbc; + color: #175DDC; border: 0; } diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts index e1ab8b614b..db35556033 100644 --- a/src/services/autofill.service.ts +++ b/src/services/autofill.service.ts @@ -43,6 +43,10 @@ const MonthAbbr = ['mm', 'mm', 'mm', 'mm', 'mm', 'mm']; const YearAbbrShort = ['yy', 'åå', 'jj', 'aa', 'гг', 'rr']; const YearAbbrLong = ['yyyy', 'åååå', 'jjjj', 'aa', 'гггг', 'rrrr']; +const OperationDelays = new Map([ + ['buzzsprout.com', 100], +]); + /* tslint:disable */ const IsoCountries: { [id: string]: string; } = { afghanistan: "AF", "aland islands": "AX", albania: "AL", algeria: "DZ", "american samoa": "AS", andorra: "AD", @@ -174,6 +178,9 @@ export default class AutofillService implements AutofillServiceInterface { return; } + // Add a small delay between operations + fillScript.properties.delay_between_operations = 20; + didAutofill = true; if (!options.skipLastUsed) { this.cipherService.updateLastUsedDate(options.cipher.id); From 11ee00c1349ea82fdd32bb86b088bb6cc5dbdd72 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Thu, 7 May 2020 12:30:23 -0400 Subject: [PATCH 6/6] remove titlements that wernt helping --- src/safari/safari/safari.entitlements | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/safari/safari/safari.entitlements b/src/safari/safari/safari.entitlements index 331158f637..85c03d7b48 100644 --- a/src/safari/safari/safari.entitlements +++ b/src/safari/safari/safari.entitlements @@ -10,9 +10,5 @@ com.apple.security.network.server - com.apple.security.automation.apple-events - - com.apple.private.tcc.manager.check-by-audit-token -