From a467881a7618005a994caa8c31326a05e48b6ad6 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Thu, 4 Mar 2021 10:23:54 -0800 Subject: [PATCH 01/34] fixing typo --- .github/workflows/build.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 812793b7681..82072d6e499 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -198,42 +198,42 @@ jobs: choco pack ./dist/chocolatey/bitwarden.nuspec --version "$env:PACKAGE_VERSION" --out ./dist/chocolatey - name: Upload portable exe artifact - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' uses: actions/upload-artifact@v2 with: name: Bitwarden-Portable-${{ env.PACKAGE_VERSION }}.exe path: ./dist/Bitwarden-Portable-${{ env.PACKAGE_VERSION }}.exe - name: Upload installer exe artifact - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' uses: actions/upload-artifact@v2 with: name: Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe path: ./dist/nsis-web/Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe - name: Upload store appx ia32 artifact - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' uses: actions/upload-artifact@v2 with: name: Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-store.appx path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-store.appx - name: Upload store appx x64 artifact - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' uses: actions/upload-artifact@v2 with: name: Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx - name: Upload store appx ARM64 artifact - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' uses: actions/upload-artifact@v2 with: name: Bitwarden-${{ env.PACKAGE_VERSION }}-arm64-store.appx path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-arm64-store.appx - name: Upload nupkg artifact - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' uses: actions/upload-artifact@v2 with: name: bitwarden.${{ env.PACKAGE_VERSION }}.nupkg @@ -300,66 +300,66 @@ jobs: run: npm run lint - name: Create Safari directory - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' shell: pwsh run: New-Item ./dist-safari -ItemType Directory -ea 0 - name: Checkout browser extension - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' uses: actions/checkout@v2 with: repository: 'bitwarden/browser' path: 'dist-safari/browser' - name: Build Safari extension - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' shell: pwsh run: ./scripts/safari-build.ps1 -skipcheckout -skipoutcopy - name: Load Safari extension for .dmg - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' shell: pwsh run: ./scripts/safari-build.ps1 -copyonly - name: Build application (dev) - if: github.ref != 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref != 'refs/heads/master' || github.ref == 'refs/heads/rc' run: npm run build - name: Build application (dist) - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' run: npm run dist:mac env: APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }} APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} - name: Upload .zip artifact - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' uses: actions/upload-artifact@v2 with: name: Bitwarden-${{ env.PACKAGE_VERSION }}-mac.zip path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-mac.zip - name: Upload .dmg artifact - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' uses: actions/upload-artifact@v2 with: name: Bitwarden-${{ env.PACKAGE_VERSION }}.dmg path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}.dmg - name: Load Safari extension for App Store - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' shell: pwsh run: ./scripts/safari-build.ps1 -mas -copyonly - name: Build application for App Store - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' run: npm run dist:mac:mas env: APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }} APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} - name: Upload .pkg artifact - if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' uses: actions/upload-artifact@v2 with: name: Bitwarden-${{ env.PACKAGE_VERSION }}.pkg From 7f04d8e952d53f00d94d827ac6a78697e6e72a4f Mon Sep 17 00:00:00 2001 From: Thomas Rittson Date: Fri, 5 Mar 2021 07:53:35 +1000 Subject: [PATCH 02/34] Add extra encrypted export warnings --- src/app/vault/export.component.ts | 19 +++++++++++++++++++ src/locales/en/messages.json | 5 ++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/app/vault/export.component.ts b/src/app/vault/export.component.ts index 0427d478eef..e58cd5e6c04 100644 --- a/src/app/vault/export.component.ts +++ b/src/app/vault/export.component.ts @@ -5,6 +5,8 @@ import { OnInit, } from '@angular/core'; +import * as os from 'os'; + import { CryptoService } from 'jslib/abstractions/crypto.service'; import { EventService } from 'jslib/abstractions/event.service'; import { ExportService } from 'jslib/abstractions/export.service'; @@ -49,4 +51,21 @@ export class ExportComponent extends BaseExportComponent implements OnInit { onWindowHidden() { this.showPassword = false; } + + async warningDialog() { + if (this.encryptedFormat) { + return await this.platformUtilsService.showDialog( + this.i18nService.t('encExportKeyWarningDesc') + + os.EOL + os.EOL + + this.i18nService.t('encExportAccountWarningDesc'), + this.i18nService.t('confirmVaultExport'), this.i18nService.t('exportVault'), + this.i18nService.t('cancel'), 'warning', + true); + } else { + return await this.platformUtilsService.showDialog( + this.i18nService.t('exportWarningDesc'), + this.i18nService.t('confirmVaultExport'), this.i18nService.t('exportVault'), + this.i18nService.t('cancel'), 'warning'); + } + } } diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json index 768a562ffb9..6f8ab9c0107 100644 --- a/src/locales/en/messages.json +++ b/src/locales/en/messages.json @@ -1227,9 +1227,12 @@ "exportWarningDesc": { "message": "This export contains your vault data in an unencrypted format. You should not store or send the exported file over unsecure channels (such as email). Delete it immediately after you are done using it." }, - "encExportWarningDesc": { + "encExportKeyWarningDesc": { "message": "This export encrypts your data using your account's encryption key. If you ever rotate your account's encryption key you should export again since you will not be able to decrypt this export file." }, + "encExportAccountWarningDesc": { + "message": "Account encryption keys are unique to each Bitwarden user account, so you can't import an encrypted export into a different account." + }, "exportMasterPassword": { "message": "Enter your master password to export your vault data." }, From 8d05013f75f11124b11b3d42b0bf5bff9ad22aaf Mon Sep 17 00:00:00 2001 From: Thomas Rittson Date: Fri, 5 Mar 2021 08:59:41 +1000 Subject: [PATCH 03/34] update jslib --- jslib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jslib b/jslib index 3942868cf48..b7acbcf3a77 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 3942868cf488ed8c1983ffadab2c8900b8c78410 +Subproject commit b7acbcf3a7766eb0a52f21fe90505a69b4c19444 From 572487532819a43384e61a9dbf24c8c9d2f1eb94 Mon Sep 17 00:00:00 2001 From: addison Date: Mon, 8 Mar 2021 15:19:08 -0500 Subject: [PATCH 04/34] fixed icon redirect bug on Sends --- jslib | 2 +- src/app/send/add-edit.component.html | 3 +-- src/app/send/send.component.html | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/jslib b/jslib index b7acbcf3a77..125de0dd470 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit b7acbcf3a7766eb0a52f21fe90505a69b4c19444 +Subproject commit 125de0dd4704909f036dbad374a4cd71719de09e diff --git a/src/app/send/add-edit.component.html b/src/app/send/add-edit.component.html index 24845b0d3bd..83219476b01 100644 --- a/src/app/send/add-edit.component.html +++ b/src/app/send/add-edit.component.html @@ -177,8 +177,7 @@ diff --git a/src/app/send/send.component.html b/src/app/send/send.component.html index 63a6a182531..3eb7d781e0e 100644 --- a/src/app/send/send.component.html +++ b/src/app/send/send.component.html @@ -42,7 +42,7 @@
+
+ +
+ + +
+
+
+ + +
+
+ +
{{send.file.fileName}} ({{send.file.sizeName}})
+
+
+ + +
+
+ + -
+
- -
- -
- - -
-
-
- - -
{{'sendFileDesc' | i18n}} {{'maxFileSize' | i18n}}
-
-
- -
- -
{{send.file.fileName}} ({{send.file.sizeName}})
-
-
- -
- - -
{{'sendTextDesc' | i18n}}
-
-
- - -
-
+
+ + +
@@ -73,13 +71,13 @@ -
{{'deletionDateDesc' | i18n}}
+ {{'deletionDateDesc' | i18n}}
-
{{'deletionDateDesc' | i18n}}
+ {{'deletionDateDesc' | i18n}}
@@ -87,13 +85,13 @@ -
{{'expirationDateDesc' | i18n}}
+ {{'expirationDateDesc' | i18n}}
-
{{'expirationDateDesc' | i18n}}
+ {{'expirationDateDesc' | i18n}}
@@ -102,13 +100,15 @@
-
{{'maxAccessCountDesc' | i18n}}
-
-
- -
+ +
@@ -135,9 +137,11 @@
- {{'sendNotesDesc' | i18n}}
+
diff --git a/src/scss/misc.scss b/src/scss/misc.scss index 2ae5737ea3f..7e780c0d1d7 100644 --- a/src/scss/misc.scss +++ b/src/scss/misc.scss @@ -4,14 +4,6 @@ small { font-size: $font-size-small; } -.subtext { - font-size: $font-size-small; - @include themify($themes) { - color: themed('subtextColor') !important; - } - padding-top: 5px; -} - .bg-primary { @include themify($themes) { background-color: themed('primaryColor') !important; diff --git a/src/scss/variables.scss b/src/scss/variables.scss index 98ab045672e..b5415db96c8 100644 --- a/src/scss/variables.scss +++ b/src/scss/variables.scss @@ -88,7 +88,6 @@ $themes: ( passwordSpecialColor: #c40800, calloutBorderColor: $border-color-dark, calloutBackgroundColor: $background-color, - subtextColor: #6c757d, ), dark: ( textColor: #ffffff, @@ -139,7 +138,6 @@ $themes: ( passwordSpecialColor: #ff7c70, calloutBorderColor: #2f2f2f, calloutBackgroundColor: #363636, - subtextColor: #938a82, ), nord: ( textColor: $nord5, @@ -190,7 +188,6 @@ $themes: ( passwordSpecialColor: $nord12, calloutBorderColor: $nord1, calloutBackgroundColor: $nord2, - subtextColor: $nord4, ), );