Skip to content

Commit

Permalink
Merge branch 'main' into auth/pm-15063/pending-auth-request-banner
Browse files Browse the repository at this point in the history
  • Loading branch information
alec-livefront authored Feb 5, 2025
2 parents 191e83b + 9cbe295 commit 9853cde
Show file tree
Hide file tree
Showing 458 changed files with 8,949 additions and 10,575 deletions.
18 changes: 11 additions & 7 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -97,25 +97,28 @@ apps/web/src/translation-constants.ts @bitwarden/team-platform-dev
.github/workflows/scan.yml @bitwarden/team-platform-dev
.github/workflows/test.yml @bitwarden/team-platform-dev
.github/workflows/version-auto-bump.yml @bitwarden/team-platform-dev
# ESLint custom rules
libs/eslint @bitwarden/team-platform-dev

## Autofill team files ##
apps/browser/src/autofill @bitwarden/team-autofill-dev
apps/desktop/src/autofill @bitwarden/team-autofill-dev
libs/common/src/autofill @bitwarden/team-autofill-dev
apps/desktop/macos/autofill-extension @bitwarden/team-autofill-dev
apps/desktop/desktop_native/windows-plugin-authenticator @bitwarden/team-autofill-dev
# DuckDuckGo integration
apps/desktop/native-messaging-test-runner @bitwarden/team-autofill-dev
apps/desktop/src/services/duckduckgo-message-handler.service.ts @bitwarden/team-autofill-dev
# SSH Agent
apps/desktop/desktop_native/core/src/ssh_agent @bitwarden/team-autofill-dev @bitwarden/wg-ssh-keys

## Component Library ##
.storybook @bitwarden/team-design-system
libs/components @bitwarden/team-design-system
libs/ui @bitwarden/team-design-system
apps/browser/src/platform/popup/layout @bitwarden/team-design-system
apps/browser/src/popup/app-routing.animations.ts @bitwarden/team-design-system
apps/web/src/app/layouts @bitwarden/team-design-system
## UI Foundation ##
.storybook @bitwarden/team-ui-foundation
libs/components @bitwarden/team-ui-foundation
libs/ui @bitwarden/team-ui-foundation
apps/browser/src/platform/popup/layout @bitwarden/team-ui-foundation
apps/browser/src/popup/app-routing.animations.ts @bitwarden/team-ui-foundation
apps/web/src/app/layouts @bitwarden/team-ui-foundation

## Desktop native module ##
apps/desktop/desktop_native @bitwarden/team-platform-dev
Expand All @@ -128,6 +131,7 @@ apps/web/src/app/key-management @bitwarden/team-key-management-dev
apps/browser/src/key-management @bitwarden/team-key-management-dev
apps/cli/src/key-management @bitwarden/team-key-management-dev
libs/key-management @bitwarden/team-key-management-dev
libs/key-management-ui @bitwarden/team-key-management-dev
libs/common/src/key-management @bitwarden/team-key-management-dev

apps/desktop/destkop_native/core/src/biometric/ @bitwarden/team-key-management-dev
Expand Down
64 changes: 64 additions & 0 deletions .github/codecov.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,66 @@
ignore:
- "**/*.spec.ts" # Tests

