Merge branch 'master' into feature-anonymous-sends

README.md

@@ -5,8 +5,8 @@
     The Bitwarden web project is an Angular application that powers the web vault (https://vault.bitwarden.com/).
 </p>
 <p align="center">
-  <a href="https://ci.appveyor.com/project/bitwarden/web/branch/master" target="_blank">
-    <img src="https://ci.appveyor.com/api/projects/status/github/bitwarden/web?branch=master&svg=true" alt="appveyor build" />
+  <a href="https://github.com/bitwarden/web/actions?query=branch:master" target="_blank">
+    <img src="https://github.com/bitwarden/web/actions/workflows/build.yml/badge.svg?branch=master" alt="Github Workflow build on master" />
   </a>
   <a href="https://crowdin.com/project/bitwarden-web" target="_blank">
     <img src="https://d322cqt584bo4o.cloudfront.net/bitwarden-web/localized.svg" alt="Crowdin" />

appveyor.yml

@@ -1,83 +0,0 @@
-image:
-- Visual Studio 2017
-- Ubuntu1804
-
-branches:
-  except:
-    - l10n_master
-    - gh-pages
-
-services:
-- docker
-
-stack: node 10
-
-init:
-- ps: |
-    if($isWindows) {
-      Install-Product node 10
-    }
-
-install:
-- ps: |
-    $env:PACKAGE_VERSION = (Get-Content -Raw -Path .\package.json | ConvertFrom-Json).version
-    $env:PUSH_DOCKER = "false"
-    $env:PROD_DEPLOY = "false"
-    $env:TAG_NAME = ""
-    if($env:APPVEYOR_REPO_TAG -eq "true" -and $env:APPVEYOR_RE_BUILD -eq "True") {
-      $env:PROD_DEPLOY = "true"
-      $env:TAG_NAME = $env:APPVEYOR_REPO_TAG_NAME.TrimStart("v")
-      echo "This is a production deployment for ${env:TAG_NAME}."
-    }
-    if("${env:DOCKER_USERNAME}" -ne "" -and "${env:DOCKER_PASSWORD}" -ne "") {
-      $env:PUSH_DOCKER = "true"
-    }
-    if($isWindows) {
-      choco install cloc --no-progress
-      cloc --include-lang TypeScript,JavaScript,HTML,Sass,CSS --vcs git
-    }
-
-before_build:
-- node --version
-- npm --version
-- sh: |
-    if [ "${PUSH_DOCKER}" == "true" ]
-    then
-      echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-    fi
-- cmd: set "GIT_PATH=C:\Program Files\Git\mingw64\libexec\git-core"
-- cmd: set "PATH=%GIT_PATH%;%PATH%"
-
-build_script:
-- sh: chmod +x ./build.sh
-- ps: |
-    if($isLinux) {
-      ./build.sh
-      ./build.sh tag dev
-
-      if($env:PROD_DEPLOY -eq "true") {
-        ./build.sh tag beta
-        ./build.sh tag $env:TAG_NAME
-      }
-
-      docker images
-      
-      if($env:PUSH_DOCKER -eq "true") {
-        ./build.sh push dev
-
-        if($env:PROD_DEPLOY -eq "true") {
-          ./build.sh push beta
-          ./build.sh push latest
-          ./build.sh push $env:TAG_NAME
-        }
-      }
-    }
-- cmd: npm install
-- cmd: npm run build:prod
-
-after_build:
-- sh: |
-    if [ "${PUSH_DOCKER}" == "true" ]
-    then
-      docker logout
-    fi

src/app/services/services.module.ts

@@ -65,7 +65,7 @@ import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from 'jslib
 import { EnvironmentService as EnvironmentServiceAbstraction } from 'jslib/abstractions/environment.service';
 import { EventService as EventLoggingServiceAbstraction } from 'jslib/abstractions/event.service';
 import { ExportService as ExportServiceAbstraction } from 'jslib/abstractions/export.service';
-import { FileUploadService as FileUploadServiceAbstraction }  from 'jslib/abstractions/fileUpload.service';
+import { FileUploadService as FileUploadServiceAbstraction } from 'jslib/abstractions/fileUpload.service';
 import { FolderService as FolderServiceAbstraction } from 'jslib/abstractions/folder.service';
 import { I18nService as I18nServiceAbstraction } from 'jslib/abstractions/i18n.service';
 import { ImportService as ImportServiceAbstraction } from 'jslib/abstractions/import.service';
@@ -105,7 +105,6 @@ const tokenService = new TokenService(storageService);
 const appIdService = new AppIdService(storageService);
 const apiService = new ApiService(tokenService, platformUtilsService,
     async (expired: boolean) => messagingService.send('logout', { expired: expired }));
-const fileUploadService: FileUploadServiceAbstraction = new FileUploadService(consoleLogService, apiService);
 const userService = new UserService(tokenService, storageService);
 const settingsService = new SettingsService(userService, storageService);
 export let searchService: SearchService = null;
@@ -116,6 +115,7 @@ const folderService = new FolderService(cryptoService, userService, apiService,
 const collectionService = new CollectionService(cryptoService, userService, storageService, i18nService);
 searchService = new SearchService(cipherService, consoleLogService);
 const policyService = new PolicyService(userService, storageService);
+const fileUploadService = new FileUploadService(consoleLogService, apiService);
 const sendService = new SendService(cryptoService, userService, apiService, fileUploadService, storageService,
     i18nService, cryptoFunctionService);
 const vaultTimeoutService = new VaultTimeoutService(cipherService, folderService, collectionService,
@@ -216,6 +216,7 @@ export function initFactory(): Function {
         { provide: PlatformUtilsServiceAbstraction, useValue: platformUtilsService },
         { provide: PasswordGenerationServiceAbstraction, useValue: passwordGenerationService },
         { provide: ApiServiceAbstraction, useValue: apiService },
+        { provide: FileUploadServiceAbstraction, useValue: fileUploadService },
         { provide: SyncServiceAbstraction, useValue: syncService },
         { provide: UserServiceAbstraction, useValue: userService },
         { provide: MessagingServiceAbstraction, useValue: messagingService },

src/locales/en/messages.json

@@ -3830,5 +3830,8 @@
   },
   "webAuthnSuccess": {
     "message": "<strong>WebAuthn verified successfully!</strong><br>You may close this tab."
+  },
+  "hintEqualsPassword": {
+    "message": "Your password hint cannot be the same as your password."
   }
 }