Merge branch 'master' of github.com:bitwarden/clients into ps/electro…

…n-builder # Conflicts: # package-lock.json
bitwarden · Mar 31, 2023 · 85a0678 · 85a0678
2 parents 15025a8 + f53024b
commit 85a0678
Show file tree

Hide file tree

Showing 1,055 changed files with 29,801 additions and 14,860 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -98,6 +98,10 @@
               {
                 "target": "./libs/common/**/*",
                 "from": "./libs/node/**/*"
+              },
+              {
+                "target": "./libs/common/**/*",
+                "from": "./libs/importer/**/*"
               }
             ]
           }
@@ -150,6 +154,12 @@
       "rules": {
         "no-restricted-imports": ["error", { "patterns": ["@bitwarden/node/*", "src/**/*"] }]
       }
+    },
+    {
+      "files": ["libs/importer/src/**/*.ts"],
+      "rules": {
+        "no-restricted-imports": ["error", { "patterns": ["@bitwarden/importer/*", "src/**/*"] }]
+      }
     }
   ]
 }
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -7,7 +7,7 @@
 # @bitwarden/team-leads
 
 ## Secrets Manager team files ##
-bitwarden_license/bit-web/src/app/secrets-manager @bitwarden/pod-sm-dev
+bitwarden_license/bit-web/src/app/secrets-manager @bitwarden/team-secrets-manager-dev
 
 ## Auth team files ##
 apps/browser/src/auth @bitwarden/team-auth-dev
@@ -26,6 +26,7 @@ apps/desktop/src/app/tools @bitwarden/team-tools-dev
 apps/web/src/app/tools @bitwarden/team-tools-dev
 libs/angular/src/tools @bitwarden/team-tools-dev
 libs/common/src/tools @bitwarden/team-tools-dev
+libs/importer @bitwarden/team-tools-dev
 
 ## Vault team files ##
 apps/browser/src/autofill @bitwarden/team-vault-dev