component_management:
default_rules:
statuses:
- type: project
target: auto
individual_components:
- component_id: key-management-biometrics
name: Key Management - Biometrics
paths:
- apps/browser/src/key-management/biometrics/**
- apps/cli/src/key-management/cli-biometrics-service.ts
- apps/desktop/destkop_native/core/src/biometric/**
- apps/desktop/src/key-management/biometrics/**
- apps/desktop/src/services/biometric-message-handler.service.ts
- apps/web/src/app/key-management/web-biometric.service.ts
- libs/key-management/src/biometrics/**
- component_id: key-management-lock
name: Key Management - Lock
paths:
- apps/browser/src/key-management/lock/**
- apps/desktop/src/key-management/lock/**
- apps/web/src/app/key-management/lock/**
- libs/key-management-ui/src/lock/**
- component_id: key-management-ipc
name: Key Management - IPC
paths:
- apps/browser/src/background/nativeMessaging.background.ts
- apps/desktop/src/services/native-messaging.service.ts
- component_id: key-management-key-rotation
name: Key Management - Key Rotation
paths:
- apps/web/src/app/key-management/key-rotation/**
- apps/web/src/app/key-management/migrate-encryption/**
- libs/key-management/src/user-asymmetric-key-regeneration/**
- component_id: key-management-process-reload
name: Key Management - Process Reload
paths:
- apps/web/src/app/key-management/services/web-process-reload.service.ts
- libs/common/src/key-management/services/default-process-reload.service.ts
- component_id: key-management-keys
name: Key Management - Keys
paths:
- libs/key-management/src/kdf-config.service.ts
- libs/key-management/src/key.service.ts
- libs/common/src/key-management/master-password/**
- component_id: key-management-crypto
name: Key Management - Crypto
paths:
- libs/common/src/key-management/crypto/**
- component_id: key-management
name: Key Management
paths:
- apps/browser/src/key-management/**
- apps/browser/src/background/nativeMessaging.background.ts
- apps/cli/src/key-management/**
- apps/desktop/destkop_native/core/src/biometric/**
- apps/desktop/src/key-management/**
- apps/desktop/src/services/biometric-message-handler.service.ts
- apps/desktop/src/services/native-messaging.service.ts
- apps/web/src/app/key-managemen/**
- libs/common/src/key-management/**
- libs/key-management/**
- libs/key-management-ui/**
8 changes: 5 additions & 3 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,8 @@
"@storybook/angular",
"@storybook/manager-api",
"@storybook/theming",
"@typescript-eslint/utils",
"@typescript-eslint/rule-tester",
"@types/react",
"autoprefixer",
"bootstrap",
Expand All @@ -225,9 +227,9 @@
"tailwindcss",
"zone.js"
],
"description": "Component library owned dependencies",
"commitMessagePrefix": "[deps] Design System:",
"reviewers": ["team:team-design-system"]
"description": "UI Foundation owned dependencies",
"commitMessagePrefix": "[deps] UI Foundation:",
"reviewers": ["team:team-ui-foundation"]
},
{
"matchPackageNames": [
Expand Down
44 changes: 37 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # v5.1.2

- name: Upload results to codecov.io
uses: codecov/test-results-action@9739113ad922ea0a9abb4b2c0f8bf6a4aa8ef820 # v1.0.1
uses: codecov/test-results-action@4e79e65778be1cecd5df25e14af1eafb6df80ea9 # v1.0.2
if: ${{ needs.check-test-secrets.outputs.available == 'true' }}
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
Expand All @@ -103,15 +103,15 @@ jobs:
matrix:
os:
- ubuntu-22.04
- macos-latest
- windows-latest
- macos-14
- windows-2022

steps:
- name: Check Rust version
run: rustup --version

- name: Install gnome-keyring
if: ${{ matrix.os=='ubuntu-latest' }}
if: ${{ matrix.os=='ubuntu-22.04' }}
run: |
sudo apt-get update
sudo apt-get install -y gnome-keyring dbus-x11
Expand All @@ -124,7 +124,7 @@ jobs:
run: cargo build

- name: Test Ubuntu
if: ${{ matrix.os=='ubuntu-latest' }}
if: ${{ matrix.os=='ubuntu-22.04' }}
working-directory: ./apps/desktop/desktop_native
run: |
eval "$(dbus-launch --sh-syntax)"
Expand All @@ -135,11 +135,41 @@ jobs:
cargo test -- --test-threads=1
- name: Test macOS
if: ${{ matrix.os=='macos-latest' }}
if: ${{ matrix.os=='macos-14' }}
working-directory: ./apps/desktop/desktop_native
run: cargo test -- --test-threads=1

- name: Test Windows
if: ${{ matrix.os=='windows-latest'}}
if: ${{ matrix.os=='windows-2022'}}
working-directory: ./apps/desktop/desktop_native/core
run: cargo test -- --test-threads=1

rust-coverage:
name: Rust Coverage
runs-on: macos-14
steps:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Install rust
uses: dtolnay/rust-toolchain@a54c7afa936fefeb4456b2dd8068152669aa8203 # stable
with:
toolchain: stable
components: llvm-tools

- name: Cache cargo registry
uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
with:
workspaces: "apps/desktop/desktop_native -> target"

- name: Install cargo-llvm-cov
run: cargo install cargo-llvm-cov --version 0.6.16

- name: Generate coverage
working-directory: ./apps/desktop/desktop_native
run: cargo llvm-cov --all-features --lcov --output-path lcov.info --workspace --no-cfg-coverage

- name: Upload to codecov.io
uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
with:
files: ./apps/desktop/desktop_native/lcov.info
6 changes: 3 additions & 3 deletions apps/browser/src/_locales/ar/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1280,9 +1280,6 @@
"premiumPurchase": {
"message": "شراء العضوية المميزة"
},
"premiumPurchaseAlert": {
"message": "يمكنك شراء العضوية المتميزة على bitwarden.com على خزانة الويب. هل تريد زيارة الموقع الآن؟"
},
"premiumPurchaseAlertV2": {
"message": "You can purchase Premium from your account settings on the Bitwarden web app."
},
Expand Down Expand Up @@ -2064,6 +2061,9 @@
"usernameGenerator": {
"message": "مولد اسم المستخدم"
},
"useThisEmail": {
"message": "Use this email"
},
"useThisPassword": {
"message": "استخدم كلمة المرور هذه"
},
Expand Down
6 changes: 3 additions & 3 deletions apps/browser/src/_locales/az/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1280,9 +1280,6 @@
"premiumPurchase": {
"message": "Premium satın al"
},
"premiumPurchaseAlert": {
"message": "Premium üzvlüyü bitwarden.com veb seyfində satın ala bilərsiniz. İndi saytı ziyarət etmək istəyirsiniz?"
},
"premiumPurchaseAlertV2": {
"message": "Bitwarden veb tətbiqindəki hesab ayarlarınızda Premium satın ala bilərsiniz."
},
Expand Down Expand Up @@ -2064,6 +2061,9 @@
"usernameGenerator": {
"message": "İstifadəçi adı yaradıcı"
},
"useThisEmail": {
"message": "Bu e-poçtu istifadə et"
},
"useThisPassword": {
"message": "Bu parolu istifadə et"
},
Expand Down
6 changes: 3 additions & 3 deletions apps/browser/src/_locales/be/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1280,9 +1280,6 @@
"premiumPurchase": {
"message": "Купіць прэміум"
},
"premiumPurchaseAlert": {
"message": "Вы можаце купіць прэміяльны статус на bitwarden.com. Перайсці на вэб-сайт зараз?"
},
"premiumPurchaseAlertV2": {
"message": "You can purchase Premium from your account settings on the Bitwarden web app."
},
Expand Down Expand Up @@ -2064,6 +2061,9 @@
"usernameGenerator": {
"message": "Генератар імені карыстальніка"
},
"useThisEmail": {
"message": "Use this email"
},
"useThisPassword": {
"message": "Выкарыстоўваць гэты пароль"
},
Expand Down
6 changes: 3 additions & 3 deletions apps/browser/src/_locales/bg/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1280,9 +1280,6 @@
"premiumPurchase": {
"message": "Покупка на платен абонамент"
},
"premiumPurchaseAlert": {
"message": "Може да платите абонамента си през сайта bitwarden.com. Искате ли да го посетите сега?"
},
"premiumPurchaseAlertV2": {
"message": "Можете да закупите платената версия от настройките на регистрацията си, в приложението по уеб на Битуорден."
},
Expand Down Expand Up @@ -2064,6 +2061,9 @@
"usernameGenerator": {
"message": "Генератор на потребителски имена"
},
"useThisEmail": {
"message": "Използване на тази е-поща"
},
"useThisPassword": {
"message": "Използване на тази парола"
},
Expand Down
6 changes: 3 additions & 3 deletions apps/browser/src/_locales/bn/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1280,9 +1280,6 @@
"premiumPurchase": {
"message": "প্রিমিয়াম কিনুন"
},
"premiumPurchaseAlert": {
"message": "আপনি bitwarden.com ওয়েব ভল্টে প্রিমিয়াম সদস্যতা কিনতে পারেন। আপনি কি এখনই ওয়েবসাইটটি দেখতে চান?"
},
"premiumPurchaseAlertV2": {
"message": "You can purchase Premium from your account settings on the Bitwarden web app."
},
Expand Down Expand Up @@ -2064,6 +2061,9 @@
"usernameGenerator": {
"message": "Username generator"
},
"useThisEmail": {
"message": "Use this email"
},
"useThisPassword": {
"message": "Use this password"
},
Expand Down
6 changes: 3 additions & 3 deletions apps/browser/src/_locales/bs/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1280,9 +1280,6 @@
"premiumPurchase": {
"message": "Purchase Premium"
},
"premiumPurchaseAlert": {
"message": "You can purchase Premium membership on the bitwarden.com web vault. Do you want to visit the website now?"
},
"premiumPurchaseAlertV2": {
"message": "You can purchase Premium from your account settings on the Bitwarden web app."
},
Expand Down Expand Up @@ -2064,6 +2061,9 @@
"usernameGenerator": {
"message": "Username generator"
},
"useThisEmail": {
"message": "Use this email"
},
"useThisPassword": {
"message": "Use this password"
},
Expand Down
Loading

0 comments on commit 9853cde

Please sign in to comment.