Auth/ps 2298 reorg auth (#4564)

* Move auth service factories to Auth team

* Move authentication componenets to Auth team

* Move auth guard services to Auth team

* Move Duo content script to Auth team

* Move auth CLI commands to Auth team

* Move Desktop Account components to Auth Team

* Move Desktop guards to Auth team

* Move two-factor provider images to Auth team

* Move web Accounts components to Auth Team

* Move web settings components to Auth Team

* Move web two factor images to Auth Team

* Fix missed import changes for Auth Team

* Fix Linting errors

* Fix missed CLI imports

* Fix missed Desktop imports

* Revert images move

* Fix missed imports in Web

* Move angular lib components to Auth Team

* Move angular auth guards to Auth team

* Move strategy specs to Auth team

* Update .eslintignore for new paths

* Move lib common abstractions to Auth team

* Move services to Auth team

* Move common lib enums to Auth team

* Move webauthn iframe to Auth team

* Move lib common domain models to Auth team

* Move common lib requests to Auth team

* Move response models to Auth team

* Clean up whitelist

* Move bit web components to Auth team

* Move SSO and SCIM files to Auth team

* Revert move SCIM to Auth team

SCIM belongs to Admin Console team

* Move captcha to Auth team

* Move key connector to Auth team

* Move emergency access to auth team

* Delete extra file

* linter fixes

* Move kdf config to auth team

* Fix whitelist

* Fix duo autoformat

* Complete two factor provider request move

* Fix whitelist names

* Fix login capitalization

* Revert hint dependency reordering

* Revert hint dependency reordering

* Revert hint component

This components is being picked up as a move between clients

* Move web hint component to Auth team

* Move new files to auth team

* Fix desktop build

* Fix browser build

.eslintignore

@@ -11,11 +11,11 @@ storybook-static
 **/gulpfile.js
 
 apps/browser/config/config.js
+apps/browser/src/auth/scripts/duo.js
 apps/browser/src/autofill/content/autofill.js
-apps/browser/src/scripts/duo.js
 
 apps/desktop/desktop_native
-apps/desktop/src/scripts/duo.js
+apps/desktop/src/auth/scripts/duo.js
 
 apps/web/config.js
 apps/web/scripts/*.js

.github/whitelist-capital-letters.txt

@@ -4,12 +4,9 @@
 ./apps/browser/src/safari/desktop/Base.lproj
 ./apps/browser/src/services/vaultTimeout
 ./apps/browser/store/windows/Assets
-./libs/common/spec/misc/logInStrategies
 ./libs/common/src/abstractions/fileDownload
 ./libs/common/src/abstractions/userVerification
 ./libs/common/src/abstractions/vaultTimeout
-./libs/common/src/misc/logInStrategies
-./libs/common/src/services/userVerification
 ./libs/common/src/services/vaultTimeout
 ./bitwarden_license/README.md
 ./bitwarden_license/bit-web/src/app/providers/services/webProvider.service.ts
@@ -24,15 +21,11 @@
 ./libs/angular/src/scss/webfonts/Open_Sans-normal-600.woff
 ./libs/angular/src/scss/webfonts/Open_Sans-normal-800.woff
 ./libs/angular/src/scss/webfonts/Open_Sans-normal-400.woff
-./libs/angular/src/components/captchaProtected.component.ts
 ./libs/angular/src/validators/inputsFieldMatch.validator.ts
 ./libs/angular/src/validators/notAllowedValueAsync.validator.ts
 ./libs/angular/src/services/theming/themeBuilder.ts
 ./libs/angular/src/interfaces/selectOptions.ts
 ./libs/components/src/stories/Introduction.stories.mdx
-./libs/common/spec/misc/logInStrategies/logIn.strategy.spec.ts
-./libs/common/spec/misc/logInStrategies/passwordLogIn.strategy.spec.ts
-./libs/common/spec/misc/logInStrategies/ssoLogIn.strategy.spec.ts
 ./libs/common/spec/web/services/webCryptoFunction.service.spec.ts
 ./libs/common/spec/shared/interceptConsole.ts
 ./libs/common/spec/models/domain/encString.spec.ts
@@ -45,19 +38,12 @@
 ./libs/common/spec/matchers/toEqualBuffer.ts
 ./libs/common/spec/services/stateMigration.service.spec.ts
 ./libs/common/spec/services/consoleLog.service.spec.ts
-./libs/common/src/misc/logInStrategies/ssoLogin.strategy.ts
-./libs/common/src/misc/logInStrategies/passwordLogin.strategy.ts
-./libs/common/src/misc/logInStrategies/passwordlessLogin.strategy.ts
-./libs/common/src/misc/logInStrategies/logIn.strategy.ts
 ./libs/common/src/misc/nodeUtils.ts
 ./libs/common/src/misc/linkedFieldOption.decorator.ts
 ./libs/common/src/misc/serviceUtils.ts
 ./libs/common/src/misc/serviceUtils.spec.ts
-./libs/common/src/types/twoFactorResponse.ts
-./libs/common/src/types/authResponse.ts
 ./libs/common/src/enums/kdfType.ts
 ./libs/common/src/enums/fileUploadType.ts
-./libs/common/src/enums/twoFactorProviderType.ts
 ./libs/common/src/enums/clientType.ts
 ./libs/common/src/enums/encryptedExportType.ts
 ./libs/common/src/enums/linkedIdType.ts
@@ -69,13 +55,11 @@
 ./libs/common/src/enums/htmlStorageLocation.ts
 ./libs/common/src/enums/providerUserType.ts
 ./libs/common/src/enums/organizationUserStatusType.ts
-./libs/common/src/enums/verificationType.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/organizationApiKeyType.ts
 ./libs/common/src/enums/hashPurpose.ts
 ./libs/common/src/enums/uriMatchType.ts
 ./libs/common/src/enums/deviceType.ts
@@ -84,18 +68,12 @@
 ./libs/common/src/enums/transactionType.ts
 ./libs/common/src/enums/providerUserStatusType.ts
 ./libs/common/src/enums/storageLocation.ts
-./libs/common/src/enums/authenticationType.ts
-./libs/common/src/enums/emergencyAccessType.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/authenticationStatus.ts
 ./libs/common/src/enums/fieldType.ts
 ./libs/common/src/enums/paymentMethodType.ts
-./libs/common/src/enums/ssoEnums.ts
-./libs/common/src/enums/authRequestType.ts
-./libs/common/src/enums/emergencyAccessStatusType.ts
 ./libs/common/src/enums/nativeMessagingVersion.ts
 ./libs/common/src/enums/organizationUserType.ts
 ./libs/common/src/factories/accountFactory.ts
@@ -114,13 +92,9 @@
 ./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/keyConnector.service.ts
 ./libs/common/src/abstractions/anonymousHub.service.ts
 ./libs/common/src/abstractions/appId.service.ts
 ./libs/common/src/abstractions/usernameGeneration.service.ts
-./libs/common/src/abstractions/twoFactor.service.ts
-./libs/common/src/services/userVerification/userVerification-api.service.ts
-./libs/common/src/services/userVerification/userVerification.service.ts
 ./libs/common/src/services/azureFileUpload.service.ts
 ./libs/common/src/services/stateMigration.service.ts
 ./libs/common/src/services/passwordGeneration.service.ts
@@ -129,12 +103,10 @@
 ./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/keyConnector.service.ts
 ./libs/common/src/services/anonymousHub.service.ts
 ./libs/common/src/services/appId.service.ts
 ./libs/common/src/services/usernameGeneration.service.ts
 ./libs/common/src/services/noopMessaging.service.ts
-./libs/common/src/services/twoFactor.service.ts
 ./libs/common/src/services/memoryStorage.service.ts
 ./libs/common/src/services/bitwardenFileUpload.service.ts
 ./libs/common/src/services/webCryptoFunction.service.ts

.prettierignore

@@ -8,14 +8,14 @@ storybook-static
 
 # External libraries / auto synced locales
 apps/browser/src/_locales
-apps/browser/src/scripts/duo.js
+apps/browser/src/auth/scripts/duo.js
 apps/browser/src/autofill/content/autofill.js
 apps/browser/src/safari
 
 apps/desktop/src/locales
 apps/desktop/dist-safari
 apps/desktop/desktop_native
-apps/desktop/src/scripts/duo.js
+apps/desktop/src/auth/scripts/duo.js
 
 apps/cli/src/locales
 apps/cli/.github

apps/browser/src/auth/background/service-factories/auth-service.factory.ts

@@ -1,27 +1,53 @@
-import { AuthService as AbstractAuthService } from "@bitwarden/common/abstractions/auth.service";
+import { AuthService as AbstractAuthService } from "@bitwarden/common/auth/abstractions/auth.service";
-import { AuthService } from "@bitwarden/common/services/auth.service";
+import { AuthService } from "@bitwarden/common/auth/services/auth.service";
 
-import { apiServiceFactory, ApiServiceInitOptions } from "./api-service.factory";
+import {
-import { appIdServiceFactory } from "./app-id-service.factory";
+  apiServiceFactory,
-import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory";
+  ApiServiceInitOptions,
-import { EncryptServiceInitOptions, encryptServiceFactory } from "./encrypt-service.factory";
+} from "../../../background/service_factories/api-service.factory";
+import { appIdServiceFactory } from "../../../background/service_factories/app-id-service.factory";
+import {
+  cryptoServiceFactory,
+  CryptoServiceInitOptions,
+} from "../../../background/service_factories/crypto-service.factory";
+import {
+  EncryptServiceInitOptions,
+  encryptServiceFactory,
+} from "../../../background/service_factories/encrypt-service.factory";
 import {
   environmentServiceFactory,
   EnvironmentServiceInitOptions,
-} from "./environment-service.factory";
+} from "../../../background/service_factories/environment-service.factory";
-import { CachedServices, factory, FactoryOptions } from "./factory-options";
+import {
-import { I18nServiceInitOptions, i18nServiceFactory } from "./i18n-service.factory";
+  CachedServices,
+  factory,
+  FactoryOptions,
+} from "../../../background/service_factories/factory-options";
+import {
+  I18nServiceInitOptions,
+  i18nServiceFactory,
+} from "../../../background/service_factories/i18n-service.factory";
+import {
+  logServiceFactory,
+  LogServiceInitOptions,
+} from "../../../background/service_factories/log-service.factory";
+import {
+  MessagingServiceInitOptions,
+  messagingServiceFactory,
+} from "../../../background/service_factories/messaging-service.factory";
+import {
+  PlatformUtilsServiceInitOptions,
+  platformUtilsServiceFactory,
+} from "../../../background/service_factories/platform-utils-service.factory";
+import {
+  stateServiceFactory,
+  StateServiceInitOptions,
+} from "../../../background/service_factories/state-service.factory";
+
 import {
   KeyConnectorServiceInitOptions,
   keyConnectorServiceFactory,
 } from "./key-connector-service.factory";
-import { logServiceFactory, LogServiceInitOptions } from "./log-service.factory";
-import { MessagingServiceInitOptions, messagingServiceFactory } from "./messaging-service.factory";
-import {
-  PlatformUtilsServiceInitOptions,
-  platformUtilsServiceFactory,
-} from "./platform-utils-service.factory";
-import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory";
 import { TokenServiceInitOptions, tokenServiceFactory } from "./token-service.factory";
 import { TwoFactorServiceInitOptions, twoFactorServiceFactory } from "./two-factor-service.factory";
 

apps/browser/src/auth/background/service-factories/key-connector-service.factory.ts

@@ -1,20 +1,37 @@
-import { KeyConnectorService as AbstractKeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service";
+import { KeyConnectorService as AbstractKeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service";
-import { KeyConnectorService } from "@bitwarden/common/services/keyConnector.service";
+import { KeyConnectorService } from "@bitwarden/common/auth/services/key-connector.service";
 
-import { apiServiceFactory, ApiServiceInitOptions } from "./api-service.factory";
+import {
+  apiServiceFactory,
+  ApiServiceInitOptions,
+} from "../../../background/service_factories/api-service.factory";
 import {
   cryptoFunctionServiceFactory,
   CryptoFunctionServiceInitOptions,
-} from "./crypto-function-service.factory";
+} from "../../../background/service_factories/crypto-function-service.factory";
-import { CryptoServiceInitOptions, cryptoServiceFactory } from "./crypto-service.factory";
+import {
-import { FactoryOptions, CachedServices, factory } from "./factory-options";
+  CryptoServiceInitOptions,
-import { logServiceFactory, LogServiceInitOptions } from "./log-service.factory";
+  cryptoServiceFactory,
+} from "../../../background/service_factories/crypto-service.factory";
+import {
+  FactoryOptions,
+  CachedServices,
+  factory,
+} from "../../../background/service_factories/factory-options";
+import {
+  logServiceFactory,
+  LogServiceInitOptions,
+} from "../../../background/service_factories/log-service.factory";
 import {
   OrganizationServiceInitOptions,
   organizationServiceFactory,
-} from "./organization-service.factory";
+} from "../../../background/service_factories/organization-service.factory";
-import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory";
+import {
-import { tokenServiceFactory, TokenServiceInitOptions } from "./token-service.factory";
+  stateServiceFactory,
+  StateServiceInitOptions,
+} from "../../../background/service_factories/state-service.factory";
+
+import { TokenServiceInitOptions, tokenServiceFactory } from "./token-service.factory";
 
 type KeyConnectorServiceFactoryOptions = FactoryOptions & {
   keyConnectorServiceOptions: {

apps/browser/src/auth/background/service-factories/token-service.factory.ts

@@ -1,8 +1,15 @@
-import { TokenService as AbstractTokenService } from "@bitwarden/common/abstractions/token.service";
+import { TokenService as AbstractTokenService } from "@bitwarden/common/auth/abstractions/token.service";
-import { TokenService } from "@bitwarden/common/services/token.service";
+import { TokenService } from "@bitwarden/common/auth/services/token.service";
 
-import { CachedServices, factory, FactoryOptions } from "./factory-options";
+import {
-import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory";
+  FactoryOptions,
+  CachedServices,
+  factory,
+} from "../../../background/service_factories/factory-options";
+import {
+  stateServiceFactory,
+  StateServiceInitOptions,
+} from "../../../background/service_factories/state-service.factory";
 
 type TokenServiceFactoryOptions = FactoryOptions;
 

apps/browser/src/auth/background/service-factories/totp-service.factory.ts

@@ -2,11 +2,18 @@ import { TotpService as AbstractTotpService } from "@bitwarden/common/abstractio
 import { TotpService } from "@bitwarden/common/services/totp.service";
 
 import {
-  cryptoFunctionServiceFactory,
   CryptoFunctionServiceInitOptions,
-} from "./crypto-function-service.factory";
+  cryptoFunctionServiceFactory,
-import { CachedServices, factory, FactoryOptions } from "./factory-options";
+} from "../../../background/service_factories/crypto-function-service.factory";
-import { logServiceFactory, LogServiceInitOptions } from "./log-service.factory";
+import {
+  FactoryOptions,
+  CachedServices,
+  factory,
+} from "../../../background/service_factories/factory-options";
+import {
+  LogServiceInitOptions,
+  logServiceFactory,
+} from "../../../background/service_factories/log-service.factory";
 
 type TotpServiceOptions = FactoryOptions;
 

apps/browser/src/auth/background/service-factories/two-factor-service.factory.ts

@@ -1,12 +1,19 @@
-import { TwoFactorService as AbstractTwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service";
+import { TwoFactorService as AbstractTwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
-import { TwoFactorService } from "@bitwarden/common/services/twoFactor.service";
+import { TwoFactorService } from "@bitwarden/common/auth/services/two-factor.service";
 
-import { FactoryOptions, CachedServices, factory } from "./factory-options";
-import { I18nServiceInitOptions, i18nServiceFactory } from "./i18n-service.factory";
 import {
-  platformUtilsServiceFactory,
+  FactoryOptions,
+  CachedServices,
+  factory,
+} from "../../../background/service_factories/factory-options";
+import {
+  I18nServiceInitOptions,
+  i18nServiceFactory,
+} from "../../../background/service_factories/i18n-service.factory";
+import {
   PlatformUtilsServiceInitOptions,
-} from "./platform-utils-service.factory";
+  platformUtilsServiceFactory,
+} from "../../../background/service_factories/platform-utils-service.factory";
 
 type TwoFactorServiceFactoryOptions = FactoryOptions;
 

apps/browser/src/auth/popup/hint.component.ts

@@ -1,12 +1,12 @@
 import { Component } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
 
-import { HintComponent as BaseHintComponent } from "@bitwarden/angular/components/hint.component";
+import { HintComponent as BaseHintComponent } from "@bitwarden/angular/auth/components/hint.component";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { LoginService } from "@bitwarden/common/abstractions/login.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
+import { LoginService } from "@bitwarden/common/auth/abstractions/login.service";
 
 @Component({
   selector: "app-hint",

apps/browser/src/auth/popup/home.component.ts

@@ -4,9 +4,9 @@ import { ActivatedRoute, Router } from "@angular/router";
 
 import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { LoginService } from "@bitwarden/common/abstractions/login.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
+import { LoginService } from "@bitwarden/common/auth/abstractions/login.service";
 
 @Component({
   selector: "app-home",

apps/browser/src/auth/popup/lock.component.ts

@@ -1,20 +1,20 @@
 import { Component, NgZone } from "@angular/core";
 import { Router } from "@angular/router";
 
-import { LockComponent as BaseLockComponent } from "@bitwarden/angular/components/lock.component";
+import { LockComponent as BaseLockComponent } from "@bitwarden/angular/auth/components/lock.component";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service";
-import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service";
+import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 
 import { BiometricErrors, BiometricErrorTypes } from "../../models/biometricErrors";
 

apps/browser/src/auth/popup/login-with-device.component.ts

@@ -1,21 +1,21 @@
 import { Component, OnDestroy, OnInit } from "@angular/core";
 import { Router } from "@angular/router";
 
-import { LoginWithDeviceComponent as BaseLoginWithDeviceComponent } from "@bitwarden/angular/components/login-with-device.component";
+import { LoginWithDeviceComponent as BaseLoginWithDeviceComponent } from "@bitwarden/angular/auth/components/login-with-device.component";
 import { AnonymousHubService } from "@bitwarden/common/abstractions/anonymousHub.service";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AppIdService } from "@bitwarden/common/abstractions/appId.service";
-import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
 import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { LoginService } from "@bitwarden/common/abstractions/login.service";
 import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { ValidationService } from "@bitwarden/common/abstractions/validation.service";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { LoginService } from "@bitwarden/common/auth/abstractions/login.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
 @Component({

apps/browser/src/auth/popup/login.component.ts

@@ -2,19 +2,19 @@ import { Component, NgZone } from "@angular/core";
 import { FormBuilder } from "@angular/forms";
 import { ActivatedRoute, Router } from "@angular/router";
 
-import { LoginComponent as BaseLoginComponent } from "@bitwarden/angular/components/login.component";
+import { LoginComponent as BaseLoginComponent } from "@bitwarden/angular/auth/components/login.component";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AppIdService } from "@bitwarden/common/abstractions/appId.service";
-import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
 import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
 import { FormValidationErrorsService } from "@bitwarden/common/abstractions/formValidationErrors.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { LoginService } from "@bitwarden/common/abstractions/login.service";
 import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { LoginService } from "@bitwarden/common/auth/abstractions/login.service";
 import { Utils } from "@bitwarden/common/misc/utils";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 

apps/browser/src/auth/popup/register.component.ts

@@ -5,7 +5,6 @@ import { Router } from "@angular/router";
 import { RegisterComponent as BaseRegisterComponent } from "@bitwarden/angular/components/register.component";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
-import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
 import { FormValidationErrorsService } from "@bitwarden/common/abstractions/formValidationErrors.service";
@@ -14,6 +13,7 @@ import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 
 @Component({
   selector: "app-register",

apps/browser/src/auth/popup/remove-password.component.ts

@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 
-import { RemovePasswordComponent as BaseRemovePasswordComponent } from "@bitwarden/angular/components/remove-password.component";
+import { RemovePasswordComponent as BaseRemovePasswordComponent } from "@bitwarden/angular/auth/components/remove-password.component";
 
 @Component({
   selector: "app-remove-password",

apps/browser/src/auth/popup/services/index.ts

@@ -0,0 +1,2 @@
+export { LockGuardService } from "./lock-guard.service";
+export { UnauthGuardService } from "./unauth-guard.service";

apps/browser/src/auth/popup/services/lock-guard.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from "@angular/core";
 
-import { LockGuard as BaseLockGuardService } from "@bitwarden/angular/guards/lock.guard";
+import { LockGuard as BaseLockGuardService } from "@bitwarden/angular/auth/guards/lock.guard";
 
 @Injectable()
 export class LockGuardService extends BaseLockGuardService {

apps/browser/src/auth/popup/services/unauth-guard.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from "@angular/core";
 
-import { UnauthGuard as BaseUnauthGuardService } from "@bitwarden/angular/guards/unauth.guard";
+import { UnauthGuard as BaseUnauthGuardService } from "@bitwarden/angular/auth/guards/unauth.guard";
 
 @Injectable()
 export class UnauthGuardService extends BaseUnauthGuardService {

apps/browser/src/auth/popup/sso.component.ts

@@ -1,9 +1,8 @@
 import { Component } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
 
-import { SsoComponent as BaseSsoComponent } from "@bitwarden/angular/components/sso.component";
+import { SsoComponent as BaseSsoComponent } from "@bitwarden/angular/auth/components/sso.component";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
 import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
@@ -12,7 +11,8 @@ import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwo
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service";
-import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
 import { BrowserApi } from "../../browser/browserApi";

apps/browser/src/auth/popup/two-factor-options.component.ts

@@ -1,10 +1,10 @@
 import { Component } from "@angular/core";
 import { Router } from "@angular/router";
 
-import { TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent } from "@bitwarden/angular/components/two-factor-options.component";
+import { TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent } from "@bitwarden/angular/auth/components/two-factor-options.component";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service";
+import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
 
 @Component({
   selector: "app-two-factor-options",

apps/browser/src/auth/popup/two-factor.component.ts

@@ -2,24 +2,24 @@ import { Component } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
 import { first } from "rxjs/operators";
 
-import { TwoFactorComponent as BaseTwoFactorComponent } from "@bitwarden/angular/components/two-factor.component";
+import { TwoFactorComponent as BaseTwoFactorComponent } from "@bitwarden/angular/auth/components/two-factor.component";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AppIdService } from "@bitwarden/common/abstractions/appId.service";
-import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service";
 import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { LoginService } from "@bitwarden/common/abstractions/login.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
-import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
-import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType";
+import { LoginService } from "@bitwarden/common/auth/abstractions/login.service";
+import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
+import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
 import { BrowserApi } from "../../browser/browserApi";
-import { PopupUtilsService } from "../services/popup-utils.service";
+import { PopupUtilsService } from "../../popup/services/popup-utils.service";
 
 const BroadcasterSubscriptionId = "TwoFactorComponent";
 

apps/browser/src/auth/popup/update-temp-password.component.ts

@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 
-import { UpdateTempPasswordComponent as BaseUpdateTempPasswordComponent } from "@bitwarden/angular/components/update-temp-password.component";
+import { UpdateTempPasswordComponent as BaseUpdateTempPasswordComponent } from "@bitwarden/angular/auth/components/update-temp-password.component";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";

apps/browser/src/autofill/background/notification.background.ts

@@ -1,8 +1,8 @@
 import { firstValueFrom } from "rxjs";
 
-import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
-import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { PolicyType } from "@bitwarden/common/enums/policyType";
 import { ThemeType } from "@bitwarden/common/enums/themeType";
 import { Utils } from "@bitwarden/common/misc/utils";

apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts

@@ -1,3 +1,7 @@
+import {
+  TotpServiceInitOptions,
+  totpServiceFactory,
+} from "../../../auth/background/service-factories/totp-service.factory";
 import {
   EventCollectionServiceInitOptions,
   eventCollectionServiceFactory,
@@ -15,10 +19,6 @@ import {
   stateServiceFactory,
   StateServiceInitOptions,
 } from "../../../background/service_factories/state-service.factory";
-import {
-  totpServiceFactory,
-  TotpServiceInitOptions,
-} from "../../../background/service_factories/totp-service.factory";
 import {
   cipherServiceFactory,
   CipherServiceInitOptions,

apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts

@@ -1,7 +1,7 @@
 import { mock, MockProxy } from "jest-mock-extended";
 
-import { AuthService } from "@bitwarden/common/abstractions/auth.service";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
-import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus";
+import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";

apps/browser/src/autofill/browser/cipher-context-menu-handler.ts

@@ -1,6 +1,6 @@
-import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
-import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { StateFactory } from "@bitwarden/common/factories/stateFactory";
 import { Utils } from "@bitwarden/common/misc/utils";
 import { GlobalState } from "@bitwarden/common/models/domain/global-state";
@@ -12,7 +12,7 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import {
   authServiceFactory,
   AuthServiceInitOptions,
-} from "../../background/service_factories/auth-service.factory";
+} from "../../auth/background/service-factories/auth-service.factory";
 import { CachedServices } from "../../background/service_factories/factory-options";
 import { searchServiceFactory } from "../../background/service_factories/search-service.factory";
 import { BrowserApi } from "../../browser/browserApi";

apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts

@@ -1,8 +1,8 @@
 import { mock, MockProxy } from "jest-mock-extended";
 
-import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { TotpService } from "@bitwarden/common/abstractions/totp.service";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";

apps/browser/src/autofill/browser/context-menu-clicked-handler.ts

@@ -1,8 +1,8 @@
-import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { TotpService } from "@bitwarden/common/abstractions/totp.service";
-import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { EventType } from "@bitwarden/common/enums/eventType";
 import { StateFactory } from "@bitwarden/common/factories/stateFactory";
 import { GlobalState } from "@bitwarden/common/models/domain/global-state";
@@ -10,17 +10,17 @@ import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.servi
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
-import LockedVaultPendingNotificationsItem from "../../background/models/lockedVaultPendingNotificationsItem";
 import {
   authServiceFactory,
   AuthServiceInitOptions,
-} from "../../background/service_factories/auth-service.factory";
+} from "../../auth/background/service-factories/auth-service.factory";
+import { totpServiceFactory } from "../../auth/background/service-factories/totp-service.factory";
+import LockedVaultPendingNotificationsItem from "../../background/models/lockedVaultPendingNotificationsItem";
 import { eventCollectionServiceFactory } from "../../background/service_factories/event-collection-service.factory";
 import { CachedServices } from "../../background/service_factories/factory-options";
 import { passwordGenerationServiceFactory } from "../../background/service_factories/password-generation-service.factory";
 import { searchServiceFactory } from "../../background/service_factories/search-service.factory";
 import { stateServiceFactory } from "../../background/service_factories/state-service.factory";
-import { totpServiceFactory } from "../../background/service_factories/totp-service.factory";
 import { BrowserApi } from "../../browser/browserApi";
 import { Account } from "../../models/account";
 import {

apps/browser/src/background/commands.background.ts

@@ -1,8 +1,8 @@
-import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service";
-import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 
 import { BrowserApi } from "../browser/browserApi";
 

apps/browser/src/background/main.background.ts

@@ -2,7 +2,6 @@ import { AvatarUpdateService as AvatarUpdateServiceAbstraction } from "@bitwarde
 import { ApiService as ApiServiceAbstraction } from "@bitwarden/common/abstractions/api.service";
 import { AppIdService as AppIdServiceAbstraction } from "@bitwarden/common/abstractions/appId.service";
 import { AuditService as AuditServiceAbstraction } from "@bitwarden/common/abstractions/audit.service";
-import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/abstractions/auth.service";
 import { CollectionService as CollectionServiceAbstraction } from "@bitwarden/common/abstractions/collection.service";
 import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/abstractions/crypto.service";
 import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@bitwarden/common/abstractions/cryptoFunction.service";
@@ -12,7 +11,6 @@ import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/
 import { ExportService as ExportServiceAbstraction } from "@bitwarden/common/abstractions/export.service";
 import { FileUploadService as FileUploadServiceAbstraction } from "@bitwarden/common/abstractions/fileUpload.service";
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service";
-import { KeyConnectorService as KeyConnectorServiceAbstraction } from "@bitwarden/common/abstractions/keyConnector.service";
 import { LogService as LogServiceAbstraction } from "@bitwarden/common/abstractions/log.service";
 import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/abstractions/messaging.service";
 import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service";
@@ -30,21 +28,28 @@ import {
   AbstractStorageService,
 } from "@bitwarden/common/abstractions/storage.service";
 import { SystemService as SystemServiceAbstraction } from "@bitwarden/common/abstractions/system.service";
-import { TokenService as TokenServiceAbstraction } from "@bitwarden/common/abstractions/token.service";
 import { TotpService as TotpServiceAbstraction } from "@bitwarden/common/abstractions/totp.service";
-import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/common/abstractions/twoFactor.service";
 import { UserVerificationApiServiceAbstraction } from "@bitwarden/common/abstractions/userVerification/userVerification-api.service.abstraction";
 import { UserVerificationService as UserVerificationServiceAbstraction } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction";
 import { UsernameGenerationService as UsernameGenerationServiceAbstraction } from "@bitwarden/common/abstractions/usernameGeneration.service";
 import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service";
 import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service";
+import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth.service";
+import { KeyConnectorService as KeyConnectorServiceAbstraction } from "@bitwarden/common/auth/abstractions/key-connector.service";
+import { TokenService as TokenServiceAbstraction } from "@bitwarden/common/auth/abstractions/token.service";
+import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/common/auth/abstractions/two-factor.service";
+import { AuthService } from "@bitwarden/common/auth/services/auth.service";
+import { KeyConnectorService } from "@bitwarden/common/auth/services/key-connector.service";
+import { TokenService } from "@bitwarden/common/auth/services/token.service";
+import { TwoFactorService } from "@bitwarden/common/auth/services/two-factor.service";
+import { UserVerificationApiService } from "@bitwarden/common/auth/services/user-verification/user-verification-api.service";
+import { UserVerificationService } from "@bitwarden/common/auth/services/user-verification/user-verification.service";
 import { StateFactory } from "@bitwarden/common/factories/stateFactory";
 import { GlobalState } from "@bitwarden/common/models/domain/global-state";
 import { AvatarUpdateService } from "@bitwarden/common/services/account/avatar-update.service";
 import { ApiService } from "@bitwarden/common/services/api.service";
 import { AppIdService } from "@bitwarden/common/services/appId.service";
 import { AuditService } from "@bitwarden/common/services/audit.service";
-import { AuthService } from "@bitwarden/common/services/auth.service";
 import { CollectionService } from "@bitwarden/common/services/collection.service";
 import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service";
 import { ContainerService } from "@bitwarden/common/services/container.service";
@@ -54,7 +59,6 @@ import { EventCollectionService } from "@bitwarden/common/services/event/event-c
 import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
 import { ExportService } from "@bitwarden/common/services/export.service";
 import { FileUploadService } from "@bitwarden/common/services/fileUpload.service";
-import { KeyConnectorService } from "@bitwarden/common/services/keyConnector.service";
 import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service";
 import { NotificationsService } from "@bitwarden/common/services/notifications.service";
 import { PasswordGenerationService } from "@bitwarden/common/services/passwordGeneration.service";
@@ -64,11 +68,7 @@ import { SearchService } from "@bitwarden/common/services/search.service";
 import { SendService } from "@bitwarden/common/services/send.service";
 import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service";
 import { SystemService } from "@bitwarden/common/services/system.service";
-import { TokenService } from "@bitwarden/common/services/token.service";
 import { TotpService } from "@bitwarden/common/services/totp.service";
-import { TwoFactorService } from "@bitwarden/common/services/twoFactor.service";
-import { UserVerificationApiService } from "@bitwarden/common/services/userVerification/userVerification-api.service";
-import { UserVerificationService } from "@bitwarden/common/services/userVerification/userVerification.service";
 import { UsernameGenerationService } from "@bitwarden/common/services/usernameGeneration.service";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/services/vaultTimeout/vaultTimeoutSettings.service";
 import { WebCryptoFunctionService } from "@bitwarden/common/services/webCryptoFunction.service";

apps/browser/src/background/nativeMessaging.background.ts

@@ -1,5 +1,4 @@
 import { AppIdService } from "@bitwarden/common/abstractions/appId.service";
-import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
@@ -7,7 +6,8 @@ import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
-import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { Utils } from "@bitwarden/common/misc/utils";
 import { EncString } from "@bitwarden/common/models/domain/enc-string";
 import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";

apps/browser/src/background/service_factories/api-service.factory.ts

@@ -1,6 +1,11 @@
 import { ApiService as AbstractApiService } from "@bitwarden/common/abstractions/api.service";
 import { ApiService } from "@bitwarden/common/services/api.service";
 
+import {
+  tokenServiceFactory,
+  TokenServiceInitOptions,
+} from "../../auth/background/service-factories/token-service.factory";
+
 import { AppIdServiceInitOptions, appIdServiceFactory } from "./app-id-service.factory";
 import {
   environmentServiceFactory,
@@ -11,7 +16,6 @@ import {
   PlatformUtilsServiceInitOptions,
   platformUtilsServiceFactory,
 } from "./platform-utils-service.factory";
-import { TokenServiceInitOptions, tokenServiceFactory } from "./token-service.factory";
 
 type ApiServiceFactoryOptions = FactoryOptions & {
   apiServiceOptions: {

apps/browser/src/background/service_factories/vault-timeout-service.factory.ts

@@ -1,5 +1,13 @@
 import { VaultTimeoutService as AbstractVaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service";
 
+import {
+  authServiceFactory,
+  AuthServiceInitOptions,
+} from "../../auth/background/service-factories/auth-service.factory";
+import {
+  keyConnectorServiceFactory,
+  KeyConnectorServiceInitOptions,
+} from "../../auth/background/service-factories/key-connector-service.factory";
 import VaultTimeoutService from "../../services/vaultTimeout/vaultTimeout.service";
 import {
   cipherServiceFactory,
@@ -10,17 +18,12 @@ import {
   FolderServiceInitOptions,
 } from "../../vault/background/service_factories/folder-service.factory";
 
-import { authServiceFactory, AuthServiceInitOptions } from "./auth-service.factory";
 import {
   collectionServiceFactory,
   CollectionServiceInitOptions,
 } from "./collection-service.factory";
 import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory";
 import { CachedServices, factory, FactoryOptions } from "./factory-options";
-import {
-  keyConnectorServiceFactory,
-  KeyConnectorServiceInitOptions,
-} from "./key-connector-service.factory";
 import { messagingServiceFactory, MessagingServiceInitOptions } from "./messaging-service.factory";
 import {
   platformUtilsServiceFactory,

apps/browser/src/background/service_factories/vault-timeout-settings-service.factory.ts

@@ -1,6 +1,11 @@
 import { VaultTimeoutSettingsService as AbstractVaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/services/vaultTimeout/vaultTimeoutSettings.service";
 
+import {
+  tokenServiceFactory,
+  TokenServiceInitOptions,
+} from "../../auth/background/service-factories/token-service.factory";
+
 import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory";
 import { CachedServices, factory, FactoryOptions } from "./factory-options";
 import { policyServiceFactory, PolicyServiceInitOptions } from "./policy-service.factory";
@@ -8,7 +13,6 @@ import {
   stateServiceFactory as stateServiceFactory,
   StateServiceInitOptions,
 } from "./state-service.factory";
-import { tokenServiceFactory, TokenServiceInitOptions } from "./token-service.factory";
 
 type VaultTimeoutSettingsServiceFactoryOptions = FactoryOptions;
 

apps/browser/src/background/webRequest.background.ts

@@ -1,6 +1,6 @@
-import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { UriMatchType } from "@bitwarden/common/enums/uriMatchType";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 

apps/browser/src/listeners/onCommandListener.ts

@@ -1,12 +1,12 @@
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
-import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus";
+import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { StateFactory } from "@bitwarden/common/factories/stateFactory";
 import { GlobalState } from "@bitwarden/common/models/domain/global-state";
 
+import { authServiceFactory } from "../auth/background/service-factories/auth-service.factory";
 import { autofillServiceFactory } from "../autofill/background/service_factories/autofill-service.factory";
 import { GeneratePasswordToClipboardCommand } from "../autofill/clipboard";
 import { AutofillTabCommand } from "../autofill/commands/autofill-tab-command";
-import { authServiceFactory } from "../background/service_factories/auth-service.factory";
 import { CachedServices } from "../background/service_factories/factory-options";
 import { logServiceFactory } from "../background/service_factories/log-service.factory";
 import {

apps/browser/src/listeners/update-badge.ts

@@ -1,14 +1,14 @@
-import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service";
-import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { StateFactory } from "@bitwarden/common/factories/stateFactory";
 import { Utils } from "@bitwarden/common/misc/utils";
 import { GlobalState } from "@bitwarden/common/models/domain/global-state";
 import { ContainerService } from "@bitwarden/common/services/container.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 
-import { authServiceFactory } from "../background/service_factories/auth-service.factory";
+import { authServiceFactory } from "../auth/background/service-factories/auth-service.factory";
 import { searchServiceFactory } from "../background/service_factories/search-service.factory";
 import { stateServiceFactory } from "../background/service_factories/state-service.factory";
 import { BrowserApi } from "../browser/browserApi";

apps/browser/src/popup/app-routing.module.ts

@@ -1,10 +1,23 @@
 import { Injectable, NgModule } from "@angular/core";
 import { ActivatedRouteSnapshot, RouteReuseStrategy, RouterModule, Routes } from "@angular/router";
 
-import { AuthGuard } from "@bitwarden/angular/guards/auth.guard";
+import { AuthGuard } from "@bitwarden/angular/auth/guards/auth.guard";
-import { LockGuard } from "@bitwarden/angular/guards/lock.guard";
+import { LockGuard } from "@bitwarden/angular/auth/guards/lock.guard";
-import { UnauthGuard } from "@bitwarden/angular/guards/unauth.guard";
+import { UnauthGuard } from "@bitwarden/angular/auth/guards/unauth.guard";
 
+import { EnvironmentComponent } from "../auth/popup/environment.component";
+import { HintComponent } from "../auth/popup/hint.component";
+import { HomeComponent } from "../auth/popup/home.component";
+import { LockComponent } from "../auth/popup/lock.component";
+import { LoginWithDeviceComponent } from "../auth/popup/login-with-device.component";
+import { LoginComponent } from "../auth/popup/login.component";
+import { RegisterComponent } from "../auth/popup/register.component";
+import { RemovePasswordComponent } from "../auth/popup/remove-password.component";
+import { SetPasswordComponent } from "../auth/popup/set-password.component";
+import { SsoComponent } from "../auth/popup/sso.component";
+import { TwoFactorOptionsComponent } from "../auth/popup/two-factor-options.component";
+import { TwoFactorComponent } from "../auth/popup/two-factor.component";
+import { UpdateTempPasswordComponent } from "../auth/popup/update-temp-password.component";
 import { AddEditComponent } from "../vault/popup/components/vault/add-edit.component";
 import { AttachmentsComponent } from "../vault/popup/components/vault/attachments.component";
 import { CurrentTabComponent } from "../vault/popup/components/vault/current-tab.component";
@@ -14,19 +27,6 @@ import { VaultFilterComponent } from "../vault/popup/components/vault/vault-filt
 import { VaultItemsComponent } from "../vault/popup/components/vault/vault-items.component";
 import { ViewComponent } from "../vault/popup/components/vault/view.component";
 
-import { EnvironmentComponent } from "./accounts/environment.component";
-import { HintComponent } from "./accounts/hint.component";
-import { HomeComponent } from "./accounts/home.component";
-import { LockComponent } from "./accounts/lock.component";
-import { LoginWithDeviceComponent } from "./accounts/login-with-device.component";
-import { LoginComponent } from "./accounts/login.component";
-import { RegisterComponent } from "./accounts/register.component";
-import { RemovePasswordComponent } from "./accounts/remove-password.component";
-import { SetPasswordComponent } from "./accounts/set-password.component";
-import { SsoComponent } from "./accounts/sso.component";
-import { TwoFactorOptionsComponent } from "./accounts/two-factor-options.component";
-import { TwoFactorComponent } from "./accounts/two-factor.component";
-import { UpdateTempPasswordComponent } from "./accounts/update-temp-password.component";
 import { GeneratorComponent } from "./generator/generator.component";
 import { PasswordGeneratorHistoryComponent } from "./generator/password-generator-history.component";
 import { SendAddEditComponent } from "./send/send-add-edit.component";

apps/browser/src/popup/app.component.ts

@@ -12,11 +12,11 @@ import { IndividualConfig, ToastrService } from "ngx-toastr";
 import { Subject, takeUntil } from "rxjs";
 import Swal, { SweetAlertIcon } from "sweetalert2";
 
-import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 
 import { BrowserApi } from "../browser/browserApi";
 import { BrowserStateService } from "../services/abstractions/browser-state.service";

apps/browser/src/popup/app.module.ts

@@ -19,6 +19,19 @@ import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { ColorPasswordCountPipe } from "@bitwarden/angular/pipes/color-password-count.pipe";
 import { ColorPasswordPipe } from "@bitwarden/angular/pipes/color-password.pipe";
 
+import { EnvironmentComponent } from "../auth/popup/environment.component";
+import { HintComponent } from "../auth/popup/hint.component";
+import { HomeComponent } from "../auth/popup/home.component";
+import { LockComponent } from "../auth/popup/lock.component";
+import { LoginWithDeviceComponent } from "../auth/popup/login-with-device.component";
+import { LoginComponent } from "../auth/popup/login.component";
+import { RegisterComponent } from "../auth/popup/register.component";
+import { RemovePasswordComponent } from "../auth/popup/remove-password.component";
+import { SetPasswordComponent } from "../auth/popup/set-password.component";
+import { SsoComponent } from "../auth/popup/sso.component";
+import { TwoFactorOptionsComponent } from "../auth/popup/two-factor-options.component";
+import { TwoFactorComponent } from "../auth/popup/two-factor.component";
+import { UpdateTempPasswordComponent } from "../auth/popup/update-temp-password.component";
 import { CollectionsComponent } from "../popup/vault/collections.component";
 import { ActionButtonsComponent } from "../vault/popup/components/action-buttons.component";
 import { CipherRowComponent } from "../vault/popup/components/cipher-row.component";
@@ -35,19 +48,6 @@ import { VaultSelectComponent } from "../vault/popup/components/vault/vault-sele
 import { ViewCustomFieldsComponent } from "../vault/popup/components/vault/view-custom-fields.component";
 import { ViewComponent } from "../vault/popup/components/vault/view.component";
 
-import { EnvironmentComponent } from "./accounts/environment.component";
-import { HintComponent } from "./accounts/hint.component";
-import { HomeComponent } from "./accounts/home.component";
-import { LockComponent } from "./accounts/lock.component";
-import { LoginWithDeviceComponent } from "./accounts/login-with-device.component";
-import { LoginComponent } from "./accounts/login.component";
-import { RegisterComponent } from "./accounts/register.component";
-import { RemovePasswordComponent } from "./accounts/remove-password.component";
-import { SetPasswordComponent } from "./accounts/set-password.component";
-import { SsoComponent } from "./accounts/sso.component";
-import { TwoFactorOptionsComponent } from "./accounts/two-factor-options.component";
-import { TwoFactorComponent } from "./accounts/two-factor.component";
-import { UpdateTempPasswordComponent } from "./accounts/update-temp-password.component";
 import { AppRoutingModule } from "./app-routing.module";
 import { AppComponent } from "./app.component";
 import { PopOutComponent } from "./components/pop-out.component";

apps/browser/src/popup/components/user-verification.component.ts

@@ -2,7 +2,7 @@ import { animate, style, transition, trigger } from "@angular/animations";
 import { Component } from "@angular/core";
 import { NG_VALUE_ACCESSOR } from "@angular/forms";
 
-import { UserVerificationComponent as BaseComponent } from "@bitwarden/angular/components/user-verification.component";
+import { UserVerificationComponent as BaseComponent } from "@bitwarden/angular/auth/components/user-verification.component";
 
 @Component({
   selector: "app-user-verification",

apps/browser/src/popup/services/services.module.ts

@@ -1,7 +1,7 @@
 import { APP_INITIALIZER, LOCALE_ID, NgModule } from "@angular/core";
 
-import { LockGuard as BaseLockGuardService } from "@bitwarden/angular/guards/lock.guard";
+import { LockGuard as BaseLockGuardService } from "@bitwarden/angular/auth/guards/lock.guard";
-import { UnauthGuard as BaseUnauthGuardService } from "@bitwarden/angular/guards/unauth.guard";
+import { UnauthGuard as BaseUnauthGuardService } from "@bitwarden/angular/auth/guards/unauth.guard";
 import { MEMORY_STORAGE, SECURE_STORAGE } from "@bitwarden/angular/services/injection-tokens";
 import { JslibServicesModule } from "@bitwarden/angular/services/jslib-services.module";
 import { ThemingService } from "@bitwarden/angular/services/theming/theming.service";
@@ -9,7 +9,6 @@ import { AbstractThemingService } from "@bitwarden/angular/services/theming/them
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AppIdService } from "@bitwarden/common/abstractions/appId.service";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
-import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/abstractions/auth.service";
 import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
 import { ConfigApiServiceAbstraction } from "@bitwarden/common/abstractions/config/config-api.service.abstraction";
 import { ConfigServiceAbstraction } from "@bitwarden/common/abstractions/config/config.service.abstraction";
@@ -23,9 +22,7 @@ import { ExportService } from "@bitwarden/common/abstractions/export.service";
 import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service";
 import { FileUploadService } from "@bitwarden/common/abstractions/fileUpload.service";
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service";
-import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service";
 import { LogService as LogServiceAbstraction } from "@bitwarden/common/abstractions/log.service";
-import { LoginService as LoginServiceAbstraction } from "@bitwarden/common/abstractions/login.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
 import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service";
 import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
@@ -49,19 +46,22 @@ import {
   AbstractMemoryStorageService,
   AbstractStorageService,
 } from "@bitwarden/common/abstractions/storage.service";
-import { TokenService } from "@bitwarden/common/abstractions/token.service";
 import { TotpService } from "@bitwarden/common/abstractions/totp.service";
-import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service";
 import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction";
 import { UsernameGenerationService } from "@bitwarden/common/abstractions/usernameGeneration.service";
 import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service";
+import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth.service";
+import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service";
+import { LoginService as LoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/login.service";
+import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
+import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
+import { AuthService } from "@bitwarden/common/auth/services/auth.service";
+import { LoginService } from "@bitwarden/common/auth/services/login.service";
 import { StateFactory } from "@bitwarden/common/factories/stateFactory";
 import { GlobalState } from "@bitwarden/common/models/domain/global-state";
-import { AuthService } from "@bitwarden/common/services/auth.service";
 import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service";
 import { ContainerService } from "@bitwarden/common/services/container.service";
-import { LoginService } from "@bitwarden/common/services/login.service";
 import { PolicyApiService } from "@bitwarden/common/services/policy/policy-api.service";
 import { SearchService } from "@bitwarden/common/services/search.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
@@ -74,6 +74,7 @@ import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder-api.service";
 
+import { LockGuardService, UnauthGuardService } from "../../auth/popup/services";
 import { AutofillService } from "../../autofill/services/abstractions/autofill.service";
 import MainBackground from "../../background/main.background";
 import { BrowserApi } from "../../browser/browserApi";
@@ -95,10 +96,8 @@ import { VaultFilterService } from "../../vault/services/vault-filter.service";
 
 import { DebounceNavigationService } from "./debounceNavigationService";
 import { InitService } from "./init.service";
-import { LockGuardService } from "./lock-guard.service";
 import { PopupSearchService } from "./popup-search.service";
 import { PopupUtilsService } from "./popup-utils.service";
-import { UnauthGuardService } from "./unauth-guard.service";
 
 const needsBackgroundInit = BrowserApi.getBackgroundPage() == null;
 const isPrivateMode = needsBackgroundInit && BrowserApi.manifestVersion !== 3;

apps/browser/src/popup/settings/settings.component.ts

@@ -7,12 +7,12 @@ import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service";
+import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service";
 import { DeviceType } from "@bitwarden/common/enums/deviceType";
 
 import { BrowserApi } from "../../browser/browserApi";

apps/browser/src/vault/popup/components/vault/view.component.ts

@@ -15,8 +15,8 @@ import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
-import { TokenService } from "@bitwarden/common/abstractions/token.service";
 import { TotpService } from "@bitwarden/common/abstractions/totp.service";
+import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";

apps/cli/src/auth/commands/lock.command.ts

@@ -1,7 +1,7 @@
 import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service";
 
-import { Response } from "../models/response";
+import { Response } from "../../models/response";
-import { MessageResponse } from "../models/response/message.response";
+import { MessageResponse } from "../../models/response/message.response";
 
 export class LockCommand {
   constructor(private vaultTimeoutService: VaultTimeoutService) {}

apps/cli/src/auth/commands/login.command.ts

@@ -6,33 +6,33 @@ import Separator from "inquirer/lib/objects/separator";
 import { firstValueFrom } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
 import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
-import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service";
 import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 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 { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
-import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType";
+import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service";
-import { NodeUtils } from "@bitwarden/common/misc/nodeUtils";
+import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
-import { Utils } from "@bitwarden/common/misc/utils";
+import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
-import { AuthResult } from "@bitwarden/common/models/domain/auth-result";
+import { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result";
 import {
   UserApiLogInCredentials,
   PasswordLogInCredentials,
   SsoLogInCredentials,
-} from "@bitwarden/common/models/domain/log-in-credentials";
+} from "@bitwarden/common/auth/models/domain/log-in-credentials";
-import { TokenTwoFactorRequest } from "@bitwarden/common/models/request/identity-token/token-two-factor.request";
+import { TokenTwoFactorRequest } from "@bitwarden/common/auth/models/request/identity-token/token-two-factor.request";
-import { TwoFactorEmailRequest } from "@bitwarden/common/models/request/two-factor-email.request";
+import { TwoFactorEmailRequest } from "@bitwarden/common/auth/models/request/two-factor-email.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";
 
-import { Response } from "../models/response";
+import { Response } from "../../models/response";
-import { MessageResponse } from "../models/response/message.response";
+import { MessageResponse } from "../../models/response/message.response";
 
 export class LoginCommand {
   protected canInteract: boolean;

apps/cli/src/auth/commands/logout.command.ts

@@ -1,8 +1,8 @@
-import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 
-import { Response } from "../models/response";
+import { Response } from "../../models/response";
-import { MessageResponse } from "../models/response/message.response";
+import { MessageResponse } from "../../models/response/message.response";
 
 export class LogoutCommand {
   constructor(

apps/cli/src/auth/commands/unlock.command.ts

@@ -2,20 +2,19 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
 import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
-import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
+import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service";
+import { SecretVerificationRequest } from "@bitwarden/common/auth/models/request/secret-verification.request";
 import { HashPurpose } from "@bitwarden/common/enums/hashPurpose";
 import { Utils } from "@bitwarden/common/misc/utils";
-import { SecretVerificationRequest } from "@bitwarden/common/models/request/secret-verification.request";
 import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
-import { Response } from "../models/response";
+import { ConvertToKeyConnectorCommand } from "../../commands/convert-to-key-connector.command";
-import { MessageResponse } from "../models/response/message.response";
+import { Response } from "../../models/response";
-import { CliUtils } from "../utils";
+import { MessageResponse } from "../../models/response/message.response";
-
+import { CliUtils } from "../../utils";
-import { ConvertToKeyConnectorCommand } from "./convert-to-key-connector.command";
 
 export class UnlockCommand {
   constructor(

apps/cli/src/bw.ts

@@ -7,6 +7,12 @@ import * as jsdom from "jsdom";
 import { ImportApiServiceAbstraction } from "@bitwarden/common/abstractions/import/import-api.service.abstraction";
 import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
+import { AuthService } from "@bitwarden/common/auth/services/auth.service";
+import { KeyConnectorService } from "@bitwarden/common/auth/services/key-connector.service";
+import { TokenService } from "@bitwarden/common/auth/services/token.service";
+import { TwoFactorService } from "@bitwarden/common/auth/services/two-factor.service";
+import { UserVerificationApiService } from "@bitwarden/common/auth/services/user-verification/user-verification-api.service";
+import { UserVerificationService } from "@bitwarden/common/auth/services/user-verification/user-verification.service";
 import { ClientType } from "@bitwarden/common/enums/clientType";
 import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions";
 import { LogLevelType } from "@bitwarden/common/enums/logLevelType";
@@ -15,7 +21,6 @@ import { Account } from "@bitwarden/common/models/domain/account";
 import { GlobalState } from "@bitwarden/common/models/domain/global-state";
 import { AppIdService } from "@bitwarden/common/services/appId.service";
 import { AuditService } from "@bitwarden/common/services/audit.service";
-import { AuthService } from "@bitwarden/common/services/auth.service";
 import { BroadcasterService } from "@bitwarden/common/services/broadcaster.service";
 import { CollectionService } from "@bitwarden/common/services/collection.service";
 import { ContainerService } from "@bitwarden/common/services/container.service";
@@ -26,7 +31,6 @@ import { ExportService } from "@bitwarden/common/services/export.service";
 import { FileUploadService } from "@bitwarden/common/services/fileUpload.service";
 import { ImportApiService } from "@bitwarden/common/services/import/import-api.service";
 import { ImportService } from "@bitwarden/common/services/import/import.service";
-import { KeyConnectorService } from "@bitwarden/common/services/keyConnector.service";
 import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service";
 import { NoopMessagingService } from "@bitwarden/common/services/noopMessaging.service";
 import { OrganizationUserServiceImplementation } from "@bitwarden/common/services/organization-user/organization-user.service.implementation";
@@ -40,11 +44,7 @@ import { SendService } from "@bitwarden/common/services/send.service";
 import { SettingsService } from "@bitwarden/common/services/settings.service";
 import { StateService } from "@bitwarden/common/services/state.service";
 import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service";
-import { TokenService } from "@bitwarden/common/services/token.service";
 import { TotpService } from "@bitwarden/common/services/totp.service";
-import { TwoFactorService } from "@bitwarden/common/services/twoFactor.service";
-import { UserVerificationApiService } from "@bitwarden/common/services/userVerification/userVerification-api.service";
-import { UserVerificationService } from "@bitwarden/common/services/userVerification/userVerification.service";
 import { VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout/vaultTimeout.service";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/services/vaultTimeout/vaultTimeoutSettings.service";
 import { InternalFolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";

apps/cli/src/commands/convert-to-key-connector.command.ts

@@ -1,8 +1,8 @@
 import * as inquirer from "inquirer";
 
 import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
-import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
+import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
 import { Response } from "../models/response";

apps/cli/src/commands/serve.command.ts

@@ -8,6 +8,8 @@ import * as koaJson from "koa-json";
 import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions";
 import { Utils } from "@bitwarden/common/misc/utils";
 
+import { LockCommand } from "../auth/commands/lock.command";
+import { UnlockCommand } from "../auth/commands/unlock.command";
 import { Main } from "../bw";
 import { Response } from "../models/response";
 import { FileResponse } from "../models/response/file.response";
@@ -20,7 +22,6 @@ import { EditCommand } from "./edit.command";
 import { GenerateCommand } from "./generate.command";
 import { GetCommand } from "./get.command";
 import { ListCommand } from "./list.command";
-import { LockCommand } from "./lock.command";
 import { RestoreCommand } from "./restore.command";
 import { SendCreateCommand } from "./send/create.command";
 import { SendDeleteCommand } from "./send/delete.command";
@@ -30,7 +31,6 @@ import { SendListCommand } from "./send/list.command";
 import { SendRemovePasswordCommand } from "./send/remove-password.command";
 import { ShareCommand } from "./share.command";
 import { StatusCommand } from "./status.command";
-import { UnlockCommand } from "./unlock.command";
 
 export class ServeCommand {
   private listCommand: ListCommand;

apps/cli/src/commands/status.command.ts

@@ -1,7 +1,7 @@
-import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
-import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
 import { Response } from "../models/response";

apps/cli/src/program.ts

@@ -1,20 +1,20 @@
 import * as chalk from "chalk";
 import * as program from "commander";
 
-import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus";
+import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions";
 
+import { LockCommand } from "./auth/commands/lock.command";
+import { LoginCommand } from "./auth/commands/login.command";
+import { LogoutCommand } from "./auth/commands/logout.command";
+import { UnlockCommand } from "./auth/commands/unlock.command";
 import { Main } from "./bw";
 import { CompletionCommand } from "./commands/completion.command";
 import { ConfigCommand } from "./commands/config.command";
 import { EncodeCommand } from "./commands/encode.command";
 import { GenerateCommand } from "./commands/generate.command";
-import { LockCommand } from "./commands/lock.command";
-import { LoginCommand } from "./commands/login.command";
-import { LogoutCommand } from "./commands/logout.command";
 import { ServeCommand } from "./commands/serve.command";
 import { StatusCommand } from "./commands/status.command";
-import { UnlockCommand } from "./commands/unlock.command";
 import { UpdateCommand } from "./commands/update.command";
 import { Response } from "./models/response";
 import { ListResponse } from "./models/response/list.response";

apps/cli/src/services/node-api.service.ts

@@ -5,7 +5,7 @@ import * as fe from "node-fetch";
 import { AppIdService } from "@bitwarden/common/abstractions/appId.service";
 import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { TokenService } from "@bitwarden/common/abstractions/token.service";
+import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
 import { ApiService } from "@bitwarden/common/services/api.service";
 
 (global as any).fetch = fe.default;

apps/desktop/src/app/accounts/hint.component.ts

@@ -1,12 +1,12 @@
 import { Component } from "@angular/core";
 import { Router } from "@angular/router";
 
-import { HintComponent as BaseHintComponent } from "@bitwarden/angular/components/hint.component";
+import { HintComponent as BaseHintComponent } from "@bitwarden/angular/auth/components/hint.component";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { LoginService } from "@bitwarden/common/abstractions/login.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
+import { LoginService } from "@bitwarden/common/auth/abstractions/login.service";
 
 @Component({
   selector: "app-hint",

apps/desktop/src/app/app-routing.module.ts

@@ -1,23 +1,23 @@
 import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
-import { AuthGuard } from "@bitwarden/angular/guards/auth.guard";
+import { AuthGuard } from "@bitwarden/angular/auth/guards/auth.guard";
-import { LockGuard } from "@bitwarden/angular/guards/lock.guard";
+import { LockGuard } from "@bitwarden/angular/auth/guards/lock.guard";
 
+import { AccessibilityCookieComponent } from "../auth/accessibility-cookie.component";
+import { LoginGuard } from "../auth/guards/login.guard";
+import { LockComponent } from "../auth/lock.component";
+import { LoginWithDeviceComponent } from "../auth/login/login-with-device.component";
+import { LoginComponent } from "../auth/login/login.component";
+import { RegisterComponent } from "../auth/register.component";
+import { RemovePasswordComponent } from "../auth/remove-password.component";
+import { SetPasswordComponent } from "../auth/set-password.component";
+import { SsoComponent } from "../auth/sso.component";
+import { TwoFactorComponent } from "../auth/two-factor.component";
+import { UpdateTempPasswordComponent } from "../auth/update-temp-password.component";
 import { VaultComponent } from "../vault/app/vault/vault.component";
 
-import { AccessibilityCookieComponent } from "./accounts/accessibility-cookie.component";
 import { HintComponent } from "./accounts/hint.component";
-import { LockComponent } from "./accounts/lock.component";
-import { LoginWithDeviceComponent } from "./accounts/login/login-with-device.component";
-import { LoginComponent } from "./accounts/login/login.component";
-import { RegisterComponent } from "./accounts/register.component";
-import { RemovePasswordComponent } from "./accounts/remove-password.component";
-import { SetPasswordComponent } from "./accounts/set-password.component";
-import { SsoComponent } from "./accounts/sso.component";
-import { TwoFactorComponent } from "./accounts/two-factor.component";
-import { UpdateTempPasswordComponent } from "./accounts/update-temp-password.component";
-import { LoginGuard } from "./guards/login.guard";
 import { SendComponent } from "./send/send.component";
 
 const routes: Routes = [

apps/desktop/src/app/app.component.ts

@@ -15,13 +15,11 @@ import { firstValueFrom, Subject, takeUntil } from "rxjs";
 
 import { ModalRef } from "@bitwarden/angular/components/modal/modal.ref";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
-import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service";
 import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { EventUploadService } from "@bitwarden/common/abstractions/event/event-upload.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
 import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service";
@@ -34,18 +32,20 @@ import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { SystemService } from "@bitwarden/common/abstractions/system.service";
 import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service";
-import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service";
+import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { InternalFolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 
+import { DeleteAccountComponent } from "../auth/delete-account.component";
+import { LoginApprovalComponent } from "../auth/login/login-approval.component";
 import { MenuUpdateRequest } from "../main/menu/menu.updater";
 import { PremiumComponent } from "../vault/app/accounts/premium.component";
 import { FolderAddEditComponent } from "../vault/app/vault/folder-add-edit.component";
 
-import { DeleteAccountComponent } from "./accounts/delete-account.component";
-import { LoginApprovalComponent } from "./accounts/login/login-approval.component";
 import { SettingsComponent } from "./accounts/settings.component";
 import { ExportComponent } from "./vault/export.component";
 import { GeneratorComponent } from "./vault/generator.component";

apps/desktop/src/app/app.module.ts

@@ -8,6 +8,19 @@ import { NgModule } from "@angular/core";
 import { ColorPasswordCountPipe } from "@bitwarden/angular/pipes/color-password-count.pipe";
 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 { LockComponent } from "../auth/lock.component";
+import { LoginApprovalComponent } from "../auth/login/login-approval.component";
+import { LoginModule } from "../auth/login/login.module";
+import { RegisterComponent } from "../auth/register.component";
+import { RemovePasswordComponent } from "../auth/remove-password.component";
+import { SetPasswordComponent } from "../auth/set-password.component";
+import { SsoComponent } from "../auth/sso.component";
+import { TwoFactorOptionsComponent } from "../auth/two-factor-options.component";
+import { TwoFactorComponent } from "../auth/two-factor.component";
+import { UpdateTempPasswordComponent } from "../auth/update-temp-password.component";
 import { PremiumComponent } from "../vault/app/accounts/premium.component";
 import { PasswordRepromptComponent } from "../vault/app/components/password-reprompt.component";
 import { AddEditCustomFieldsComponent } from "../vault/app/vault/add-edit-custom-fields.component";
@@ -22,21 +35,8 @@ 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 { AccessibilityCookieComponent } from "./accounts/accessibility-cookie.component";
-import { DeleteAccountComponent } from "./accounts/delete-account.component";
-import { EnvironmentComponent } from "./accounts/environment.component";
 import { HintComponent } from "./accounts/hint.component";
-import { LockComponent } from "./accounts/lock.component";
-import { LoginApprovalComponent } from "./accounts/login/login-approval.component";
-import { LoginModule } from "./accounts/login/login.module";
-import { RegisterComponent } from "./accounts/register.component";
-import { RemovePasswordComponent } from "./accounts/remove-password.component";
-import { SetPasswordComponent } from "./accounts/set-password.component";
 import { SettingsComponent } from "./accounts/settings.component";
-import { SsoComponent } from "./accounts/sso.component";
-import { TwoFactorOptionsComponent } from "./accounts/two-factor-options.component";
-import { TwoFactorComponent } from "./accounts/two-factor.component";
-import { UpdateTempPasswordComponent } from "./accounts/update-temp-password.component";
 import { VaultTimeoutInputComponent } from "./accounts/vault-timeout-input.component";
 import { AppRoutingModule } from "./app-routing.module";
 import { AppComponent } from "./app.component";

apps/desktop/src/app/components/user-verification.component.ts

@@ -2,7 +2,7 @@ import { animate, style, transition, trigger } from "@angular/animations";
 import { Component } from "@angular/core";
 import { NG_VALUE_ACCESSOR } from "@angular/forms";
 
-import { UserVerificationComponent as BaseComponent } from "@bitwarden/angular/components/user-verification.component";
+import { UserVerificationComponent as BaseComponent } from "@bitwarden/angular/auth/components/user-verification.component";
 
 @Component({
   selector: "app-user-verification",

apps/desktop/src/app/layout/account-switcher.component.ts

@@ -4,11 +4,11 @@ import { Component, OnDestroy, OnInit } from "@angular/core";
 import { Router } from "@angular/router";
 import { concatMap, Subject, takeUntil } from "rxjs";
 
-import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
-import { TokenService } from "@bitwarden/common/abstractions/token.service";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
-import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus";
+import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
+import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { Utils } from "@bitwarden/common/misc/utils";
 import { Account } from "@bitwarden/common/models/domain/account";
 

apps/desktop/src/app/services/init.service.ts

@@ -10,8 +10,8 @@ import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstrac
 import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service";
 import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService as StateServiceAbstraction } from "@bitwarden/common/abstractions/state.service";
-import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/common/abstractions/twoFactor.service";
 import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service";
+import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/common/auth/abstractions/two-factor.service";
 import { ContainerService } from "@bitwarden/common/services/container.service";
 import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
 import { VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout/vaultTimeout.service";

apps/desktop/src/app/services/services.module.ts

@@ -11,7 +11,6 @@ import {
 } from "@bitwarden/angular/services/injection-tokens";
 import { JslibServicesModule } from "@bitwarden/angular/services/jslib-services.module";
 import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction";
-import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/abstractions/auth.service";
 import { BroadcasterService as BroadcasterServiceAbstraction } from "@bitwarden/common/abstractions/broadcaster.service";
 import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/abstractions/crypto.service";
 import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@bitwarden/common/abstractions/cryptoFunction.service";
@@ -22,7 +21,6 @@ import {
   LogService,
   LogService as LogServiceAbstraction,
 } from "@bitwarden/common/abstractions/log.service";
-import { LoginService as LoginServiceAbstraction } from "@bitwarden/common/abstractions/login.service";
 import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/abstractions/messaging.service";
 import { PasswordGenerationService as PasswordGenerationServiceAbstraction } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/abstractions/platformUtils.service";
@@ -31,15 +29,18 @@ import { StateService as StateServiceAbstraction } from "@bitwarden/common/abstr
 import { StateMigrationService as StateMigrationServiceAbstraction } from "@bitwarden/common/abstractions/stateMigration.service";
 import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service";
 import { SystemService as SystemServiceAbstraction } from "@bitwarden/common/abstractions/system.service";
+import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth.service";
+import { LoginService as LoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/login.service";
+import { LoginService } from "@bitwarden/common/auth/services/login.service";
 import { ClientType } from "@bitwarden/common/enums/clientType";
 import { StateFactory } from "@bitwarden/common/factories/stateFactory";
 import { GlobalState } from "@bitwarden/common/models/domain/global-state";
-import { LoginService } from "@bitwarden/common/services/login.service";
 import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service";
 import { SystemService } from "@bitwarden/common/services/system.service";
 import { CipherService as CipherServiceAbstraction } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 
+import { LoginGuard } from "../../auth/guards/login.guard";
 import { Account } from "../../models/account";
 import { ElectronCryptoService } from "../../services/electron-crypto.service";
 import { ElectronLogService } from "../../services/electron-log.service";
@@ -53,7 +54,6 @@ import { NativeMessageHandlerService } from "../../services/native-message-handl
 import { NativeMessagingService } from "../../services/native-messaging.service";
 import { StateService } from "../../services/state.service";
 import { PasswordRepromptService } from "../../vault/services/password-reprompt.service";
-import { LoginGuard } from "../guards/login.guard";
 import { SearchBarService } from "../layout/search/search-bar.service";
 
 import { DesktopFileDownloadService } from "./desktop-file-download.service";

apps/desktop/src/auth/accessibility-cookie.component.ts

@@ -8,7 +8,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { Utils } from "@bitwarden/common/misc/utils";
 
-import { getCookie } from "../../utils";
+import { getCookie } from "../utils";
 
 const BroadcasterSubscriptionId = "AccessibilityCookieComponent";
 

apps/desktop/src/auth/delete-account.component.ts

@@ -1,10 +1,10 @@
 import { Component } from "@angular/core";
 import { FormBuilder } from "@angular/forms";
 
-import { AccountApiService } from "@bitwarden/common/abstractions/account/account-api.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
+import { AccountApiService } from "@bitwarden/common/auth/abstractions/account-api.service";
 import { Verification } from "@bitwarden/common/types/verification";
 
 @Component({

apps/desktop/src/auth/lock.component.ts

@@ -2,19 +2,19 @@ import { Component, NgZone } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
 import { ipcRenderer } from "electron";
 
-import { LockComponent as BaseLockComponent } from "@bitwarden/angular/components/lock.component";
+import { LockComponent as BaseLockComponent } from "@bitwarden/angular/auth/components/lock.component";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service";
+import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service";
 
 const BroadcasterSubscriptionId = "LockComponent";
 

apps/desktop/src/auth/login/login-approval.component.ts

@@ -6,11 +6,11 @@ import { ModalRef } from "@bitwarden/angular/components/modal/modal.ref";
 import { ModalConfig } from "@bitwarden/angular/services/modal.service";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AppIdService } from "@bitwarden/common/abstractions/appId.service";
-import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
-import { AuthRequestResponse } from "@bitwarden/common/models/response/auth-request.response";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { AuthRequestResponse } from "@bitwarden/common/auth/models/response/auth-request.response";
 
 const RequestTimeOut = 60000 * 15; //15 Minutes
 const RequestTimeUpdate = 60000 * 5; //5 Minutes

apps/desktop/src/auth/login/login-with-device.component.ts

@@ -1,22 +1,22 @@
 import { Component, OnDestroy, OnInit, ViewChild, ViewContainerRef } from "@angular/core";
 import { Router } from "@angular/router";
 
-import { LoginWithDeviceComponent as BaseLoginWithDeviceComponent } from "@bitwarden/angular/components/login-with-device.component";
+import { LoginWithDeviceComponent as BaseLoginWithDeviceComponent } from "@bitwarden/angular/auth/components/login-with-device.component";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { AnonymousHubService } from "@bitwarden/common/abstractions/anonymousHub.service";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AppIdService } from "@bitwarden/common/abstractions/appId.service";
-import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
 import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { LoginService } from "@bitwarden/common/abstractions/login.service";
 import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { ValidationService } from "@bitwarden/common/abstractions/validation.service";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { LoginService } from "@bitwarden/common/auth/abstractions/login.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
 import { EnvironmentComponent } from "../environment.component";

apps/desktop/src/auth/login/login.component.ts

@@ -2,22 +2,22 @@ import { Component, NgZone, OnDestroy, ViewChild, ViewContainerRef } from "@angu
 import { FormBuilder } from "@angular/forms";
 import { ActivatedRoute, Router } from "@angular/router";
 
-import { LoginComponent as BaseLoginComponent } from "@bitwarden/angular/components/login.component";
+import { LoginComponent as BaseLoginComponent } from "@bitwarden/angular/auth/components/login.component";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AppIdService } from "@bitwarden/common/abstractions/appId.service";
-import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service";
 import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
 import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
 import { FormValidationErrorsService } from "@bitwarden/common/abstractions/formValidationErrors.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { LoginService } from "@bitwarden/common/abstractions/login.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
 import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { LoginService } from "@bitwarden/common/auth/abstractions/login.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
 import { EnvironmentComponent } from "../environment.component";

apps/desktop/src/auth/login/login.module.ts

@@ -1,7 +1,7 @@
 import { NgModule } from "@angular/core";
 import { RouterModule } from "@angular/router";
 
-import { SharedModule } from "../../shared/shared.module";
+import { SharedModule } from "../../app/shared/shared.module";
 
 import { LoginWithDeviceComponent } from "./login-with-device.component";
 import { LoginComponent } from "./login.component";

apps/desktop/src/auth/register.component.ts

@@ -5,7 +5,6 @@ import { Router } from "@angular/router";
 import { RegisterComponent as BaseRegisterComponent } from "@bitwarden/angular/components/register.component";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
-import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
@@ -15,6 +14,7 @@ import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 
 const BroadcasterSubscriptionId = "RegisterComponent";
 

apps/desktop/src/auth/remove-password.component.ts

@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 
-import { RemovePasswordComponent as BaseRemovePasswordComponent } from "@bitwarden/angular/components/remove-password.component";
+import { RemovePasswordComponent as BaseRemovePasswordComponent } from "@bitwarden/angular/auth/components/remove-password.component";
 
 @Component({
   selector: "app-remove-password",