fix merge conflicts

.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/**/*"] }]
+      }
     }
   ]
 }

.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
@@ -35,3 +36,17 @@ apps/desktop/src/vault @bitwarden/team-vault-dev
 apps/web/src/app/vault @bitwarden/team-vault-dev
 libs/angular/src/vault @bitwarden/team-vault-dev
 libs/common/src/vault @bitwarden/team-vault-dev
+
+## Admin Console team files ##
+apps/browser/src/admin-console @bitwarden/team-admin-console-dev
+apps/cli/src/admin-console @bitwarden/team-admin-console-dev
+apps/desktop/src/admin-console @bitwarden/team-admin-console-dev
+apps/web/src/app/admin-console @bitwarden/team-admin-console-dev
+bitwarden_license/bit-web/src/app/admin-console @bitwarden/team-admin-console-dev
+libs/angular/src/admin-console @bitwarden/team-admin-console-dev
+libs/common/src/admin-console @bitwarden/team-admin-console-dev
+
+## Billing team files ##
+apps/web/src/app/billing @bitwarden/team-billing-dev
+libs/angular/src/billing @bitwarden/team-billing-dev
+libs/common/src/billing @bitwarden/team-billing-dev

.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

.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

.github/whitelist-capital-letters.txt

@@ -30,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
@@ -46,8 +43,6 @@
 ./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/encryptionType.ts
 ./libs/common/src/enums/htmlStorageLocation.ts
 ./libs/common/src/enums/notificationType.ts
@@ -77,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
@@ -87,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

.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'

.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'

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": "Зразумела"

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",

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"

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": {