diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e03192f940..88e5f29d9b 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -2,10 +2,24 @@ # # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners -# Secrets Manager team files +# The following owners will be the default owners for everything in the repo. +# Unless a later match takes precedence +# @bitwarden/team-leads + +## Secrets Manager team files ## bitwarden_license/bit-web/src/app/secrets-manager @bitwarden/pod-sm-dev -# Password Manager Vault team files +## Auth team files ## +apps/browser/src/auth @bitwarden/team-auth-dev +apps/cli/src/auth @bitwarden/team-auth-dev +apps/desktop/src/auth @bitwarden/team-auth-dev +apps/web/src/auth @bitwarden/team-auth-dev +# web connectors used for auth +apps/web/src/connectors @bitwarden/team-auth-dev +libs/angular/src/auth @bitwarden/team-auth-dev +libs/common/src/auth @bitwarden/team-auth-dev + +## Vault team files ## apps/browser/src/vault @bitwarden/team-vault-dev apps/cli/src/vault @bitwarden/team-vault-dev apps/desktop/src/vault @bitwarden/team-vault-dev diff --git a/apps/cli/src/auth/commands/login.command.ts b/apps/cli/src/auth/commands/login.command.ts index fcdd7b0a82..cd038f89e8 100644 --- a/apps/cli/src/auth/commands/login.command.ts +++ b/apps/cli/src/auth/commands/login.command.ts @@ -25,9 +25,9 @@ import { } from "@bitwarden/common/auth/models/domain/log-in-credentials"; import { TokenTwoFactorRequest } from "@bitwarden/common/auth/models/request/identity-token/token-two-factor.request"; import { TwoFactorEmailRequest } from "@bitwarden/common/auth/models/request/two-factor-email.request"; +import { UpdateTempPasswordRequest } from "@bitwarden/common/auth/models/request/update-temp-password.request"; import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; import { Utils } from "@bitwarden/common/misc/utils"; -import { UpdateTempPasswordRequest } from "@bitwarden/common/models/request/update-temp-password.request"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; diff --git a/apps/desktop/src/app/app-routing.module.ts b/apps/desktop/src/app/app-routing.module.ts index c77b943971..d9b94fd0cb 100644 --- a/apps/desktop/src/app/app-routing.module.ts +++ b/apps/desktop/src/app/app-routing.module.ts @@ -6,6 +6,7 @@ import { LockGuard } from "@bitwarden/angular/auth/guards/lock.guard"; import { AccessibilityCookieComponent } from "../auth/accessibility-cookie.component"; import { LoginGuard } from "../auth/guards/login.guard"; +import { HintComponent } from "../auth/hint.component"; import { LockComponent } from "../auth/lock.component"; import { LoginWithDeviceComponent } from "../auth/login/login-with-device.component"; import { LoginComponent } from "../auth/login/login.component"; @@ -17,7 +18,6 @@ import { TwoFactorComponent } from "../auth/two-factor.component"; import { UpdateTempPasswordComponent } from "../auth/update-temp-password.component"; import { VaultComponent } from "../vault/app/vault/vault.component"; -import { HintComponent } from "./accounts/hint.component"; import { SendComponent } from "./send/send.component"; const routes: Routes = [ diff --git a/apps/desktop/src/app/app.module.ts b/apps/desktop/src/app/app.module.ts index 2e074528bb..58bcef23f5 100644 --- a/apps/desktop/src/app/app.module.ts +++ b/apps/desktop/src/app/app.module.ts @@ -11,6 +11,7 @@ import { ColorPasswordPipe } from "@bitwarden/angular/pipes/color-password.pipe" import { AccessibilityCookieComponent } from "../auth/accessibility-cookie.component"; import { DeleteAccountComponent } from "../auth/delete-account.component"; import { EnvironmentComponent } from "../auth/environment.component"; +import { HintComponent } from "../auth/hint.component"; import { LockComponent } from "../auth/lock.component"; import { LoginApprovalComponent } from "../auth/login/login-approval.component"; import { LoginModule } from "../auth/login/login.module"; @@ -35,7 +36,6 @@ import { VaultComponent } from "../vault/app/vault/vault.component"; import { ViewCustomFieldsComponent } from "../vault/app/vault/view-custom-fields.component"; import { ViewComponent } from "../vault/app/vault/view.component"; -import { HintComponent } from "./accounts/hint.component"; import { SettingsComponent } from "./accounts/settings.component"; import { VaultTimeoutInputComponent } from "./accounts/vault-timeout-input.component"; import { AppRoutingModule } from "./app-routing.module"; diff --git a/apps/desktop/src/app/accounts/hint.component.html b/apps/desktop/src/auth/hint.component.html similarity index 100% rename from apps/desktop/src/app/accounts/hint.component.html rename to apps/desktop/src/auth/hint.component.html diff --git a/apps/desktop/src/app/accounts/hint.component.ts b/apps/desktop/src/auth/hint.component.ts similarity index 100% rename from apps/desktop/src/app/accounts/hint.component.ts rename to apps/desktop/src/auth/hint.component.ts diff --git a/libs/angular/src/auth/components/update-temp-password.component.ts b/libs/angular/src/auth/components/update-temp-password.component.ts index 49a3b57146..26e6389e5f 100644 --- a/libs/angular/src/auth/components/update-temp-password.component.ts +++ b/libs/angular/src/auth/components/update-temp-password.component.ts @@ -9,10 +9,10 @@ import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwo import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { UpdateTempPasswordRequest } from "@bitwarden/common/auth/models/request/update-temp-password.request"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; -import { UpdateTempPasswordRequest } from "@bitwarden/common/models/request/update-temp-password.request"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { ChangePasswordComponent as BaseChangePasswordComponent } from "./change-password.component"; diff --git a/libs/common/src/abstractions/api.service.ts b/libs/common/src/abstractions/api.service.ts index 6ba5cd4400..4c4dd68d85 100644 --- a/libs/common/src/abstractions/api.service.ts +++ b/libs/common/src/abstractions/api.service.ts @@ -21,6 +21,7 @@ import { TwoFactorEmailRequest } from "../auth/models/request/two-factor-email.r import { TwoFactorProviderRequest } from "../auth/models/request/two-factor-provider.request"; import { TwoFactorRecoveryRequest } from "../auth/models/request/two-factor-recovery.request"; import { UpdateProfileRequest } from "../auth/models/request/update-profile.request"; +import { UpdateTempPasswordRequest } from "../auth/models/request/update-temp-password.request"; import { UpdateTwoFactorAuthenticatorRequest } from "../auth/models/request/update-two-factor-authenticator.request"; import { UpdateTwoFactorDuoRequest } from "../auth/models/request/update-two-factor-duo.request"; import { UpdateTwoFactorEmailRequest } from "../auth/models/request/update-two-factor-email.request"; @@ -87,7 +88,6 @@ import { TaxInfoUpdateRequest } from "../models/request/tax-info-update.request" import { UpdateAvatarRequest } from "../models/request/update-avatar.request"; import { UpdateDomainsRequest } from "../models/request/update-domains.request"; import { UpdateKeyRequest } from "../models/request/update-key.request"; -import { UpdateTempPasswordRequest } from "../models/request/update-temp-password.request"; import { VerifyDeleteRecoverRequest } from "../models/request/verify-delete-recover.request"; import { VerifyEmailRequest } from "../models/request/verify-email.request"; import { BillingHistoryResponse } from "../models/response/billing-history.response"; diff --git a/libs/common/src/models/request/update-temp-password.request.ts b/libs/common/src/auth/models/request/update-temp-password.request.ts similarity index 53% rename from libs/common/src/models/request/update-temp-password.request.ts rename to libs/common/src/auth/models/request/update-temp-password.request.ts index fa35e37f9e..88fd8a5d2b 100644 --- a/libs/common/src/models/request/update-temp-password.request.ts +++ b/libs/common/src/auth/models/request/update-temp-password.request.ts @@ -1,4 +1,4 @@ -import { OrganizationUserResetPasswordRequest } from "../../abstractions/organization-user/requests"; +import { OrganizationUserResetPasswordRequest } from "../../../abstractions/organization-user/requests"; export class UpdateTempPasswordRequest extends OrganizationUserResetPasswordRequest { masterPasswordHint: string; diff --git a/libs/common/src/services/api.service.ts b/libs/common/src/services/api.service.ts index 81dce4c854..26570d5303 100644 --- a/libs/common/src/services/api.service.ts +++ b/libs/common/src/services/api.service.ts @@ -28,6 +28,7 @@ import { TwoFactorEmailRequest } from "../auth/models/request/two-factor-email.r import { TwoFactorProviderRequest } from "../auth/models/request/two-factor-provider.request"; import { TwoFactorRecoveryRequest } from "../auth/models/request/two-factor-recovery.request"; import { UpdateProfileRequest } from "../auth/models/request/update-profile.request"; +import { UpdateTempPasswordRequest } from "../auth/models/request/update-temp-password.request"; import { UpdateTwoFactorAuthenticatorRequest } from "../auth/models/request/update-two-factor-authenticator.request"; import { UpdateTwoFactorDuoRequest } from "../auth/models/request/update-two-factor-duo.request"; import { UpdateTwoFactorEmailRequest } from "../auth/models/request/update-two-factor-email.request"; @@ -96,7 +97,6 @@ import { TaxInfoUpdateRequest } from "../models/request/tax-info-update.request" import { UpdateAvatarRequest } from "../models/request/update-avatar.request"; import { UpdateDomainsRequest } from "../models/request/update-domains.request"; import { UpdateKeyRequest } from "../models/request/update-key.request"; -import { UpdateTempPasswordRequest } from "../models/request/update-temp-password.request"; import { VerifyDeleteRecoverRequest } from "../models/request/verify-delete-recover.request"; import { VerifyEmailRequest } from "../models/request/verify-email.request"; import { BillingHistoryResponse } from "../models/response/billing-history.response";