diff --git a/.github/DISCUSSION_TEMPLATE/community-pr-proposals.yml b/.github/DISCUSSION_TEMPLATE/community-pr-proposals.yml
diff --git a/.github/DISCUSSION_TEMPLATE/password-manager.yml b/.github/DISCUSSION_TEMPLATE/password-manager.yml
@@ -0,0 +1,11 @@
+body:
+  - type: markdown
+    attributes:
+      value: |
+        If you would like to contribute code to the Bitwarden codebase for consideration, please review [https://contributing.bitwarden.com/](https://contributing.bitwarden.com/) before posting. To keep discussion on topic, posts that do not include a proposal for a code contribution you wish to develop will be removed. For feature requests and community discussion, please visit https://community.bitwarden.com/
+  - type: textarea
+    attributes:
+      label: Code Contribution Proposal
+      description: "Please include a description of the code contribution you would like to contribute, including any relevant screenshots, and links to any existing [feature requests](https://community.bitwarden.com/c/feature-requests/5/none). This helps get feedback from the community and Bitwarden team members before you start writing code"
+    validations:
+      required: true
diff --git a/.github/DISCUSSION_TEMPLATE/secrets-manager.yml b/.github/DISCUSSION_TEMPLATE/secrets-manager.yml
@@ -0,0 +1,11 @@
+body:
+  - type: markdown
+    attributes:
+      value: |
+        If you would like to contribute code to the Bitwarden codebase for consideration, please review [https://contributing.bitwarden.com/](https://contributing.bitwarden.com/) before posting. To keep discussion on topic, posts that do not include a proposal for a code contribution you wish to develop will be removed. For feature requests and community discussion, please visit https://community.bitwarden.com/
+  - type: textarea
+    attributes:
+      label: Code Contribution Proposal
+      description: "Please include a description of the code contribution you would like to contribute, including any relevant screenshots, and links to any existing [feature requests](https://community.bitwarden.com/c/feature-requests/5/none). This helps get feedback from the community and Bitwarden team members before you start writing code"
+    validations:
+      required: true
diff --git a/.github/whitelist-capital-letters.txt b/.github/whitelist-capital-letters.txt
@@ -9,7 +9,6 @@
 ./libs/common/src/abstractions/vaultTimeout
 ./libs/common/src/services/vaultTimeout
 ./bitwarden_license/README.md
-./bitwarden_license/bit-web/src/app/providers/services/webProvider.service.ts
 ./libs/angular/src/directives/cipherListVirtualScroll.directive.ts
 ./libs/angular/src/scss/webfonts/Open_Sans-italic-700.woff
 ./libs/angular/src/scss/webfonts/Open_Sans-normal-300.woff
@@ -31,9 +30,6 @@
 ./libs/common/spec/models/domain/encString.spec.ts
 ./libs/common/spec/models/domain/symmetricCryptoKey.spec.ts
 ./libs/common/spec/models/domain/encArrayBuffer.spec.ts
-./libs/common/spec/models/domain/sendAccess.spec.ts
-./libs/common/spec/models/domain/sendFile.spec.ts
-./libs/common/spec/models/domain/sendText.spec.ts
 ./libs/common/spec/matchers/toEqualBuffer.spec.ts
 ./libs/common/spec/matchers/toEqualBuffer.ts
 ./libs/common/spec/services/stateMigration.service.spec.ts
@@ -47,35 +43,22 @@
 ./libs/common/src/enums/clientType.ts
 ./libs/common/src/enums/encryptedExportType.ts
 ./libs/common/src/enums/linkedIdType.ts
-./libs/common/src/enums/sendType.ts
-./libs/common/src/enums/importOptions.ts
-./libs/common/src/enums/policyType.ts
-./libs/common/src/enums/planSponsorshipType.ts
 ./libs/common/src/enums/encryptionType.ts
 ./libs/common/src/enums/htmlStorageLocation.ts
-./libs/common/src/enums/providerUserType.ts
-./libs/common/src/enums/organizationUserStatusType.ts
 ./libs/common/src/enums/notificationType.ts
 ./libs/common/src/enums/keySuffixOptions.ts
 ./libs/common/src/enums/productType.ts
-./libs/common/src/enums/scimProviderType.ts
 ./libs/common/src/enums/eventType.ts
 ./libs/common/src/enums/hashPurpose.ts
 ./libs/common/src/enums/uriMatchType.ts
 ./libs/common/src/enums/deviceType.ts
-./libs/common/src/enums/organizationConnectionType.ts
 ./libs/common/src/enums/secureNoteType.ts
-./libs/common/src/enums/transactionType.ts
-./libs/common/src/enums/providerUserStatusType.ts
 ./libs/common/src/enums/storageLocation.ts
 ./libs/common/src/enums/themeType.ts
 ./libs/common/src/enums/logLevelType.ts
-./libs/common/src/enums/planType.ts
 ./libs/common/src/enums/stateVersion.ts
 ./libs/common/src/enums/fieldType.ts
-./libs/common/src/enums/paymentMethodType.ts
 ./libs/common/src/enums/nativeMessagingVersion.ts
-./libs/common/src/enums/organizationUserType.ts
 ./libs/common/src/factories/accountFactory.ts
 ./libs/common/src/factories/globalStateFactory.ts
 ./libs/common/src/factories/stateFactory.ts
@@ -89,7 +72,6 @@
 ./libs/common/src/abstractions/formValidationErrors.service.ts
 ./libs/common/src/abstractions/vaultTimeout/vaultTimeoutSettings.service.ts
 ./libs/common/src/abstractions/vaultTimeout/vaultTimeout.service.ts
-./libs/common/src/abstractions/fileUpload.service.ts
 ./libs/common/src/abstractions/cryptoFunction.service.ts
 ./libs/common/src/abstractions/anonymousHub.service.ts
 ./libs/common/src/abstractions/appId.service.ts
@@ -99,7 +81,6 @@
 ./libs/common/src/services/formValidationErrors.service.ts
 ./libs/common/src/services/vaultTimeout/vaultTimeoutSettings.service.ts
 ./libs/common/src/services/vaultTimeout/vaultTimeout.service.ts
-./libs/common/src/services/fileUpload.service.ts
 ./libs/common/src/services/anonymousHub.service.ts
 ./libs/common/src/services/appId.service.ts
 ./libs/common/src/services/noopMessaging.service.ts

diff --git a/.github/workflows/build-browser.yml b/.github/workflows/build-browser.yml
@@ -10,6 +10,7 @@ on:
       - 'apps/browser/**'
       - 'libs/**'
       - '*'
+      - '!libs/importer'
       - '!*.md'
       - '!*.txt'
   push:
@@ -21,6 +22,7 @@ on:
       - 'apps/browser/**'
       - 'libs/**'
       - '*'
+      - '!libs/importer'
       - '!*.md'
       - '!*.txt'
       - '.github/workflows/build-browser.yml'

diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
@@ -10,6 +10,7 @@ on:
       - 'apps/desktop/**'
       - 'libs/**'
       - '*'
+      - '!libs/importer'
       - '!*.md'
       - '!*.txt'
       - '.github/workflows/build-desktop.yml'
@@ -22,6 +23,7 @@ on:
       - 'apps/desktop/**'
       - 'libs/**'
       - '*'
+      - '!libs/importer'
       - '!*.md'
       - '!*.txt'
       - '.github/workflows/build-desktop.yml'

diff --git a/.github/workflows/build-web.yml b/.github/workflows/build-web.yml
@@ -80,7 +80,7 @@ jobs:
             npm_command: "dist:bit:selfhost"
           - name: "cloud-QA"
             npm_command: "build:bit:qa"
-          - name: "cloud-POC"
+          - name: "cloud-POC2"
             npm_command: "build:bit:poc"
           - name: "ee"
             npm_command: "build:bit:ee"
@@ -204,6 +204,10 @@ jobs:
             IMAGE_TAG=$(echo "${GITHUB_REF:11}" | sed "s#/#-#g")
           fi
 
+          if [[ "$IMAGE_TAG" == "master" ]]; then
+            IMAGE_TAG=dev
+          fi
+
           TAG_EXTENSION=${{ github.event.inputs.custom_tag_extension }}
 
           if [[ $TAG_EXTENSION ]]; then

diff --git a/.github/workflows/deploy-non-prod-web.yml b/.github/workflows/deploy-non-prod-web.yml
@@ -12,7 +12,7 @@ on:
         type: choice
         options:
           - QA
-          - POC
+          - POC2
 
 
 jobs:

diff --git a/apps/browser/package.json b/apps/browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bitwarden/browser",
-  "version": "2023.2.1",
+  "version": "2023.3.0",
   "scripts": {
     "build": "webpack",
     "build:mv3": "cross-env MANIFEST_VERSION=3 webpack",

diff --git a/apps/browser/src/_locales/be/messages.json b/apps/browser/src/_locales/be/messages.json
@@ -2124,7 +2124,7 @@
     "message": "Як аўтазапоўніць"
   },
   "autofillSelectInfoWithCommand": {
-    "message": "Select an item from this page or use the shortcut: $COMMAND$",
+    "message": "Выберыце элемент на гэтай старонцы або скарыстайцеся спалучэннем клавіш: $COMMAND$",
     "placeholders": {
       "command": {
         "content": "$1",
@@ -2133,7 +2133,7 @@
     }
   },
   "autofillSelectInfoWithoutCommand": {
-    "message": "Select an item from this page or set a shortcut in settings."
+    "message": "Выберыце элемент на гэтай старонцы або задайце спалучэнне клавіш у наладах."
   },
   "gotIt": {
     "message": "Зразумела"

diff --git a/apps/browser/src/_locales/de/messages.json b/apps/browser/src/_locales/de/messages.json
@@ -1300,7 +1300,7 @@
     "description": "Default URI match detection for auto-fill."
   },
   "toggleOptions": {
-    "message": "Umschaltoptionen"
+    "message": "Optionen umschalten"
   },
   "toggleCurrentUris": {
     "message": "Aktuelle URIs umschalten",

diff --git a/apps/browser/src/_locales/fi/messages.json b/apps/browser/src/_locales/fi/messages.json
@@ -474,7 +474,7 @@
     }
   },
   "autofillError": {
-    "message": "Valitttua kohdetta ei voitu täyttää tälle sivulle automaattisesti. Kopioi ja liitä tiedot itse."
+    "message": "Valittua kohdetta ei voitu täyttää tälle sivulle automaattisesti. Kopioi ja liitä tiedot itse."
   },
   "loggedOut": {
     "message": "Kirjauduttu ulos"
@@ -979,7 +979,7 @@
     "message": "Vaarantuneet tai epäluotettavat sivustot voivat väärinkäyttää sivun avautuessa suoritettavaa automaattista täyttöä."
   },
   "learnMoreAboutAutofill": {
-    "message": "Lue lisää automaattisesta täytöstä"
+    "message": "Lisätietoja automaattisesta täytöstä"
   },
   "defaultAutoFillOnPageLoad": {
     "message": "Automaattisen täytön oletusasetus kirjautumistiedoille"
@@ -2124,7 +2124,7 @@
     "message": "Miten täytetään automaattisesti"
   },
   "autofillSelectInfoWithCommand": {
-    "message": "Valitse kohde tältä sivulta tai käytä pikanäppäintä $COMMAND$",
+    "message": "Valitse tälle sivulle sopiva kohde tai käytä pikanäppäintä $COMMAND$.",
     "placeholders": {
       "command": {
         "content": "$1",
@@ -2133,13 +2133,13 @@
     }
   },
   "autofillSelectInfoWithoutCommand": {
-    "message": "Valitse kohde tältä sivulta tai määritä pikanäppäin asetuksista."
+    "message": "Valitse tälle sivulle sopiva kohde tai määritä pikanäppäin asetuksista."
   },
   "gotIt": {
     "message": "Selvä"
   },
   "autofillSettings": {
-    "message": "Automaattisen täytön asetukset"
+    "message": "Täytön asetukset"
   },
   "autofillShortcut": {
     "message": "Automaattisen täytön pikanäppäin"

diff --git a/apps/browser/src/_locales/hi/messages.json b/apps/browser/src/_locales/hi/messages.json
@@ -196,13 +196,13 @@
     "message": "Help & Feedback"
   },
   "helpCenter": {
-    "message": "Bitwarden Help center"
+    "message": "बिटवॉर्डेन सहायता केंद्र"
   },
   "communityForums": {
     "message": "Explore Bitwarden community forums"
   },
   "contactSupport": {
-    "message": "Contact Bitwarden support"
+    "message": "बिटवॉर्डेन सहायता से संपर्क करें"
   },
   "sync": {
     "message": "सिंक"
@@ -357,7 +357,7 @@
     "message": "ताला खोलें"
   },
   "loggedInAsOn": {
-    "message": "Logged in as $EMAIL$ on $HOSTNAME$.",
+    "message": "$HOSTNAME$ पर $EMAIL$ के रूप में लॉग इन किया है।",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -439,7 +439,7 @@
     "message": "मास्टर पासवर्ड पुनः डालने की आवश्यकता है।"
   },
   "masterPasswordMinlength": {
-    "message": "Master password must be at least $VALUE$ characters long.",
+    "message": "मास्टर पासवर्ड कम से कम $VALUE$ अक्षर लंबा होना चाहिए।",
     "description": "The Master Password must be at least a specific number of characters long.",
     "placeholders": {
       "value": {
@@ -464,7 +464,7 @@
     "message": "सत्यापन कोड अवैध है"
   },
   "valueCopied": {
-    "message": "$VALUE$ copied",
+    "message": "$VALUE$ कॉपी हो गया है।",
     "description": "Value has been copied to the clipboard.",
     "placeholders": {
       "value": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ on: @@
             type: choice
             options:
               - QA
-              - POC
+              - POC2
     jobs:
@@ Expand Down @@