From cf972e784ca7e4c5908702bd00318648a0b3bd8f Mon Sep 17 00:00:00 2001 From: Matt Gibson Date: Mon, 6 Feb 2023 16:53:37 -0500 Subject: [PATCH] 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 | 4 +- .github/whitelist-capital-letters.txt | 28 ----- .prettierignore | 4 +- .../auth-service.factory.ts | 58 ++++++--- .../key-connector-service.factory.ts | 37 ++++-- .../token-service.factory.ts | 15 ++- .../totp-service.factory.ts | 15 ++- .../two-factor-service.factory.ts | 19 ++- .../popup}/environment.component.html | 0 .../popup}/environment.component.ts | 0 .../popup}/hint.component.html | 0 .../accounts => auth/popup}/hint.component.ts | 4 +- .../popup}/home.component.html | 0 .../accounts => auth/popup}/home.component.ts | 2 +- .../popup}/lock.component.html | 0 .../accounts => auth/popup}/lock.component.ts | 8 +- .../popup}/login-with-device.component.html | 0 .../popup}/login-with-device.component.ts | 6 +- .../popup}/login.component.html | 0 .../popup}/login.component.ts | 6 +- .../popup}/register.component.html | 0 .../popup}/register.component.ts | 2 +- .../popup}/remove-password.component.html | 0 .../popup}/remove-password.component.ts | 2 +- apps/browser/src/auth/popup/services/index.ts | 2 + .../popup/services/lock-guard.service.ts | 2 +- .../popup/services/unauth-guard.service.ts | 2 +- .../popup}/set-password.component.html | 0 .../popup}/set-password.component.ts | 0 .../popup}/sso.component.html | 0 .../accounts => auth/popup}/sso.component.ts | 6 +- .../popup}/two-factor-options.component.html | 0 .../popup}/two-factor-options.component.ts | 4 +- .../popup}/two-factor.component.html | 0 .../popup}/two-factor.component.ts | 12 +- .../update-temp-password.component.html | 0 .../popup}/update-temp-password.component.ts | 2 +- apps/browser/src/{ => auth}/scripts/duo.js | 0 .../background/notification.background.ts | 4 +- .../autofill-service.factory.ts | 8 +- .../cipher-context-menu-handler.spec.ts | 4 +- .../browser/cipher-context-menu-handler.ts | 6 +- .../context-menu-clicked-handler.spec.ts | 2 +- .../browser/context-menu-clicked-handler.ts | 10 +- .../src/background/commands.background.ts | 4 +- .../browser/src/background/main.background.ts | 20 +-- .../background/nativeMessaging.background.ts | 4 +- .../service_factories/api-service.factory.ts | 6 +- .../vault-timeout-service.factory.ts | 13 +- .../vault-timeout-settings-service.factory.ts | 6 +- .../src/background/webRequest.background.ts | 4 +- .../src/listeners/onCommandListener.ts | 4 +- apps/browser/src/listeners/update-badge.ts | 6 +- apps/browser/src/popup/app-routing.module.ts | 32 ++--- apps/browser/src/popup/app.component.ts | 2 +- apps/browser/src/popup/app.module.ts | 26 ++-- .../components/user-verification.component.ts | 2 +- .../src/popup/services/services.module.ts | 21 ++-- .../src/popup/settings/settings.component.ts | 2 +- .../popup/components/vault/view.component.ts | 2 +- .../src/{ => auth}/commands/lock.command.ts | 4 +- .../src/{ => auth}/commands/login.command.ts | 24 ++-- .../src/{ => auth}/commands/logout.command.ts | 6 +- .../src/{ => auth}/commands/unlock.command.ts | 13 +- apps/cli/src/bw.ts | 12 +- .../convert-to-key-connector.command.ts | 2 +- apps/cli/src/commands/serve.command.ts | 4 +- apps/cli/src/commands/status.command.ts | 4 +- apps/cli/src/program.ts | 10 +- apps/cli/src/services/node-api.service.ts | 2 +- .../src/app/accounts/hint.component.ts | 4 +- apps/desktop/src/app/app-routing.module.ts | 26 ++-- apps/desktop/src/app/app.component.ts | 10 +- apps/desktop/src/app/app.module.ts | 26 ++-- .../components/user-verification.component.ts | 2 +- .../app/layout/account-switcher.component.ts | 6 +- apps/desktop/src/app/services/init.service.ts | 2 +- .../src/app/services/services.module.ts | 8 +- .../accessibility-cookie.component.html | 0 .../accessibility-cookie.component.ts | 2 +- .../delete-account.component.html | 0 .../delete-account.component.ts | 2 +- .../environment.component.html | 0 .../environment.component.ts | 0 .../src/{app => auth}/guards/login.guard.ts | 0 .../accounts => auth}/lock.component.html | 0 .../{app/accounts => auth}/lock.component.ts | 4 +- .../login/login-approval.component.html | 0 .../login/login-approval.component.ts | 4 +- .../login/login-with-device.component.html | 0 .../login/login-with-device.component.ts | 6 +- .../login/login.component.html | 0 .../login/login.component.ts | 6 +- .../accounts => auth}/login/login.module.ts | 2 +- .../accounts => auth}/register.component.html | 0 .../accounts => auth}/register.component.ts | 2 +- .../remove-password.component.html | 0 .../remove-password.component.ts | 2 +- apps/desktop/src/{ => auth}/scripts/duo.js | 0 .../set-password.component.html | 0 .../set-password.component.ts | 0 .../{app/accounts => auth}/sso.component.html | 0 .../{app/accounts => auth}/sso.component.ts | 4 +- .../two-factor-options.component.html | 0 .../two-factor-options.component.ts | 4 +- .../two-factor.component.html | 0 .../accounts => auth}/two-factor.component.ts | 10 +- .../update-temp-password.component.html | 0 .../update-temp-password.component.ts | 2 +- .../encrypted-message-handler.service.ts | 4 +- .../src/vault/app/vault/view.component.ts | 2 +- .../trial-initiation.module.ts | 2 +- apps/web/src/app/app.component.ts | 4 +- .../user-verification-prompt.component.ts | 2 +- .../components/user-verification.component.ts | 2 +- apps/web/src/app/core/core.module.ts | 4 +- apps/web/src/app/core/init.service.ts | 2 +- apps/web/src/app/guards/home.guard.ts | 4 +- apps/web/src/app/layouts/navbar.component.ts | 2 +- .../billing/billing-sync-api-key.component.ts | 4 +- ...ganization-subscription-cloud.component.ts | 2 +- .../components/reset-password.component.ts | 2 +- .../organization-routing.module.ts | 2 +- .../settings/two-factor-setup.component.ts | 8 +- .../vault/vault-items.component.ts | 2 +- apps/web/src/app/oss-routing.module.ts | 42 +++---- apps/web/src/app/oss.module.ts | 2 +- .../src/app/reports/reports-routing.module.ts | 2 +- .../web/src/app/settings/account.component.ts | 5 +- .../web/src/app/settings/api-key.component.ts | 4 +- .../app/settings/change-email.component.ts | 6 +- .../src/app/settings/change-kdf.component.ts | 2 +- .../app/settings/change-password.component.ts | 10 +- .../app/settings/delete-account.component.ts | 2 +- .../web/src/app/settings/premium.component.ts | 2 +- .../web/src/app/settings/profile.component.ts | 4 +- .../app/settings/security-keys.component.ts | 2 +- .../app/settings/security-routing.module.ts | 3 +- .../src/app/settings/security.component.ts | 2 +- .../src/app/settings/settings.component.ts | 2 +- .../src/app/shared/loose-components.module.ts | 66 +++++----- .../accept-emergency.component.html | 0 .../accept-emergency.component.ts | 4 +- .../accept-organization.component.html | 0 .../accept-organization.component.ts | 2 +- .../accounts => auth}/hint.component.html | 0 .../{app/accounts => auth}/hint.component.ts | 4 +- .../accounts => auth}/lock.component.html | 0 .../{app/accounts => auth}/lock.component.ts | 6 +- .../login/login-with-device.component.html | 0 .../login/login-with-device.component.ts | 8 +- .../login/login.component.html | 0 .../login/login.component.ts | 10 +- .../accounts => auth}/login/login.module.ts | 2 +- .../recover-delete.component.html | 0 .../recover-delete.component.ts | 0 .../recover-two-factor.component.html | 0 .../recover-two-factor.component.ts | 4 +- .../register-form.component.html | 0 .../register-form/register-form.component.ts | 2 +- .../register-form/register-form.module.ts | 2 +- .../remove-password.component.html | 0 .../remove-password.component.ts | 2 +- .../set-password.component.html | 0 .../set-password.component.ts | 0 .../deauthorize-sessions.component.html | 0 .../deauthorize-sessions.component.ts | 0 .../emergency-access-add-edit.component.html | 0 .../emergency-access-add-edit.component.ts | 6 +- .../emergency-access-attachments.component.ts | 2 +- .../emergency-access-confirm.component.html | 0 .../emergency-access-confirm.component.ts | 0 .../emergency-access-takeover.component.html | 0 .../emergency-access-takeover.component.ts | 6 +- .../emergency-access-view.component.html | 0 .../emergency-access-view.component.ts | 2 +- .../emergency-access.component.html | 0 .../emergency-access.component.ts | 10 +- .../emergency-add-edit.component.ts | 4 +- .../two-factor-authenticator.component.html | 0 .../two-factor-authenticator.component.ts | 8 +- .../settings/two-factor-base.component.ts | 10 +- .../settings/two-factor-duo.component.html | 0 .../settings/two-factor-duo.component.ts | 8 +- .../settings/two-factor-email.component.html | 0 .../settings/two-factor-email.component.ts | 10 +- .../two-factor-recovery.component.html | 0 .../settings/two-factor-recovery.component.ts | 4 +- .../settings/two-factor-setup.component.html | 0 .../settings/two-factor-setup.component.ts | 4 +- .../settings/two-factor-verify.component.html | 0 .../settings/two-factor-verify.component.ts | 10 +- .../two-factor-webauthn.component.html | 0 .../settings/two-factor-webauthn.component.ts | 12 +- .../two-factor-yubikey.component.html | 0 .../settings/two-factor-yubikey.component.ts | 8 +- .../settings/verify-email.component.html | 0 .../settings/verify-email.component.ts | 2 +- .../{app/accounts => auth}/sso.component.html | 0 .../{app/accounts => auth}/sso.component.ts | 4 +- .../two-factor-options.component.html | 0 .../two-factor-options.component.ts | 4 +- .../two-factor.component.html | 0 .../accounts => auth}/two-factor.component.ts | 12 +- .../update-password.component.html | 0 .../update-password.component.ts | 2 +- .../update-temp-password.component.html | 0 .../update-temp-password.component.ts | 2 +- .../verify-email-token.component.html | 0 .../verify-email-token.component.ts | 0 .../verify-recover-delete.component.html | 0 .../verify-recover-delete.component.ts | 0 .../organization-name-badge.component.ts | 2 +- .../components/link-sso.component.ts | 4 +- .../vault/app/vault/vault-items.component.ts | 2 +- .../src/vault/app/vault/vault.component.ts | 2 +- .../manage => auth}/sso.component.html | 0 .../manage => auth}/sso.component.ts | 10 +- .../organizations/manage/scim.component.ts | 4 +- .../organizations-routing.module.ts | 5 +- .../app/organizations/organizations.module.ts | 3 +- .../app/providers/providers-routing.module.ts | 2 +- .../captcha-protected.component.ts} | 2 +- .../components/change-password.component.ts | 4 +- .../{ => auth}/components/hint.component.ts | 4 +- .../{ => auth}/components/lock.component.ts | 4 +- .../components/login-with-device.component.ts | 14 +-- .../{ => auth}/components/login.component.ts | 10 +- .../components/remove-password.component.ts | 2 +- .../{ => auth}/components/sso.component.ts | 8 +- .../two-factor-options.component.ts | 4 +- .../components/two-factor.component.ts | 20 +-- .../components/update-password.component.ts | 4 +- .../update-temp-password.component.ts | 0 .../user-verification-prompt.component.ts | 5 +- .../components/user-verification.component.ts | 4 +- .../src/{ => auth}/guards/auth.guard.ts | 6 +- .../src/{ => auth}/guards/lock.guard.ts | 4 +- .../src/{ => auth}/guards/unauth.guard.ts | 4 +- .../src/components/register.component.ts | 9 +- .../src/components/set-password.component.ts | 4 +- .../src/components/set-pin.component.ts | 2 +- .../src/services/jslib-services.module.ts | 44 +++---- .../src/vault/components/view.component.ts | 2 +- .../services/password-reprompt.service.ts | 2 +- libs/common/src/abstractions/api.service.ts | 110 ++++++++--------- .../common/src/abstractions/crypto.service.ts | 2 +- ...-user-reset-password-enrollment.request.ts | 2 +- .../organization-api.service.abstraction.ts | 10 +- libs/common/src/abstractions/state.service.ts | 4 +- .../common/src/abstractions/system.service.ts | 2 +- ...serVerification-api.service.abstraction.ts | 2 +- .../userVerification.service.abstraction.ts | 2 +- .../account-api.service.abstraction.ts | 2 +- .../abstractions}/account-api.service.ts | 0 .../abstractions}/account.service.ts | 0 .../{ => auth}/abstractions/auth.service.ts | 6 +- .../abstractions/key-connector.service.ts} | 2 +- .../{ => auth}/abstractions/login.service.ts | 0 .../{ => auth}/abstractions/token.service.ts | 0 .../abstractions/two-factor.service.ts} | 2 +- .../captcha-iframe.ts} | 3 +- .../enums/auth-request-type.ts} | 0 .../enums/authentication-status.ts} | 0 .../enums/authentication-type.ts} | 0 .../enums/emergency-access-status-type.ts} | 0 .../enums/emergency-access-type.ts} | 0 .../enums/organization-api-key-type.ts} | 0 .../{enums/ssoEnums.ts => auth/enums/sso.ts} | 0 .../enums/two-factor-provider-type.ts} | 0 .../enums/verification-type.ts} | 0 .../login-strategies/login.strategy.spec.ts} | 45 +++---- .../login-strategies/login.strategy.ts} | 28 ++--- .../password-login.strategy.spec.ts} | 32 ++--- .../password-login.strategy.ts} | 16 +-- .../passwordless-login.strategy.ts} | 16 +-- .../sso-login.strategy.spec.ts} | 28 ++--- .../login-strategies/sso-login.strategy.ts} | 14 +-- .../user-api-login.strategy.spec.ts | 30 ++--- .../user-api-login.strategy.ts | 14 +-- .../{ => auth}/models/api/sso-config.api.ts | 4 +- .../{ => auth}/models/domain/auth-result.ts | 4 +- .../models/domain/environment-urls.ts | 0 .../{ => auth}/models/domain/kdf-config.ts | 0 .../models/domain/log-in-credentials.ts | 5 +- .../request/captcha-protected.request.ts | 0 .../request/device-verification.request.ts | 0 .../models/request/email-token.request.ts | 0 .../models/request/email.request.ts | 0 .../emergency-access-accept.request.ts | 0 .../emergency-access-confirm.request.ts | 0 .../emergency-access-invite.request.ts | 2 +- .../emergency-access-password.request.ts | 0 .../emergency-access-update.request.ts | 2 +- .../request/identity-token}/device.request.ts | 4 +- .../identity-token/password-token.request.ts | 6 +- .../identity-token/sso-token.request.ts | 3 +- .../token-two-factor.request.ts | 2 +- .../request/identity-token/token.request.ts | 3 +- .../identity-token/user-api-token.request.ts | 3 +- .../request/key-connector-user-key.request.ts | 0 .../request}/organization-sso.request.ts | 2 +- .../models/request/password-hint.request.ts | 0 .../models/request/password.request.ts | 0 .../request/passwordless-auth.request.ts | 0 .../passwordless-create-auth.request.ts | 2 +- .../request/secret-verification.request.ts | 0 .../request}/set-key-connector-key.request.ts | 4 +- .../models/request/set-password.request.ts | 5 +- .../request/two-factor-email.request.ts | 0 .../request/two-factor-provider.request.ts | 2 +- .../request/two-factor-recovery.request.ts | 0 .../models/request/update-profile.request.ts | 0 ...update-two-factor-authenticator.request.ts | 0 .../request/update-two-factor-duo.request.ts | 0 .../update-two-factor-email.request.ts | 0 ...ate-two-factor-web-authn-delete.request.ts | 0 .../update-two-factor-web-authn.request.ts | 0 .../update-two-factor-yubio-otp.request.ts | 0 .../models/request}/verify-otp.request.ts | 0 .../models/response/api-key.response.ts | 2 +- .../models/response/auth-request.response.ts | 5 +- .../response}/captcha-protected.response.ts | 0 .../response/device-verification.response.ts | 2 +- .../models/response/device.response.ts | 5 +- .../response/emergency-access.response.ts | 11 +- .../response/identity-captcha.response.ts | 2 +- .../response/identity-token.response.ts | 5 +- .../response/identity-two-factor.response.ts | 5 +- .../key-connector-user-key.response.ts | 2 +- .../response}/organization-sso.response.ts | 4 +- .../models/response/prelogin.response.ts | 5 +- .../models/response}/register.response.ts | 2 +- .../response/sso-pre-validate.response.ts | 2 +- .../two-factor-authenticator.response.ts | 2 +- .../response/two-factor-duo.response.ts | 2 +- .../response/two-factor-email.response.ts | 2 +- .../response/two-factor-provider.response.ts | 5 +- .../response/two-factor-recover.response.ts | 2 +- .../response/two-factor-web-authn.response.ts | 5 +- .../response/two-factor-yubi-key.response.ts | 2 +- .../{ => auth}/models/view/sso-config.view.ts | 5 +- .../services}/account-api.service.ts | 4 +- .../services}/account.service.ts | 2 +- .../src/{ => auth}/services/auth.service.ts | 50 ++++---- .../services/key-connector.service.ts} | 24 ++-- .../src/{ => auth}/services/login.service.ts | 2 +- .../src/{ => auth}/services/token.service.ts | 4 +- .../services/two-factor.service.ts} | 8 +- .../user-verification-api.service.ts} | 6 +- .../user-verification.service.ts} | 14 +-- .../types/auth-response.ts} | 4 +- .../types/two-factor-response.ts} | 0 .../webauthn-iframe.ts} | 0 libs/common/src/enums/kdfType.ts | 2 +- .../bitwarden-password-protected-importer.ts | 2 +- libs/common/src/models/domain/account.ts | 4 +- libs/common/src/models/domain/global-state.ts | 2 +- libs/common/src/models/request/kdf.request.ts | 3 +- .../request/organization-api-key.request.ts | 5 +- .../src/models/request/register.request.ts | 2 +- ...ganization-api-key-information.response.ts | 2 +- .../src/services/anonymousHub.service.ts | 2 +- libs/common/src/services/api.service.ts | 116 +++++++++--------- libs/common/src/services/crypto.service.ts | 2 +- .../src/services/environment.service.ts | 2 +- libs/common/src/services/export.service.ts | 2 +- .../src/services/notifications.service.ts | 4 +- .../organization/organization-api.service.ts | 10 +- libs/common/src/services/state.service.ts | 4 +- .../src/services/stateMigration.service.ts | 5 +- libs/common/src/services/system.service.ts | 4 +- .../vaultTimeout/vaultTimeout.service.ts | 6 +- .../vaultTimeoutSettings.service.ts | 2 +- libs/common/src/types/verification.ts | 2 +- .../src/vault/services/sync/sync.service.ts | 2 +- libs/components/src/dialog/dialog.service.ts | 4 +- 377 files changed, 1030 insertions(+), 998 deletions(-) rename apps/browser/src/{background/service_factories => auth/background/service-factories}/auth-service.factory.ts (57%) rename apps/browser/src/{background/service_factories => auth/background/service-factories}/key-connector-service.factory.ts (58%) rename apps/browser/src/{background/service_factories => auth/background/service-factories}/token-service.factory.ts (58%) rename apps/browser/src/{background/service_factories => auth/background/service-factories}/totp-service.factory.ts (71%) rename apps/browser/src/{background/service_factories => auth/background/service-factories}/two-factor-service.factory.ts (63%) rename apps/browser/src/{popup/accounts => auth/popup}/environment.component.html (100%) rename apps/browser/src/{popup/accounts => auth/popup}/environment.component.ts (100%) rename apps/browser/src/{popup/accounts => auth/popup}/hint.component.html (100%) rename apps/browser/src/{popup/accounts => auth/popup}/hint.component.ts (89%) rename apps/browser/src/{popup/accounts => auth/popup}/home.component.html (100%) rename apps/browser/src/{popup/accounts => auth/popup}/home.component.ts (96%) rename apps/browser/src/{popup/accounts => auth/popup}/lock.component.html (100%) rename apps/browser/src/{popup/accounts => auth/popup}/lock.component.ts (91%) rename apps/browser/src/{popup/accounts => auth/popup}/login-with-device.component.html (100%) rename apps/browser/src/{popup/accounts => auth/popup}/login-with-device.component.ts (91%) rename apps/browser/src/{popup/accounts => auth/popup}/login.component.html (100%) rename apps/browser/src/{popup/accounts => auth/popup}/login.component.ts (95%) rename apps/browser/src/{popup/accounts => auth/popup}/register.component.html (100%) rename apps/browser/src/{popup/accounts => auth/popup}/register.component.ts (96%) rename apps/browser/src/{popup/accounts => auth/popup}/remove-password.component.html (100%) rename apps/browser/src/{popup/accounts => auth/popup}/remove-password.component.ts (80%) create mode 100644 apps/browser/src/auth/popup/services/index.ts rename apps/browser/src/{ => auth}/popup/services/lock-guard.service.ts (87%) rename apps/browser/src/{ => auth}/popup/services/unauth-guard.service.ts (86%) rename apps/browser/src/{popup/accounts => auth/popup}/set-password.component.html (100%) rename apps/browser/src/{popup/accounts => auth/popup}/set-password.component.ts (100%) rename apps/browser/src/{popup/accounts => auth/popup}/sso.component.html (100%) rename apps/browser/src/{popup/accounts => auth/popup}/sso.component.ts (92%) rename apps/browser/src/{popup/accounts => auth/popup}/two-factor-options.component.html (100%) rename apps/browser/src/{popup/accounts => auth/popup}/two-factor-options.component.ts (83%) rename apps/browser/src/{popup/accounts => auth/popup}/two-factor.component.html (100%) rename apps/browser/src/{popup/accounts => auth/popup}/two-factor.component.ts (90%) rename apps/browser/src/{popup/accounts => auth/popup}/update-temp-password.component.html (100%) rename apps/browser/src/{popup/accounts => auth/popup}/update-temp-password.component.ts (95%) rename apps/browser/src/{ => auth}/scripts/duo.js (100%) rename apps/cli/src/{ => auth}/commands/lock.command.ts (76%) rename apps/cli/src/{ => auth}/commands/login.command.ts (96%) rename apps/cli/src/{ => auth}/commands/logout.command.ts (70%) rename apps/cli/src/{ => auth}/commands/unlock.command.ts (90%) rename apps/desktop/src/{app/accounts => auth}/accessibility-cookie.component.html (100%) rename apps/desktop/src/{app/accounts => auth}/accessibility-cookie.component.ts (98%) rename apps/desktop/src/{app/accounts => auth}/delete-account.component.html (100%) rename apps/desktop/src/{app/accounts => auth}/delete-account.component.ts (93%) rename apps/desktop/src/{app/accounts => auth}/environment.component.html (100%) rename apps/desktop/src/{app/accounts => auth}/environment.component.ts (100%) rename apps/desktop/src/{app => auth}/guards/login.guard.ts (100%) rename apps/desktop/src/{app/accounts => auth}/lock.component.html (100%) rename apps/desktop/src/{app/accounts => auth}/lock.component.ts (96%) rename apps/desktop/src/{app/accounts => auth}/login/login-approval.component.html (100%) rename apps/desktop/src/{app/accounts => auth}/login/login-approval.component.ts (96%) rename apps/desktop/src/{app/accounts => auth}/login/login-with-device.component.html (100%) rename apps/desktop/src/{app/accounts => auth}/login/login-with-device.component.ts (93%) rename apps/desktop/src/{app/accounts => auth}/login/login.component.html (100%) rename apps/desktop/src/{app/accounts => auth}/login/login.component.ts (96%) rename apps/desktop/src/{app/accounts => auth}/login/login.module.ts (86%) rename apps/desktop/src/{app/accounts => auth}/register.component.html (100%) rename apps/desktop/src/{app/accounts => auth}/register.component.ts (97%) rename apps/desktop/src/{app/accounts => auth}/remove-password.component.html (100%) rename apps/desktop/src/{app/accounts => auth}/remove-password.component.ts (80%) rename apps/desktop/src/{ => auth}/scripts/duo.js (100%) rename apps/desktop/src/{app/accounts => auth}/set-password.component.html (100%) rename apps/desktop/src/{app/accounts => auth}/set-password.component.ts (100%) rename apps/desktop/src/{app/accounts => auth}/sso.component.html (100%) rename apps/desktop/src/{app/accounts => auth}/sso.component.ts (94%) rename apps/desktop/src/{app/accounts => auth}/two-factor-options.component.html (100%) rename apps/desktop/src/{app/accounts => auth}/two-factor-options.component.ts (81%) rename apps/desktop/src/{app/accounts => auth}/two-factor.component.html (100%) rename apps/desktop/src/{app/accounts => auth}/two-factor.component.ts (89%) rename apps/desktop/src/{app/accounts => auth}/update-temp-password.component.html (100%) rename apps/desktop/src/{app/accounts => auth}/update-temp-password.component.ts (95%) rename apps/web/src/{app/accounts => auth}/accept-emergency.component.html (100%) rename apps/web/src/{app/accounts => auth}/accept-emergency.component.ts (93%) rename apps/web/src/{app/accounts => auth}/accept-organization.component.html (100%) rename apps/web/src/{app/accounts => auth}/accept-organization.component.ts (98%) rename apps/web/src/{app/accounts => auth}/hint.component.html (100%) rename apps/web/src/{app/accounts => auth}/hint.component.ts (88%) rename apps/web/src/{app/accounts => auth}/lock.component.html (100%) rename apps/web/src/{app/accounts => auth}/lock.component.ts (92%) rename apps/web/src/{app/accounts => auth}/login/login-with-device.component.html (100%) rename apps/web/src/{app/accounts => auth}/login/login-with-device.component.ts (88%) rename apps/web/src/{app/accounts => auth}/login/login.component.html (100%) rename apps/web/src/{app/accounts => auth}/login/login.component.ts (96%) rename apps/web/src/{app/accounts => auth}/login/login.module.ts (89%) rename apps/web/src/{app/accounts => auth}/recover-delete.component.html (100%) rename apps/web/src/{app/accounts => auth}/recover-delete.component.ts (100%) rename apps/web/src/{app/accounts => auth}/recover-two-factor.component.html (100%) rename apps/web/src/{app/accounts => auth}/recover-two-factor.component.ts (90%) rename apps/web/src/{app/accounts => auth}/register-form/register-form.component.html (100%) rename apps/web/src/{app/accounts => auth}/register-form/register-form.component.ts (97%) rename apps/web/src/{app/accounts => auth}/register-form/register-form.module.ts (84%) rename apps/web/src/{app/accounts => auth}/remove-password.component.html (100%) rename apps/web/src/{app/accounts => auth}/remove-password.component.ts (80%) rename apps/web/src/{app/accounts => auth}/set-password.component.html (100%) rename apps/web/src/{app/accounts => auth}/set-password.component.ts (100%) rename apps/web/src/{app => auth}/settings/deauthorize-sessions.component.html (100%) rename apps/web/src/{app => auth}/settings/deauthorize-sessions.component.ts (100%) rename apps/web/src/{app/settings => auth/settings/emergency-access}/emergency-access-add-edit.component.html (100%) rename apps/web/src/{app/settings => auth/settings/emergency-access}/emergency-access-add-edit.component.ts (94%) rename apps/web/src/{app/settings => auth/settings/emergency-access}/emergency-access-attachments.component.ts (96%) rename apps/web/src/{app/settings => auth/settings/emergency-access}/emergency-access-confirm.component.html (100%) rename apps/web/src/{app/settings => auth/settings/emergency-access}/emergency-access-confirm.component.ts (100%) rename apps/web/src/{app/settings => auth/settings/emergency-access}/emergency-access-takeover.component.html (100%) rename apps/web/src/{app/settings => auth/settings/emergency-access}/emergency-access-takeover.component.ts (94%) rename apps/web/src/{app/settings => auth/settings/emergency-access}/emergency-access-view.component.html (100%) rename apps/web/src/{app/settings => auth/settings/emergency-access}/emergency-access-view.component.ts (96%) rename apps/web/src/{app/settings => auth/settings/emergency-access}/emergency-access.component.html (100%) rename apps/web/src/{app/settings => auth/settings/emergency-access}/emergency-access.component.ts (97%) rename apps/web/src/{app/settings => auth/settings/emergency-access}/emergency-add-edit.component.ts (96%) rename apps/web/src/{app => auth}/settings/two-factor-authenticator.component.html (100%) rename apps/web/src/{app => auth}/settings/two-factor-authenticator.component.ts (92%) rename apps/web/src/{app => auth}/settings/two-factor-base.component.ts (85%) rename apps/web/src/{app => auth}/settings/two-factor-duo.component.html (100%) rename apps/web/src/{app => auth}/settings/two-factor-duo.component.ts (85%) rename apps/web/src/{app => auth}/settings/two-factor-email.component.html (100%) rename apps/web/src/{app => auth}/settings/two-factor-email.component.ts (84%) rename apps/web/src/{app => auth}/settings/two-factor-recovery.component.html (100%) rename apps/web/src/{app => auth}/settings/two-factor-recovery.component.ts (86%) rename apps/web/src/{app => auth}/settings/two-factor-setup.component.html (100%) rename apps/web/src/{app => auth}/settings/two-factor-setup.component.ts (97%) rename apps/web/src/{app => auth}/settings/two-factor-verify.component.html (100%) rename apps/web/src/{app => auth}/settings/two-factor-verify.component.ts (84%) rename apps/web/src/{app => auth}/settings/two-factor-webauthn.component.html (100%) rename apps/web/src/{app => auth}/settings/two-factor-webauthn.component.ts (91%) rename apps/web/src/{app => auth}/settings/two-factor-yubikey.component.html (100%) rename apps/web/src/{app => auth}/settings/two-factor-yubikey.component.ts (90%) rename apps/web/src/{app => auth}/settings/verify-email.component.html (100%) rename apps/web/src/{app => auth}/settings/verify-email.component.ts (94%) rename apps/web/src/{app/accounts => auth}/sso.component.html (100%) rename apps/web/src/{app/accounts => auth}/sso.component.ts (95%) rename apps/web/src/{app/accounts => auth}/two-factor-options.component.html (100%) rename apps/web/src/{app/accounts => auth}/two-factor-options.component.ts (81%) rename apps/web/src/{app/accounts => auth}/two-factor.component.html (100%) rename apps/web/src/{app/accounts => auth}/two-factor.component.ts (87%) rename apps/web/src/{app/accounts => auth}/update-password.component.html (100%) rename apps/web/src/{app/accounts => auth}/update-password.component.ts (96%) rename apps/web/src/{app/accounts => auth}/update-temp-password.component.html (100%) rename apps/web/src/{app/accounts => auth}/update-temp-password.component.ts (95%) rename apps/web/src/{app/accounts => auth}/verify-email-token.component.html (100%) rename apps/web/src/{app/accounts => auth}/verify-email-token.component.ts (100%) rename apps/web/src/{app/accounts => auth}/verify-recover-delete.component.html (100%) rename apps/web/src/{app/accounts => auth}/verify-recover-delete.component.ts (100%) rename bitwarden_license/bit-web/src/app/{organizations/manage => auth}/sso.component.html (100%) rename bitwarden_license/bit-web/src/app/{organizations/manage => auth}/sso.component.ts (96%) rename libs/angular/src/{components/captchaProtected.component.ts => auth/components/captcha-protected.component.ts} (96%) rename libs/angular/src/{ => auth}/components/change-password.component.ts (96%) rename libs/angular/src/{ => auth}/components/hint.component.ts (91%) rename libs/angular/src/{ => auth}/components/lock.component.ts (97%) rename libs/angular/src/{ => auth}/components/login-with-device.component.ts (93%) rename libs/angular/src/{ => auth}/components/login.component.ts (95%) rename libs/angular/src/{ => auth}/components/remove-password.component.ts (96%) rename libs/angular/src/{ => auth}/components/sso.component.ts (96%) rename libs/angular/src/{ => auth}/components/two-factor-options.component.ts (84%) rename libs/angular/src/{ => auth}/components/two-factor.component.ts (90%) rename libs/angular/src/{ => auth}/components/update-password.component.ts (96%) rename libs/angular/src/{ => auth}/components/update-temp-password.component.ts (100%) rename libs/angular/src/{ => auth}/components/user-verification-prompt.component.ts (92%) rename libs/angular/src/{ => auth}/components/user-verification.component.ts (93%) rename libs/angular/src/{ => auth}/guards/auth.guard.ts (82%) rename libs/angular/src/{ => auth}/guards/lock.guard.ts (78%) rename libs/angular/src/{ => auth}/guards/unauth.guard.ts (78%) rename libs/common/src/{abstractions/account => auth/abstractions}/account-api.service.abstraction.ts (56%) rename libs/common/src/{abstractions/account => auth/abstractions}/account-api.service.ts (100%) rename libs/common/src/{abstractions/account => auth/abstractions}/account.service.ts (100%) rename libs/common/src/{ => auth}/abstractions/auth.service.ts (86%) rename libs/common/src/{abstractions/keyConnector.service.ts => auth/abstractions/key-connector.service.ts} (91%) rename libs/common/src/{ => auth}/abstractions/login.service.ts (100%) rename libs/common/src/{ => auth}/abstractions/token.service.ts (100%) rename libs/common/src/{abstractions/twoFactor.service.ts => auth/abstractions/two-factor.service.ts} (90%) rename libs/common/src/{misc/captcha_iframe.ts => auth/captcha-iframe.ts} (94%) rename libs/common/src/{enums/authRequestType.ts => auth/enums/auth-request-type.ts} (100%) rename libs/common/src/{enums/authenticationStatus.ts => auth/enums/authentication-status.ts} (100%) rename libs/common/src/{enums/authenticationType.ts => auth/enums/authentication-type.ts} (100%) rename libs/common/src/{enums/emergencyAccessStatusType.ts => auth/enums/emergency-access-status-type.ts} (100%) rename libs/common/src/{enums/emergencyAccessType.ts => auth/enums/emergency-access-type.ts} (100%) rename libs/common/src/{enums/organizationApiKeyType.ts => auth/enums/organization-api-key-type.ts} (100%) rename libs/common/src/{enums/ssoEnums.ts => auth/enums/sso.ts} (100%) rename libs/common/src/{enums/twoFactorProviderType.ts => auth/enums/two-factor-provider-type.ts} (100%) rename libs/common/src/{enums/verificationType.ts => auth/enums/verification-type.ts} (100%) rename libs/common/{spec/misc/logInStrategies/logIn.strategy.spec.ts => src/auth/login-strategies/login.strategy.spec.ts} (82%) rename libs/common/src/{misc/logInStrategies/logIn.strategy.ts => auth/login-strategies/login.strategy.ts} (84%) rename libs/common/{spec/misc/logInStrategies/passwordLogIn.strategy.spec.ts => src/auth/login-strategies/password-login.strategy.spec.ts} (72%) rename libs/common/src/{misc/logInStrategies/passwordLogin.strategy.ts => auth/login-strategies/password-login.strategy.ts} (81%) rename libs/common/src/{misc/logInStrategies/passwordlessLogin.strategy.ts => auth/login-strategies/passwordless-login.strategy.ts} (79%) rename libs/common/{spec/misc/logInStrategies/ssoLogIn.strategy.spec.ts => src/auth/login-strategies/sso-login.strategy.spec.ts} (77%) rename libs/common/src/{misc/logInStrategies/ssoLogin.strategy.ts => auth/login-strategies/sso-login.strategy.ts} (78%) rename libs/common/{spec/misc/logInStrategies => src/auth/login-strategies}/user-api-login.strategy.spec.ts (74%) rename libs/common/src/{misc/logInStrategies => auth/login-strategies}/user-api-login.strategy.ts (80%) rename libs/common/src/{ => auth}/models/api/sso-config.api.ts (98%) rename libs/common/src/{ => auth}/models/domain/auth-result.ts (74%) rename libs/common/src/{ => auth}/models/domain/environment-urls.ts (100%) rename libs/common/src/{ => auth}/models/domain/kdf-config.ts (100%) rename libs/common/src/{ => auth}/models/domain/log-in-credentials.ts (87%) rename libs/common/src/{ => auth}/models/request/captcha-protected.request.ts (100%) rename libs/common/src/{ => auth}/models/request/device-verification.request.ts (100%) rename libs/common/src/{ => auth}/models/request/email-token.request.ts (100%) rename libs/common/src/{ => auth}/models/request/email.request.ts (100%) rename libs/common/src/{ => auth}/models/request/emergency-access-accept.request.ts (100%) rename libs/common/src/{ => auth}/models/request/emergency-access-confirm.request.ts (100%) rename libs/common/src/{ => auth}/models/request/emergency-access-invite.request.ts (61%) rename libs/common/src/{ => auth}/models/request/emergency-access-password.request.ts (100%) rename libs/common/src/{ => auth}/models/request/emergency-access-update.request.ts (63%) rename libs/common/src/{models/request => auth/models/request/identity-token}/device.request.ts (70%) rename libs/common/src/{ => auth}/models/request/identity-token/password-token.request.ts (85%) rename libs/common/src/{ => auth}/models/request/identity-token/sso-token.request.ts (92%) rename libs/common/src/{ => auth}/models/request/identity-token/token-two-factor.request.ts (69%) rename libs/common/src/{ => auth}/models/request/identity-token/token.request.ts (96%) rename libs/common/src/{ => auth}/models/request/identity-token/user-api-token.request.ts (92%) rename libs/common/src/{ => auth}/models/request/key-connector-user-key.request.ts (100%) rename libs/common/src/{models/request/organization => auth/models/request}/organization-sso.request.ts (64%) rename libs/common/src/{ => auth}/models/request/password-hint.request.ts (100%) rename libs/common/src/{ => auth}/models/request/password.request.ts (100%) rename libs/common/src/{ => auth}/models/request/passwordless-auth.request.ts (100%) rename libs/common/src/{ => auth}/models/request/passwordless-create-auth.request.ts (80%) rename libs/common/src/{ => auth}/models/request/secret-verification.request.ts (100%) rename libs/common/src/{models/request/account => auth/models/request}/set-key-connector-key.request.ts (83%) rename libs/common/src/{ => auth}/models/request/set-password.request.ts (87%) rename libs/common/src/{ => auth}/models/request/two-factor-email.request.ts (100%) rename libs/common/src/{ => auth}/models/request/two-factor-provider.request.ts (70%) rename libs/common/src/{ => auth}/models/request/two-factor-recovery.request.ts (100%) rename libs/common/src/{ => auth}/models/request/update-profile.request.ts (100%) rename libs/common/src/{ => auth}/models/request/update-two-factor-authenticator.request.ts (100%) rename libs/common/src/{ => auth}/models/request/update-two-factor-duo.request.ts (100%) rename libs/common/src/{ => auth}/models/request/update-two-factor-email.request.ts (100%) rename libs/common/src/{ => auth}/models/request/update-two-factor-web-authn-delete.request.ts (100%) rename libs/common/src/{ => auth}/models/request/update-two-factor-web-authn.request.ts (100%) rename libs/common/src/{ => auth}/models/request/update-two-factor-yubio-otp.request.ts (100%) rename libs/common/src/{models/request/account => auth/models/request}/verify-otp.request.ts (100%) rename libs/common/src/{ => auth}/models/response/api-key.response.ts (79%) rename libs/common/src/{ => auth}/models/response/auth-request.response.ts (93%) rename libs/common/src/{models/response/authentication => auth/models/response}/captcha-protected.response.ts (100%) rename libs/common/src/{ => auth}/models/response/device-verification.response.ts (86%) rename libs/common/src/{ => auth}/models/response/device.response.ts (79%) rename libs/common/src/{ => auth}/models/response/emergency-access.response.ts (90%) rename libs/common/src/{ => auth}/models/response/identity-captcha.response.ts (74%) rename libs/common/src/{ => auth}/models/response/identity-token.response.ts (92%) rename libs/common/src/{ => auth}/models/response/identity-two-factor.response.ts (84%) rename libs/common/src/{ => auth}/models/response/key-connector-user-key.response.ts (72%) rename libs/common/src/{models/response/organization => auth/models/response}/organization-sso.response.ts (89%) rename libs/common/src/{ => auth}/models/response/prelogin.response.ts (78%) rename libs/common/src/{models/response/authentication => auth/models/response}/register.response.ts (82%) rename libs/common/src/{ => auth}/models/response/sso-pre-validate.response.ts (72%) rename libs/common/src/{ => auth}/models/response/two-factor-authenticator.response.ts (78%) rename libs/common/src/{ => auth}/models/response/two-factor-duo.response.ts (85%) rename libs/common/src/{ => auth}/models/response/two-factor-email.response.ts (78%) rename libs/common/src/{ => auth}/models/response/two-factor-provider.response.ts (65%) rename libs/common/src/{ => auth}/models/response/two-factor-recover.response.ts (72%) rename libs/common/src/{ => auth}/models/response/two-factor-web-authn.response.ts (94%) rename libs/common/src/{ => auth}/models/response/two-factor-yubi-key.response.ts (89%) rename libs/common/src/{ => auth}/models/view/sso-config.view.ts (97%) rename libs/common/src/{services/account => auth/services}/account-api.service.ts (85%) rename libs/common/src/{services/account => auth/services}/account.service.ts (84%) rename libs/common/src/{ => auth}/services/auth.service.ts (84%) rename libs/common/src/{services/keyConnector.service.ts => auth/services/key-connector.service.ts} (84%) rename libs/common/src/{ => auth}/services/login.service.ts (91%) rename libs/common/src/{ => auth}/services/token.service.ts (97%) rename libs/common/src/{services/twoFactor.service.ts => auth/services/two-factor.service.ts} (95%) rename libs/common/src/{services/userVerification/userVerification-api.service.ts => auth/services/user-verification/user-verification-api.service.ts} (61%) rename libs/common/src/{services/userVerification/userVerification.service.ts => auth/services/user-verification/user-verification.service.ts} (83%) rename libs/common/src/{types/authResponse.ts => auth/types/auth-response.ts} (60%) rename libs/common/src/{types/twoFactorResponse.ts => auth/types/two-factor-response.ts} (100%) rename libs/common/src/{misc/webauthn_iframe.ts => auth/webauthn-iframe.ts} (100%) diff --git a/.eslintignore b/.eslintignore index 96ea1708da..f34b968315 100644 --- a/.eslintignore +++ b/.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 diff --git a/.github/whitelist-capital-letters.txt b/.github/whitelist-capital-letters.txt index b100c980f0..db8e006640 100644 --- a/.github/whitelist-capital-letters.txt +++ b/.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 diff --git a/.prettierignore b/.prettierignore index 245cb91c21..986cadd3d5 100644 --- a/.prettierignore +++ b/.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 diff --git a/apps/browser/src/background/service_factories/auth-service.factory.ts b/apps/browser/src/auth/background/service-factories/auth-service.factory.ts similarity index 57% rename from apps/browser/src/background/service_factories/auth-service.factory.ts rename to apps/browser/src/auth/background/service-factories/auth-service.factory.ts index 495fa1b0df..6b1fbdfa4e 100644 --- a/apps/browser/src/background/service_factories/auth-service.factory.ts +++ b/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 } from "@bitwarden/common/services/auth.service"; +import { AuthService as AbstractAuthService } from "@bitwarden/common/auth/abstractions/auth.service"; +import { AuthService } from "@bitwarden/common/auth/services/auth.service"; -import { apiServiceFactory, ApiServiceInitOptions } from "./api-service.factory"; -import { appIdServiceFactory } from "./app-id-service.factory"; -import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory"; -import { EncryptServiceInitOptions, encryptServiceFactory } from "./encrypt-service.factory"; +import { + apiServiceFactory, + ApiServiceInitOptions, +} 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"; -import { CachedServices, factory, FactoryOptions } from "./factory-options"; -import { I18nServiceInitOptions, i18nServiceFactory } from "./i18n-service.factory"; +} from "../../../background/service_factories/environment-service.factory"; +import { + 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"; diff --git a/apps/browser/src/background/service_factories/key-connector-service.factory.ts b/apps/browser/src/auth/background/service-factories/key-connector-service.factory.ts similarity index 58% rename from apps/browser/src/background/service_factories/key-connector-service.factory.ts rename to apps/browser/src/auth/background/service-factories/key-connector-service.factory.ts index 80a0df6a0a..c9e154da1b 100644 --- a/apps/browser/src/background/service_factories/key-connector-service.factory.ts +++ b/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 } from "@bitwarden/common/services/keyConnector.service"; +import { KeyConnectorService as AbstractKeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.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"; -import { CryptoServiceInitOptions, cryptoServiceFactory } from "./crypto-service.factory"; -import { FactoryOptions, CachedServices, factory } from "./factory-options"; -import { logServiceFactory, LogServiceInitOptions } from "./log-service.factory"; +} from "../../../background/service_factories/crypto-function-service.factory"; +import { + CryptoServiceInitOptions, + 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"; -import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory"; -import { tokenServiceFactory, TokenServiceInitOptions } from "./token-service.factory"; +} from "../../../background/service_factories/organization-service.factory"; +import { + stateServiceFactory, + StateServiceInitOptions, +} from "../../../background/service_factories/state-service.factory"; + +import { TokenServiceInitOptions, tokenServiceFactory } from "./token-service.factory"; type KeyConnectorServiceFactoryOptions = FactoryOptions & { keyConnectorServiceOptions: { diff --git a/apps/browser/src/background/service_factories/token-service.factory.ts b/apps/browser/src/auth/background/service-factories/token-service.factory.ts similarity index 58% rename from apps/browser/src/background/service_factories/token-service.factory.ts rename to apps/browser/src/auth/background/service-factories/token-service.factory.ts index 2b642985e2..00f09cbde1 100644 --- a/apps/browser/src/background/service_factories/token-service.factory.ts +++ b/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 } from "@bitwarden/common/services/token.service"; +import { TokenService as AbstractTokenService } from "@bitwarden/common/auth/abstractions/token.service"; +import { TokenService } from "@bitwarden/common/auth/services/token.service"; -import { CachedServices, factory, FactoryOptions } from "./factory-options"; -import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory"; +import { + FactoryOptions, + CachedServices, + factory, +} from "../../../background/service_factories/factory-options"; +import { + stateServiceFactory, + StateServiceInitOptions, +} from "../../../background/service_factories/state-service.factory"; type TokenServiceFactoryOptions = FactoryOptions; diff --git a/apps/browser/src/background/service_factories/totp-service.factory.ts b/apps/browser/src/auth/background/service-factories/totp-service.factory.ts similarity index 71% rename from apps/browser/src/background/service_factories/totp-service.factory.ts rename to apps/browser/src/auth/background/service-factories/totp-service.factory.ts index 07556489de..c6533bd0b4 100644 --- a/apps/browser/src/background/service_factories/totp-service.factory.ts +++ b/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"; -import { CachedServices, factory, FactoryOptions } from "./factory-options"; -import { logServiceFactory, LogServiceInitOptions } from "./log-service.factory"; + cryptoFunctionServiceFactory, +} from "../../../background/service_factories/crypto-function-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; diff --git a/apps/browser/src/background/service_factories/two-factor-service.factory.ts b/apps/browser/src/auth/background/service-factories/two-factor-service.factory.ts similarity index 63% rename from apps/browser/src/background/service_factories/two-factor-service.factory.ts rename to apps/browser/src/auth/background/service-factories/two-factor-service.factory.ts index 6a0788e846..8763a96d04 100644 --- a/apps/browser/src/background/service_factories/two-factor-service.factory.ts +++ b/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 } from "@bitwarden/common/services/twoFactor.service"; +import { TwoFactorService as AbstractTwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.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; diff --git a/apps/browser/src/popup/accounts/environment.component.html b/apps/browser/src/auth/popup/environment.component.html similarity index 100% rename from apps/browser/src/popup/accounts/environment.component.html rename to apps/browser/src/auth/popup/environment.component.html diff --git a/apps/browser/src/popup/accounts/environment.component.ts b/apps/browser/src/auth/popup/environment.component.ts similarity index 100% rename from apps/browser/src/popup/accounts/environment.component.ts rename to apps/browser/src/auth/popup/environment.component.ts diff --git a/apps/browser/src/popup/accounts/hint.component.html b/apps/browser/src/auth/popup/hint.component.html similarity index 100% rename from apps/browser/src/popup/accounts/hint.component.html rename to apps/browser/src/auth/popup/hint.component.html diff --git a/apps/browser/src/popup/accounts/hint.component.ts b/apps/browser/src/auth/popup/hint.component.ts similarity index 89% rename from apps/browser/src/popup/accounts/hint.component.ts rename to apps/browser/src/auth/popup/hint.component.ts index 4948407e5a..a0477bb27a 100644 --- a/apps/browser/src/popup/accounts/hint.component.ts +++ b/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", diff --git a/apps/browser/src/popup/accounts/home.component.html b/apps/browser/src/auth/popup/home.component.html similarity index 100% rename from apps/browser/src/popup/accounts/home.component.html rename to apps/browser/src/auth/popup/home.component.html diff --git a/apps/browser/src/popup/accounts/home.component.ts b/apps/browser/src/auth/popup/home.component.ts similarity index 96% rename from apps/browser/src/popup/accounts/home.component.ts rename to apps/browser/src/auth/popup/home.component.ts index e6a31bea9a..9f864fa2ad 100644 --- a/apps/browser/src/popup/accounts/home.component.ts +++ b/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", diff --git a/apps/browser/src/popup/accounts/lock.component.html b/apps/browser/src/auth/popup/lock.component.html similarity index 100% rename from apps/browser/src/popup/accounts/lock.component.html rename to apps/browser/src/auth/popup/lock.component.html diff --git a/apps/browser/src/popup/accounts/lock.component.ts b/apps/browser/src/auth/popup/lock.component.ts similarity index 91% rename from apps/browser/src/popup/accounts/lock.component.ts rename to apps/browser/src/auth/popup/lock.component.ts index 775ecaa3ca..fe708e9d7b 100644 --- a/apps/browser/src/popup/accounts/lock.component.ts +++ b/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"; diff --git a/apps/browser/src/popup/accounts/login-with-device.component.html b/apps/browser/src/auth/popup/login-with-device.component.html similarity index 100% rename from apps/browser/src/popup/accounts/login-with-device.component.html rename to apps/browser/src/auth/popup/login-with-device.component.html diff --git a/apps/browser/src/popup/accounts/login-with-device.component.ts b/apps/browser/src/auth/popup/login-with-device.component.ts similarity index 91% rename from apps/browser/src/popup/accounts/login-with-device.component.ts rename to apps/browser/src/auth/popup/login-with-device.component.ts index a286f4dd3b..9b89c123e1 100644 --- a/apps/browser/src/popup/accounts/login-with-device.component.ts +++ b/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({ diff --git a/apps/browser/src/popup/accounts/login.component.html b/apps/browser/src/auth/popup/login.component.html similarity index 100% rename from apps/browser/src/popup/accounts/login.component.html rename to apps/browser/src/auth/popup/login.component.html diff --git a/apps/browser/src/popup/accounts/login.component.ts b/apps/browser/src/auth/popup/login.component.ts similarity index 95% rename from apps/browser/src/popup/accounts/login.component.ts rename to apps/browser/src/auth/popup/login.component.ts index b191a2e279..539ef43a4a 100644 --- a/apps/browser/src/popup/accounts/login.component.ts +++ b/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"; diff --git a/apps/browser/src/popup/accounts/register.component.html b/apps/browser/src/auth/popup/register.component.html similarity index 100% rename from apps/browser/src/popup/accounts/register.component.html rename to apps/browser/src/auth/popup/register.component.html diff --git a/apps/browser/src/popup/accounts/register.component.ts b/apps/browser/src/auth/popup/register.component.ts similarity index 96% rename from apps/browser/src/popup/accounts/register.component.ts rename to apps/browser/src/auth/popup/register.component.ts index d199b48485..85faff832d 100644 --- a/apps/browser/src/popup/accounts/register.component.ts +++ b/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", diff --git a/apps/browser/src/popup/accounts/remove-password.component.html b/apps/browser/src/auth/popup/remove-password.component.html similarity index 100% rename from apps/browser/src/popup/accounts/remove-password.component.html rename to apps/browser/src/auth/popup/remove-password.component.html diff --git a/apps/browser/src/popup/accounts/remove-password.component.ts b/apps/browser/src/auth/popup/remove-password.component.ts similarity index 80% rename from apps/browser/src/popup/accounts/remove-password.component.ts rename to apps/browser/src/auth/popup/remove-password.component.ts index 89ebd4a620..5272a3082a 100644 --- a/apps/browser/src/popup/accounts/remove-password.component.ts +++ b/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", diff --git a/apps/browser/src/auth/popup/services/index.ts b/apps/browser/src/auth/popup/services/index.ts new file mode 100644 index 0000000000..06bfe0009b --- /dev/null +++ b/apps/browser/src/auth/popup/services/index.ts @@ -0,0 +1,2 @@ +export { LockGuardService } from "./lock-guard.service"; +export { UnauthGuardService } from "./unauth-guard.service"; diff --git a/apps/browser/src/popup/services/lock-guard.service.ts b/apps/browser/src/auth/popup/services/lock-guard.service.ts similarity index 87% rename from apps/browser/src/popup/services/lock-guard.service.ts rename to apps/browser/src/auth/popup/services/lock-guard.service.ts index 13f92f0342..ef6ebc73ac 100644 --- a/apps/browser/src/popup/services/lock-guard.service.ts +++ b/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 { diff --git a/apps/browser/src/popup/services/unauth-guard.service.ts b/apps/browser/src/auth/popup/services/unauth-guard.service.ts similarity index 86% rename from apps/browser/src/popup/services/unauth-guard.service.ts rename to apps/browser/src/auth/popup/services/unauth-guard.service.ts index 7b9c33b2d6..4aa700b556 100644 --- a/apps/browser/src/popup/services/unauth-guard.service.ts +++ b/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 { diff --git a/apps/browser/src/popup/accounts/set-password.component.html b/apps/browser/src/auth/popup/set-password.component.html similarity index 100% rename from apps/browser/src/popup/accounts/set-password.component.html rename to apps/browser/src/auth/popup/set-password.component.html diff --git a/apps/browser/src/popup/accounts/set-password.component.ts b/apps/browser/src/auth/popup/set-password.component.ts similarity index 100% rename from apps/browser/src/popup/accounts/set-password.component.ts rename to apps/browser/src/auth/popup/set-password.component.ts diff --git a/apps/browser/src/popup/accounts/sso.component.html b/apps/browser/src/auth/popup/sso.component.html similarity index 100% rename from apps/browser/src/popup/accounts/sso.component.html rename to apps/browser/src/auth/popup/sso.component.html diff --git a/apps/browser/src/popup/accounts/sso.component.ts b/apps/browser/src/auth/popup/sso.component.ts similarity index 92% rename from apps/browser/src/popup/accounts/sso.component.ts rename to apps/browser/src/auth/popup/sso.component.ts index 09b6cd8d85..ec95be9e4f 100644 --- a/apps/browser/src/popup/accounts/sso.component.ts +++ b/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"; diff --git a/apps/browser/src/popup/accounts/two-factor-options.component.html b/apps/browser/src/auth/popup/two-factor-options.component.html similarity index 100% rename from apps/browser/src/popup/accounts/two-factor-options.component.html rename to apps/browser/src/auth/popup/two-factor-options.component.html diff --git a/apps/browser/src/popup/accounts/two-factor-options.component.ts b/apps/browser/src/auth/popup/two-factor-options.component.ts similarity index 83% rename from apps/browser/src/popup/accounts/two-factor-options.component.ts rename to apps/browser/src/auth/popup/two-factor-options.component.ts index ddb1a42e14..6aa8109f05 100644 --- a/apps/browser/src/popup/accounts/two-factor-options.component.ts +++ b/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", diff --git a/apps/browser/src/popup/accounts/two-factor.component.html b/apps/browser/src/auth/popup/two-factor.component.html similarity index 100% rename from apps/browser/src/popup/accounts/two-factor.component.html rename to apps/browser/src/auth/popup/two-factor.component.html diff --git a/apps/browser/src/popup/accounts/two-factor.component.ts b/apps/browser/src/auth/popup/two-factor.component.ts similarity index 90% rename from apps/browser/src/popup/accounts/two-factor.component.ts rename to apps/browser/src/auth/popup/two-factor.component.ts index d97cedeb3f..4f1515a6d8 100644 --- a/apps/browser/src/popup/accounts/two-factor.component.ts +++ b/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 { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; +import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; +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"; diff --git a/apps/browser/src/popup/accounts/update-temp-password.component.html b/apps/browser/src/auth/popup/update-temp-password.component.html similarity index 100% rename from apps/browser/src/popup/accounts/update-temp-password.component.html rename to apps/browser/src/auth/popup/update-temp-password.component.html diff --git a/apps/browser/src/popup/accounts/update-temp-password.component.ts b/apps/browser/src/auth/popup/update-temp-password.component.ts similarity index 95% rename from apps/browser/src/popup/accounts/update-temp-password.component.ts rename to apps/browser/src/auth/popup/update-temp-password.component.ts index aa9b75940a..968400e7f6 100644 --- a/apps/browser/src/popup/accounts/update-temp-password.component.ts +++ b/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"; diff --git a/apps/browser/src/scripts/duo.js b/apps/browser/src/auth/scripts/duo.js similarity index 100% rename from apps/browser/src/scripts/duo.js rename to apps/browser/src/auth/scripts/duo.js diff --git a/apps/browser/src/autofill/background/notification.background.ts b/apps/browser/src/autofill/background/notification.background.ts index 6729fc8bd6..ca0149bd72 100644 --- a/apps/browser/src/autofill/background/notification.background.ts +++ b/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"; diff --git a/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts b/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts index 6187a87161..87836198d7 100644 --- a/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts +++ b/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, diff --git a/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts b/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts index fe1e5b4271..53d3d10076 100644 --- a/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts +++ b/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 { 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 { 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"; diff --git a/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts b/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts index 366f2e4659..b47683c8ce 100644 --- a/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts +++ b/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"; diff --git a/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts b/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts index 89e9751257..1ac8b5d9dc 100644 --- a/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts +++ b/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"; diff --git a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts index 63b83049df..840ae7a774 100644 --- a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts +++ b/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 { diff --git a/apps/browser/src/background/commands.background.ts b/apps/browser/src/background/commands.background.ts index 2ad3eafe49..7e2c11e2e8 100644 --- a/apps/browser/src/background/commands.background.ts +++ b/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"; diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts index 4be9a03376..9d08bf071c 100644 --- a/apps/browser/src/background/main.background.ts +++ b/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"; diff --git a/apps/browser/src/background/nativeMessaging.background.ts b/apps/browser/src/background/nativeMessaging.background.ts index 77146633cf..df78380cd3 100644 --- a/apps/browser/src/background/nativeMessaging.background.ts +++ b/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"; diff --git a/apps/browser/src/background/service_factories/api-service.factory.ts b/apps/browser/src/background/service_factories/api-service.factory.ts index cee76c4e1d..830d51a1a2 100644 --- a/apps/browser/src/background/service_factories/api-service.factory.ts +++ b/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: { diff --git a/apps/browser/src/background/service_factories/vault-timeout-service.factory.ts b/apps/browser/src/background/service_factories/vault-timeout-service.factory.ts index 7dc28fd88f..a1529d9e94 100644 --- a/apps/browser/src/background/service_factories/vault-timeout-service.factory.ts +++ b/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, diff --git a/apps/browser/src/background/service_factories/vault-timeout-settings-service.factory.ts b/apps/browser/src/background/service_factories/vault-timeout-settings-service.factory.ts index 0d8ed149b8..aa9f526f79 100644 --- a/apps/browser/src/background/service_factories/vault-timeout-settings-service.factory.ts +++ b/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; diff --git a/apps/browser/src/background/webRequest.background.ts b/apps/browser/src/background/webRequest.background.ts index 6424dec3b4..ca0e0909a7 100644 --- a/apps/browser/src/background/webRequest.background.ts +++ b/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"; diff --git a/apps/browser/src/listeners/onCommandListener.ts b/apps/browser/src/listeners/onCommandListener.ts index 319dda7b01..ed6b599070 100644 --- a/apps/browser/src/listeners/onCommandListener.ts +++ b/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 { diff --git a/apps/browser/src/listeners/update-badge.ts b/apps/browser/src/listeners/update-badge.ts index 8595d2ae43..de469117bc 100644 --- a/apps/browser/src/listeners/update-badge.ts +++ b/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"; diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts index 3fb599f8ff..00022aa8ac 100644 --- a/apps/browser/src/popup/app-routing.module.ts +++ b/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 { LockGuard } from "@bitwarden/angular/guards/lock.guard"; -import { UnauthGuard } from "@bitwarden/angular/guards/unauth.guard"; +import { AuthGuard } from "@bitwarden/angular/auth/guards/auth.guard"; +import { LockGuard } from "@bitwarden/angular/auth/guards/lock.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"; diff --git a/apps/browser/src/popup/app.component.ts b/apps/browser/src/popup/app.component.ts index da7b0062b8..dd231e865c 100644 --- a/apps/browser/src/popup/app.component.ts +++ b/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"; diff --git a/apps/browser/src/popup/app.module.ts b/apps/browser/src/popup/app.module.ts index bbed34e7c7..aa07815f5e 100644 --- a/apps/browser/src/popup/app.module.ts +++ b/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"; diff --git a/apps/browser/src/popup/components/user-verification.component.ts b/apps/browser/src/popup/components/user-verification.component.ts index 2eb89c2833..87b514c416 100644 --- a/apps/browser/src/popup/components/user-verification.component.ts +++ b/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", diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts index 0ec710cc1c..7f4fad3fd9 100644 --- a/apps/browser/src/popup/services/services.module.ts +++ b/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 { UnauthGuard as BaseUnauthGuardService } from "@bitwarden/angular/guards/unauth.guard"; +import { LockGuard as BaseLockGuardService } from "@bitwarden/angular/auth/guards/lock.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; diff --git a/apps/browser/src/popup/settings/settings.component.ts b/apps/browser/src/popup/settings/settings.component.ts index 9728ff2a5d..0c2d1a2eba 100644 --- a/apps/browser/src/popup/settings/settings.component.ts +++ b/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"; diff --git a/apps/browser/src/vault/popup/components/vault/view.component.ts b/apps/browser/src/vault/popup/components/vault/view.component.ts index c37283e698..5dac1a0d9d 100644 --- a/apps/browser/src/vault/popup/components/vault/view.component.ts +++ b/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"; diff --git a/apps/cli/src/commands/lock.command.ts b/apps/cli/src/auth/commands/lock.command.ts similarity index 76% rename from apps/cli/src/commands/lock.command.ts rename to apps/cli/src/auth/commands/lock.command.ts index f9f136a6b9..3a33024a6f 100644 --- a/apps/cli/src/commands/lock.command.ts +++ b/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 { MessageResponse } from "../models/response/message.response"; +import { Response } from "../../models/response"; +import { MessageResponse } from "../../models/response/message.response"; export class LockCommand { constructor(private vaultTimeoutService: VaultTimeoutService) {} diff --git a/apps/cli/src/commands/login.command.ts b/apps/cli/src/auth/commands/login.command.ts similarity index 96% rename from apps/cli/src/commands/login.command.ts rename to apps/cli/src/auth/commands/login.command.ts index 7942917622..fcdd7b0a82 100644 --- a/apps/cli/src/commands/login.command.ts +++ b/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 { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; -import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; -import { Utils } from "@bitwarden/common/misc/utils"; -import { AuthResult } from "@bitwarden/common/models/domain/auth-result"; +import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; +import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; +import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service"; +import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type"; +import { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result"; import { UserApiLogInCredentials, PasswordLogInCredentials, SsoLogInCredentials, -} from "@bitwarden/common/models/domain/log-in-credentials"; -import { TokenTwoFactorRequest } from "@bitwarden/common/models/request/identity-token/token-two-factor.request"; -import { TwoFactorEmailRequest } from "@bitwarden/common/models/request/two-factor-email.request"; +} from "@bitwarden/common/auth/models/domain/log-in-credentials"; +import { TokenTwoFactorRequest } from "@bitwarden/common/auth/models/request/identity-token/token-two-factor.request"; +import { TwoFactorEmailRequest } from "@bitwarden/common/auth/models/request/two-factor-email.request"; +import { 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 { MessageResponse } from "../models/response/message.response"; +import { Response } from "../../models/response"; +import { MessageResponse } from "../../models/response/message.response"; export class LoginCommand { protected canInteract: boolean; diff --git a/apps/cli/src/commands/logout.command.ts b/apps/cli/src/auth/commands/logout.command.ts similarity index 70% rename from apps/cli/src/commands/logout.command.ts rename to apps/cli/src/auth/commands/logout.command.ts index 3de7627576..a82edc62f9 100644 --- a/apps/cli/src/commands/logout.command.ts +++ b/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 { MessageResponse } from "../models/response/message.response"; +import { Response } from "../../models/response"; +import { MessageResponse } from "../../models/response/message.response"; export class LogoutCommand { constructor( diff --git a/apps/cli/src/commands/unlock.command.ts b/apps/cli/src/auth/commands/unlock.command.ts similarity index 90% rename from apps/cli/src/commands/unlock.command.ts rename to apps/cli/src/auth/commands/unlock.command.ts index 73a4a80256..5fbf4219a8 100644 --- a/apps/cli/src/commands/unlock.command.ts +++ b/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 { MessageResponse } from "../models/response/message.response"; -import { CliUtils } from "../utils"; - -import { ConvertToKeyConnectorCommand } from "./convert-to-key-connector.command"; +import { ConvertToKeyConnectorCommand } from "../../commands/convert-to-key-connector.command"; +import { Response } from "../../models/response"; +import { MessageResponse } from "../../models/response/message.response"; +import { CliUtils } from "../../utils"; export class UnlockCommand { constructor( diff --git a/apps/cli/src/bw.ts b/apps/cli/src/bw.ts index 74a9038e61..fa2d313979 100644 --- a/apps/cli/src/bw.ts +++ b/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"; diff --git a/apps/cli/src/commands/convert-to-key-connector.command.ts b/apps/cli/src/commands/convert-to-key-connector.command.ts index 3d6149f2a5..16ac2b7818 100644 --- a/apps/cli/src/commands/convert-to-key-connector.command.ts +++ b/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"; diff --git a/apps/cli/src/commands/serve.command.ts b/apps/cli/src/commands/serve.command.ts index 854d71567b..f3acc5b282 100644 --- a/apps/cli/src/commands/serve.command.ts +++ b/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; diff --git a/apps/cli/src/commands/status.command.ts b/apps/cli/src/commands/status.command.ts index c73dbdca88..b847ce389c 100644 --- a/apps/cli/src/commands/status.command.ts +++ b/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"; diff --git a/apps/cli/src/program.ts b/apps/cli/src/program.ts index e3e7613b53..62e4a991b4 100644 --- a/apps/cli/src/program.ts +++ b/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"; diff --git a/apps/cli/src/services/node-api.service.ts b/apps/cli/src/services/node-api.service.ts index 2036ccc61c..9a757afd25 100644 --- a/apps/cli/src/services/node-api.service.ts +++ b/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; diff --git a/apps/desktop/src/app/accounts/hint.component.ts b/apps/desktop/src/app/accounts/hint.component.ts index 8987efd617..0de5c6c79b 100644 --- a/apps/desktop/src/app/accounts/hint.component.ts +++ b/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", diff --git a/apps/desktop/src/app/app-routing.module.ts b/apps/desktop/src/app/app-routing.module.ts index 8d3c1fc3ab..c77b943971 100644 --- a/apps/desktop/src/app/app-routing.module.ts +++ b/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 { LockGuard } from "@bitwarden/angular/guards/lock.guard"; +import { AuthGuard } from "@bitwarden/angular/auth/guards/auth.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 = [ diff --git a/apps/desktop/src/app/app.component.ts b/apps/desktop/src/app/app.component.ts index 24e21cae01..2f009c9c7a 100644 --- a/apps/desktop/src/app/app.component.ts +++ b/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"; diff --git a/apps/desktop/src/app/app.module.ts b/apps/desktop/src/app/app.module.ts index 7e945c0107..2e074528bb 100644 --- a/apps/desktop/src/app/app.module.ts +++ b/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"; diff --git a/apps/desktop/src/app/components/user-verification.component.ts b/apps/desktop/src/app/components/user-verification.component.ts index 2eb89c2833..87b514c416 100644 --- a/apps/desktop/src/app/components/user-verification.component.ts +++ b/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", diff --git a/apps/desktop/src/app/layout/account-switcher.component.ts b/apps/desktop/src/app/layout/account-switcher.component.ts index 09222cbced..eedb9c33a3 100644 --- a/apps/desktop/src/app/layout/account-switcher.component.ts +++ b/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 { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; +import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; +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"; diff --git a/apps/desktop/src/app/services/init.service.ts b/apps/desktop/src/app/services/init.service.ts index b5158b5588..1208ab3853 100644 --- a/apps/desktop/src/app/services/init.service.ts +++ b/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"; diff --git a/apps/desktop/src/app/services/services.module.ts b/apps/desktop/src/app/services/services.module.ts index bb6887a0ca..e2d2ae988e 100644 --- a/apps/desktop/src/app/services/services.module.ts +++ b/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"; diff --git a/apps/desktop/src/app/accounts/accessibility-cookie.component.html b/apps/desktop/src/auth/accessibility-cookie.component.html similarity index 100% rename from apps/desktop/src/app/accounts/accessibility-cookie.component.html rename to apps/desktop/src/auth/accessibility-cookie.component.html diff --git a/apps/desktop/src/app/accounts/accessibility-cookie.component.ts b/apps/desktop/src/auth/accessibility-cookie.component.ts similarity index 98% rename from apps/desktop/src/app/accounts/accessibility-cookie.component.ts rename to apps/desktop/src/auth/accessibility-cookie.component.ts index a8173400ed..dbcbd097fa 100644 --- a/apps/desktop/src/app/accounts/accessibility-cookie.component.ts +++ b/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"; diff --git a/apps/desktop/src/app/accounts/delete-account.component.html b/apps/desktop/src/auth/delete-account.component.html similarity index 100% rename from apps/desktop/src/app/accounts/delete-account.component.html rename to apps/desktop/src/auth/delete-account.component.html diff --git a/apps/desktop/src/app/accounts/delete-account.component.ts b/apps/desktop/src/auth/delete-account.component.ts similarity index 93% rename from apps/desktop/src/app/accounts/delete-account.component.ts rename to apps/desktop/src/auth/delete-account.component.ts index 6ee941df83..573a796d2f 100644 --- a/apps/desktop/src/app/accounts/delete-account.component.ts +++ b/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({ diff --git a/apps/desktop/src/app/accounts/environment.component.html b/apps/desktop/src/auth/environment.component.html similarity index 100% rename from apps/desktop/src/app/accounts/environment.component.html rename to apps/desktop/src/auth/environment.component.html diff --git a/apps/desktop/src/app/accounts/environment.component.ts b/apps/desktop/src/auth/environment.component.ts similarity index 100% rename from apps/desktop/src/app/accounts/environment.component.ts rename to apps/desktop/src/auth/environment.component.ts diff --git a/apps/desktop/src/app/guards/login.guard.ts b/apps/desktop/src/auth/guards/login.guard.ts similarity index 100% rename from apps/desktop/src/app/guards/login.guard.ts rename to apps/desktop/src/auth/guards/login.guard.ts diff --git a/apps/desktop/src/app/accounts/lock.component.html b/apps/desktop/src/auth/lock.component.html similarity index 100% rename from apps/desktop/src/app/accounts/lock.component.html rename to apps/desktop/src/auth/lock.component.html diff --git a/apps/desktop/src/app/accounts/lock.component.ts b/apps/desktop/src/auth/lock.component.ts similarity index 96% rename from apps/desktop/src/app/accounts/lock.component.ts rename to apps/desktop/src/auth/lock.component.ts index 433bd79172..1de50e2043 100644 --- a/apps/desktop/src/app/accounts/lock.component.ts +++ b/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"; diff --git a/apps/desktop/src/app/accounts/login/login-approval.component.html b/apps/desktop/src/auth/login/login-approval.component.html similarity index 100% rename from apps/desktop/src/app/accounts/login/login-approval.component.html rename to apps/desktop/src/auth/login/login-approval.component.html diff --git a/apps/desktop/src/app/accounts/login/login-approval.component.ts b/apps/desktop/src/auth/login/login-approval.component.ts similarity index 96% rename from apps/desktop/src/app/accounts/login/login-approval.component.ts rename to apps/desktop/src/auth/login/login-approval.component.ts index 511ed81533..3d21513370 100644 --- a/apps/desktop/src/app/accounts/login/login-approval.component.ts +++ b/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 diff --git a/apps/desktop/src/app/accounts/login/login-with-device.component.html b/apps/desktop/src/auth/login/login-with-device.component.html similarity index 100% rename from apps/desktop/src/app/accounts/login/login-with-device.component.html rename to apps/desktop/src/auth/login/login-with-device.component.html diff --git a/apps/desktop/src/app/accounts/login/login-with-device.component.ts b/apps/desktop/src/auth/login/login-with-device.component.ts similarity index 93% rename from apps/desktop/src/app/accounts/login/login-with-device.component.ts rename to apps/desktop/src/auth/login/login-with-device.component.ts index 8eedd472e5..506ca36d74 100644 --- a/apps/desktop/src/app/accounts/login/login-with-device.component.ts +++ b/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"; diff --git a/apps/desktop/src/app/accounts/login/login.component.html b/apps/desktop/src/auth/login/login.component.html similarity index 100% rename from apps/desktop/src/app/accounts/login/login.component.html rename to apps/desktop/src/auth/login/login.component.html diff --git a/apps/desktop/src/app/accounts/login/login.component.ts b/apps/desktop/src/auth/login/login.component.ts similarity index 96% rename from apps/desktop/src/app/accounts/login/login.component.ts rename to apps/desktop/src/auth/login/login.component.ts index d6a6afbdc6..38af5e32fe 100644 --- a/apps/desktop/src/app/accounts/login/login.component.ts +++ b/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"; diff --git a/apps/desktop/src/app/accounts/login/login.module.ts b/apps/desktop/src/auth/login/login.module.ts similarity index 86% rename from apps/desktop/src/app/accounts/login/login.module.ts rename to apps/desktop/src/auth/login/login.module.ts index cfe92d74ad..5b67d2a580 100644 --- a/apps/desktop/src/app/accounts/login/login.module.ts +++ b/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"; diff --git a/apps/desktop/src/app/accounts/register.component.html b/apps/desktop/src/auth/register.component.html similarity index 100% rename from apps/desktop/src/app/accounts/register.component.html rename to apps/desktop/src/auth/register.component.html diff --git a/apps/desktop/src/app/accounts/register.component.ts b/apps/desktop/src/auth/register.component.ts similarity index 97% rename from apps/desktop/src/app/accounts/register.component.ts rename to apps/desktop/src/auth/register.component.ts index 94706064d2..2f459993e0 100644 --- a/apps/desktop/src/app/accounts/register.component.ts +++ b/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"; diff --git a/apps/desktop/src/app/accounts/remove-password.component.html b/apps/desktop/src/auth/remove-password.component.html similarity index 100% rename from apps/desktop/src/app/accounts/remove-password.component.html rename to apps/desktop/src/auth/remove-password.component.html diff --git a/apps/desktop/src/app/accounts/remove-password.component.ts b/apps/desktop/src/auth/remove-password.component.ts similarity index 80% rename from apps/desktop/src/app/accounts/remove-password.component.ts rename to apps/desktop/src/auth/remove-password.component.ts index 89ebd4a620..5272a3082a 100644 --- a/apps/desktop/src/app/accounts/remove-password.component.ts +++ b/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", diff --git a/apps/desktop/src/scripts/duo.js b/apps/desktop/src/auth/scripts/duo.js similarity index 100% rename from apps/desktop/src/scripts/duo.js rename to apps/desktop/src/auth/scripts/duo.js diff --git a/apps/desktop/src/app/accounts/set-password.component.html b/apps/desktop/src/auth/set-password.component.html similarity index 100% rename from apps/desktop/src/app/accounts/set-password.component.html rename to apps/desktop/src/auth/set-password.component.html diff --git a/apps/desktop/src/app/accounts/set-password.component.ts b/apps/desktop/src/auth/set-password.component.ts similarity index 100% rename from apps/desktop/src/app/accounts/set-password.component.ts rename to apps/desktop/src/auth/set-password.component.ts diff --git a/apps/desktop/src/app/accounts/sso.component.html b/apps/desktop/src/auth/sso.component.html similarity index 100% rename from apps/desktop/src/app/accounts/sso.component.html rename to apps/desktop/src/auth/sso.component.html diff --git a/apps/desktop/src/app/accounts/sso.component.ts b/apps/desktop/src/auth/sso.component.ts similarity index 94% rename from apps/desktop/src/app/accounts/sso.component.ts rename to apps/desktop/src/auth/sso.component.ts index 83af8dc4b0..0fa12ae33a 100644 --- a/apps/desktop/src/app/accounts/sso.component.ts +++ b/apps/desktop/src/auth/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"; @@ -11,6 +10,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"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Component({ diff --git a/apps/desktop/src/app/accounts/two-factor-options.component.html b/apps/desktop/src/auth/two-factor-options.component.html similarity index 100% rename from apps/desktop/src/app/accounts/two-factor-options.component.html rename to apps/desktop/src/auth/two-factor-options.component.html diff --git a/apps/desktop/src/app/accounts/two-factor-options.component.ts b/apps/desktop/src/auth/two-factor-options.component.ts similarity index 81% rename from apps/desktop/src/app/accounts/two-factor-options.component.ts rename to apps/desktop/src/auth/two-factor-options.component.ts index 89a089d8f1..514994f753 100644 --- a/apps/desktop/src/app/accounts/two-factor-options.component.ts +++ b/apps/desktop/src/auth/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", diff --git a/apps/desktop/src/app/accounts/two-factor.component.html b/apps/desktop/src/auth/two-factor.component.html similarity index 100% rename from apps/desktop/src/app/accounts/two-factor.component.html rename to apps/desktop/src/auth/two-factor.component.html diff --git a/apps/desktop/src/app/accounts/two-factor.component.ts b/apps/desktop/src/auth/two-factor.component.ts similarity index 89% rename from apps/desktop/src/app/accounts/two-factor.component.ts rename to apps/desktop/src/auth/two-factor.component.ts index 6b52899b1d..47f52b36d1 100644 --- a/apps/desktop/src/app/accounts/two-factor.component.ts +++ b/apps/desktop/src/auth/two-factor.component.ts @@ -1,19 +1,19 @@ import { Component, ViewChild, ViewContainerRef } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; -import { TwoFactorComponent as BaseTwoFactorComponent } from "@bitwarden/angular/components/two-factor.component"; +import { TwoFactorComponent as BaseTwoFactorComponent } from "@bitwarden/angular/auth/components/two-factor.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 { 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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service"; -import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; +import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; +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 { TwoFactorOptionsComponent } from "./two-factor-options.component"; diff --git a/apps/desktop/src/app/accounts/update-temp-password.component.html b/apps/desktop/src/auth/update-temp-password.component.html similarity index 100% rename from apps/desktop/src/app/accounts/update-temp-password.component.html rename to apps/desktop/src/auth/update-temp-password.component.html diff --git a/apps/desktop/src/app/accounts/update-temp-password.component.ts b/apps/desktop/src/auth/update-temp-password.component.ts similarity index 95% rename from apps/desktop/src/app/accounts/update-temp-password.component.ts rename to apps/desktop/src/auth/update-temp-password.component.ts index 64c40ddc75..4e7edb07fc 100644 --- a/apps/desktop/src/app/accounts/update-temp-password.component.ts +++ b/apps/desktop/src/auth/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"; diff --git a/apps/desktop/src/services/encrypted-message-handler.service.ts b/apps/desktop/src/services/encrypted-message-handler.service.ts index 57550c9bc0..f02cec3868 100644 --- a/apps/desktop/src/services/encrypted-message-handler.service.ts +++ b/apps/desktop/src/services/encrypted-message-handler.service.ts @@ -1,10 +1,10 @@ import { firstValueFrom } from "rxjs"; -import { AuthService } from "@bitwarden/common/abstractions/auth.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.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 { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; diff --git a/apps/desktop/src/vault/app/vault/view.component.ts b/apps/desktop/src/vault/app/vault/view.component.ts index b409addd51..8419702611 100644 --- a/apps/desktop/src/vault/app/vault/view.component.ts +++ b/apps/desktop/src/vault/app/vault/view.component.ts @@ -19,8 +19,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"; diff --git a/apps/web/src/app/accounts/trial-initiation/trial-initiation.module.ts b/apps/web/src/app/accounts/trial-initiation/trial-initiation.module.ts index fd18800222..4aaee20001 100644 --- a/apps/web/src/app/accounts/trial-initiation/trial-initiation.module.ts +++ b/apps/web/src/app/accounts/trial-initiation/trial-initiation.module.ts @@ -4,9 +4,9 @@ import { NgModule } from "@angular/core"; import { FormFieldModule } from "@bitwarden/components"; +import { RegisterFormModule } from "../../../auth/register-form/register-form.module"; import { OrganizationCreateModule } from "../../organizations/create/organization-create.module"; import { LooseComponentsModule, SharedModule } from "../../shared"; -import { RegisterFormModule } from "../register-form/register-form.module"; import { BillingComponent } from "./billing.component"; import { ConfirmationDetailsComponent } from "./confirmation-details.component"; diff --git a/apps/web/src/app/app.component.ts b/apps/web/src/app/app.component.ts index b9dac0c6db..c65d616044 100644 --- a/apps/web/src/app/app.component.ts +++ b/apps/web/src/app/app.component.ts @@ -7,13 +7,11 @@ import { IndividualConfig, ToastrService } from "ngx-toastr"; import { Subject, takeUntil } from "rxjs"; import Swal from "sweetalert2"; -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 { NotificationsService } from "@bitwarden/common/abstractions/notifications.service"; import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; @@ -22,6 +20,8 @@ import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { SettingsService } from "@bitwarden/common/abstractions/settings.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; +import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; +import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; 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"; diff --git a/apps/web/src/app/components/user-verification-prompt.component.ts b/apps/web/src/app/components/user-verification-prompt.component.ts index e057193aff..4b24b446a8 100644 --- a/apps/web/src/app/components/user-verification-prompt.component.ts +++ b/apps/web/src/app/components/user-verification-prompt.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { UserVerificationPromptComponent as BaseUserVerificationPrompt } from "@bitwarden/angular/components/user-verification-prompt.component"; +import { UserVerificationPromptComponent as BaseUserVerificationPrompt } from "@bitwarden/angular/auth/components/user-verification-prompt.component"; @Component({ templateUrl: "user-verification-prompt.component.html", diff --git a/apps/web/src/app/components/user-verification.component.ts b/apps/web/src/app/components/user-verification.component.ts index 2eb89c2833..87b514c416 100644 --- a/apps/web/src/app/components/user-verification.component.ts +++ b/apps/web/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", diff --git a/apps/web/src/app/core/core.module.ts b/apps/web/src/app/core/core.module.ts index 4b30a37ff5..137f6e02dd 100644 --- a/apps/web/src/app/core/core.module.ts +++ b/apps/web/src/app/core/core.module.ts @@ -13,14 +13,14 @@ import { JslibServicesModule } from "@bitwarden/angular/services/jslib-services. import { ModalService as ModalServiceAbstraction } from "@bitwarden/angular/services/modal.service"; import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service"; import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service"; -import { LoginService as LoginServiceAbstraction } from "@bitwarden/common/abstractions/login.service"; import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService as BaseStateServiceAbstraction } from "@bitwarden/common/abstractions/state.service"; import { StateMigrationService as StateMigrationServiceAbstraction } from "@bitwarden/common/abstractions/stateMigration.service"; import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service"; +import { LoginService as LoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/login.service"; +import { LoginService } from "@bitwarden/common/auth/services/login.service"; import { StateFactory } from "@bitwarden/common/factories/stateFactory"; -import { LoginService } from "@bitwarden/common/services/login.service"; import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service"; import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; diff --git a/apps/web/src/app/core/init.service.ts b/apps/web/src/app/core/init.service.ts index 8baa7c0ddc..1ecd7d3fef 100644 --- a/apps/web/src/app/core/init.service.ts +++ b/apps/web/src/app/core/init.service.ts @@ -12,8 +12,8 @@ import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/ import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service"; import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.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 as VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout/vaultTimeout.service"; diff --git a/apps/web/src/app/guards/home.guard.ts b/apps/web/src/app/guards/home.guard.ts index 6469042742..bbcf3448c7 100644 --- a/apps/web/src/app/guards/home.guard.ts +++ b/apps/web/src/app/guards/home.guard.ts @@ -1,8 +1,8 @@ import { Injectable } from "@angular/core"; import { ActivatedRouteSnapshot, CanActivate, Router } from "@angular/router"; -import { AuthService } from "@bitwarden/common/abstractions/auth.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"; @Injectable({ providedIn: "root", diff --git a/apps/web/src/app/layouts/navbar.component.ts b/apps/web/src/app/layouts/navbar.component.ts index 3fbcfc3e2b..3d67e75b32 100644 --- a/apps/web/src/app/layouts/navbar.component.ts +++ b/apps/web/src/app/layouts/navbar.component.ts @@ -10,7 +10,7 @@ import { } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; -import { TokenService } from "@bitwarden/common/abstractions/token.service"; +import { TokenService } from "@bitwarden/common/auth/abstractions/token.service"; import { Organization } from "@bitwarden/common/models/domain/organization"; import { Provider } from "@bitwarden/common/models/domain/provider"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; diff --git a/apps/web/src/app/organizations/billing/billing-sync-api-key.component.ts b/apps/web/src/app/organizations/billing/billing-sync-api-key.component.ts index acc13ee6d5..a23bf68977 100644 --- a/apps/web/src/app/organizations/billing/billing-sync-api-key.component.ts +++ b/apps/web/src/app/organizations/billing/billing-sync-api-key.component.ts @@ -6,9 +6,9 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; -import { OrganizationApiKeyType } from "@bitwarden/common/enums/organizationApiKeyType"; +import { OrganizationApiKeyType } from "@bitwarden/common/auth/enums/organization-api-key-type"; +import { ApiKeyResponse } from "@bitwarden/common/auth/models/response/api-key.response"; import { OrganizationApiKeyRequest } from "@bitwarden/common/models/request/organization-api-key.request"; -import { ApiKeyResponse } from "@bitwarden/common/models/response/api-key.response"; import { Verification } from "@bitwarden/common/types/verification"; export interface BillingSyncApiModalData { diff --git a/apps/web/src/app/organizations/billing/organization-subscription-cloud.component.ts b/apps/web/src/app/organizations/billing/organization-subscription-cloud.component.ts index c70b3a2929..1dc972be9a 100644 --- a/apps/web/src/app/organizations/billing/organization-subscription-cloud.component.ts +++ b/apps/web/src/app/organizations/billing/organization-subscription-cloud.component.ts @@ -9,7 +9,7 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { OrganizationApiKeyType } from "@bitwarden/common/enums/organizationApiKeyType"; +import { OrganizationApiKeyType } from "@bitwarden/common/auth/enums/organization-api-key-type"; import { PlanType } from "@bitwarden/common/enums/planType"; import { Organization } from "@bitwarden/common/models/domain/organization"; import { OrganizationSubscriptionResponse } from "@bitwarden/common/models/response/organization-subscription.response"; diff --git a/apps/web/src/app/organizations/members/components/reset-password.component.ts b/apps/web/src/app/organizations/members/components/reset-password.component.ts index 391420c48a..a02f8be7bc 100644 --- a/apps/web/src/app/organizations/members/components/reset-password.component.ts +++ b/apps/web/src/app/organizations/members/components/reset-password.component.ts @@ -19,8 +19,8 @@ import { OrganizationUserResetPasswordRequest } from "@bitwarden/common/abstract 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 { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { KdfConfig } from "@bitwarden/common/models/domain/kdf-config"; import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; diff --git a/apps/web/src/app/organizations/organization-routing.module.ts b/apps/web/src/app/organizations/organization-routing.module.ts index 2bce40e3ac..2ba5545be0 100644 --- a/apps/web/src/app/organizations/organization-routing.module.ts +++ b/apps/web/src/app/organizations/organization-routing.module.ts @@ -1,7 +1,7 @@ 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 { canAccessOrgAdmin, canAccessGroupsTab, diff --git a/apps/web/src/app/organizations/settings/two-factor-setup.component.ts b/apps/web/src/app/organizations/settings/two-factor-setup.component.ts index b50adc3bb0..fa9d25b8be 100644 --- a/apps/web/src/app/organizations/settings/two-factor-setup.component.ts +++ b/apps/web/src/app/organizations/settings/two-factor-setup.component.ts @@ -6,14 +6,14 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; +import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type"; -import { TwoFactorDuoComponent } from "../../settings/two-factor-duo.component"; -import { TwoFactorSetupComponent as BaseTwoFactorSetupComponent } from "../../settings/two-factor-setup.component"; +import { TwoFactorDuoComponent } from "../../../auth/settings/two-factor-duo.component"; +import { TwoFactorSetupComponent as BaseTwoFactorSetupComponent } from "../../../auth/settings/two-factor-setup.component"; @Component({ selector: "app-two-factor-setup", - templateUrl: "../../settings/two-factor-setup.component.html", + templateUrl: "../../../auth/settings/two-factor-setup.component.html", }) // eslint-disable-next-line rxjs-angular/prefer-takeuntil export class TwoFactorSetupComponent extends BaseTwoFactorSetupComponent { diff --git a/apps/web/src/app/organizations/vault/vault-items.component.ts b/apps/web/src/app/organizations/vault/vault-items.component.ts index 3417a7f055..4ef2c8f953 100644 --- a/apps/web/src/app/organizations/vault/vault-items.component.ts +++ b/apps/web/src/app/organizations/vault/vault-items.component.ts @@ -10,8 +10,8 @@ import { OrganizationService } from "@bitwarden/common/abstractions/organization import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService } from "@bitwarden/common/abstractions/search.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 { Organization } from "@bitwarden/common/models/domain/organization"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; import { CollectionView } from "@bitwarden/common/models/view/collection.view"; diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts index e2e4d40f10..5f97828f3c 100644 --- a/apps/web/src/app/oss-routing.module.ts +++ b/apps/web/src/app/oss-routing.module.ts @@ -1,30 +1,32 @@ import { NgModule } from "@angular/core"; import { Route, RouterModule, Routes } from "@angular/router"; -import { AuthGuard } from "@bitwarden/angular/guards/auth.guard"; -import { LockGuard } from "@bitwarden/angular/guards/lock.guard"; -import { UnauthGuard } from "@bitwarden/angular/guards/unauth.guard"; +import { AuthGuard } from "@bitwarden/angular/auth/guards/auth.guard"; +import { LockGuard } from "@bitwarden/angular/auth/guards/lock.guard"; +import { UnauthGuard } from "@bitwarden/angular/auth/guards/unauth.guard"; +import { AcceptEmergencyComponent } from "../auth/accept-emergency.component"; +import { AcceptOrganizationComponent } from "../auth/accept-organization.component"; +import { HintComponent } from "../auth/hint.component"; +import { LockComponent } from "../auth/lock.component"; +import { LoginWithDeviceComponent } from "../auth/login/login-with-device.component"; +import { LoginComponent } from "../auth/login/login.component"; +import { RecoverDeleteComponent } from "../auth/recover-delete.component"; +import { RecoverTwoFactorComponent } from "../auth/recover-two-factor.component"; +import { RemovePasswordComponent } from "../auth/remove-password.component"; +import { SetPasswordComponent } from "../auth/set-password.component"; +import { EmergencyAccessViewComponent } from "../auth/settings/emergency-access/emergency-access-view.component"; +import { EmergencyAccessComponent } from "../auth/settings/emergency-access/emergency-access.component"; +import { SsoComponent } from "../auth/sso.component"; +import { TwoFactorComponent } from "../auth/two-factor.component"; +import { UpdatePasswordComponent } from "../auth/update-password.component"; +import { UpdateTempPasswordComponent } from "../auth/update-temp-password.component"; +import { VerifyEmailTokenComponent } from "../auth/verify-email-token.component"; +import { VerifyRecoverDeleteComponent } from "../auth/verify-recover-delete.component"; import { flagEnabled, Flags } from "../utils/flags"; import { VaultModule } from "../vault/app/vault/vault.module"; -import { AcceptEmergencyComponent } from "./accounts/accept-emergency.component"; -import { AcceptOrganizationComponent } from "./accounts/accept-organization.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 { RecoverDeleteComponent } from "./accounts/recover-delete.component"; -import { RecoverTwoFactorComponent } from "./accounts/recover-two-factor.component"; -import { RemovePasswordComponent } from "./accounts/remove-password.component"; -import { SetPasswordComponent } from "./accounts/set-password.component"; -import { SsoComponent } from "./accounts/sso.component"; import { TrialInitiationComponent } from "./accounts/trial-initiation/trial-initiation.component"; -import { TwoFactorComponent } from "./accounts/two-factor.component"; -import { UpdatePasswordComponent } from "./accounts/update-password.component"; -import { UpdateTempPasswordComponent } from "./accounts/update-temp-password.component"; -import { VerifyEmailTokenComponent } from "./accounts/verify-email-token.component"; -import { VerifyRecoverDeleteComponent } from "./accounts/verify-recover-delete.component"; import { HomeGuard } from "./guards/home.guard"; import { FrontendLayoutComponent } from "./layouts/frontend-layout.component"; import { UserLayoutComponent } from "./layouts/user-layout.component"; @@ -37,8 +39,6 @@ import { SendComponent } from "./send/send.component"; import { AccountComponent } from "./settings/account.component"; import { CreateOrganizationComponent } from "./settings/create-organization.component"; import { DomainRulesComponent } from "./settings/domain-rules.component"; -import { EmergencyAccessViewComponent } from "./settings/emergency-access-view.component"; -import { EmergencyAccessComponent } from "./settings/emergency-access.component"; import { PreferencesComponent } from "./settings/preferences.component"; import { SecurityRoutingModule } from "./settings/security-routing.module"; import { SettingsComponent } from "./settings/settings.component"; diff --git a/apps/web/src/app/oss.module.ts b/apps/web/src/app/oss.module.ts index 99887178f2..21902bf1fe 100644 --- a/apps/web/src/app/oss.module.ts +++ b/apps/web/src/app/oss.module.ts @@ -1,9 +1,9 @@ import { NgModule } from "@angular/core"; +import { LoginModule } from "../auth/login/login.module"; import { OrganizationBadgeModule } from "../vault/app/vault/organization-badge/organization-badge.module"; import { VaultFilterModule } from "../vault/app/vault/vault-filter/vault-filter.module"; -import { LoginModule } from "./accounts/login/login.module"; import { TrialInitiationModule } from "./accounts/trial-initiation/trial-initiation.module"; import { OrganizationCreateModule } from "./organizations/create/organization-create.module"; import { OrganizationManageModule } from "./organizations/manage/organization-manage.module"; diff --git a/apps/web/src/app/reports/reports-routing.module.ts b/apps/web/src/app/reports/reports-routing.module.ts index 1967b1e035..1bfaaf546e 100644 --- a/apps/web/src/app/reports/reports-routing.module.ts +++ b/apps/web/src/app/reports/reports-routing.module.ts @@ -1,7 +1,7 @@ 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 { HasPremiumGuard } from "../shared/guards/has-premium.guard"; diff --git a/apps/web/src/app/settings/account.component.ts b/apps/web/src/app/settings/account.component.ts index 48153fa5b7..d67cd1a80f 100644 --- a/apps/web/src/app/settings/account.component.ts +++ b/apps/web/src/app/settings/account.component.ts @@ -2,10 +2,11 @@ import { Component, ViewChild, ViewContainerRef } from "@angular/core"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; + +import { DeauthorizeSessionsComponent } from "../../auth/settings/deauthorize-sessions.component"; -import { DeauthorizeSessionsComponent } from "./deauthorize-sessions.component"; import { DeleteAccountComponent } from "./delete-account.component"; import { PurgeVaultComponent } from "./purge-vault.component"; diff --git a/apps/web/src/app/settings/api-key.component.ts b/apps/web/src/app/settings/api-key.component.ts index ae376ffd69..5607f32009 100644 --- a/apps/web/src/app/settings/api-key.component.ts +++ b/apps/web/src/app/settings/api-key.component.ts @@ -2,8 +2,8 @@ import { Component } from "@angular/core"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; -import { SecretVerificationRequest } from "@bitwarden/common/models/request/secret-verification.request"; -import { ApiKeyResponse } from "@bitwarden/common/models/response/api-key.response"; +import { SecretVerificationRequest } from "@bitwarden/common/auth/models/request/secret-verification.request"; +import { ApiKeyResponse } from "@bitwarden/common/auth/models/response/api-key.response"; import { Verification } from "@bitwarden/common/types/verification"; @Component({ diff --git a/apps/web/src/app/settings/change-email.component.ts b/apps/web/src/app/settings/change-email.component.ts index 134698584e..320441979d 100644 --- a/apps/web/src/app/settings/change-email.component.ts +++ b/apps/web/src/app/settings/change-email.component.ts @@ -7,9 +7,9 @@ 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 { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; -import { EmailTokenRequest } from "@bitwarden/common/models/request/email-token.request"; -import { EmailRequest } from "@bitwarden/common/models/request/email.request"; +import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type"; +import { EmailTokenRequest } from "@bitwarden/common/auth/models/request/email-token.request"; +import { EmailRequest } from "@bitwarden/common/auth/models/request/email.request"; @Component({ selector: "app-change-email", diff --git a/apps/web/src/app/settings/change-kdf.component.ts b/apps/web/src/app/settings/change-kdf.component.ts index 3f41c888d1..c11d127c0e 100644 --- a/apps/web/src/app/settings/change-kdf.component.ts +++ b/apps/web/src/app/settings/change-kdf.component.ts @@ -7,6 +7,7 @@ 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 { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config"; import { DEFAULT_KDF_CONFIG, DEFAULT_PBKDF2_ITERATIONS, @@ -15,7 +16,6 @@ import { DEFAULT_ARGON2_PARALLELISM, KdfType, } from "@bitwarden/common/enums/kdfType"; -import { KdfConfig } from "@bitwarden/common/models/domain/kdf-config"; import { KdfRequest } from "@bitwarden/common/models/request/kdf.request"; @Component({ diff --git a/apps/web/src/app/settings/change-password.component.ts b/apps/web/src/app/settings/change-password.component.ts index 6553f8acca..a7d2930c35 100644 --- a/apps/web/src/app/settings/change-password.component.ts +++ b/apps/web/src/app/settings/change-password.component.ts @@ -2,11 +2,10 @@ import { Component } from "@angular/core"; import { Router } from "@angular/router"; import { firstValueFrom } from "rxjs"; -import { ChangePasswordComponent as BaseChangePasswordComponent } from "@bitwarden/angular/components/change-password.component"; +import { ChangePasswordComponent as BaseChangePasswordComponent } from "@bitwarden/angular/auth/components/change-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"; -import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/abstractions/organization-user/requests"; @@ -17,12 +16,13 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { SendService } from "@bitwarden/common/abstractions/send.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { EmergencyAccessStatusType } from "@bitwarden/common/enums/emergencyAccessStatusType"; +import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; +import { EmergencyAccessStatusType } from "@bitwarden/common/auth/enums/emergency-access-status-type"; +import { EmergencyAccessUpdateRequest } from "@bitwarden/common/auth/models/request/emergency-access-update.request"; +import { PasswordRequest } from "@bitwarden/common/auth/models/request/password.request"; 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"; -import { EmergencyAccessUpdateRequest } from "@bitwarden/common/models/request/emergency-access-update.request"; -import { PasswordRequest } from "@bitwarden/common/models/request/password.request"; import { SendWithIdRequest } from "@bitwarden/common/models/request/send-with-id.request"; import { UpdateKeyRequest } from "@bitwarden/common/models/request/update-key.request"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; diff --git a/apps/web/src/app/settings/delete-account.component.ts b/apps/web/src/app/settings/delete-account.component.ts index 1162945864..65f3daf9f7 100644 --- a/apps/web/src/app/settings/delete-account.component.ts +++ b/apps/web/src/app/settings/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({ diff --git a/apps/web/src/app/settings/premium.component.ts b/apps/web/src/app/settings/premium.component.ts index 0dcab671ef..33c2c0c76e 100644 --- a/apps/web/src/app/settings/premium.component.ts +++ b/apps/web/src/app/settings/premium.component.ts @@ -7,7 +7,7 @@ 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 { TokenService } from "@bitwarden/common/auth/abstractions/token.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { PaymentComponent } from "./payment.component"; diff --git a/apps/web/src/app/settings/profile.component.ts b/apps/web/src/app/settings/profile.component.ts index 1c4b1198c4..a5fe239d04 100644 --- a/apps/web/src/app/settings/profile.component.ts +++ b/apps/web/src/app/settings/profile.component.ts @@ -5,11 +5,11 @@ import { ModalService } from "@bitwarden/angular/services/modal.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { UpdateProfileRequest } from "@bitwarden/common/models/request/update-profile.request"; +import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; +import { UpdateProfileRequest } from "@bitwarden/common/auth/models/request/update-profile.request"; import { ProfileResponse } from "@bitwarden/common/models/response/profile.response"; import { ChangeAvatarComponent } from "./change-avatar.component"; diff --git a/apps/web/src/app/settings/security-keys.component.ts b/apps/web/src/app/settings/security-keys.component.ts index a44789bc77..822ba4d578 100644 --- a/apps/web/src/app/settings/security-keys.component.ts +++ b/apps/web/src/app/settings/security-keys.component.ts @@ -2,8 +2,8 @@ import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; import { ApiKeyComponent } from "./api-key.component"; diff --git a/apps/web/src/app/settings/security-routing.module.ts b/apps/web/src/app/settings/security-routing.module.ts index 42d36e0a88..bc28f88add 100644 --- a/apps/web/src/app/settings/security-routing.module.ts +++ b/apps/web/src/app/settings/security-routing.module.ts @@ -1,10 +1,11 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; +import { TwoFactorSetupComponent } from "../../auth/settings/two-factor-setup.component"; + import { ChangePasswordComponent } from "./change-password.component"; import { SecurityKeysComponent } from "./security-keys.component"; import { SecurityComponent } from "./security.component"; -import { TwoFactorSetupComponent } from "./two-factor-setup.component"; const routes: Routes = [ { diff --git a/apps/web/src/app/settings/security.component.ts b/apps/web/src/app/settings/security.component.ts index a0c0ae98c0..1c70f85eda 100644 --- a/apps/web/src/app/settings/security.component.ts +++ b/apps/web/src/app/settings/security.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service"; +import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; @Component({ selector: "app-security", diff --git a/apps/web/src/app/settings/settings.component.ts b/apps/web/src/app/settings/settings.component.ts index 2a2fc4d278..d85ef54d96 100644 --- a/apps/web/src/app/settings/settings.component.ts +++ b/apps/web/src/app/settings/settings.component.ts @@ -4,7 +4,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; 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 { StateService } from "../core"; diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts index f00a4359b5..ece942b1de 100644 --- a/apps/web/src/app/shared/loose-components.module.ts +++ b/apps/web/src/app/shared/loose-components.module.ts @@ -1,6 +1,39 @@ import { NgModule } from "@angular/core"; import { PasswordRepromptComponent } from "../../../src/vault/app/components/password-reprompt.component"; +import { AcceptEmergencyComponent } from "../../auth/accept-emergency.component"; +import { AcceptOrganizationComponent } from "../../auth/accept-organization.component"; +import { HintComponent } from "../../auth/hint.component"; +import { LockComponent } from "../../auth/lock.component"; +import { RecoverDeleteComponent } from "../../auth/recover-delete.component"; +import { RecoverTwoFactorComponent } from "../../auth/recover-two-factor.component"; +import { RegisterFormModule } from "../../auth/register-form/register-form.module"; +import { RemovePasswordComponent } from "../../auth/remove-password.component"; +import { SetPasswordComponent } from "../../auth/set-password.component"; +import { DeauthorizeSessionsComponent } from "../../auth/settings/deauthorize-sessions.component"; +import { EmergencyAccessAddEditComponent } from "../../auth/settings/emergency-access/emergency-access-add-edit.component"; +import { EmergencyAccessAttachmentsComponent } from "../../auth/settings/emergency-access/emergency-access-attachments.component"; +import { EmergencyAccessConfirmComponent } from "../../auth/settings/emergency-access/emergency-access-confirm.component"; +import { EmergencyAccessTakeoverComponent } from "../../auth/settings/emergency-access/emergency-access-takeover.component"; +import { EmergencyAccessViewComponent } from "../../auth/settings/emergency-access/emergency-access-view.component"; +import { EmergencyAccessComponent } from "../../auth/settings/emergency-access/emergency-access.component"; +import { EmergencyAddEditComponent } from "../../auth/settings/emergency-access/emergency-add-edit.component"; +import { TwoFactorAuthenticatorComponent } from "../../auth/settings/two-factor-authenticator.component"; +import { TwoFactorDuoComponent } from "../../auth/settings/two-factor-duo.component"; +import { TwoFactorEmailComponent } from "../../auth/settings/two-factor-email.component"; +import { TwoFactorRecoveryComponent } from "../../auth/settings/two-factor-recovery.component"; +import { TwoFactorSetupComponent } from "../../auth/settings/two-factor-setup.component"; +import { TwoFactorVerifyComponent } from "../../auth/settings/two-factor-verify.component"; +import { TwoFactorWebAuthnComponent } from "../../auth/settings/two-factor-webauthn.component"; +import { TwoFactorYubiKeyComponent } from "../../auth/settings/two-factor-yubikey.component"; +import { VerifyEmailComponent } from "../../auth/settings/verify-email.component"; +import { SsoComponent } from "../../auth/sso.component"; +import { TwoFactorOptionsComponent } from "../../auth/two-factor-options.component"; +import { TwoFactorComponent } from "../../auth/two-factor.component"; +import { UpdatePasswordComponent } from "../../auth/update-password.component"; +import { UpdateTempPasswordComponent } from "../../auth/update-temp-password.component"; +import { VerifyEmailTokenComponent } from "../../auth/verify-email-token.component"; +import { VerifyRecoverDeleteComponent } from "../../auth/verify-recover-delete.component"; import { PremiumBadgeComponent } from "../../vault/app/components/premium-badge.component"; import { AddEditCustomFieldsComponent } from "../../vault/app/vault/add-edit-custom-fields.component"; import { AddEditComponent } from "../../vault/app/vault/add-edit.component"; @@ -8,22 +41,6 @@ import { AttachmentsComponent } from "../../vault/app/vault/attachments.componen import { CollectionsComponent } from "../../vault/app/vault/collections.component"; import { FolderAddEditComponent } from "../../vault/app/vault/folder-add-edit.component"; import { ShareComponent } from "../../vault/app/vault/share.component"; -import { AcceptEmergencyComponent } from "../accounts/accept-emergency.component"; -import { AcceptOrganizationComponent } from "../accounts/accept-organization.component"; -import { HintComponent } from "../accounts/hint.component"; -import { LockComponent } from "../accounts/lock.component"; -import { RecoverDeleteComponent } from "../accounts/recover-delete.component"; -import { RecoverTwoFactorComponent } from "../accounts/recover-two-factor.component"; -import { RegisterFormModule } from "../accounts/register-form/register-form.module"; -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 { UpdatePasswordComponent } from "../accounts/update-password.component"; -import { UpdateTempPasswordComponent } from "../accounts/update-temp-password.component"; -import { VerifyEmailTokenComponent } from "../accounts/verify-email-token.component"; -import { VerifyRecoverDeleteComponent } from "../accounts/verify-recover-delete.component"; import { DynamicAvatarComponent } from "../components/dynamic-avatar.component"; import { OrganizationSwitcherComponent } from "../components/organization-switcher.component"; import { SelectableAvatarComponent } from "../components/selectable-avatar.component"; @@ -70,16 +87,8 @@ import { ChangeEmailComponent } from "../settings/change-email.component"; import { ChangeKdfComponent } from "../settings/change-kdf.component"; import { ChangePasswordComponent } from "../settings/change-password.component"; import { CreateOrganizationComponent } from "../settings/create-organization.component"; -import { DeauthorizeSessionsComponent } from "../settings/deauthorize-sessions.component"; import { DeleteAccountComponent } from "../settings/delete-account.component"; import { DomainRulesComponent } from "../settings/domain-rules.component"; -import { EmergencyAccessAddEditComponent } from "../settings/emergency-access-add-edit.component"; -import { EmergencyAccessAttachmentsComponent } from "../settings/emergency-access-attachments.component"; -import { EmergencyAccessConfirmComponent } from "../settings/emergency-access-confirm.component"; -import { EmergencyAccessTakeoverComponent } from "../settings/emergency-access-takeover.component"; -import { EmergencyAccessViewComponent } from "../settings/emergency-access-view.component"; -import { EmergencyAccessComponent } from "../settings/emergency-access.component"; -import { EmergencyAddEditComponent } from "../settings/emergency-add-edit.component"; import { LowKdfComponent } from "../settings/low-kdf.component"; import { OrganizationPlansComponent } from "../settings/organization-plans.component"; import { PaymentMethodComponent } from "../settings/payment-method.component"; @@ -95,19 +104,10 @@ import { SponsoredFamiliesComponent } from "../settings/sponsored-families.compo import { SponsoringOrgRowComponent } from "../settings/sponsoring-org-row.component"; import { SubscriptionComponent } from "../settings/subscription.component"; import { TaxInfoComponent } from "../settings/tax-info.component"; -import { TwoFactorAuthenticatorComponent } from "../settings/two-factor-authenticator.component"; -import { TwoFactorDuoComponent } from "../settings/two-factor-duo.component"; -import { TwoFactorEmailComponent } from "../settings/two-factor-email.component"; -import { TwoFactorRecoveryComponent } from "../settings/two-factor-recovery.component"; -import { TwoFactorSetupComponent } from "../settings/two-factor-setup.component"; -import { TwoFactorVerifyComponent } from "../settings/two-factor-verify.component"; -import { TwoFactorWebAuthnComponent } from "../settings/two-factor-webauthn.component"; -import { TwoFactorYubiKeyComponent } from "../settings/two-factor-yubikey.component"; import { UpdateKeyComponent } from "../settings/update-key.component"; import { UpdateLicenseComponent } from "../settings/update-license.component"; import { UserSubscriptionComponent } from "../settings/user-subscription.component"; import { VaultTimeoutInputComponent } from "../settings/vault-timeout-input.component"; -import { VerifyEmailComponent } from "../settings/verify-email.component"; import { GeneratorComponent } from "../tools/generator.component"; import { PasswordGeneratorHistoryComponent } from "../tools/password-generator-history.component"; import { ToolsComponent } from "../tools/tools.component"; diff --git a/apps/web/src/app/accounts/accept-emergency.component.html b/apps/web/src/auth/accept-emergency.component.html similarity index 100% rename from apps/web/src/app/accounts/accept-emergency.component.html rename to apps/web/src/auth/accept-emergency.component.html diff --git a/apps/web/src/app/accounts/accept-emergency.component.ts b/apps/web/src/auth/accept-emergency.component.ts similarity index 93% rename from apps/web/src/app/accounts/accept-emergency.component.ts rename to apps/web/src/auth/accept-emergency.component.ts index 8cfdb9dcb1..1904ce4e4e 100644 --- a/apps/web/src/app/accounts/accept-emergency.component.ts +++ b/apps/web/src/auth/accept-emergency.component.ts @@ -5,9 +5,9 @@ import { ApiService } from "@bitwarden/common/abstractions/api.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 { EmergencyAccessAcceptRequest } from "@bitwarden/common/models/request/emergency-access-accept.request"; +import { EmergencyAccessAcceptRequest } from "@bitwarden/common/auth/models/request/emergency-access-accept.request"; -import { BaseAcceptComponent } from "../common/base.accept.component"; +import { BaseAcceptComponent } from "../app/common/base.accept.component"; @Component({ selector: "app-accept-emergency", diff --git a/apps/web/src/app/accounts/accept-organization.component.html b/apps/web/src/auth/accept-organization.component.html similarity index 100% rename from apps/web/src/app/accounts/accept-organization.component.html rename to apps/web/src/auth/accept-organization.component.html diff --git a/apps/web/src/app/accounts/accept-organization.component.ts b/apps/web/src/auth/accept-organization.component.ts similarity index 98% rename from apps/web/src/app/accounts/accept-organization.component.ts rename to apps/web/src/auth/accept-organization.component.ts index 4153c9c516..ececc3c370 100644 --- a/apps/web/src/app/accounts/accept-organization.component.ts +++ b/apps/web/src/auth/accept-organization.component.ts @@ -15,7 +15,7 @@ import { StateService } from "@bitwarden/common/abstractions/state.service"; import { Utils } from "@bitwarden/common/misc/utils"; import { Policy } from "@bitwarden/common/models/domain/policy"; -import { BaseAcceptComponent } from "../common/base.accept.component"; +import { BaseAcceptComponent } from "../app/common/base.accept.component"; @Component({ selector: "app-accept-organization", diff --git a/apps/web/src/app/accounts/hint.component.html b/apps/web/src/auth/hint.component.html similarity index 100% rename from apps/web/src/app/accounts/hint.component.html rename to apps/web/src/auth/hint.component.html diff --git a/apps/web/src/app/accounts/hint.component.ts b/apps/web/src/auth/hint.component.ts similarity index 88% rename from apps/web/src/app/accounts/hint.component.ts rename to apps/web/src/auth/hint.component.ts index aaf58fe949..bb99f0dd68 100644 --- a/apps/web/src/app/accounts/hint.component.ts +++ b/apps/web/src/auth/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", diff --git a/apps/web/src/app/accounts/lock.component.html b/apps/web/src/auth/lock.component.html similarity index 100% rename from apps/web/src/app/accounts/lock.component.html rename to apps/web/src/auth/lock.component.html diff --git a/apps/web/src/app/accounts/lock.component.ts b/apps/web/src/auth/lock.component.ts similarity index 92% rename from apps/web/src/app/accounts/lock.component.ts rename to apps/web/src/auth/lock.component.ts index 0aed1fb0ea..0c56830a9a 100644 --- a/apps/web/src/app/accounts/lock.component.ts +++ b/apps/web/src/auth/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 { 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"; -import { RouterService } from "../core"; +import { RouterService } from "../app/core"; @Component({ selector: "app-lock", diff --git a/apps/web/src/app/accounts/login/login-with-device.component.html b/apps/web/src/auth/login/login-with-device.component.html similarity index 100% rename from apps/web/src/app/accounts/login/login-with-device.component.html rename to apps/web/src/auth/login/login-with-device.component.html diff --git a/apps/web/src/app/accounts/login/login-with-device.component.ts b/apps/web/src/auth/login/login-with-device.component.ts similarity index 88% rename from apps/web/src/app/accounts/login/login-with-device.component.ts rename to apps/web/src/auth/login/login-with-device.component.ts index 2be7df0502..c39acb663a 100644 --- a/apps/web/src/app/accounts/login/login-with-device.component.ts +++ b/apps/web/src/auth/login/login-with-device.component.ts @@ -1,22 +1,22 @@ 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 { 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 { StateService } from "../../core/state/state.service"; +import { StateService } from "../../app/core"; @Component({ selector: "app-login-with-device", diff --git a/apps/web/src/app/accounts/login/login.component.html b/apps/web/src/auth/login/login.component.html similarity index 100% rename from apps/web/src/app/accounts/login/login.component.html rename to apps/web/src/auth/login/login.component.html diff --git a/apps/web/src/app/accounts/login/login.component.ts b/apps/web/src/auth/login/login.component.ts similarity index 96% rename from apps/web/src/app/accounts/login/login.component.ts rename to apps/web/src/auth/login/login.component.ts index c240e0fab9..4bd961756b 100644 --- a/apps/web/src/app/accounts/login/login.component.ts +++ b/apps/web/src/auth/login/login.component.ts @@ -4,29 +4,29 @@ import { ActivatedRoute, Router } from "@angular/router"; import { Subject, takeUntil } from "rxjs"; import { first } from "rxjs/operators"; -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 { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction"; import { InternalPolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; +import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; +import { LoginService } from "@bitwarden/common/auth/abstractions/login.service"; import { PolicyData } from "@bitwarden/common/models/data/policy.data"; import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; import { Policy } from "@bitwarden/common/models/domain/policy"; import { ListResponse } from "@bitwarden/common/models/response/list.response"; import { PolicyResponse } from "@bitwarden/common/models/response/policy.response"; -import { flagEnabled } from "../../../utils/flags"; -import { RouterService, StateService } from "../../core"; +import { RouterService, StateService } from "../../app/core"; +import { flagEnabled } from "../../utils/flags"; @Component({ selector: "app-login", diff --git a/apps/web/src/app/accounts/login/login.module.ts b/apps/web/src/auth/login/login.module.ts similarity index 89% rename from apps/web/src/app/accounts/login/login.module.ts rename to apps/web/src/auth/login/login.module.ts index 1dfbe92580..2938241c54 100644 --- a/apps/web/src/app/accounts/login/login.module.ts +++ b/apps/web/src/auth/login/login.module.ts @@ -2,7 +2,7 @@ import { NgModule } from "@angular/core"; import { CheckboxModule } from "@bitwarden/components"; -import { SharedModule } from "../../shared"; +import { SharedModule } from "../../app/shared"; import { LoginWithDeviceComponent } from "./login-with-device.component"; import { LoginComponent } from "./login.component"; diff --git a/apps/web/src/app/accounts/recover-delete.component.html b/apps/web/src/auth/recover-delete.component.html similarity index 100% rename from apps/web/src/app/accounts/recover-delete.component.html rename to apps/web/src/auth/recover-delete.component.html diff --git a/apps/web/src/app/accounts/recover-delete.component.ts b/apps/web/src/auth/recover-delete.component.ts similarity index 100% rename from apps/web/src/app/accounts/recover-delete.component.ts rename to apps/web/src/auth/recover-delete.component.ts diff --git a/apps/web/src/app/accounts/recover-two-factor.component.html b/apps/web/src/auth/recover-two-factor.component.html similarity index 100% rename from apps/web/src/app/accounts/recover-two-factor.component.html rename to apps/web/src/auth/recover-two-factor.component.html diff --git a/apps/web/src/app/accounts/recover-two-factor.component.ts b/apps/web/src/auth/recover-two-factor.component.ts similarity index 90% rename from apps/web/src/app/accounts/recover-two-factor.component.ts rename to apps/web/src/auth/recover-two-factor.component.ts index bfedd8679a..df84c4ead6 100644 --- a/apps/web/src/app/accounts/recover-two-factor.component.ts +++ b/apps/web/src/auth/recover-two-factor.component.ts @@ -2,12 +2,12 @@ import { Component } from "@angular/core"; import { Router } from "@angular/router"; 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 { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { TwoFactorRecoveryRequest } from "@bitwarden/common/models/request/two-factor-recovery.request"; +import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; +import { TwoFactorRecoveryRequest } from "@bitwarden/common/auth/models/request/two-factor-recovery.request"; @Component({ selector: "app-recover-two-factor", diff --git a/apps/web/src/app/accounts/register-form/register-form.component.html b/apps/web/src/auth/register-form/register-form.component.html similarity index 100% rename from apps/web/src/app/accounts/register-form/register-form.component.html rename to apps/web/src/auth/register-form/register-form.component.html diff --git a/apps/web/src/app/accounts/register-form/register-form.component.ts b/apps/web/src/auth/register-form/register-form.component.ts similarity index 97% rename from apps/web/src/app/accounts/register-form/register-form.component.ts rename to apps/web/src/auth/register-form/register-form.component.ts index 242ce39baf..b0b48726e7 100644 --- a/apps/web/src/app/accounts/register-form/register-form.component.ts +++ b/apps/web/src/auth/register-form/register-form.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"; @@ -15,6 +14,7 @@ import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwo import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; import { ReferenceEventRequest } from "@bitwarden/common/models/request/reference-event.request"; diff --git a/apps/web/src/app/accounts/register-form/register-form.module.ts b/apps/web/src/auth/register-form/register-form.module.ts similarity index 84% rename from apps/web/src/app/accounts/register-form/register-form.module.ts rename to apps/web/src/auth/register-form/register-form.module.ts index ee0aa91d1a..e2a17e77be 100644 --- a/apps/web/src/app/accounts/register-form/register-form.module.ts +++ b/apps/web/src/auth/register-form/register-form.module.ts @@ -1,6 +1,6 @@ import { NgModule } from "@angular/core"; -import { SharedModule } from "../../shared"; +import { SharedModule } from "../../app/shared"; import { RegisterFormComponent } from "./register-form.component"; diff --git a/apps/web/src/app/accounts/remove-password.component.html b/apps/web/src/auth/remove-password.component.html similarity index 100% rename from apps/web/src/app/accounts/remove-password.component.html rename to apps/web/src/auth/remove-password.component.html diff --git a/apps/web/src/app/accounts/remove-password.component.ts b/apps/web/src/auth/remove-password.component.ts similarity index 80% rename from apps/web/src/app/accounts/remove-password.component.ts rename to apps/web/src/auth/remove-password.component.ts index 89ebd4a620..5272a3082a 100644 --- a/apps/web/src/app/accounts/remove-password.component.ts +++ b/apps/web/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", diff --git a/apps/web/src/app/accounts/set-password.component.html b/apps/web/src/auth/set-password.component.html similarity index 100% rename from apps/web/src/app/accounts/set-password.component.html rename to apps/web/src/auth/set-password.component.html diff --git a/apps/web/src/app/accounts/set-password.component.ts b/apps/web/src/auth/set-password.component.ts similarity index 100% rename from apps/web/src/app/accounts/set-password.component.ts rename to apps/web/src/auth/set-password.component.ts diff --git a/apps/web/src/app/settings/deauthorize-sessions.component.html b/apps/web/src/auth/settings/deauthorize-sessions.component.html similarity index 100% rename from apps/web/src/app/settings/deauthorize-sessions.component.html rename to apps/web/src/auth/settings/deauthorize-sessions.component.html diff --git a/apps/web/src/app/settings/deauthorize-sessions.component.ts b/apps/web/src/auth/settings/deauthorize-sessions.component.ts similarity index 100% rename from apps/web/src/app/settings/deauthorize-sessions.component.ts rename to apps/web/src/auth/settings/deauthorize-sessions.component.ts diff --git a/apps/web/src/app/settings/emergency-access-add-edit.component.html b/apps/web/src/auth/settings/emergency-access/emergency-access-add-edit.component.html similarity index 100% rename from apps/web/src/app/settings/emergency-access-add-edit.component.html rename to apps/web/src/auth/settings/emergency-access/emergency-access-add-edit.component.html diff --git a/apps/web/src/app/settings/emergency-access-add-edit.component.ts b/apps/web/src/auth/settings/emergency-access/emergency-access-add-edit.component.ts similarity index 94% rename from apps/web/src/app/settings/emergency-access-add-edit.component.ts rename to apps/web/src/auth/settings/emergency-access/emergency-access-add-edit.component.ts index aad2a957ff..21f647d571 100644 --- a/apps/web/src/app/settings/emergency-access-add-edit.component.ts +++ b/apps/web/src/auth/settings/emergency-access/emergency-access-add-edit.component.ts @@ -4,9 +4,9 @@ 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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { EmergencyAccessType } from "@bitwarden/common/enums/emergencyAccessType"; -import { EmergencyAccessInviteRequest } from "@bitwarden/common/models/request/emergency-access-invite.request"; -import { EmergencyAccessUpdateRequest } from "@bitwarden/common/models/request/emergency-access-update.request"; +import { EmergencyAccessType } from "@bitwarden/common/auth/enums/emergency-access-type"; +import { EmergencyAccessInviteRequest } from "@bitwarden/common/auth/models/request/emergency-access-invite.request"; +import { EmergencyAccessUpdateRequest } from "@bitwarden/common/auth/models/request/emergency-access-update.request"; @Component({ selector: "emergency-access-add-edit", diff --git a/apps/web/src/app/settings/emergency-access-attachments.component.ts b/apps/web/src/auth/settings/emergency-access/emergency-access-attachments.component.ts similarity index 96% rename from apps/web/src/app/settings/emergency-access-attachments.component.ts rename to apps/web/src/auth/settings/emergency-access/emergency-access-attachments.component.ts index 6830fd27b7..089606b892 100644 --- a/apps/web/src/app/settings/emergency-access-attachments.component.ts +++ b/apps/web/src/auth/settings/emergency-access/emergency-access-attachments.component.ts @@ -13,7 +13,7 @@ import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.v @Component({ selector: "emergency-access-attachments", - templateUrl: "../../vault/app/vault/attachments.component.html", + templateUrl: "../../../vault/app/vault/attachments.component.html", }) export class EmergencyAccessAttachmentsComponent extends BaseAttachmentsComponent { viewOnly = true; diff --git a/apps/web/src/app/settings/emergency-access-confirm.component.html b/apps/web/src/auth/settings/emergency-access/emergency-access-confirm.component.html similarity index 100% rename from apps/web/src/app/settings/emergency-access-confirm.component.html rename to apps/web/src/auth/settings/emergency-access/emergency-access-confirm.component.html diff --git a/apps/web/src/app/settings/emergency-access-confirm.component.ts b/apps/web/src/auth/settings/emergency-access/emergency-access-confirm.component.ts similarity index 100% rename from apps/web/src/app/settings/emergency-access-confirm.component.ts rename to apps/web/src/auth/settings/emergency-access/emergency-access-confirm.component.ts diff --git a/apps/web/src/app/settings/emergency-access-takeover.component.html b/apps/web/src/auth/settings/emergency-access/emergency-access-takeover.component.html similarity index 100% rename from apps/web/src/app/settings/emergency-access-takeover.component.html rename to apps/web/src/auth/settings/emergency-access/emergency-access-takeover.component.html diff --git a/apps/web/src/app/settings/emergency-access-takeover.component.ts b/apps/web/src/auth/settings/emergency-access/emergency-access-takeover.component.ts similarity index 94% rename from apps/web/src/app/settings/emergency-access-takeover.component.ts rename to apps/web/src/auth/settings/emergency-access/emergency-access-takeover.component.ts index 303496d2a6..13e4fd76d8 100644 --- a/apps/web/src/app/settings/emergency-access-takeover.component.ts +++ b/apps/web/src/auth/settings/emergency-access/emergency-access-takeover.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from "@angular/core"; import { takeUntil } from "rxjs"; -import { ChangePasswordComponent } from "@bitwarden/angular/components/change-password.component"; +import { ChangePasswordComponent } from "@bitwarden/angular/auth/components/change-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"; @@ -11,12 +11,12 @@ import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwo import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config"; +import { EmergencyAccessPasswordRequest } from "@bitwarden/common/auth/models/request/emergency-access-password.request"; import { KdfType } from "@bitwarden/common/enums/kdfType"; import { PolicyData } from "@bitwarden/common/models/data/policy.data"; -import { KdfConfig } from "@bitwarden/common/models/domain/kdf-config"; import { Policy } from "@bitwarden/common/models/domain/policy"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; -import { EmergencyAccessPasswordRequest } from "@bitwarden/common/models/request/emergency-access-password.request"; import { PolicyResponse } from "@bitwarden/common/models/response/policy.response"; @Component({ diff --git a/apps/web/src/app/settings/emergency-access-view.component.html b/apps/web/src/auth/settings/emergency-access/emergency-access-view.component.html similarity index 100% rename from apps/web/src/app/settings/emergency-access-view.component.html rename to apps/web/src/auth/settings/emergency-access/emergency-access-view.component.html diff --git a/apps/web/src/app/settings/emergency-access-view.component.ts b/apps/web/src/auth/settings/emergency-access/emergency-access-view.component.ts similarity index 96% rename from apps/web/src/app/settings/emergency-access-view.component.ts rename to apps/web/src/auth/settings/emergency-access/emergency-access-view.component.ts index 2cf95f4d2f..82bc9a706f 100644 --- a/apps/web/src/app/settings/emergency-access-view.component.ts +++ b/apps/web/src/auth/settings/emergency-access/emergency-access-view.component.ts @@ -4,8 +4,8 @@ import { ActivatedRoute, Router } from "@angular/router"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { EmergencyAccessViewResponse } from "@bitwarden/common/auth/models/response/emergency-access.response"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; -import { EmergencyAccessViewResponse } from "@bitwarden/common/models/response/emergency-access.response"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CipherData } from "@bitwarden/common/vault/models/data/cipher.data"; import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; diff --git a/apps/web/src/app/settings/emergency-access.component.html b/apps/web/src/auth/settings/emergency-access/emergency-access.component.html similarity index 100% rename from apps/web/src/app/settings/emergency-access.component.html rename to apps/web/src/auth/settings/emergency-access/emergency-access.component.html diff --git a/apps/web/src/app/settings/emergency-access.component.ts b/apps/web/src/auth/settings/emergency-access/emergency-access.component.ts similarity index 97% rename from apps/web/src/app/settings/emergency-access.component.ts rename to apps/web/src/auth/settings/emergency-access/emergency-access.component.ts index 64a2680ba8..56dd5d7a71 100644 --- a/apps/web/src/app/settings/emergency-access.component.ts +++ b/apps/web/src/auth/settings/emergency-access/emergency-access.component.ts @@ -10,14 +10,14 @@ import { MessagingService } from "@bitwarden/common/abstractions/messaging.servi import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { EmergencyAccessStatusType } from "@bitwarden/common/enums/emergencyAccessStatusType"; -import { EmergencyAccessType } from "@bitwarden/common/enums/emergencyAccessType"; -import { Utils } from "@bitwarden/common/misc/utils"; -import { EmergencyAccessConfirmRequest } from "@bitwarden/common/models/request/emergency-access-confirm.request"; +import { EmergencyAccessStatusType } from "@bitwarden/common/auth/enums/emergency-access-status-type"; +import { EmergencyAccessType } from "@bitwarden/common/auth/enums/emergency-access-type"; +import { EmergencyAccessConfirmRequest } from "@bitwarden/common/auth/models/request/emergency-access-confirm.request"; import { EmergencyAccessGranteeDetailsResponse, EmergencyAccessGrantorDetailsResponse, -} from "@bitwarden/common/models/response/emergency-access.response"; +} from "@bitwarden/common/auth/models/response/emergency-access.response"; +import { Utils } from "@bitwarden/common/misc/utils"; import { EmergencyAccessAddEditComponent } from "./emergency-access-add-edit.component"; import { EmergencyAccessConfirmComponent } from "./emergency-access-confirm.component"; diff --git a/apps/web/src/app/settings/emergency-add-edit.component.ts b/apps/web/src/auth/settings/emergency-access/emergency-add-edit.component.ts similarity index 96% rename from apps/web/src/app/settings/emergency-add-edit.component.ts rename to apps/web/src/auth/settings/emergency-access/emergency-add-edit.component.ts index 63e4bd17f5..81acbe845a 100644 --- a/apps/web/src/app/settings/emergency-add-edit.component.ts +++ b/apps/web/src/auth/settings/emergency-access/emergency-add-edit.component.ts @@ -17,11 +17,11 @@ import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folde import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; -import { AddEditComponent as BaseAddEditComponent } from "../../vault/app/vault/add-edit.component"; +import { AddEditComponent as BaseAddEditComponent } from "../../../vault/app/vault/add-edit.component"; @Component({ selector: "app-org-vault-add-edit", - templateUrl: "../../vault/app/vault/add-edit.component.html", + templateUrl: "../../../vault/app/vault/add-edit.component.html", }) export class EmergencyAddEditComponent extends BaseAddEditComponent { originalCipher: Cipher = null; diff --git a/apps/web/src/app/settings/two-factor-authenticator.component.html b/apps/web/src/auth/settings/two-factor-authenticator.component.html similarity index 100% rename from apps/web/src/app/settings/two-factor-authenticator.component.html rename to apps/web/src/auth/settings/two-factor-authenticator.component.html diff --git a/apps/web/src/app/settings/two-factor-authenticator.component.ts b/apps/web/src/auth/settings/two-factor-authenticator.component.ts similarity index 92% rename from apps/web/src/app/settings/two-factor-authenticator.component.ts rename to apps/web/src/auth/settings/two-factor-authenticator.component.ts index 90825f98be..a82c54d346 100644 --- a/apps/web/src/app/settings/two-factor-authenticator.component.ts +++ b/apps/web/src/auth/settings/two-factor-authenticator.component.ts @@ -6,11 +6,11 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; -import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; +import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type"; +import { UpdateTwoFactorAuthenticatorRequest } from "@bitwarden/common/auth/models/request/update-two-factor-authenticator.request"; +import { TwoFactorAuthenticatorResponse } from "@bitwarden/common/auth/models/response/two-factor-authenticator.response"; +import { AuthResponse } from "@bitwarden/common/auth/types/auth-response"; import { Utils } from "@bitwarden/common/misc/utils"; -import { UpdateTwoFactorAuthenticatorRequest } from "@bitwarden/common/models/request/update-two-factor-authenticator.request"; -import { TwoFactorAuthenticatorResponse } from "@bitwarden/common/models/response/two-factor-authenticator.response"; -import { AuthResponse } from "@bitwarden/common/types/authResponse"; import { TwoFactorBaseComponent } from "./two-factor-base.component"; diff --git a/apps/web/src/app/settings/two-factor-base.component.ts b/apps/web/src/auth/settings/two-factor-base.component.ts similarity index 85% rename from apps/web/src/app/settings/two-factor-base.component.ts rename to apps/web/src/auth/settings/two-factor-base.component.ts index 992861d4fc..f32770b0d0 100644 --- a/apps/web/src/app/settings/two-factor-base.component.ts +++ b/apps/web/src/auth/settings/two-factor-base.component.ts @@ -5,11 +5,11 @@ 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 { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; -import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; -import { VerificationType } from "@bitwarden/common/enums/verificationType"; -import { SecretVerificationRequest } from "@bitwarden/common/models/request/secret-verification.request"; -import { TwoFactorProviderRequest } from "@bitwarden/common/models/request/two-factor-provider.request"; -import { AuthResponseBase } from "@bitwarden/common/types/authResponse"; +import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type"; +import { VerificationType } from "@bitwarden/common/auth/enums/verification-type"; +import { SecretVerificationRequest } from "@bitwarden/common/auth/models/request/secret-verification.request"; +import { TwoFactorProviderRequest } from "@bitwarden/common/auth/models/request/two-factor-provider.request"; +import { AuthResponseBase } from "@bitwarden/common/auth/types/auth-response"; @Directive() export abstract class TwoFactorBaseComponent { diff --git a/apps/web/src/app/settings/two-factor-duo.component.html b/apps/web/src/auth/settings/two-factor-duo.component.html similarity index 100% rename from apps/web/src/app/settings/two-factor-duo.component.html rename to apps/web/src/auth/settings/two-factor-duo.component.html diff --git a/apps/web/src/app/settings/two-factor-duo.component.ts b/apps/web/src/auth/settings/two-factor-duo.component.ts similarity index 85% rename from apps/web/src/app/settings/two-factor-duo.component.ts rename to apps/web/src/auth/settings/two-factor-duo.component.ts index be3f40a89f..14388ea5bf 100644 --- a/apps/web/src/app/settings/two-factor-duo.component.ts +++ b/apps/web/src/auth/settings/two-factor-duo.component.ts @@ -5,10 +5,10 @@ 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 { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; -import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; -import { UpdateTwoFactorDuoRequest } from "@bitwarden/common/models/request/update-two-factor-duo.request"; -import { TwoFactorDuoResponse } from "@bitwarden/common/models/response/two-factor-duo.response"; -import { AuthResponse } from "@bitwarden/common/types/authResponse"; +import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type"; +import { UpdateTwoFactorDuoRequest } from "@bitwarden/common/auth/models/request/update-two-factor-duo.request"; +import { TwoFactorDuoResponse } from "@bitwarden/common/auth/models/response/two-factor-duo.response"; +import { AuthResponse } from "@bitwarden/common/auth/types/auth-response"; import { TwoFactorBaseComponent } from "./two-factor-base.component"; diff --git a/apps/web/src/app/settings/two-factor-email.component.html b/apps/web/src/auth/settings/two-factor-email.component.html similarity index 100% rename from apps/web/src/app/settings/two-factor-email.component.html rename to apps/web/src/auth/settings/two-factor-email.component.html diff --git a/apps/web/src/app/settings/two-factor-email.component.ts b/apps/web/src/auth/settings/two-factor-email.component.ts similarity index 84% rename from apps/web/src/app/settings/two-factor-email.component.ts rename to apps/web/src/auth/settings/two-factor-email.component.ts index a5a6f35b7f..38070bd3ea 100644 --- a/apps/web/src/app/settings/two-factor-email.component.ts +++ b/apps/web/src/auth/settings/two-factor-email.component.ts @@ -6,11 +6,11 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; -import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; -import { TwoFactorEmailRequest } from "@bitwarden/common/models/request/two-factor-email.request"; -import { UpdateTwoFactorEmailRequest } from "@bitwarden/common/models/request/update-two-factor-email.request"; -import { TwoFactorEmailResponse } from "@bitwarden/common/models/response/two-factor-email.response"; -import { AuthResponse } from "@bitwarden/common/types/authResponse"; +import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type"; +import { TwoFactorEmailRequest } from "@bitwarden/common/auth/models/request/two-factor-email.request"; +import { UpdateTwoFactorEmailRequest } from "@bitwarden/common/auth/models/request/update-two-factor-email.request"; +import { TwoFactorEmailResponse } from "@bitwarden/common/auth/models/response/two-factor-email.response"; +import { AuthResponse } from "@bitwarden/common/auth/types/auth-response"; import { TwoFactorBaseComponent } from "./two-factor-base.component"; diff --git a/apps/web/src/app/settings/two-factor-recovery.component.html b/apps/web/src/auth/settings/two-factor-recovery.component.html similarity index 100% rename from apps/web/src/app/settings/two-factor-recovery.component.html rename to apps/web/src/auth/settings/two-factor-recovery.component.html diff --git a/apps/web/src/app/settings/two-factor-recovery.component.ts b/apps/web/src/auth/settings/two-factor-recovery.component.ts similarity index 86% rename from apps/web/src/app/settings/two-factor-recovery.component.ts rename to apps/web/src/auth/settings/two-factor-recovery.component.ts index d7bb2a4a65..9d7fe24c50 100644 --- a/apps/web/src/app/settings/two-factor-recovery.component.ts +++ b/apps/web/src/auth/settings/two-factor-recovery.component.ts @@ -1,8 +1,8 @@ import { Component } from "@angular/core"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; -import { TwoFactorRecoverResponse } from "@bitwarden/common/models/response/two-factor-recover.response"; +import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type"; +import { TwoFactorRecoverResponse } from "@bitwarden/common/auth/models/response/two-factor-recover.response"; @Component({ selector: "app-two-factor-recovery", diff --git a/apps/web/src/app/settings/two-factor-setup.component.html b/apps/web/src/auth/settings/two-factor-setup.component.html similarity index 100% rename from apps/web/src/app/settings/two-factor-setup.component.html rename to apps/web/src/auth/settings/two-factor-setup.component.html diff --git a/apps/web/src/app/settings/two-factor-setup.component.ts b/apps/web/src/auth/settings/two-factor-setup.component.ts similarity index 97% rename from apps/web/src/app/settings/two-factor-setup.component.ts rename to apps/web/src/auth/settings/two-factor-setup.component.ts index 72daa52039..818ade5bb2 100644 --- a/apps/web/src/app/settings/two-factor-setup.component.ts +++ b/apps/web/src/auth/settings/two-factor-setup.component.ts @@ -7,9 +7,9 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type"; +import { TwoFactorProviders } from "@bitwarden/common/auth/services/two-factor.service"; import { PolicyType } from "@bitwarden/common/enums/policyType"; -import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; -import { TwoFactorProviders } from "@bitwarden/common/services/twoFactor.service"; import { TwoFactorAuthenticatorComponent } from "./two-factor-authenticator.component"; import { TwoFactorDuoComponent } from "./two-factor-duo.component"; diff --git a/apps/web/src/app/settings/two-factor-verify.component.html b/apps/web/src/auth/settings/two-factor-verify.component.html similarity index 100% rename from apps/web/src/app/settings/two-factor-verify.component.html rename to apps/web/src/auth/settings/two-factor-verify.component.html diff --git a/apps/web/src/app/settings/two-factor-verify.component.ts b/apps/web/src/auth/settings/two-factor-verify.component.ts similarity index 84% rename from apps/web/src/app/settings/two-factor-verify.component.ts rename to apps/web/src/auth/settings/two-factor-verify.component.ts index 53da0d8fe1..47b10db7f1 100644 --- a/apps/web/src/app/settings/two-factor-verify.component.ts +++ b/apps/web/src/auth/settings/two-factor-verify.component.ts @@ -3,11 +3,11 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; -import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; -import { VerificationType } from "@bitwarden/common/enums/verificationType"; -import { SecretVerificationRequest } from "@bitwarden/common/models/request/secret-verification.request"; -import { AuthResponse } from "@bitwarden/common/types/authResponse"; -import { TwoFactorResponse } from "@bitwarden/common/types/twoFactorResponse"; +import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type"; +import { VerificationType } from "@bitwarden/common/auth/enums/verification-type"; +import { SecretVerificationRequest } from "@bitwarden/common/auth/models/request/secret-verification.request"; +import { AuthResponse } from "@bitwarden/common/auth/types/auth-response"; +import { TwoFactorResponse } from "@bitwarden/common/auth/types/two-factor-response"; import { Verification } from "@bitwarden/common/types/verification"; @Component({ diff --git a/apps/web/src/app/settings/two-factor-webauthn.component.html b/apps/web/src/auth/settings/two-factor-webauthn.component.html similarity index 100% rename from apps/web/src/app/settings/two-factor-webauthn.component.html rename to apps/web/src/auth/settings/two-factor-webauthn.component.html diff --git a/apps/web/src/app/settings/two-factor-webauthn.component.ts b/apps/web/src/auth/settings/two-factor-webauthn.component.ts similarity index 91% rename from apps/web/src/app/settings/two-factor-webauthn.component.ts rename to apps/web/src/auth/settings/two-factor-webauthn.component.ts index e6e3565277..0fc3bfb29c 100644 --- a/apps/web/src/app/settings/two-factor-webauthn.component.ts +++ b/apps/web/src/auth/settings/two-factor-webauthn.component.ts @@ -5,15 +5,15 @@ 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 { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; -import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; -import { SecretVerificationRequest } from "@bitwarden/common/models/request/secret-verification.request"; -import { UpdateTwoFactorWebAuthnDeleteRequest } from "@bitwarden/common/models/request/update-two-factor-web-authn-delete.request"; -import { UpdateTwoFactorWebAuthnRequest } from "@bitwarden/common/models/request/update-two-factor-web-authn.request"; +import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type"; +import { SecretVerificationRequest } from "@bitwarden/common/auth/models/request/secret-verification.request"; +import { UpdateTwoFactorWebAuthnDeleteRequest } from "@bitwarden/common/auth/models/request/update-two-factor-web-authn-delete.request"; +import { UpdateTwoFactorWebAuthnRequest } from "@bitwarden/common/auth/models/request/update-two-factor-web-authn.request"; import { ChallengeResponse, TwoFactorWebAuthnResponse, -} from "@bitwarden/common/models/response/two-factor-web-authn.response"; -import { AuthResponse } from "@bitwarden/common/types/authResponse"; +} from "@bitwarden/common/auth/models/response/two-factor-web-authn.response"; +import { AuthResponse } from "@bitwarden/common/auth/types/auth-response"; import { TwoFactorBaseComponent } from "./two-factor-base.component"; diff --git a/apps/web/src/app/settings/two-factor-yubikey.component.html b/apps/web/src/auth/settings/two-factor-yubikey.component.html similarity index 100% rename from apps/web/src/app/settings/two-factor-yubikey.component.html rename to apps/web/src/auth/settings/two-factor-yubikey.component.html diff --git a/apps/web/src/app/settings/two-factor-yubikey.component.ts b/apps/web/src/auth/settings/two-factor-yubikey.component.ts similarity index 90% rename from apps/web/src/app/settings/two-factor-yubikey.component.ts rename to apps/web/src/auth/settings/two-factor-yubikey.component.ts index d6d5234e7f..1f86b381eb 100644 --- a/apps/web/src/app/settings/two-factor-yubikey.component.ts +++ b/apps/web/src/auth/settings/two-factor-yubikey.component.ts @@ -5,10 +5,10 @@ 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 { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; -import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; -import { UpdateTwoFactorYubioOtpRequest } from "@bitwarden/common/models/request/update-two-factor-yubio-otp.request"; -import { TwoFactorYubiKeyResponse } from "@bitwarden/common/models/response/two-factor-yubi-key.response"; -import { AuthResponse } from "@bitwarden/common/types/authResponse"; +import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type"; +import { UpdateTwoFactorYubioOtpRequest } from "@bitwarden/common/auth/models/request/update-two-factor-yubio-otp.request"; +import { TwoFactorYubiKeyResponse } from "@bitwarden/common/auth/models/response/two-factor-yubi-key.response"; +import { AuthResponse } from "@bitwarden/common/auth/types/auth-response"; import { TwoFactorBaseComponent } from "./two-factor-base.component"; diff --git a/apps/web/src/app/settings/verify-email.component.html b/apps/web/src/auth/settings/verify-email.component.html similarity index 100% rename from apps/web/src/app/settings/verify-email.component.html rename to apps/web/src/auth/settings/verify-email.component.html diff --git a/apps/web/src/app/settings/verify-email.component.ts b/apps/web/src/auth/settings/verify-email.component.ts similarity index 94% rename from apps/web/src/app/settings/verify-email.component.ts rename to apps/web/src/auth/settings/verify-email.component.ts index 9580a71e22..21c6667fa2 100644 --- a/apps/web/src/app/settings/verify-email.component.ts +++ b/apps/web/src/auth/settings/verify-email.component.ts @@ -4,7 +4,7 @@ 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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { TokenService } from "@bitwarden/common/abstractions/token.service"; +import { TokenService } from "@bitwarden/common/auth/abstractions/token.service"; @Component({ selector: "app-verify-email", diff --git a/apps/web/src/app/accounts/sso.component.html b/apps/web/src/auth/sso.component.html similarity index 100% rename from apps/web/src/app/accounts/sso.component.html rename to apps/web/src/auth/sso.component.html diff --git a/apps/web/src/app/accounts/sso.component.ts b/apps/web/src/auth/sso.component.ts similarity index 95% rename from apps/web/src/app/accounts/sso.component.ts rename to apps/web/src/auth/sso.component.ts index 111d5f2a36..14fe1bb375 100644 --- a/apps/web/src/app/accounts/sso.component.ts +++ b/apps/web/src/auth/sso.component.ts @@ -2,9 +2,8 @@ import { Component } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -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,6 +11,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-sso", diff --git a/apps/web/src/app/accounts/two-factor-options.component.html b/apps/web/src/auth/two-factor-options.component.html similarity index 100% rename from apps/web/src/app/accounts/two-factor-options.component.html rename to apps/web/src/auth/two-factor-options.component.html diff --git a/apps/web/src/app/accounts/two-factor-options.component.ts b/apps/web/src/auth/two-factor-options.component.ts similarity index 81% rename from apps/web/src/app/accounts/two-factor-options.component.ts rename to apps/web/src/auth/two-factor-options.component.ts index 89a089d8f1..514994f753 100644 --- a/apps/web/src/app/accounts/two-factor-options.component.ts +++ b/apps/web/src/auth/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", diff --git a/apps/web/src/app/accounts/two-factor.component.html b/apps/web/src/auth/two-factor.component.html similarity index 100% rename from apps/web/src/app/accounts/two-factor.component.html rename to apps/web/src/auth/two-factor.component.html diff --git a/apps/web/src/app/accounts/two-factor.component.ts b/apps/web/src/auth/two-factor.component.ts similarity index 87% rename from apps/web/src/app/accounts/two-factor.component.ts rename to apps/web/src/auth/two-factor.component.ts index 4fb6f6e365..e972d91e8a 100644 --- a/apps/web/src/app/accounts/two-factor.component.ts +++ b/apps/web/src/auth/two-factor.component.ts @@ -1,21 +1,21 @@ import { Component, ViewChild, ViewContainerRef } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; -import { TwoFactorComponent as BaseTwoFactorComponent } from "@bitwarden/angular/components/two-factor.component"; +import { TwoFactorComponent as BaseTwoFactorComponent } from "@bitwarden/angular/auth/components/two-factor.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 { 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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service"; -import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; +import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; +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 { RouterService } from "../core"; +import { RouterService } from "../app/core"; import { TwoFactorOptionsComponent } from "./two-factor-options.component"; diff --git a/apps/web/src/app/accounts/update-password.component.html b/apps/web/src/auth/update-password.component.html similarity index 100% rename from apps/web/src/app/accounts/update-password.component.html rename to apps/web/src/auth/update-password.component.html diff --git a/apps/web/src/app/accounts/update-password.component.ts b/apps/web/src/auth/update-password.component.ts similarity index 96% rename from apps/web/src/app/accounts/update-password.component.ts rename to apps/web/src/auth/update-password.component.ts index dfa5d82c0d..183f13d213 100644 --- a/apps/web/src/app/accounts/update-password.component.ts +++ b/apps/web/src/auth/update-password.component.ts @@ -1,7 +1,7 @@ import { Component } from "@angular/core"; import { Router } from "@angular/router"; -import { UpdatePasswordComponent as BaseUpdatePasswordComponent } from "@bitwarden/angular/components/update-password.component"; +import { UpdatePasswordComponent as BaseUpdatePasswordComponent } from "@bitwarden/angular/auth/components/update-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"; diff --git a/apps/web/src/app/accounts/update-temp-password.component.html b/apps/web/src/auth/update-temp-password.component.html similarity index 100% rename from apps/web/src/app/accounts/update-temp-password.component.html rename to apps/web/src/auth/update-temp-password.component.html diff --git a/apps/web/src/app/accounts/update-temp-password.component.ts b/apps/web/src/auth/update-temp-password.component.ts similarity index 95% rename from apps/web/src/app/accounts/update-temp-password.component.ts rename to apps/web/src/auth/update-temp-password.component.ts index 12a087d6b6..f34cafb8f9 100644 --- a/apps/web/src/app/accounts/update-temp-password.component.ts +++ b/apps/web/src/auth/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"; diff --git a/apps/web/src/app/accounts/verify-email-token.component.html b/apps/web/src/auth/verify-email-token.component.html similarity index 100% rename from apps/web/src/app/accounts/verify-email-token.component.html rename to apps/web/src/auth/verify-email-token.component.html diff --git a/apps/web/src/app/accounts/verify-email-token.component.ts b/apps/web/src/auth/verify-email-token.component.ts similarity index 100% rename from apps/web/src/app/accounts/verify-email-token.component.ts rename to apps/web/src/auth/verify-email-token.component.ts diff --git a/apps/web/src/app/accounts/verify-recover-delete.component.html b/apps/web/src/auth/verify-recover-delete.component.html similarity index 100% rename from apps/web/src/app/accounts/verify-recover-delete.component.html rename to apps/web/src/auth/verify-recover-delete.component.html diff --git a/apps/web/src/app/accounts/verify-recover-delete.component.ts b/apps/web/src/auth/verify-recover-delete.component.ts similarity index 100% rename from apps/web/src/app/accounts/verify-recover-delete.component.ts rename to apps/web/src/auth/verify-recover-delete.component.ts diff --git a/apps/web/src/vault/app/vault/organization-badge/organization-name-badge.component.ts b/apps/web/src/vault/app/vault/organization-badge/organization-name-badge.component.ts index bddba952b8..a22d1e2c3a 100644 --- a/apps/web/src/vault/app/vault/organization-badge/organization-name-badge.component.ts +++ b/apps/web/src/vault/app/vault/organization-badge/organization-name-badge.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; import { AvatarUpdateService } from "@bitwarden/common/abstractions/account/avatar-update.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { TokenService } from "@bitwarden/common/abstractions/token.service"; +import { TokenService } from "@bitwarden/common/auth/abstractions/token.service"; import { Utils } from "@bitwarden/common/misc/utils"; @Component({ diff --git a/apps/web/src/vault/app/vault/vault-filter/components/link-sso.component.ts b/apps/web/src/vault/app/vault/vault-filter/components/link-sso.component.ts index bc898a3d5c..b0aa80bc0f 100644 --- a/apps/web/src/vault/app/vault/vault-filter/components/link-sso.component.ts +++ b/apps/web/src/vault/app/vault/vault-filter/components/link-sso.component.ts @@ -1,9 +1,8 @@ import { AfterContentInit, Component, Input } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; -import { SsoComponent } from "@bitwarden/angular/components/sso.component"; +import { SsoComponent } 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"; @@ -11,6 +10,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"; import { Organization } from "@bitwarden/common/models/domain/organization"; @Component({ diff --git a/apps/web/src/vault/app/vault/vault-items.component.ts b/apps/web/src/vault/app/vault/vault-items.component.ts index 7f662f09f3..b932a948fe 100644 --- a/apps/web/src/vault/app/vault/vault-items.component.ts +++ b/apps/web/src/vault/app/vault/vault-items.component.ts @@ -10,8 +10,8 @@ import { OrganizationService } from "@bitwarden/common/abstractions/organization import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService } from "@bitwarden/common/abstractions/search.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 { EventType } from "@bitwarden/common/enums/eventType"; import { Organization } from "@bitwarden/common/models/domain/organization"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; diff --git a/apps/web/src/vault/app/vault/vault.component.ts b/apps/web/src/vault/app/vault/vault.component.ts index ab49744f34..bc702222cf 100644 --- a/apps/web/src/vault/app/vault/vault.component.ts +++ b/apps/web/src/vault/app/vault/vault.component.ts @@ -19,7 +19,7 @@ import { MessagingService } from "@bitwarden/common/abstractions/messaging.servi import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; 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 { TokenService } from "@bitwarden/common/auth/abstractions/token.service"; import { KdfType, DEFAULT_PBKDF2_ITERATIONS } from "@bitwarden/common/enums/kdfType"; import { ServiceUtils } from "@bitwarden/common/misc/serviceUtils"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; diff --git a/bitwarden_license/bit-web/src/app/organizations/manage/sso.component.html b/bitwarden_license/bit-web/src/app/auth/sso.component.html similarity index 100% rename from bitwarden_license/bit-web/src/app/organizations/manage/sso.component.html rename to bitwarden_license/bit-web/src/app/auth/sso.component.html diff --git a/bitwarden_license/bit-web/src/app/organizations/manage/sso.component.ts b/bitwarden_license/bit-web/src/app/auth/sso.component.ts similarity index 96% rename from bitwarden_license/bit-web/src/app/organizations/manage/sso.component.ts rename to bitwarden_license/bit-web/src/app/auth/sso.component.ts index 7bfab7fb50..4e22ddcce4 100644 --- a/bitwarden_license/bit-web/src/app/organizations/manage/sso.component.ts +++ b/bitwarden_license/bit-web/src/app/auth/sso.component.ts @@ -22,13 +22,13 @@ import { Saml2NameIdFormat, Saml2SigningBehavior, SsoType, -} from "@bitwarden/common/enums/ssoEnums"; +} from "@bitwarden/common/auth/enums/sso"; +import { SsoConfigApi } from "@bitwarden/common/auth/models/api/sso-config.api"; +import { OrganizationSsoRequest } from "@bitwarden/common/auth/models/request/organization-sso.request"; +import { OrganizationSsoResponse } from "@bitwarden/common/auth/models/response/organization-sso.response"; +import { SsoConfigView } from "@bitwarden/common/auth/models/view/sso-config.view"; import { Utils } from "@bitwarden/common/misc/utils"; -import { SsoConfigApi } from "@bitwarden/common/models/api/sso-config.api"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { OrganizationSsoRequest } from "@bitwarden/common/models/request/organization/organization-sso.request"; -import { OrganizationSsoResponse } from "@bitwarden/common/models/response/organization/organization-sso.response"; -import { SsoConfigView } from "@bitwarden/common/models/view/sso-config.view"; const defaultSigningAlgorithm = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"; diff --git a/bitwarden_license/bit-web/src/app/organizations/manage/scim.component.ts b/bitwarden_license/bit-web/src/app/organizations/manage/scim.component.ts index c4e44ab0f6..bb7bc921f4 100644 --- a/bitwarden_license/bit-web/src/app/organizations/manage/scim.component.ts +++ b/bitwarden_license/bit-web/src/app/organizations/manage/scim.component.ts @@ -7,13 +7,13 @@ import { EnvironmentService } from "@bitwarden/common/abstractions/environment.s import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { OrganizationApiKeyType } from "@bitwarden/common/enums/organizationApiKeyType"; +import { OrganizationApiKeyType } from "@bitwarden/common/auth/enums/organization-api-key-type"; +import { ApiKeyResponse } from "@bitwarden/common/auth/models/response/api-key.response"; import { OrganizationConnectionType } from "@bitwarden/common/enums/organizationConnectionType"; import { ScimConfigApi } from "@bitwarden/common/models/api/scim-config.api"; import { OrganizationApiKeyRequest } from "@bitwarden/common/models/request/organization-api-key.request"; import { OrganizationConnectionRequest } from "@bitwarden/common/models/request/organization-connection.request"; import { ScimConfigRequest } from "@bitwarden/common/models/request/scim-config.request"; -import { ApiKeyResponse } from "@bitwarden/common/models/response/api-key.response"; import { OrganizationConnectionResponse } from "@bitwarden/common/models/response/organization-connection.response"; @Component({ diff --git a/bitwarden_license/bit-web/src/app/organizations/organizations-routing.module.ts b/bitwarden_license/bit-web/src/app/organizations/organizations-routing.module.ts index c97a5926d7..7215102e95 100644 --- a/bitwarden_license/bit-web/src/app/organizations/organizations-routing.module.ts +++ b/bitwarden_license/bit-web/src/app/organizations/organizations-routing.module.ts @@ -1,15 +1,16 @@ 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 { canAccessSettingsTab } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/models/domain/organization"; import { OrganizationPermissionsGuard } from "@bitwarden/web-vault/app/organizations/guards/org-permissions.guard"; import { OrganizationLayoutComponent } from "@bitwarden/web-vault/app/organizations/layouts/organization-layout.component"; import { SettingsComponent } from "@bitwarden/web-vault/app/organizations/settings/settings.component"; +import { SsoComponent } from "../auth/sso.component"; + import { ScimComponent } from "./manage/scim.component"; -import { SsoComponent } from "./manage/sso.component"; const routes: Routes = [ { diff --git a/bitwarden_license/bit-web/src/app/organizations/organizations.module.ts b/bitwarden_license/bit-web/src/app/organizations/organizations.module.ts index 628c1ca767..fd33bca0b0 100644 --- a/bitwarden_license/bit-web/src/app/organizations/organizations.module.ts +++ b/bitwarden_license/bit-web/src/app/organizations/organizations.module.ts @@ -2,9 +2,10 @@ import { NgModule } from "@angular/core"; import { SharedModule } from "@bitwarden/web-vault/app/shared/shared.module"; +import { SsoComponent } from "../auth/sso.component"; + import { InputCheckboxComponent } from "./components/input-checkbox.component"; import { ScimComponent } from "./manage/scim.component"; -import { SsoComponent } from "./manage/sso.component"; import { OrganizationsRoutingModule } from "./organizations-routing.module"; @NgModule({ diff --git a/bitwarden_license/bit-web/src/app/providers/providers-routing.module.ts b/bitwarden_license/bit-web/src/app/providers/providers-routing.module.ts index 1d3f79c43e..21357e57ef 100644 --- a/bitwarden_license/bit-web/src/app/providers/providers-routing.module.ts +++ b/bitwarden_license/bit-web/src/app/providers/providers-routing.module.ts @@ -1,7 +1,7 @@ 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 { Provider } from "@bitwarden/common/models/domain/provider"; import { FrontendLayoutComponent } from "@bitwarden/web-vault/app/layouts/frontend-layout.component"; import { ProvidersComponent } from "@bitwarden/web-vault/app/providers/providers.component"; diff --git a/libs/angular/src/components/captchaProtected.component.ts b/libs/angular/src/auth/components/captcha-protected.component.ts similarity index 96% rename from libs/angular/src/components/captchaProtected.component.ts rename to libs/angular/src/auth/components/captcha-protected.component.ts index 13cb729918..0783b2605b 100644 --- a/libs/angular/src/components/captchaProtected.component.ts +++ b/libs/angular/src/auth/components/captcha-protected.component.ts @@ -3,7 +3,7 @@ import { Directive, Input } from "@angular/core"; import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { CaptchaIFrame } from "@bitwarden/common/misc/captcha_iframe"; +import { CaptchaIFrame } from "@bitwarden/common/auth/captcha-iframe"; import { Utils } from "@bitwarden/common/misc/utils"; @Directive() diff --git a/libs/angular/src/components/change-password.component.ts b/libs/angular/src/auth/components/change-password.component.ts similarity index 96% rename from libs/angular/src/components/change-password.component.ts rename to libs/angular/src/auth/components/change-password.component.ts index f6eac73309..77a08e2b0b 100644 --- a/libs/angular/src/components/change-password.component.ts +++ b/libs/angular/src/auth/components/change-password.component.ts @@ -8,13 +8,13 @@ import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwo import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config"; import { KdfType } from "@bitwarden/common/enums/kdfType"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { KdfConfig } from "@bitwarden/common/models/domain/kdf-config"; import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; -import { PasswordColorText } from "../shared/components/password-strength/password-strength.component"; +import { PasswordColorText } from "../../shared/components/password-strength/password-strength.component"; @Directive() export class ChangePasswordComponent implements OnInit, OnDestroy { diff --git a/libs/angular/src/components/hint.component.ts b/libs/angular/src/auth/components/hint.component.ts similarity index 91% rename from libs/angular/src/components/hint.component.ts rename to libs/angular/src/auth/components/hint.component.ts index de49e28c86..bfa5d3b92e 100644 --- a/libs/angular/src/components/hint.component.ts +++ b/libs/angular/src/auth/components/hint.component.ts @@ -4,9 +4,9 @@ import { Router } from "@angular/router"; 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 { PasswordHintRequest } from "@bitwarden/common/models/request/password-hint.request"; +import { LoginService } from "@bitwarden/common/auth/abstractions/login.service"; +import { PasswordHintRequest } from "@bitwarden/common/auth/models/request/password-hint.request"; @Directive() export class HintComponent implements OnInit { diff --git a/libs/angular/src/components/lock.component.ts b/libs/angular/src/auth/components/lock.component.ts similarity index 97% rename from libs/angular/src/components/lock.component.ts rename to libs/angular/src/auth/components/lock.component.ts index f48254660a..1528a3ef7b 100644 --- a/libs/angular/src/components/lock.component.ts +++ b/libs/angular/src/auth/components/lock.component.ts @@ -7,19 +7,19 @@ import { ApiService } from "@bitwarden/common/abstractions/api.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"; +import { SecretVerificationRequest } from "@bitwarden/common/auth/models/request/secret-verification.request"; import { HashPurpose } from "@bitwarden/common/enums/hashPurpose"; import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions"; 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"; -import { SecretVerificationRequest } from "@bitwarden/common/models/request/secret-verification.request"; @Directive() export class LockComponent implements OnInit, OnDestroy { diff --git a/libs/angular/src/components/login-with-device.component.ts b/libs/angular/src/auth/components/login-with-device.component.ts similarity index 93% rename from libs/angular/src/components/login-with-device.component.ts rename to libs/angular/src/auth/components/login-with-device.component.ts index e894a3b33c..d8569212d2 100644 --- a/libs/angular/src/components/login-with-device.component.ts +++ b/libs/angular/src/auth/components/login-with-device.component.ts @@ -5,26 +5,26 @@ import { Subject, takeUntil } from "rxjs"; 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 { AuthRequestType } from "@bitwarden/common/enums/authRequestType"; +import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; +import { LoginService } from "@bitwarden/common/auth/abstractions/login.service"; +import { AuthRequestType } from "@bitwarden/common/auth/enums/auth-request-type"; +import { PasswordlessLogInCredentials } from "@bitwarden/common/auth/models/domain/log-in-credentials"; +import { PasswordlessCreateAuthRequest } from "@bitwarden/common/auth/models/request/passwordless-create-auth.request"; +import { AuthRequestResponse } from "@bitwarden/common/auth/models/response/auth-request.response"; import { Utils } from "@bitwarden/common/misc/utils"; -import { PasswordlessLogInCredentials } from "@bitwarden/common/models/domain/log-in-credentials"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; -import { PasswordlessCreateAuthRequest } from "@bitwarden/common/models/request/passwordless-create-auth.request"; -import { AuthRequestResponse } from "@bitwarden/common/models/response/auth-request.response"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; -import { CaptchaProtectedComponent } from "./captchaProtected.component"; +import { CaptchaProtectedComponent } from "./captcha-protected.component"; @Directive() export class LoginWithDeviceComponent diff --git a/libs/angular/src/components/login.component.ts b/libs/angular/src/auth/components/login.component.ts similarity index 95% rename from libs/angular/src/components/login.component.ts rename to libs/angular/src/auth/components/login.component.ts index d0c495a605..3f662d89b9 100644 --- a/libs/angular/src/components/login.component.ts +++ b/libs/angular/src/auth/components/login.component.ts @@ -5,7 +5,6 @@ import { take } from "rxjs/operators"; 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 { @@ -14,15 +13,16 @@ import { } 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 { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result"; +import { PasswordLogInCredentials } from "@bitwarden/common/auth/models/domain/log-in-credentials"; import { Utils } from "@bitwarden/common/misc/utils"; -import { AuthResult } from "@bitwarden/common/models/domain/auth-result"; -import { PasswordLogInCredentials } from "@bitwarden/common/models/domain/log-in-credentials"; -import { CaptchaProtectedComponent } from "./captchaProtected.component"; +import { CaptchaProtectedComponent } from "./captcha-protected.component"; @Directive() export class LoginComponent extends CaptchaProtectedComponent implements OnInit { diff --git a/libs/angular/src/components/remove-password.component.ts b/libs/angular/src/auth/components/remove-password.component.ts similarity index 96% rename from libs/angular/src/components/remove-password.component.ts rename to libs/angular/src/auth/components/remove-password.component.ts index c1498a2980..8d01d39d27 100644 --- a/libs/angular/src/components/remove-password.component.ts +++ b/libs/angular/src/auth/components/remove-password.component.ts @@ -2,10 +2,10 @@ import { Directive, OnInit } from "@angular/core"; import { Router } from "@angular/router"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; import { Organization } from "@bitwarden/common/models/domain/organization"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; diff --git a/libs/angular/src/components/sso.component.ts b/libs/angular/src/auth/components/sso.component.ts similarity index 96% rename from libs/angular/src/components/sso.component.ts rename to libs/angular/src/auth/components/sso.component.ts index 9477df62c9..61f65aeab6 100644 --- a/libs/angular/src/components/sso.component.ts +++ b/libs/angular/src/auth/components/sso.component.ts @@ -3,7 +3,6 @@ import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; 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"; @@ -11,10 +10,11 @@ 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"; +import { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result"; +import { SsoLogInCredentials } from "@bitwarden/common/auth/models/domain/log-in-credentials"; +import { SsoPreValidateResponse } from "@bitwarden/common/auth/models/response/sso-pre-validate.response"; import { Utils } from "@bitwarden/common/misc/utils"; -import { AuthResult } from "@bitwarden/common/models/domain/auth-result"; -import { SsoLogInCredentials } from "@bitwarden/common/models/domain/log-in-credentials"; -import { SsoPreValidateResponse } from "@bitwarden/common/models/response/sso-pre-validate.response"; @Directive() export class SsoComponent { diff --git a/libs/angular/src/components/two-factor-options.component.ts b/libs/angular/src/auth/components/two-factor-options.component.ts similarity index 84% rename from libs/angular/src/components/two-factor-options.component.ts rename to libs/angular/src/auth/components/two-factor-options.component.ts index 4d3eeb99a8..3b18a5c2f7 100644 --- a/libs/angular/src/components/two-factor-options.component.ts +++ b/libs/angular/src/auth/components/two-factor-options.component.ts @@ -3,8 +3,8 @@ import { Router } from "@angular/router"; 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 { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; +import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service"; +import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type"; @Directive() export class TwoFactorOptionsComponent implements OnInit { diff --git a/libs/angular/src/components/two-factor.component.ts b/libs/angular/src/auth/components/two-factor.component.ts similarity index 90% rename from libs/angular/src/components/two-factor.component.ts rename to libs/angular/src/auth/components/two-factor.component.ts index 28799df660..f6e39844e6 100644 --- a/libs/angular/src/components/two-factor.component.ts +++ b/libs/angular/src/auth/components/two-factor.component.ts @@ -5,22 +5,22 @@ import { first } from "rxjs/operators"; 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 { 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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service"; -import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; -import { WebAuthnIFrame } from "@bitwarden/common/misc/webauthn_iframe"; -import { AuthResult } from "@bitwarden/common/models/domain/auth-result"; -import { TokenTwoFactorRequest } from "@bitwarden/common/models/request/identity-token/token-two-factor.request"; -import { TwoFactorEmailRequest } from "@bitwarden/common/models/request/two-factor-email.request"; -import { TwoFactorProviders } from "@bitwarden/common/services/twoFactor.service"; +import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; +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 { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result"; +import { TokenTwoFactorRequest } from "@bitwarden/common/auth/models/request/identity-token/token-two-factor.request"; +import { TwoFactorEmailRequest } from "@bitwarden/common/auth/models/request/two-factor-email.request"; +import { TwoFactorProviders } from "@bitwarden/common/auth/services/two-factor.service"; +import { WebAuthnIFrame } from "@bitwarden/common/auth/webauthn-iframe"; -import { CaptchaProtectedComponent } from "./captchaProtected.component"; +import { CaptchaProtectedComponent } from "./captcha-protected.component"; @Directive() export class TwoFactorComponent extends CaptchaProtectedComponent implements OnInit, OnDestroy { diff --git a/libs/angular/src/components/update-password.component.ts b/libs/angular/src/auth/components/update-password.component.ts similarity index 96% rename from libs/angular/src/components/update-password.component.ts rename to libs/angular/src/auth/components/update-password.component.ts index 9b8d3c0aa1..48979ab097 100644 --- a/libs/angular/src/components/update-password.component.ts +++ b/libs/angular/src/auth/components/update-password.component.ts @@ -11,11 +11,11 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; -import { VerificationType } from "@bitwarden/common/enums/verificationType"; +import { VerificationType } from "@bitwarden/common/auth/enums/verification-type"; +import { PasswordRequest } from "@bitwarden/common/auth/models/request/password.request"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; -import { PasswordRequest } from "@bitwarden/common/models/request/password.request"; import { Verification } from "@bitwarden/common/types/verification"; import { ChangePasswordComponent as BaseChangePasswordComponent } from "./change-password.component"; diff --git a/libs/angular/src/components/update-temp-password.component.ts b/libs/angular/src/auth/components/update-temp-password.component.ts similarity index 100% rename from libs/angular/src/components/update-temp-password.component.ts rename to libs/angular/src/auth/components/update-temp-password.component.ts diff --git a/libs/angular/src/components/user-verification-prompt.component.ts b/libs/angular/src/auth/components/user-verification-prompt.component.ts similarity index 92% rename from libs/angular/src/components/user-verification-prompt.component.ts rename to libs/angular/src/auth/components/user-verification-prompt.component.ts index 5c2a4c620f..842d9e1222 100644 --- a/libs/angular/src/components/user-verification-prompt.component.ts +++ b/libs/angular/src/auth/components/user-verification-prompt.component.ts @@ -5,9 +5,8 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; -import { ModalConfig } from "../services/modal.service"; - -import { ModalRef } from "./modal/modal.ref"; +import { ModalRef } from "../../components/modal/modal.ref"; +import { ModalConfig } from "../../services/modal.service"; /** * Used to verify the user's identity (using their master password or email-based OTP for Key Connector users). You can customize all of the text in the modal. diff --git a/libs/angular/src/components/user-verification.component.ts b/libs/angular/src/auth/components/user-verification.component.ts similarity index 93% rename from libs/angular/src/components/user-verification.component.ts rename to libs/angular/src/auth/components/user-verification.component.ts index 3234d353c1..ea514e177c 100644 --- a/libs/angular/src/components/user-verification.component.ts +++ b/libs/angular/src/auth/components/user-verification.component.ts @@ -1,9 +1,9 @@ import { Directive, OnInit } from "@angular/core"; import { ControlValueAccessor, FormControl } from "@angular/forms"; -import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; -import { VerificationType } from "@bitwarden/common/enums/verificationType"; +import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; +import { VerificationType } from "@bitwarden/common/auth/enums/verification-type"; import { Utils } from "@bitwarden/common/misc/utils"; import { Verification } from "@bitwarden/common/types/verification"; diff --git a/libs/angular/src/guards/auth.guard.ts b/libs/angular/src/auth/guards/auth.guard.ts similarity index 82% rename from libs/angular/src/guards/auth.guard.ts rename to libs/angular/src/auth/guards/auth.guard.ts index 9961d26a77..f3c9ebcdcf 100644 --- a/libs/angular/src/guards/auth.guard.ts +++ b/libs/angular/src/auth/guards/auth.guard.ts @@ -1,10 +1,10 @@ import { Injectable } from "@angular/core"; import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from "@angular/router"; -import { AuthService } from "@bitwarden/common/abstractions/auth.service"; -import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.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"; @Injectable() export class AuthGuard implements CanActivate { diff --git a/libs/angular/src/guards/lock.guard.ts b/libs/angular/src/auth/guards/lock.guard.ts similarity index 78% rename from libs/angular/src/guards/lock.guard.ts rename to libs/angular/src/auth/guards/lock.guard.ts index 1c6853e9f8..b4cc01dc16 100644 --- a/libs/angular/src/guards/lock.guard.ts +++ b/libs/angular/src/auth/guards/lock.guard.ts @@ -1,8 +1,8 @@ import { Injectable } from "@angular/core"; import { CanActivate, Router } from "@angular/router"; -import { AuthService } from "@bitwarden/common/abstractions/auth.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"; @Injectable() export class LockGuard implements CanActivate { diff --git a/libs/angular/src/guards/unauth.guard.ts b/libs/angular/src/auth/guards/unauth.guard.ts similarity index 78% rename from libs/angular/src/guards/unauth.guard.ts rename to libs/angular/src/auth/guards/unauth.guard.ts index d869ca5ad8..62a4ebdc31 100644 --- a/libs/angular/src/guards/unauth.guard.ts +++ b/libs/angular/src/auth/guards/unauth.guard.ts @@ -1,8 +1,8 @@ import { Injectable } from "@angular/core"; import { CanActivate, Router } from "@angular/router"; -import { AuthService } from "@bitwarden/common/abstractions/auth.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"; @Injectable() export class UnauthGuard implements CanActivate { diff --git a/libs/angular/src/components/register.component.ts b/libs/angular/src/components/register.component.ts index 012c378cdc..db4a568adc 100644 --- a/libs/angular/src/components/register.component.ts +++ b/libs/angular/src/components/register.component.ts @@ -4,7 +4,6 @@ import { Router } from "@angular/router"; 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 { @@ -16,19 +15,19 @@ 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"; +import { PasswordLogInCredentials } from "@bitwarden/common/auth/models/domain/log-in-credentials"; +import { RegisterResponse } from "@bitwarden/common/auth/models/response/register.response"; import { DEFAULT_KDF_CONFIG, DEFAULT_KDF_TYPE } from "@bitwarden/common/enums/kdfType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { PasswordLogInCredentials } from "@bitwarden/common/models/domain/log-in-credentials"; import { KeysRequest } from "@bitwarden/common/models/request/keys.request"; import { ReferenceEventRequest } from "@bitwarden/common/models/request/reference-event.request"; import { RegisterRequest } from "@bitwarden/common/models/request/register.request"; -import { RegisterResponse } from "@bitwarden/common/models/response/authentication/register.response"; +import { CaptchaProtectedComponent } from "../auth/components/captcha-protected.component"; import { PasswordColorText } from "../shared/components/password-strength/password-strength.component"; import { InputsFieldMatch } from "../validators/inputsFieldMatch.validator"; -import { CaptchaProtectedComponent } from "./captchaProtected.component"; - @Directive() export class RegisterComponent extends CaptchaProtectedComponent implements OnInit { @Input() isInTrialFlow = false; diff --git a/libs/angular/src/components/set-password.component.ts b/libs/angular/src/components/set-password.component.ts index ab0f56b585..7868651c6c 100644 --- a/libs/angular/src/components/set-password.component.ts +++ b/libs/angular/src/components/set-password.component.ts @@ -14,16 +14,16 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction"; import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { SetPasswordRequest } from "@bitwarden/common/auth/models/request/set-password.request"; import { HashPurpose } from "@bitwarden/common/enums/hashPurpose"; import { DEFAULT_KDF_TYPE, DEFAULT_KDF_CONFIG } from "@bitwarden/common/enums/kdfType"; 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"; import { KeysRequest } from "@bitwarden/common/models/request/keys.request"; -import { SetPasswordRequest } from "@bitwarden/common/models/request/set-password.request"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; -import { ChangePasswordComponent as BaseChangePasswordComponent } from "./change-password.component"; +import { ChangePasswordComponent as BaseChangePasswordComponent } from "../auth/components/change-password.component"; @Directive() export class SetPasswordComponent extends BaseChangePasswordComponent { diff --git a/libs/angular/src/components/set-pin.component.ts b/libs/angular/src/components/set-pin.component.ts index 5819e6c524..74461d72df 100644 --- a/libs/angular/src/components/set-pin.component.ts +++ b/libs/angular/src/components/set-pin.component.ts @@ -1,8 +1,8 @@ import { Directive, OnInit } from "@angular/core"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; import { Utils } from "@bitwarden/common/misc/utils"; import { ModalRef } from "./modal/modal.ref"; diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts index f1387ad911..12fb2c11d7 100644 --- a/libs/angular/src/services/jslib-services.module.ts +++ b/libs/angular/src/services/jslib-services.module.ts @@ -1,16 +1,10 @@ import { Injector, LOCALE_ID, NgModule } from "@angular/core"; -import { AccountApiService as AccountApiServiceAbstraction } from "@bitwarden/common/abstractions/account/account-api.service"; -import { - AccountService as AccountServiceAbstraction, - InternalAccountService, -} from "@bitwarden/common/abstractions/account/account.service"; import { AvatarUpdateService as AccountUpdateServiceAbstraction } from "@bitwarden/common/abstractions/account/avatar-update.service"; import { AnonymousHubService as AnonymousHubServiceAbstraction } from "@bitwarden/common/abstractions/anonymousHub.service"; 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 { BroadcasterService as BroadcasterServiceAbstraction } from "@bitwarden/common/abstractions/broadcaster.service"; import { CollectionService as CollectionServiceAbstraction } from "@bitwarden/common/abstractions/collection.service"; import { ConfigApiServiceAbstraction } from "@bitwarden/common/abstractions/config/config-api.service.abstraction"; @@ -25,9 +19,7 @@ import { ExportService as ExportServiceAbstraction } from "@bitwarden/common/abs import { FileUploadService as FileUploadServiceAbstraction } from "@bitwarden/common/abstractions/fileUpload.service"; import { FormValidationErrorsService as FormValidationErrorsServiceAbstraction } from "@bitwarden/common/abstractions/formValidationErrors.service"; import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service"; -import { KeyConnectorService as KeyConnectorServiceAbstraction } from "@bitwarden/common/abstractions/keyConnector.service"; import { LogService } 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 { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; @@ -50,27 +42,41 @@ import { SettingsService as SettingsServiceAbstraction } from "@bitwarden/common import { StateService as StateServiceAbstraction } from "@bitwarden/common/abstractions/state.service"; import { StateMigrationService as StateMigrationServiceAbstraction } from "@bitwarden/common/abstractions/stateMigration.service"; import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.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 { ValidationService as ValidationServiceAbstraction } from "@bitwarden/common/abstractions/validation.service"; import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service"; +import { AccountApiService as AccountApiServiceAbstraction } from "@bitwarden/common/auth/abstractions/account-api.service"; +import { + AccountService as AccountServiceAbstraction, + InternalAccountService, +} from "@bitwarden/common/auth/abstractions/account.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 { LoginService as LoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/login.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 { AccountApiServiceImplementation } from "@bitwarden/common/auth/services/account-api.service"; +import { AccountServiceImplementation } from "@bitwarden/common/auth/services/account.service"; +import { AuthService } from "@bitwarden/common/auth/services/auth.service"; +import { KeyConnectorService } from "@bitwarden/common/auth/services/key-connector.service"; +import { LoginService } from "@bitwarden/common/auth/services/login.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 { flagEnabled } from "@bitwarden/common/misc/flags"; import { Account } from "@bitwarden/common/models/domain/account"; import { GlobalState } from "@bitwarden/common/models/domain/global-state"; -import { AccountApiServiceImplementation } from "@bitwarden/common/services/account/account-api.service"; -import { AccountServiceImplementation } from "@bitwarden/common/services/account/account.service"; import { AvatarUpdateService } from "@bitwarden/common/services/account/avatar-update.service"; import { AnonymousHubService } from "@bitwarden/common/services/anonymousHub.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 { ConfigApiService } from "@bitwarden/common/services/config/config-api.service"; import { ConfigService } from "@bitwarden/common/services/config/config.service"; @@ -84,8 +90,6 @@ import { EventUploadService } from "@bitwarden/common/services/event/event-uploa import { ExportService } from "@bitwarden/common/services/export.service"; import { FileUploadService } from "@bitwarden/common/services/fileUpload.service"; import { FormValidationErrorsService } from "@bitwarden/common/services/formValidationErrors.service"; -import { KeyConnectorService } from "@bitwarden/common/services/keyConnector.service"; -import { LoginService } from "@bitwarden/common/services/login.service"; import { NotificationsService } from "@bitwarden/common/services/notifications.service"; import { OrganizationUserServiceImplementation } from "@bitwarden/common/services/organization-user/organization-user.service.implementation"; import { OrganizationApiService } from "@bitwarden/common/services/organization/organization-api.service"; @@ -99,11 +103,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 { UsernameGenerationService } from "@bitwarden/common/services/usernameGeneration.service"; import { ValidationService } from "@bitwarden/common/services/validation.service"; import { VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout/vaultTimeout.service"; @@ -124,9 +124,9 @@ import { FolderService } from "@bitwarden/common/vault/services/folder/folder.se import { SyncNotifierService } from "@bitwarden/common/vault/services/sync/sync-notifier.service"; import { SyncService } from "@bitwarden/common/vault/services/sync/sync.service"; -import { AuthGuard } from "../guards/auth.guard"; -import { LockGuard } from "../guards/lock.guard"; -import { UnauthGuard } from "../guards/unauth.guard"; +import { AuthGuard } from "../auth/guards/auth.guard"; +import { LockGuard } from "../auth/guards/lock.guard"; +import { UnauthGuard } from "../auth/guards/unauth.guard"; import { PasswordRepromptService } from "../vault/services/password-reprompt.service"; import { BroadcasterService } from "./broadcaster.service"; diff --git a/libs/angular/src/vault/components/view.component.ts b/libs/angular/src/vault/components/view.component.ts index 3b417e7f1d..a90578b6b6 100644 --- a/libs/angular/src/vault/components/view.component.ts +++ b/libs/angular/src/vault/components/view.component.ts @@ -20,8 +20,8 @@ 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 { 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 { EventType } from "@bitwarden/common/enums/eventType"; import { FieldType } from "@bitwarden/common/enums/fieldType"; import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer"; diff --git a/libs/angular/src/vault/services/password-reprompt.service.ts b/libs/angular/src/vault/services/password-reprompt.service.ts index 8984bc7fdf..0bd945001c 100644 --- a/libs/angular/src/vault/services/password-reprompt.service.ts +++ b/libs/angular/src/vault/services/password-reprompt.service.ts @@ -1,6 +1,6 @@ import { Injectable } from "@angular/core"; -import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service"; +import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; import { ModalService } from "../../services/modal.service"; diff --git a/libs/common/src/abstractions/api.service.ts b/libs/common/src/abstractions/api.service.ts index 437c63a949..6ba5cd4400 100644 --- a/libs/common/src/abstractions/api.service.ts +++ b/libs/common/src/abstractions/api.service.ts @@ -1,33 +1,71 @@ +import { DeviceVerificationRequest } from "../auth/models/request/device-verification.request"; +import { EmailTokenRequest } from "../auth/models/request/email-token.request"; +import { EmailRequest } from "../auth/models/request/email.request"; +import { EmergencyAccessAcceptRequest } from "../auth/models/request/emergency-access-accept.request"; +import { EmergencyAccessConfirmRequest } from "../auth/models/request/emergency-access-confirm.request"; +import { EmergencyAccessInviteRequest } from "../auth/models/request/emergency-access-invite.request"; +import { EmergencyAccessPasswordRequest } from "../auth/models/request/emergency-access-password.request"; +import { EmergencyAccessUpdateRequest } from "../auth/models/request/emergency-access-update.request"; +import { PasswordTokenRequest } from "../auth/models/request/identity-token/password-token.request"; +import { SsoTokenRequest } from "../auth/models/request/identity-token/sso-token.request"; +import { UserApiTokenRequest } from "../auth/models/request/identity-token/user-api-token.request"; +import { KeyConnectorUserKeyRequest } from "../auth/models/request/key-connector-user-key.request"; +import { PasswordHintRequest } from "../auth/models/request/password-hint.request"; +import { PasswordRequest } from "../auth/models/request/password.request"; +import { PasswordlessAuthRequest } from "../auth/models/request/passwordless-auth.request"; +import { PasswordlessCreateAuthRequest } from "../auth/models/request/passwordless-create-auth.request"; +import { SecretVerificationRequest } from "../auth/models/request/secret-verification.request"; +import { SetKeyConnectorKeyRequest } from "../auth/models/request/set-key-connector-key.request"; +import { SetPasswordRequest } from "../auth/models/request/set-password.request"; +import { TwoFactorEmailRequest } from "../auth/models/request/two-factor-email.request"; +import { TwoFactorProviderRequest } from "../auth/models/request/two-factor-provider.request"; +import { TwoFactorRecoveryRequest } from "../auth/models/request/two-factor-recovery.request"; +import { UpdateProfileRequest } from "../auth/models/request/update-profile.request"; +import { UpdateTwoFactorAuthenticatorRequest } from "../auth/models/request/update-two-factor-authenticator.request"; +import { UpdateTwoFactorDuoRequest } from "../auth/models/request/update-two-factor-duo.request"; +import { UpdateTwoFactorEmailRequest } from "../auth/models/request/update-two-factor-email.request"; +import { UpdateTwoFactorWebAuthnDeleteRequest } from "../auth/models/request/update-two-factor-web-authn-delete.request"; +import { UpdateTwoFactorWebAuthnRequest } from "../auth/models/request/update-two-factor-web-authn.request"; +import { UpdateTwoFactorYubioOtpRequest } from "../auth/models/request/update-two-factor-yubio-otp.request"; +import { ApiKeyResponse } from "../auth/models/response/api-key.response"; +import { AuthRequestResponse } from "../auth/models/response/auth-request.response"; +import { DeviceVerificationResponse } from "../auth/models/response/device-verification.response"; +import { + EmergencyAccessGranteeDetailsResponse, + EmergencyAccessGrantorDetailsResponse, + EmergencyAccessTakeoverResponse, + EmergencyAccessViewResponse, +} from "../auth/models/response/emergency-access.response"; +import { IdentityCaptchaResponse } from "../auth/models/response/identity-captcha.response"; +import { IdentityTokenResponse } from "../auth/models/response/identity-token.response"; +import { IdentityTwoFactorResponse } from "../auth/models/response/identity-two-factor.response"; +import { KeyConnectorUserKeyResponse } from "../auth/models/response/key-connector-user-key.response"; +import { PreloginResponse } from "../auth/models/response/prelogin.response"; +import { RegisterResponse } from "../auth/models/response/register.response"; +import { SsoPreValidateResponse } from "../auth/models/response/sso-pre-validate.response"; +import { TwoFactorAuthenticatorResponse } from "../auth/models/response/two-factor-authenticator.response"; +import { TwoFactorDuoResponse } from "../auth/models/response/two-factor-duo.response"; +import { TwoFactorEmailResponse } from "../auth/models/response/two-factor-email.response"; +import { TwoFactorProviderResponse } from "../auth/models/response/two-factor-provider.response"; +import { TwoFactorRecoverResponse } from "../auth/models/response/two-factor-recover.response"; +import { + ChallengeResponse, + TwoFactorWebAuthnResponse, +} from "../auth/models/response/two-factor-web-authn.response"; +import { TwoFactorYubiKeyResponse } from "../auth/models/response/two-factor-yubi-key.response"; import { OrganizationConnectionType } from "../enums/organizationConnectionType"; -import { SetKeyConnectorKeyRequest } from "../models/request/account/set-key-connector-key.request"; import { BitPayInvoiceRequest } from "../models/request/bit-pay-invoice.request"; import { CollectionBulkDeleteRequest } from "../models/request/collection-bulk-delete.request"; import { CollectionRequest } from "../models/request/collection.request"; import { DeleteRecoverRequest } from "../models/request/delete-recover.request"; -import { DeviceVerificationRequest } from "../models/request/device-verification.request"; -import { EmailTokenRequest } from "../models/request/email-token.request"; -import { EmailRequest } from "../models/request/email.request"; -import { EmergencyAccessAcceptRequest } from "../models/request/emergency-access-accept.request"; -import { EmergencyAccessConfirmRequest } from "../models/request/emergency-access-confirm.request"; -import { EmergencyAccessInviteRequest } from "../models/request/emergency-access-invite.request"; -import { EmergencyAccessPasswordRequest } from "../models/request/emergency-access-password.request"; -import { EmergencyAccessUpdateRequest } from "../models/request/emergency-access-update.request"; import { EventRequest } from "../models/request/event.request"; import { IapCheckRequest } from "../models/request/iap-check.request"; -import { PasswordTokenRequest } from "../models/request/identity-token/password-token.request"; -import { SsoTokenRequest } from "../models/request/identity-token/sso-token.request"; -import { UserApiTokenRequest } from "../models/request/identity-token/user-api-token.request"; import { KdfRequest } from "../models/request/kdf.request"; -import { KeyConnectorUserKeyRequest } from "../models/request/key-connector-user-key.request"; import { KeysRequest } from "../models/request/keys.request"; import { OrganizationConnectionRequest } from "../models/request/organization-connection.request"; import { OrganizationImportRequest } from "../models/request/organization-import.request"; import { OrganizationSponsorshipCreateRequest } from "../models/request/organization/organization-sponsorship-create.request"; import { OrganizationSponsorshipRedeemRequest } from "../models/request/organization/organization-sponsorship-redeem.request"; -import { PasswordHintRequest } from "../models/request/password-hint.request"; -import { PasswordRequest } from "../models/request/password.request"; -import { PasswordlessAuthRequest } from "../models/request/passwordless-auth.request"; -import { PasswordlessCreateAuthRequest } from "../models/request/passwordless-create-auth.request"; import { PaymentRequest } from "../models/request/payment.request"; import { PreloginRequest } from "../models/request/prelogin.request"; import { ProviderAddOrganizationRequest } from "../models/request/provider/provider-add-organization.request"; @@ -41,32 +79,17 @@ import { ProviderUserConfirmRequest } from "../models/request/provider/provider- import { ProviderUserInviteRequest } from "../models/request/provider/provider-user-invite.request"; import { ProviderUserUpdateRequest } from "../models/request/provider/provider-user-update.request"; import { RegisterRequest } from "../models/request/register.request"; -import { SecretVerificationRequest } from "../models/request/secret-verification.request"; import { SelectionReadOnlyRequest } from "../models/request/selection-read-only.request"; import { SendAccessRequest } from "../models/request/send-access.request"; import { SendRequest } from "../models/request/send.request"; -import { SetPasswordRequest } from "../models/request/set-password.request"; import { StorageRequest } from "../models/request/storage.request"; import { TaxInfoUpdateRequest } from "../models/request/tax-info-update.request"; -import { TwoFactorEmailRequest } from "../models/request/two-factor-email.request"; -import { TwoFactorProviderRequest } from "../models/request/two-factor-provider.request"; -import { TwoFactorRecoveryRequest } from "../models/request/two-factor-recovery.request"; import { UpdateAvatarRequest } from "../models/request/update-avatar.request"; import { UpdateDomainsRequest } from "../models/request/update-domains.request"; import { UpdateKeyRequest } from "../models/request/update-key.request"; -import { UpdateProfileRequest } from "../models/request/update-profile.request"; import { UpdateTempPasswordRequest } from "../models/request/update-temp-password.request"; -import { UpdateTwoFactorAuthenticatorRequest } from "../models/request/update-two-factor-authenticator.request"; -import { UpdateTwoFactorDuoRequest } from "../models/request/update-two-factor-duo.request"; -import { UpdateTwoFactorEmailRequest } from "../models/request/update-two-factor-email.request"; -import { UpdateTwoFactorWebAuthnDeleteRequest } from "../models/request/update-two-factor-web-authn-delete.request"; -import { UpdateTwoFactorWebAuthnRequest } from "../models/request/update-two-factor-web-authn.request"; -import { UpdateTwoFactorYubioOtpRequest } from "../models/request/update-two-factor-yubio-otp.request"; import { VerifyDeleteRecoverRequest } from "../models/request/verify-delete-recover.request"; import { VerifyEmailRequest } from "../models/request/verify-email.request"; -import { ApiKeyResponse } from "../models/response/api-key.response"; -import { AuthRequestResponse } from "../models/response/auth-request.response"; -import { RegisterResponse } from "../models/response/authentication/register.response"; import { BillingHistoryResponse } from "../models/response/billing-history.response"; import { BillingPaymentResponse } from "../models/response/billing-payment.response"; import { BreachAccountResponse } from "../models/response/breach-account.response"; @@ -74,19 +97,8 @@ import { CollectionAccessDetailsResponse, CollectionResponse, } from "../models/response/collection.response"; -import { DeviceVerificationResponse } from "../models/response/device-verification.response"; import { DomainsResponse } from "../models/response/domains.response"; -import { - EmergencyAccessGranteeDetailsResponse, - EmergencyAccessGrantorDetailsResponse, - EmergencyAccessTakeoverResponse, - EmergencyAccessViewResponse, -} from "../models/response/emergency-access.response"; import { EventResponse } from "../models/response/event.response"; -import { IdentityCaptchaResponse } from "../models/response/identity-captcha.response"; -import { IdentityTokenResponse } from "../models/response/identity-token.response"; -import { IdentityTwoFactorResponse } from "../models/response/identity-two-factor.response"; -import { KeyConnectorUserKeyResponse } from "../models/response/key-connector-user-key.response"; import { ListResponse } from "../models/response/list.response"; import { OrganizationConnectionConfigApis, @@ -97,7 +109,6 @@ import { OrganizationSponsorshipSyncStatusResponse } from "../models/response/or import { PaymentResponse } from "../models/response/payment.response"; import { PlanResponse } from "../models/response/plan.response"; import { PolicyResponse } from "../models/response/policy.response"; -import { PreloginResponse } from "../models/response/prelogin.response"; import { ProfileResponse } from "../models/response/profile.response"; import { ProviderOrganizationOrganizationDetailsResponse, @@ -115,20 +126,9 @@ import { SendAccessResponse } from "../models/response/send-access.response"; import { SendFileDownloadDataResponse } from "../models/response/send-file-download-data.response"; import { SendFileUploadDataResponse } from "../models/response/send-file-upload-data.response"; import { SendResponse } from "../models/response/send.response"; -import { SsoPreValidateResponse } from "../models/response/sso-pre-validate.response"; import { SubscriptionResponse } from "../models/response/subscription.response"; import { TaxInfoResponse } from "../models/response/tax-info.response"; import { TaxRateResponse } from "../models/response/tax-rate.response"; -import { TwoFactorAuthenticatorResponse } from "../models/response/two-factor-authenticator.response"; -import { TwoFactorDuoResponse } from "../models/response/two-factor-duo.response"; -import { TwoFactorEmailResponse } from "../models/response/two-factor-email.response"; -import { TwoFactorProviderResponse } from "../models/response/two-factor-provider.response"; -import { TwoFactorRecoverResponse } from "../models/response/two-factor-recover.response"; -import { - ChallengeResponse, - TwoFactorWebAuthnResponse, -} from "../models/response/two-factor-web-authn.response"; -import { TwoFactorYubiKeyResponse } from "../models/response/two-factor-yubi-key.response"; import { UserKeyResponse } from "../models/response/user-key.response"; import { SendAccessView } from "../models/view/send-access.view"; import { AttachmentRequest } from "../vault/models/request/attachment.request"; diff --git a/libs/common/src/abstractions/crypto.service.ts b/libs/common/src/abstractions/crypto.service.ts index 25f1a07ba0..62da94681e 100644 --- a/libs/common/src/abstractions/crypto.service.ts +++ b/libs/common/src/abstractions/crypto.service.ts @@ -1,9 +1,9 @@ +import { KdfConfig } from "../auth/models/domain/kdf-config"; import { HashPurpose } from "../enums/hashPurpose"; import { KdfType } from "../enums/kdfType"; import { KeySuffixOptions } from "../enums/keySuffixOptions"; import { EncArrayBuffer } from "../models/domain/enc-array-buffer"; import { EncString } from "../models/domain/enc-string"; -import { KdfConfig } from "../models/domain/kdf-config"; import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; import { ProfileOrganizationResponse } from "../models/response/profile-organization.response"; import { ProfileProviderOrganizationResponse } from "../models/response/profile-provider-organization.response"; diff --git a/libs/common/src/abstractions/organization-user/requests/organization-user-reset-password-enrollment.request.ts b/libs/common/src/abstractions/organization-user/requests/organization-user-reset-password-enrollment.request.ts index aff5d58c80..c1fdc252f1 100644 --- a/libs/common/src/abstractions/organization-user/requests/organization-user-reset-password-enrollment.request.ts +++ b/libs/common/src/abstractions/organization-user/requests/organization-user-reset-password-enrollment.request.ts @@ -1,4 +1,4 @@ -import { SecretVerificationRequest } from "../../../models/request/secret-verification.request"; +import { SecretVerificationRequest } from "../../../auth/models/request/secret-verification.request"; export class OrganizationUserResetPasswordEnrollmentRequest extends SecretVerificationRequest { resetPasswordKey: string; diff --git a/libs/common/src/abstractions/organization/organization-api.service.abstraction.ts b/libs/common/src/abstractions/organization/organization-api.service.abstraction.ts index 92f4711d14..6fe56db226 100644 --- a/libs/common/src/abstractions/organization/organization-api.service.abstraction.ts +++ b/libs/common/src/abstractions/organization/organization-api.service.abstraction.ts @@ -1,4 +1,8 @@ -import { OrganizationApiKeyType } from "../../enums/organizationApiKeyType"; +import { OrganizationApiKeyType } from "../../auth/enums/organization-api-key-type"; +import { OrganizationSsoRequest } from "../../auth/models/request/organization-sso.request"; +import { SecretVerificationRequest } from "../../auth/models/request/secret-verification.request"; +import { ApiKeyResponse } from "../../auth/models/response/api-key.response"; +import { OrganizationSsoResponse } from "../../auth/models/response/organization-sso.response"; import { ImportDirectoryRequest } from "../../models/request/import-directory.request"; import { OrganizationApiKeyRequest } from "../../models/request/organization-api-key.request"; import { OrganizationCreateRequest } from "../../models/request/organization-create.request"; @@ -7,13 +11,10 @@ import { OrganizationSubscriptionUpdateRequest } from "../../models/request/orga import { OrganizationTaxInfoUpdateRequest } from "../../models/request/organization-tax-info-update.request"; import { OrganizationUpdateRequest } from "../../models/request/organization-update.request"; import { OrganizationUpgradeRequest } from "../../models/request/organization-upgrade.request"; -import { OrganizationSsoRequest } from "../../models/request/organization/organization-sso.request"; import { PaymentRequest } from "../../models/request/payment.request"; import { SeatRequest } from "../../models/request/seat.request"; -import { SecretVerificationRequest } from "../../models/request/secret-verification.request"; import { StorageRequest } from "../../models/request/storage.request"; import { VerifyBankRequest } from "../../models/request/verify-bank.request"; -import { ApiKeyResponse } from "../../models/response/api-key.response"; import { BillingResponse } from "../../models/response/billing.response"; import { ListResponse } from "../../models/response/list.response"; import { OrganizationApiKeyInformationResponse } from "../../models/response/organization-api-key-information.response"; @@ -21,7 +22,6 @@ import { OrganizationAutoEnrollStatusResponse } from "../../models/response/orga import { OrganizationKeysResponse } from "../../models/response/organization-keys.response"; import { OrganizationSubscriptionResponse } from "../../models/response/organization-subscription.response"; import { OrganizationResponse } from "../../models/response/organization.response"; -import { OrganizationSsoResponse } from "../../models/response/organization/organization-sso.response"; import { PaymentResponse } from "../../models/response/payment.response"; import { TaxInfoResponse } from "../../models/response/tax-info.response"; diff --git a/libs/common/src/abstractions/state.service.ts b/libs/common/src/abstractions/state.service.ts index 859e36cc4e..51b939893d 100644 --- a/libs/common/src/abstractions/state.service.ts +++ b/libs/common/src/abstractions/state.service.ts @@ -1,5 +1,7 @@ import { Observable } from "rxjs"; +import { EnvironmentUrls } from "../auth/models/domain/environment-urls"; +import { KdfConfig } from "../auth/models/domain/kdf-config"; import { KdfType } from "../enums/kdfType"; import { ThemeType } from "../enums/themeType"; import { UriMatchType } from "../enums/uriMatchType"; @@ -13,9 +15,7 @@ import { SendData } from "../models/data/send.data"; import { ServerConfigData } from "../models/data/server-config.data"; import { Account, AccountSettingsSettings } from "../models/domain/account"; import { EncString } from "../models/domain/enc-string"; -import { EnvironmentUrls } from "../models/domain/environment-urls"; import { GeneratedPasswordHistory } from "../models/domain/generated-password-history"; -import { KdfConfig } from "../models/domain/kdf-config"; import { Policy } from "../models/domain/policy"; import { StorageOptions } from "../models/domain/storage-options"; import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; diff --git a/libs/common/src/abstractions/system.service.ts b/libs/common/src/abstractions/system.service.ts index 29953b967b..20e77ed149 100644 --- a/libs/common/src/abstractions/system.service.ts +++ b/libs/common/src/abstractions/system.service.ts @@ -1,4 +1,4 @@ -import { AuthService } from "./auth.service"; +import { AuthService } from "../auth/abstractions/auth.service"; export abstract class SystemService { startProcessReload: (authService: AuthService) => Promise; diff --git a/libs/common/src/abstractions/userVerification/userVerification-api.service.abstraction.ts b/libs/common/src/abstractions/userVerification/userVerification-api.service.abstraction.ts index bb77034e46..78e4099eee 100644 --- a/libs/common/src/abstractions/userVerification/userVerification-api.service.abstraction.ts +++ b/libs/common/src/abstractions/userVerification/userVerification-api.service.abstraction.ts @@ -1,4 +1,4 @@ -import { VerifyOTPRequest } from "../../models/request/account/verify-otp.request"; +import { VerifyOTPRequest } from "../../auth/models/request/verify-otp.request"; export abstract class UserVerificationApiServiceAbstraction { postAccountVerifyOTP: (request: VerifyOTPRequest) => Promise; diff --git a/libs/common/src/abstractions/userVerification/userVerification.service.abstraction.ts b/libs/common/src/abstractions/userVerification/userVerification.service.abstraction.ts index 3327ae8480..dcfd52bf05 100644 --- a/libs/common/src/abstractions/userVerification/userVerification.service.abstraction.ts +++ b/libs/common/src/abstractions/userVerification/userVerification.service.abstraction.ts @@ -1,4 +1,4 @@ -import { SecretVerificationRequest } from "../../models/request/secret-verification.request"; +import { SecretVerificationRequest } from "../../auth/models/request/secret-verification.request"; import { Verification } from "../../types/verification"; export abstract class UserVerificationService { diff --git a/libs/common/src/abstractions/account/account-api.service.abstraction.ts b/libs/common/src/auth/abstractions/account-api.service.abstraction.ts similarity index 56% rename from libs/common/src/abstractions/account/account-api.service.abstraction.ts rename to libs/common/src/auth/abstractions/account-api.service.abstraction.ts index 7af1333a46..aaac78af84 100644 --- a/libs/common/src/abstractions/account/account-api.service.abstraction.ts +++ b/libs/common/src/auth/abstractions/account-api.service.abstraction.ts @@ -1,4 +1,4 @@ -import { SecretVerificationRequest } from "../../models/request/secret-verification.request"; +import { SecretVerificationRequest } from "../models/request/secret-verification.request"; export abstract class AccountApiService { abstract deleteAccount(request: SecretVerificationRequest): Promise; diff --git a/libs/common/src/abstractions/account/account-api.service.ts b/libs/common/src/auth/abstractions/account-api.service.ts similarity index 100% rename from libs/common/src/abstractions/account/account-api.service.ts rename to libs/common/src/auth/abstractions/account-api.service.ts diff --git a/libs/common/src/abstractions/account/account.service.ts b/libs/common/src/auth/abstractions/account.service.ts similarity index 100% rename from libs/common/src/abstractions/account/account.service.ts rename to libs/common/src/auth/abstractions/account.service.ts diff --git a/libs/common/src/abstractions/auth.service.ts b/libs/common/src/auth/abstractions/auth.service.ts similarity index 86% rename from libs/common/src/abstractions/auth.service.ts rename to libs/common/src/auth/abstractions/auth.service.ts index 6f035ef8d3..ac4197c22d 100644 --- a/libs/common/src/abstractions/auth.service.ts +++ b/libs/common/src/auth/abstractions/auth.service.ts @@ -1,6 +1,8 @@ import { Observable } from "rxjs"; -import { AuthenticationStatus } from "../enums/authenticationStatus"; +import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key"; +import { AuthRequestPushNotification } from "../../models/response/notification.response"; +import { AuthenticationStatus } from "../enums/authentication-status"; import { AuthResult } from "../models/domain/auth-result"; import { UserApiLogInCredentials, @@ -8,10 +10,8 @@ import { SsoLogInCredentials, PasswordlessLogInCredentials, } from "../models/domain/log-in-credentials"; -import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; import { TokenTwoFactorRequest } from "../models/request/identity-token/token-two-factor.request"; import { AuthRequestResponse } from "../models/response/auth-request.response"; -import { AuthRequestPushNotification } from "../models/response/notification.response"; export abstract class AuthService { masterPasswordHash: string; diff --git a/libs/common/src/abstractions/keyConnector.service.ts b/libs/common/src/auth/abstractions/key-connector.service.ts similarity index 91% rename from libs/common/src/abstractions/keyConnector.service.ts rename to libs/common/src/auth/abstractions/key-connector.service.ts index 7a6d0ac84c..263282ff6c 100644 --- a/libs/common/src/abstractions/keyConnector.service.ts +++ b/libs/common/src/auth/abstractions/key-connector.service.ts @@ -1,4 +1,4 @@ -import { Organization } from "../models/domain/organization"; +import { Organization } from "../../models/domain/organization"; import { IdentityTokenResponse } from "../models/response/identity-token.response"; export abstract class KeyConnectorService { diff --git a/libs/common/src/abstractions/login.service.ts b/libs/common/src/auth/abstractions/login.service.ts similarity index 100% rename from libs/common/src/abstractions/login.service.ts rename to libs/common/src/auth/abstractions/login.service.ts diff --git a/libs/common/src/abstractions/token.service.ts b/libs/common/src/auth/abstractions/token.service.ts similarity index 100% rename from libs/common/src/abstractions/token.service.ts rename to libs/common/src/auth/abstractions/token.service.ts diff --git a/libs/common/src/abstractions/twoFactor.service.ts b/libs/common/src/auth/abstractions/two-factor.service.ts similarity index 90% rename from libs/common/src/abstractions/twoFactor.service.ts rename to libs/common/src/auth/abstractions/two-factor.service.ts index 25c0955770..3ea7eb8db9 100644 --- a/libs/common/src/abstractions/twoFactor.service.ts +++ b/libs/common/src/auth/abstractions/two-factor.service.ts @@ -1,4 +1,4 @@ -import { TwoFactorProviderType } from "../enums/twoFactorProviderType"; +import { TwoFactorProviderType } from "../enums/two-factor-provider-type"; import { IdentityTwoFactorResponse } from "../models/response/identity-two-factor.response"; export interface TwoFactorProviderDetails { diff --git a/libs/common/src/misc/captcha_iframe.ts b/libs/common/src/auth/captcha-iframe.ts similarity index 94% rename from libs/common/src/misc/captcha_iframe.ts rename to libs/common/src/auth/captcha-iframe.ts index ca422fc021..8559ef4050 100644 --- a/libs/common/src/misc/captcha_iframe.ts +++ b/libs/common/src/auth/captcha-iframe.ts @@ -1,6 +1,5 @@ import { I18nService } from "../abstractions/i18n.service"; - -import { IFrameComponent } from "./iframe_component"; +import { IFrameComponent } from "../misc/iframe_component"; export class CaptchaIFrame extends IFrameComponent { constructor( diff --git a/libs/common/src/enums/authRequestType.ts b/libs/common/src/auth/enums/auth-request-type.ts similarity index 100% rename from libs/common/src/enums/authRequestType.ts rename to libs/common/src/auth/enums/auth-request-type.ts diff --git a/libs/common/src/enums/authenticationStatus.ts b/libs/common/src/auth/enums/authentication-status.ts similarity index 100% rename from libs/common/src/enums/authenticationStatus.ts rename to libs/common/src/auth/enums/authentication-status.ts diff --git a/libs/common/src/enums/authenticationType.ts b/libs/common/src/auth/enums/authentication-type.ts similarity index 100% rename from libs/common/src/enums/authenticationType.ts rename to libs/common/src/auth/enums/authentication-type.ts diff --git a/libs/common/src/enums/emergencyAccessStatusType.ts b/libs/common/src/auth/enums/emergency-access-status-type.ts similarity index 100% rename from libs/common/src/enums/emergencyAccessStatusType.ts rename to libs/common/src/auth/enums/emergency-access-status-type.ts diff --git a/libs/common/src/enums/emergencyAccessType.ts b/libs/common/src/auth/enums/emergency-access-type.ts similarity index 100% rename from libs/common/src/enums/emergencyAccessType.ts rename to libs/common/src/auth/enums/emergency-access-type.ts diff --git a/libs/common/src/enums/organizationApiKeyType.ts b/libs/common/src/auth/enums/organization-api-key-type.ts similarity index 100% rename from libs/common/src/enums/organizationApiKeyType.ts rename to libs/common/src/auth/enums/organization-api-key-type.ts diff --git a/libs/common/src/enums/ssoEnums.ts b/libs/common/src/auth/enums/sso.ts similarity index 100% rename from libs/common/src/enums/ssoEnums.ts rename to libs/common/src/auth/enums/sso.ts diff --git a/libs/common/src/enums/twoFactorProviderType.ts b/libs/common/src/auth/enums/two-factor-provider-type.ts similarity index 100% rename from libs/common/src/enums/twoFactorProviderType.ts rename to libs/common/src/auth/enums/two-factor-provider-type.ts diff --git a/libs/common/src/enums/verificationType.ts b/libs/common/src/auth/enums/verification-type.ts similarity index 100% rename from libs/common/src/enums/verificationType.ts rename to libs/common/src/auth/enums/verification-type.ts diff --git a/libs/common/spec/misc/logInStrategies/logIn.strategy.spec.ts b/libs/common/src/auth/login-strategies/login.strategy.spec.ts similarity index 82% rename from libs/common/spec/misc/logInStrategies/logIn.strategy.spec.ts rename to libs/common/src/auth/login-strategies/login.strategy.spec.ts index 3ec22a8eec..1c173d42df 100644 --- a/libs/common/spec/misc/logInStrategies/logIn.strategy.spec.ts +++ b/libs/common/src/auth/login-strategies/login.strategy.spec.ts @@ -1,27 +1,28 @@ import { mock, MockProxy } from "jest-mock-extended"; -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 { 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 { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service"; -import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; -import { PasswordLogInStrategy } from "@bitwarden/common/misc/logInStrategies/passwordLogin.strategy"; -import { Utils } from "@bitwarden/common/misc/utils"; -import { Account, AccountProfile, AccountTokens } from "@bitwarden/common/models/domain/account"; -import { AuthResult } from "@bitwarden/common/models/domain/auth-result"; -import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { PasswordLogInCredentials } from "@bitwarden/common/models/domain/log-in-credentials"; -import { PasswordTokenRequest } from "@bitwarden/common/models/request/identity-token/password-token.request"; -import { TokenTwoFactorRequest } from "@bitwarden/common/models/request/identity-token/token-two-factor.request"; -import { IdentityCaptchaResponse } from "@bitwarden/common/models/response/identity-captcha.response"; -import { IdentityTokenResponse } from "@bitwarden/common/models/response/identity-token.response"; -import { IdentityTwoFactorResponse } from "@bitwarden/common/models/response/identity-two-factor.response"; +import { ApiService } from "../../abstractions/api.service"; +import { AppIdService } from "../../abstractions/appId.service"; +import { CryptoService } from "../../abstractions/crypto.service"; +import { LogService } from "../../abstractions/log.service"; +import { MessagingService } from "../../abstractions/messaging.service"; +import { PlatformUtilsService } from "../../abstractions/platformUtils.service"; +import { StateService } from "../../abstractions/state.service"; +import { Utils } from "../../misc/utils"; +import { Account, AccountProfile, AccountTokens } from "../../models/domain/account"; +import { EncString } from "../../models/domain/enc-string"; +import { AuthService } from "../abstractions/auth.service"; +import { TokenService } from "../abstractions/token.service"; +import { TwoFactorService } from "../abstractions/two-factor.service"; +import { TwoFactorProviderType } from "../enums/two-factor-provider-type"; +import { AuthResult } from "../models/domain/auth-result"; +import { PasswordLogInCredentials } from "../models/domain/log-in-credentials"; +import { PasswordTokenRequest } from "../models/request/identity-token/password-token.request"; +import { TokenTwoFactorRequest } from "../models/request/identity-token/token-two-factor.request"; +import { IdentityCaptchaResponse } from "../models/response/identity-captcha.response"; +import { IdentityTokenResponse } from "../models/response/identity-token.response"; +import { IdentityTwoFactorResponse } from "../models/response/identity-two-factor.response"; + +import { PasswordLogInStrategy } from "./password-login.strategy"; const email = "hello@world.com"; const masterPassword = "password"; diff --git a/libs/common/src/misc/logInStrategies/logIn.strategy.ts b/libs/common/src/auth/login-strategies/login.strategy.ts similarity index 84% rename from libs/common/src/misc/logInStrategies/logIn.strategy.ts rename to libs/common/src/auth/login-strategies/login.strategy.ts index 84d8074ddc..5b6e50d91d 100644 --- a/libs/common/src/misc/logInStrategies/logIn.strategy.ts +++ b/libs/common/src/auth/login-strategies/login.strategy.ts @@ -5,26 +5,26 @@ import { LogService } from "../../abstractions/log.service"; import { MessagingService } from "../../abstractions/messaging.service"; import { PlatformUtilsService } from "../../abstractions/platformUtils.service"; import { StateService } from "../../abstractions/state.service"; -import { TokenService } from "../../abstractions/token.service"; -import { TwoFactorService } from "../../abstractions/twoFactor.service"; -import { TwoFactorProviderType } from "../../enums/twoFactorProviderType"; import { Account, AccountProfile, AccountTokens } from "../../models/domain/account"; -import { AuthResult } from "../../models/domain/auth-result"; +import { KeysRequest } from "../../models/request/keys.request"; +import { TokenService } from "../abstractions/token.service"; +import { TwoFactorService } from "../abstractions/two-factor.service"; +import { TwoFactorProviderType } from "../enums/two-factor-provider-type"; +import { AuthResult } from "../models/domain/auth-result"; import { UserApiLogInCredentials, PasswordLogInCredentials, SsoLogInCredentials, PasswordlessLogInCredentials, -} from "../../models/domain/log-in-credentials"; -import { DeviceRequest } from "../../models/request/device.request"; -import { PasswordTokenRequest } from "../../models/request/identity-token/password-token.request"; -import { SsoTokenRequest } from "../../models/request/identity-token/sso-token.request"; -import { TokenTwoFactorRequest } from "../../models/request/identity-token/token-two-factor.request"; -import { UserApiTokenRequest } from "../../models/request/identity-token/user-api-token.request"; -import { KeysRequest } from "../../models/request/keys.request"; -import { IdentityCaptchaResponse } from "../../models/response/identity-captcha.response"; -import { IdentityTokenResponse } from "../../models/response/identity-token.response"; -import { IdentityTwoFactorResponse } from "../../models/response/identity-two-factor.response"; +} from "../models/domain/log-in-credentials"; +import { DeviceRequest } from "../models/request/identity-token/device.request"; +import { PasswordTokenRequest } from "../models/request/identity-token/password-token.request"; +import { SsoTokenRequest } from "../models/request/identity-token/sso-token.request"; +import { TokenTwoFactorRequest } from "../models/request/identity-token/token-two-factor.request"; +import { UserApiTokenRequest } from "../models/request/identity-token/user-api-token.request"; +import { IdentityCaptchaResponse } from "../models/response/identity-captcha.response"; +import { IdentityTokenResponse } from "../models/response/identity-token.response"; +import { IdentityTwoFactorResponse } from "../models/response/identity-two-factor.response"; export abstract class LogInStrategy { protected abstract tokenRequest: UserApiTokenRequest | PasswordTokenRequest | SsoTokenRequest; diff --git a/libs/common/spec/misc/logInStrategies/passwordLogIn.strategy.spec.ts b/libs/common/src/auth/login-strategies/password-login.strategy.spec.ts similarity index 72% rename from libs/common/spec/misc/logInStrategies/passwordLogIn.strategy.spec.ts rename to libs/common/src/auth/login-strategies/password-login.strategy.spec.ts index dfcb1bb16d..a718e4c9bd 100644 --- a/libs/common/spec/misc/logInStrategies/passwordLogIn.strategy.spec.ts +++ b/libs/common/src/auth/login-strategies/password-login.strategy.spec.ts @@ -1,22 +1,22 @@ import { mock, MockProxy } from "jest-mock-extended"; -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 { 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 { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service"; -import { HashPurpose } from "@bitwarden/common/enums/hashPurpose"; -import { PasswordLogInStrategy } from "@bitwarden/common/misc/logInStrategies/passwordLogin.strategy"; -import { Utils } from "@bitwarden/common/misc/utils"; -import { PasswordLogInCredentials } from "@bitwarden/common/models/domain/log-in-credentials"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; +import { ApiService } from "../../abstractions/api.service"; +import { AppIdService } from "../../abstractions/appId.service"; +import { CryptoService } from "../../abstractions/crypto.service"; +import { LogService } from "../../abstractions/log.service"; +import { MessagingService } from "../../abstractions/messaging.service"; +import { PlatformUtilsService } from "../../abstractions/platformUtils.service"; +import { StateService } from "../../abstractions/state.service"; +import { HashPurpose } from "../../enums/hashPurpose"; +import { Utils } from "../../misc/utils"; +import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key"; +import { AuthService } from "../abstractions/auth.service"; +import { TokenService } from "../abstractions/token.service"; +import { TwoFactorService } from "../abstractions/two-factor.service"; +import { PasswordLogInCredentials } from "../models/domain/log-in-credentials"; -import { identityTokenResponseFactory } from "./logIn.strategy.spec"; +import { identityTokenResponseFactory } from "./login.strategy.spec"; +import { PasswordLogInStrategy } from "./password-login.strategy"; const email = "hello@world.com"; const masterPassword = "password"; diff --git a/libs/common/src/misc/logInStrategies/passwordLogin.strategy.ts b/libs/common/src/auth/login-strategies/password-login.strategy.ts similarity index 81% rename from libs/common/src/misc/logInStrategies/passwordLogin.strategy.ts rename to libs/common/src/auth/login-strategies/password-login.strategy.ts index 7025b5342e..f0bd3a4aa9 100644 --- a/libs/common/src/misc/logInStrategies/passwordLogin.strategy.ts +++ b/libs/common/src/auth/login-strategies/password-login.strategy.ts @@ -1,21 +1,21 @@ import { ApiService } from "../../abstractions/api.service"; import { AppIdService } from "../../abstractions/appId.service"; -import { AuthService } from "../../abstractions/auth.service"; import { CryptoService } from "../../abstractions/crypto.service"; import { LogService } from "../../abstractions/log.service"; import { MessagingService } from "../../abstractions/messaging.service"; import { PlatformUtilsService } from "../../abstractions/platformUtils.service"; import { StateService } from "../../abstractions/state.service"; -import { TokenService } from "../../abstractions/token.service"; -import { TwoFactorService } from "../../abstractions/twoFactor.service"; import { HashPurpose } from "../../enums/hashPurpose"; -import { AuthResult } from "../../models/domain/auth-result"; -import { PasswordLogInCredentials } from "../../models/domain/log-in-credentials"; import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key"; -import { PasswordTokenRequest } from "../../models/request/identity-token/password-token.request"; -import { TokenTwoFactorRequest } from "../../models/request/identity-token/token-two-factor.request"; +import { AuthService } from "../abstractions/auth.service"; +import { TokenService } from "../abstractions/token.service"; +import { TwoFactorService } from "../abstractions/two-factor.service"; +import { AuthResult } from "../models/domain/auth-result"; +import { PasswordLogInCredentials } from "../models/domain/log-in-credentials"; +import { PasswordTokenRequest } from "../models/request/identity-token/password-token.request"; +import { TokenTwoFactorRequest } from "../models/request/identity-token/token-two-factor.request"; -import { LogInStrategy } from "./logIn.strategy"; +import { LogInStrategy } from "./login.strategy"; export class PasswordLogInStrategy extends LogInStrategy { get email() { diff --git a/libs/common/src/misc/logInStrategies/passwordlessLogin.strategy.ts b/libs/common/src/auth/login-strategies/passwordless-login.strategy.ts similarity index 79% rename from libs/common/src/misc/logInStrategies/passwordlessLogin.strategy.ts rename to libs/common/src/auth/login-strategies/passwordless-login.strategy.ts index e61835f9ae..3701bcbfd4 100644 --- a/libs/common/src/misc/logInStrategies/passwordlessLogin.strategy.ts +++ b/libs/common/src/auth/login-strategies/passwordless-login.strategy.ts @@ -1,19 +1,19 @@ import { ApiService } from "../../abstractions/api.service"; import { AppIdService } from "../../abstractions/appId.service"; -import { AuthService } from "../../abstractions/auth.service"; import { CryptoService } from "../../abstractions/crypto.service"; import { LogService } from "../../abstractions/log.service"; import { MessagingService } from "../../abstractions/messaging.service"; import { PlatformUtilsService } from "../../abstractions/platformUtils.service"; import { StateService } from "../../abstractions/state.service"; -import { TokenService } from "../../abstractions/token.service"; -import { TwoFactorService } from "../../abstractions/twoFactor.service"; -import { AuthResult } from "../../models/domain/auth-result"; -import { PasswordlessLogInCredentials } from "../../models/domain/log-in-credentials"; -import { PasswordTokenRequest } from "../../models/request/identity-token/password-token.request"; -import { TokenTwoFactorRequest } from "../../models/request/identity-token/token-two-factor.request"; +import { AuthService } from "../abstractions/auth.service"; +import { TokenService } from "../abstractions/token.service"; +import { TwoFactorService } from "../abstractions/two-factor.service"; +import { AuthResult } from "../models/domain/auth-result"; +import { PasswordlessLogInCredentials } from "../models/domain/log-in-credentials"; +import { PasswordTokenRequest } from "../models/request/identity-token/password-token.request"; +import { TokenTwoFactorRequest } from "../models/request/identity-token/token-two-factor.request"; -import { LogInStrategy } from "./logIn.strategy"; +import { LogInStrategy } from "./login.strategy"; export class PasswordlessLogInStrategy extends LogInStrategy { get email() { diff --git a/libs/common/spec/misc/logInStrategies/ssoLogIn.strategy.spec.ts b/libs/common/src/auth/login-strategies/sso-login.strategy.spec.ts similarity index 77% rename from libs/common/spec/misc/logInStrategies/ssoLogIn.strategy.spec.ts rename to libs/common/src/auth/login-strategies/sso-login.strategy.spec.ts index d36998d238..d1d34aa256 100644 --- a/libs/common/spec/misc/logInStrategies/ssoLogIn.strategy.spec.ts +++ b/libs/common/src/auth/login-strategies/sso-login.strategy.spec.ts @@ -1,20 +1,20 @@ import { mock, MockProxy } from "jest-mock-extended"; -import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { AppIdService } from "@bitwarden/common/abstractions/appId.service"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.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 { TokenService } from "@bitwarden/common/abstractions/token.service"; -import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service"; -import { SsoLogInStrategy } from "@bitwarden/common/misc/logInStrategies/ssoLogin.strategy"; -import { Utils } from "@bitwarden/common/misc/utils"; -import { SsoLogInCredentials } from "@bitwarden/common/models/domain/log-in-credentials"; +import { ApiService } from "../../abstractions/api.service"; +import { AppIdService } from "../../abstractions/appId.service"; +import { CryptoService } from "../../abstractions/crypto.service"; +import { LogService } from "../../abstractions/log.service"; +import { MessagingService } from "../../abstractions/messaging.service"; +import { PlatformUtilsService } from "../../abstractions/platformUtils.service"; +import { StateService } from "../../abstractions/state.service"; +import { Utils } from "../../misc/utils"; +import { KeyConnectorService } from "../abstractions/key-connector.service"; +import { TokenService } from "../abstractions/token.service"; +import { TwoFactorService } from "../abstractions/two-factor.service"; +import { SsoLogInCredentials } from "../models/domain/log-in-credentials"; -import { identityTokenResponseFactory } from "./logIn.strategy.spec"; +import { identityTokenResponseFactory } from "./login.strategy.spec"; +import { SsoLogInStrategy } from "./sso-login.strategy"; describe("SsoLogInStrategy", () => { let cryptoService: MockProxy; diff --git a/libs/common/src/misc/logInStrategies/ssoLogin.strategy.ts b/libs/common/src/auth/login-strategies/sso-login.strategy.ts similarity index 78% rename from libs/common/src/misc/logInStrategies/ssoLogin.strategy.ts rename to libs/common/src/auth/login-strategies/sso-login.strategy.ts index 8006dbaea2..87d12764d8 100644 --- a/libs/common/src/misc/logInStrategies/ssoLogin.strategy.ts +++ b/libs/common/src/auth/login-strategies/sso-login.strategy.ts @@ -1,18 +1,18 @@ import { ApiService } from "../../abstractions/api.service"; import { AppIdService } from "../../abstractions/appId.service"; import { CryptoService } from "../../abstractions/crypto.service"; -import { KeyConnectorService } from "../../abstractions/keyConnector.service"; import { LogService } from "../../abstractions/log.service"; import { MessagingService } from "../../abstractions/messaging.service"; import { PlatformUtilsService } from "../../abstractions/platformUtils.service"; import { StateService } from "../../abstractions/state.service"; -import { TokenService } from "../../abstractions/token.service"; -import { TwoFactorService } from "../../abstractions/twoFactor.service"; -import { SsoLogInCredentials } from "../../models/domain/log-in-credentials"; -import { SsoTokenRequest } from "../../models/request/identity-token/sso-token.request"; -import { IdentityTokenResponse } from "../../models/response/identity-token.response"; +import { KeyConnectorService } from "../abstractions/key-connector.service"; +import { TokenService } from "../abstractions/token.service"; +import { TwoFactorService } from "../abstractions/two-factor.service"; +import { SsoLogInCredentials } from "../models/domain/log-in-credentials"; +import { SsoTokenRequest } from "../models/request/identity-token/sso-token.request"; +import { IdentityTokenResponse } from "../models/response/identity-token.response"; -import { LogInStrategy } from "./logIn.strategy"; +import { LogInStrategy } from "./login.strategy"; export class SsoLogInStrategy extends LogInStrategy { tokenRequest: SsoTokenRequest; diff --git a/libs/common/spec/misc/logInStrategies/user-api-login.strategy.spec.ts b/libs/common/src/auth/login-strategies/user-api-login.strategy.spec.ts similarity index 74% rename from libs/common/spec/misc/logInStrategies/user-api-login.strategy.spec.ts rename to libs/common/src/auth/login-strategies/user-api-login.strategy.spec.ts index ce9030550c..66452f4457 100644 --- a/libs/common/spec/misc/logInStrategies/user-api-login.strategy.spec.ts +++ b/libs/common/src/auth/login-strategies/user-api-login.strategy.spec.ts @@ -1,21 +1,21 @@ import { mock, MockProxy } from "jest-mock-extended"; -import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { AppIdService } from "@bitwarden/common/abstractions/appId.service"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.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 { TokenService } from "@bitwarden/common/abstractions/token.service"; -import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service"; -import { UserApiLogInStrategy } from "@bitwarden/common/misc/logInStrategies/user-api-login.strategy"; -import { Utils } from "@bitwarden/common/misc/utils"; -import { UserApiLogInCredentials } from "@bitwarden/common/models/domain/log-in-credentials"; +import { ApiService } from "../../abstractions/api.service"; +import { AppIdService } from "../../abstractions/appId.service"; +import { CryptoService } from "../../abstractions/crypto.service"; +import { EnvironmentService } from "../../abstractions/environment.service"; +import { LogService } from "../../abstractions/log.service"; +import { MessagingService } from "../../abstractions/messaging.service"; +import { PlatformUtilsService } from "../../abstractions/platformUtils.service"; +import { StateService } from "../../abstractions/state.service"; +import { Utils } from "../../misc/utils"; +import { KeyConnectorService } from "../abstractions/key-connector.service"; +import { TokenService } from "../abstractions/token.service"; +import { TwoFactorService } from "../abstractions/two-factor.service"; +import { UserApiLogInCredentials } from "../models/domain/log-in-credentials"; -import { identityTokenResponseFactory } from "./logIn.strategy.spec"; +import { identityTokenResponseFactory } from "./login.strategy.spec"; +import { UserApiLogInStrategy } from "./user-api-login.strategy"; describe("UserApiLogInStrategy", () => { let cryptoService: MockProxy; diff --git a/libs/common/src/misc/logInStrategies/user-api-login.strategy.ts b/libs/common/src/auth/login-strategies/user-api-login.strategy.ts similarity index 80% rename from libs/common/src/misc/logInStrategies/user-api-login.strategy.ts rename to libs/common/src/auth/login-strategies/user-api-login.strategy.ts index f15f8f7d88..af7ae91c6e 100644 --- a/libs/common/src/misc/logInStrategies/user-api-login.strategy.ts +++ b/libs/common/src/auth/login-strategies/user-api-login.strategy.ts @@ -2,18 +2,18 @@ import { ApiService } from "../../abstractions/api.service"; import { AppIdService } from "../../abstractions/appId.service"; import { CryptoService } from "../../abstractions/crypto.service"; import { EnvironmentService } from "../../abstractions/environment.service"; -import { KeyConnectorService } from "../../abstractions/keyConnector.service"; import { LogService } from "../../abstractions/log.service"; import { MessagingService } from "../../abstractions/messaging.service"; import { PlatformUtilsService } from "../../abstractions/platformUtils.service"; import { StateService } from "../../abstractions/state.service"; -import { TokenService } from "../../abstractions/token.service"; -import { TwoFactorService } from "../../abstractions/twoFactor.service"; -import { UserApiLogInCredentials } from "../../models/domain/log-in-credentials"; -import { UserApiTokenRequest } from "../../models/request/identity-token/user-api-token.request"; -import { IdentityTokenResponse } from "../../models/response/identity-token.response"; +import { TokenService } from "../../auth/abstractions/token.service"; +import { TwoFactorService } from "../../auth/abstractions/two-factor.service"; +import { KeyConnectorService } from "../abstractions/key-connector.service"; +import { UserApiLogInCredentials } from "../models/domain/log-in-credentials"; +import { UserApiTokenRequest } from "../models/request/identity-token/user-api-token.request"; +import { IdentityTokenResponse } from "../models/response/identity-token.response"; -import { LogInStrategy } from "./logIn.strategy"; +import { LogInStrategy } from "./login.strategy"; export class UserApiLogInStrategy extends LogInStrategy { tokenRequest: UserApiTokenRequest; diff --git a/libs/common/src/models/api/sso-config.api.ts b/libs/common/src/auth/models/api/sso-config.api.ts similarity index 98% rename from libs/common/src/models/api/sso-config.api.ts rename to libs/common/src/auth/models/api/sso-config.api.ts index 3037a28b01..e681d2c27b 100644 --- a/libs/common/src/models/api/sso-config.api.ts +++ b/libs/common/src/auth/models/api/sso-config.api.ts @@ -1,11 +1,11 @@ +import { BaseResponse } from "../../../models/response/base.response"; import { OpenIdConnectRedirectBehavior, Saml2BindingType, Saml2NameIdFormat, Saml2SigningBehavior, SsoType, -} from "../../enums/ssoEnums"; -import { BaseResponse } from "../response/base.response"; +} from "../../enums/sso"; import { SsoConfigView } from "../view/sso-config.view"; export class SsoConfigApi extends BaseResponse { diff --git a/libs/common/src/models/domain/auth-result.ts b/libs/common/src/auth/models/domain/auth-result.ts similarity index 74% rename from libs/common/src/models/domain/auth-result.ts rename to libs/common/src/auth/models/domain/auth-result.ts index 0781f87214..3de10e0e39 100644 --- a/libs/common/src/models/domain/auth-result.ts +++ b/libs/common/src/auth/models/domain/auth-result.ts @@ -1,5 +1,5 @@ -import { TwoFactorProviderType } from "../../enums/twoFactorProviderType"; -import { Utils } from "../../misc/utils"; +import { Utils } from "../../../misc/utils"; +import { TwoFactorProviderType } from "../../enums/two-factor-provider-type"; export class AuthResult { captchaSiteKey = ""; diff --git a/libs/common/src/models/domain/environment-urls.ts b/libs/common/src/auth/models/domain/environment-urls.ts similarity index 100% rename from libs/common/src/models/domain/environment-urls.ts rename to libs/common/src/auth/models/domain/environment-urls.ts diff --git a/libs/common/src/models/domain/kdf-config.ts b/libs/common/src/auth/models/domain/kdf-config.ts similarity index 100% rename from libs/common/src/models/domain/kdf-config.ts rename to libs/common/src/auth/models/domain/kdf-config.ts diff --git a/libs/common/src/models/domain/log-in-credentials.ts b/libs/common/src/auth/models/domain/log-in-credentials.ts similarity index 87% rename from libs/common/src/models/domain/log-in-credentials.ts rename to libs/common/src/auth/models/domain/log-in-credentials.ts index 81323934bf..aabdaea02d 100644 --- a/libs/common/src/models/domain/log-in-credentials.ts +++ b/libs/common/src/auth/models/domain/log-in-credentials.ts @@ -1,8 +1,7 @@ -import { AuthenticationType } from "../../enums/authenticationType"; +import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key"; +import { AuthenticationType } from "../../enums/authentication-type"; import { TokenTwoFactorRequest } from "../request/identity-token/token-two-factor.request"; -import { SymmetricCryptoKey } from "./symmetric-crypto-key"; - export class PasswordLogInCredentials { readonly type = AuthenticationType.Password; diff --git a/libs/common/src/models/request/captcha-protected.request.ts b/libs/common/src/auth/models/request/captcha-protected.request.ts similarity index 100% rename from libs/common/src/models/request/captcha-protected.request.ts rename to libs/common/src/auth/models/request/captcha-protected.request.ts diff --git a/libs/common/src/models/request/device-verification.request.ts b/libs/common/src/auth/models/request/device-verification.request.ts similarity index 100% rename from libs/common/src/models/request/device-verification.request.ts rename to libs/common/src/auth/models/request/device-verification.request.ts diff --git a/libs/common/src/models/request/email-token.request.ts b/libs/common/src/auth/models/request/email-token.request.ts similarity index 100% rename from libs/common/src/models/request/email-token.request.ts rename to libs/common/src/auth/models/request/email-token.request.ts diff --git a/libs/common/src/models/request/email.request.ts b/libs/common/src/auth/models/request/email.request.ts similarity index 100% rename from libs/common/src/models/request/email.request.ts rename to libs/common/src/auth/models/request/email.request.ts diff --git a/libs/common/src/models/request/emergency-access-accept.request.ts b/libs/common/src/auth/models/request/emergency-access-accept.request.ts similarity index 100% rename from libs/common/src/models/request/emergency-access-accept.request.ts rename to libs/common/src/auth/models/request/emergency-access-accept.request.ts diff --git a/libs/common/src/models/request/emergency-access-confirm.request.ts b/libs/common/src/auth/models/request/emergency-access-confirm.request.ts similarity index 100% rename from libs/common/src/models/request/emergency-access-confirm.request.ts rename to libs/common/src/auth/models/request/emergency-access-confirm.request.ts diff --git a/libs/common/src/models/request/emergency-access-invite.request.ts b/libs/common/src/auth/models/request/emergency-access-invite.request.ts similarity index 61% rename from libs/common/src/models/request/emergency-access-invite.request.ts rename to libs/common/src/auth/models/request/emergency-access-invite.request.ts index d75ed4195c..c5f038bd2c 100644 --- a/libs/common/src/models/request/emergency-access-invite.request.ts +++ b/libs/common/src/auth/models/request/emergency-access-invite.request.ts @@ -1,4 +1,4 @@ -import { EmergencyAccessType } from "../../enums/emergencyAccessType"; +import { EmergencyAccessType } from "../../enums/emergency-access-type"; export class EmergencyAccessInviteRequest { email: string; diff --git a/libs/common/src/models/request/emergency-access-password.request.ts b/libs/common/src/auth/models/request/emergency-access-password.request.ts similarity index 100% rename from libs/common/src/models/request/emergency-access-password.request.ts rename to libs/common/src/auth/models/request/emergency-access-password.request.ts diff --git a/libs/common/src/models/request/emergency-access-update.request.ts b/libs/common/src/auth/models/request/emergency-access-update.request.ts similarity index 63% rename from libs/common/src/models/request/emergency-access-update.request.ts rename to libs/common/src/auth/models/request/emergency-access-update.request.ts index d7c55c94a1..37e7e975aa 100644 --- a/libs/common/src/models/request/emergency-access-update.request.ts +++ b/libs/common/src/auth/models/request/emergency-access-update.request.ts @@ -1,4 +1,4 @@ -import { EmergencyAccessType } from "../../enums/emergencyAccessType"; +import { EmergencyAccessType } from "../../enums/emergency-access-type"; export class EmergencyAccessUpdateRequest { type: EmergencyAccessType; diff --git a/libs/common/src/models/request/device.request.ts b/libs/common/src/auth/models/request/identity-token/device.request.ts similarity index 70% rename from libs/common/src/models/request/device.request.ts rename to libs/common/src/auth/models/request/identity-token/device.request.ts index 66c17b57dc..cabbb50585 100644 --- a/libs/common/src/models/request/device.request.ts +++ b/libs/common/src/auth/models/request/identity-token/device.request.ts @@ -1,5 +1,5 @@ -import { PlatformUtilsService } from "../../abstractions/platformUtils.service"; -import { DeviceType } from "../../enums/deviceType"; +import { PlatformUtilsService } from "../../../../abstractions/platformUtils.service"; +import { DeviceType } from "../../../../enums/deviceType"; export class DeviceRequest { type: DeviceType; diff --git a/libs/common/src/models/request/identity-token/password-token.request.ts b/libs/common/src/auth/models/request/identity-token/password-token.request.ts similarity index 85% rename from libs/common/src/models/request/identity-token/password-token.request.ts rename to libs/common/src/auth/models/request/identity-token/password-token.request.ts index 20485eb2bf..7fe6f0e0c3 100644 --- a/libs/common/src/models/request/identity-token/password-token.request.ts +++ b/libs/common/src/auth/models/request/identity-token/password-token.request.ts @@ -1,8 +1,8 @@ -import { ClientType } from "../../../enums/clientType"; -import { Utils } from "../../../misc/utils"; +import { ClientType } from "../../../../enums/clientType"; +import { Utils } from "../../../../misc/utils"; import { CaptchaProtectedRequest } from "../captcha-protected.request"; -import { DeviceRequest } from "../device.request"; +import { DeviceRequest } from "./device.request"; import { TokenTwoFactorRequest } from "./token-two-factor.request"; import { TokenRequest } from "./token.request"; diff --git a/libs/common/src/models/request/identity-token/sso-token.request.ts b/libs/common/src/auth/models/request/identity-token/sso-token.request.ts similarity index 92% rename from libs/common/src/models/request/identity-token/sso-token.request.ts rename to libs/common/src/auth/models/request/identity-token/sso-token.request.ts index 8074e04c3c..52ac7e28de 100644 --- a/libs/common/src/models/request/identity-token/sso-token.request.ts +++ b/libs/common/src/auth/models/request/identity-token/sso-token.request.ts @@ -1,5 +1,4 @@ -import { DeviceRequest } from "../device.request"; - +import { DeviceRequest } from "./device.request"; import { TokenTwoFactorRequest } from "./token-two-factor.request"; import { TokenRequest } from "./token.request"; diff --git a/libs/common/src/models/request/identity-token/token-two-factor.request.ts b/libs/common/src/auth/models/request/identity-token/token-two-factor.request.ts similarity index 69% rename from libs/common/src/models/request/identity-token/token-two-factor.request.ts rename to libs/common/src/auth/models/request/identity-token/token-two-factor.request.ts index 8a7ac2ccc2..fe55e42845 100644 --- a/libs/common/src/models/request/identity-token/token-two-factor.request.ts +++ b/libs/common/src/auth/models/request/identity-token/token-two-factor.request.ts @@ -1,4 +1,4 @@ -import { TwoFactorProviderType } from "../../../enums/twoFactorProviderType"; +import { TwoFactorProviderType } from "../../../enums/two-factor-provider-type"; export class TokenTwoFactorRequest { constructor( diff --git a/libs/common/src/models/request/identity-token/token.request.ts b/libs/common/src/auth/models/request/identity-token/token.request.ts similarity index 96% rename from libs/common/src/models/request/identity-token/token.request.ts rename to libs/common/src/auth/models/request/identity-token/token.request.ts index 32becd222a..f11aaf4727 100644 --- a/libs/common/src/models/request/identity-token/token.request.ts +++ b/libs/common/src/auth/models/request/identity-token/token.request.ts @@ -1,5 +1,4 @@ -import { DeviceRequest } from "../device.request"; - +import { DeviceRequest } from "./device.request"; import { TokenTwoFactorRequest } from "./token-two-factor.request"; export abstract class TokenRequest { diff --git a/libs/common/src/models/request/identity-token/user-api-token.request.ts b/libs/common/src/auth/models/request/identity-token/user-api-token.request.ts similarity index 92% rename from libs/common/src/models/request/identity-token/user-api-token.request.ts rename to libs/common/src/auth/models/request/identity-token/user-api-token.request.ts index 15a9bbfe68..fb3adced5a 100644 --- a/libs/common/src/models/request/identity-token/user-api-token.request.ts +++ b/libs/common/src/auth/models/request/identity-token/user-api-token.request.ts @@ -1,5 +1,4 @@ -import { DeviceRequest } from "../device.request"; - +import { DeviceRequest } from "./device.request"; import { TokenTwoFactorRequest } from "./token-two-factor.request"; import { TokenRequest } from "./token.request"; diff --git a/libs/common/src/models/request/key-connector-user-key.request.ts b/libs/common/src/auth/models/request/key-connector-user-key.request.ts similarity index 100% rename from libs/common/src/models/request/key-connector-user-key.request.ts rename to libs/common/src/auth/models/request/key-connector-user-key.request.ts diff --git a/libs/common/src/models/request/organization/organization-sso.request.ts b/libs/common/src/auth/models/request/organization-sso.request.ts similarity index 64% rename from libs/common/src/models/request/organization/organization-sso.request.ts rename to libs/common/src/auth/models/request/organization-sso.request.ts index 2da606cd94..68cbfd045a 100644 --- a/libs/common/src/models/request/organization/organization-sso.request.ts +++ b/libs/common/src/auth/models/request/organization-sso.request.ts @@ -1,4 +1,4 @@ -import { SsoConfigApi } from "../../api/sso-config.api"; +import { SsoConfigApi } from "../api/sso-config.api"; export class OrganizationSsoRequest { enabled = false; diff --git a/libs/common/src/models/request/password-hint.request.ts b/libs/common/src/auth/models/request/password-hint.request.ts similarity index 100% rename from libs/common/src/models/request/password-hint.request.ts rename to libs/common/src/auth/models/request/password-hint.request.ts diff --git a/libs/common/src/models/request/password.request.ts b/libs/common/src/auth/models/request/password.request.ts similarity index 100% rename from libs/common/src/models/request/password.request.ts rename to libs/common/src/auth/models/request/password.request.ts diff --git a/libs/common/src/models/request/passwordless-auth.request.ts b/libs/common/src/auth/models/request/passwordless-auth.request.ts similarity index 100% rename from libs/common/src/models/request/passwordless-auth.request.ts rename to libs/common/src/auth/models/request/passwordless-auth.request.ts diff --git a/libs/common/src/models/request/passwordless-create-auth.request.ts b/libs/common/src/auth/models/request/passwordless-create-auth.request.ts similarity index 80% rename from libs/common/src/models/request/passwordless-create-auth.request.ts rename to libs/common/src/auth/models/request/passwordless-create-auth.request.ts index df83c54777..cb85f823c2 100644 --- a/libs/common/src/models/request/passwordless-create-auth.request.ts +++ b/libs/common/src/auth/models/request/passwordless-create-auth.request.ts @@ -1,4 +1,4 @@ -import { AuthRequestType } from "../../enums/authRequestType"; +import { AuthRequestType } from "../../enums/auth-request-type"; export class PasswordlessCreateAuthRequest { constructor( diff --git a/libs/common/src/models/request/secret-verification.request.ts b/libs/common/src/auth/models/request/secret-verification.request.ts similarity index 100% rename from libs/common/src/models/request/secret-verification.request.ts rename to libs/common/src/auth/models/request/secret-verification.request.ts diff --git a/libs/common/src/models/request/account/set-key-connector-key.request.ts b/libs/common/src/auth/models/request/set-key-connector-key.request.ts similarity index 83% rename from libs/common/src/models/request/account/set-key-connector-key.request.ts rename to libs/common/src/auth/models/request/set-key-connector-key.request.ts index 264b4832ff..9d79e3c424 100644 --- a/libs/common/src/models/request/account/set-key-connector-key.request.ts +++ b/libs/common/src/auth/models/request/set-key-connector-key.request.ts @@ -1,6 +1,6 @@ import { KdfType } from "../../../enums/kdfType"; -import { KdfConfig } from "../../domain/kdf-config"; -import { KeysRequest } from "../keys.request"; +import { KeysRequest } from "../../../models/request/keys.request"; +import { KdfConfig } from "../domain/kdf-config"; export class SetKeyConnectorKeyRequest { key: string; diff --git a/libs/common/src/models/request/set-password.request.ts b/libs/common/src/auth/models/request/set-password.request.ts similarity index 87% rename from libs/common/src/models/request/set-password.request.ts rename to libs/common/src/auth/models/request/set-password.request.ts index 33bfdf198a..02f0f237ef 100644 --- a/libs/common/src/models/request/set-password.request.ts +++ b/libs/common/src/auth/models/request/set-password.request.ts @@ -1,6 +1,5 @@ -import { KdfType } from "../../enums/kdfType"; - -import { KeysRequest } from "./keys.request"; +import { KdfType } from "../../../enums/kdfType"; +import { KeysRequest } from "../../../models/request/keys.request"; export class SetPasswordRequest { masterPasswordHash: string; diff --git a/libs/common/src/models/request/two-factor-email.request.ts b/libs/common/src/auth/models/request/two-factor-email.request.ts similarity index 100% rename from libs/common/src/models/request/two-factor-email.request.ts rename to libs/common/src/auth/models/request/two-factor-email.request.ts diff --git a/libs/common/src/models/request/two-factor-provider.request.ts b/libs/common/src/auth/models/request/two-factor-provider.request.ts similarity index 70% rename from libs/common/src/models/request/two-factor-provider.request.ts rename to libs/common/src/auth/models/request/two-factor-provider.request.ts index 5d866b4658..8d9718c25c 100644 --- a/libs/common/src/models/request/two-factor-provider.request.ts +++ b/libs/common/src/auth/models/request/two-factor-provider.request.ts @@ -1,4 +1,4 @@ -import { TwoFactorProviderType } from "../../enums/twoFactorProviderType"; +import { TwoFactorProviderType } from "../../enums/two-factor-provider-type"; import { SecretVerificationRequest } from "./secret-verification.request"; diff --git a/libs/common/src/models/request/two-factor-recovery.request.ts b/libs/common/src/auth/models/request/two-factor-recovery.request.ts similarity index 100% rename from libs/common/src/models/request/two-factor-recovery.request.ts rename to libs/common/src/auth/models/request/two-factor-recovery.request.ts diff --git a/libs/common/src/models/request/update-profile.request.ts b/libs/common/src/auth/models/request/update-profile.request.ts similarity index 100% rename from libs/common/src/models/request/update-profile.request.ts rename to libs/common/src/auth/models/request/update-profile.request.ts diff --git a/libs/common/src/models/request/update-two-factor-authenticator.request.ts b/libs/common/src/auth/models/request/update-two-factor-authenticator.request.ts similarity index 100% rename from libs/common/src/models/request/update-two-factor-authenticator.request.ts rename to libs/common/src/auth/models/request/update-two-factor-authenticator.request.ts diff --git a/libs/common/src/models/request/update-two-factor-duo.request.ts b/libs/common/src/auth/models/request/update-two-factor-duo.request.ts similarity index 100% rename from libs/common/src/models/request/update-two-factor-duo.request.ts rename to libs/common/src/auth/models/request/update-two-factor-duo.request.ts diff --git a/libs/common/src/models/request/update-two-factor-email.request.ts b/libs/common/src/auth/models/request/update-two-factor-email.request.ts similarity index 100% rename from libs/common/src/models/request/update-two-factor-email.request.ts rename to libs/common/src/auth/models/request/update-two-factor-email.request.ts diff --git a/libs/common/src/models/request/update-two-factor-web-authn-delete.request.ts b/libs/common/src/auth/models/request/update-two-factor-web-authn-delete.request.ts similarity index 100% rename from libs/common/src/models/request/update-two-factor-web-authn-delete.request.ts rename to libs/common/src/auth/models/request/update-two-factor-web-authn-delete.request.ts diff --git a/libs/common/src/models/request/update-two-factor-web-authn.request.ts b/libs/common/src/auth/models/request/update-two-factor-web-authn.request.ts similarity index 100% rename from libs/common/src/models/request/update-two-factor-web-authn.request.ts rename to libs/common/src/auth/models/request/update-two-factor-web-authn.request.ts diff --git a/libs/common/src/models/request/update-two-factor-yubio-otp.request.ts b/libs/common/src/auth/models/request/update-two-factor-yubio-otp.request.ts similarity index 100% rename from libs/common/src/models/request/update-two-factor-yubio-otp.request.ts rename to libs/common/src/auth/models/request/update-two-factor-yubio-otp.request.ts diff --git a/libs/common/src/models/request/account/verify-otp.request.ts b/libs/common/src/auth/models/request/verify-otp.request.ts similarity index 100% rename from libs/common/src/models/request/account/verify-otp.request.ts rename to libs/common/src/auth/models/request/verify-otp.request.ts diff --git a/libs/common/src/models/response/api-key.response.ts b/libs/common/src/auth/models/response/api-key.response.ts similarity index 79% rename from libs/common/src/models/response/api-key.response.ts rename to libs/common/src/auth/models/response/api-key.response.ts index 21d9dc29c9..38996972d2 100644 --- a/libs/common/src/models/response/api-key.response.ts +++ b/libs/common/src/auth/models/response/api-key.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class ApiKeyResponse extends BaseResponse { apiKey: string; diff --git a/libs/common/src/models/response/auth-request.response.ts b/libs/common/src/auth/models/response/auth-request.response.ts similarity index 93% rename from libs/common/src/models/response/auth-request.response.ts rename to libs/common/src/auth/models/response/auth-request.response.ts index 5175cbf143..9571669405 100644 --- a/libs/common/src/models/response/auth-request.response.ts +++ b/libs/common/src/auth/models/response/auth-request.response.ts @@ -1,6 +1,5 @@ -import { DeviceType } from "../../enums/deviceType"; - -import { BaseResponse } from "./base.response"; +import { DeviceType } from "../../../enums/deviceType"; +import { BaseResponse } from "../../../models/response/base.response"; const RequestTimeOut = 60000 * 15; //15 Minutes diff --git a/libs/common/src/models/response/authentication/captcha-protected.response.ts b/libs/common/src/auth/models/response/captcha-protected.response.ts similarity index 100% rename from libs/common/src/models/response/authentication/captcha-protected.response.ts rename to libs/common/src/auth/models/response/captcha-protected.response.ts diff --git a/libs/common/src/models/response/device-verification.response.ts b/libs/common/src/auth/models/response/device-verification.response.ts similarity index 86% rename from libs/common/src/models/response/device-verification.response.ts rename to libs/common/src/auth/models/response/device-verification.response.ts index f5ce248d42..d4e2d7220b 100644 --- a/libs/common/src/models/response/device-verification.response.ts +++ b/libs/common/src/auth/models/response/device-verification.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class DeviceVerificationResponse extends BaseResponse { isDeviceVerificationSectionEnabled: boolean; diff --git a/libs/common/src/models/response/device.response.ts b/libs/common/src/auth/models/response/device.response.ts similarity index 79% rename from libs/common/src/models/response/device.response.ts rename to libs/common/src/auth/models/response/device.response.ts index 5ac624c72f..f1be55f0ce 100644 --- a/libs/common/src/models/response/device.response.ts +++ b/libs/common/src/auth/models/response/device.response.ts @@ -1,6 +1,5 @@ -import { DeviceType } from "../../enums/deviceType"; - -import { BaseResponse } from "./base.response"; +import { DeviceType } from "../../../enums/deviceType"; +import { BaseResponse } from "../../../models/response/base.response"; export class DeviceResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/emergency-access.response.ts b/libs/common/src/auth/models/response/emergency-access.response.ts similarity index 90% rename from libs/common/src/models/response/emergency-access.response.ts rename to libs/common/src/auth/models/response/emergency-access.response.ts index 9051c878c8..7c41bceb1e 100644 --- a/libs/common/src/models/response/emergency-access.response.ts +++ b/libs/common/src/auth/models/response/emergency-access.response.ts @@ -1,9 +1,8 @@ -import { EmergencyAccessStatusType } from "../../enums/emergencyAccessStatusType"; -import { EmergencyAccessType } from "../../enums/emergencyAccessType"; -import { KdfType } from "../../enums/kdfType"; -import { CipherResponse } from "../../vault/models/response/cipher.response"; - -import { BaseResponse } from "./base.response"; +import { KdfType } from "../../../enums/kdfType"; +import { BaseResponse } from "../../../models/response/base.response"; +import { CipherResponse } from "../../../vault/models/response/cipher.response"; +import { EmergencyAccessStatusType } from "../../enums/emergency-access-status-type"; +import { EmergencyAccessType } from "../../enums/emergency-access-type"; export class EmergencyAccessGranteeDetailsResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/identity-captcha.response.ts b/libs/common/src/auth/models/response/identity-captcha.response.ts similarity index 74% rename from libs/common/src/models/response/identity-captcha.response.ts rename to libs/common/src/auth/models/response/identity-captcha.response.ts index c6cc045407..f5ec727d90 100644 --- a/libs/common/src/models/response/identity-captcha.response.ts +++ b/libs/common/src/auth/models/response/identity-captcha.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class IdentityCaptchaResponse extends BaseResponse { siteKey: string; diff --git a/libs/common/src/models/response/identity-token.response.ts b/libs/common/src/auth/models/response/identity-token.response.ts similarity index 92% rename from libs/common/src/models/response/identity-token.response.ts rename to libs/common/src/auth/models/response/identity-token.response.ts index 3e23e026dc..bac5a447da 100644 --- a/libs/common/src/models/response/identity-token.response.ts +++ b/libs/common/src/auth/models/response/identity-token.response.ts @@ -1,6 +1,5 @@ -import { KdfType } from "../../enums/kdfType"; - -import { BaseResponse } from "./base.response"; +import { KdfType } from "../../../enums/kdfType"; +import { BaseResponse } from "../../../models/response/base.response"; export class IdentityTokenResponse extends BaseResponse { accessToken: string; diff --git a/libs/common/src/models/response/identity-two-factor.response.ts b/libs/common/src/auth/models/response/identity-two-factor.response.ts similarity index 84% rename from libs/common/src/models/response/identity-two-factor.response.ts rename to libs/common/src/auth/models/response/identity-two-factor.response.ts index 8009b4cd01..a6c286e5be 100644 --- a/libs/common/src/models/response/identity-two-factor.response.ts +++ b/libs/common/src/auth/models/response/identity-two-factor.response.ts @@ -1,6 +1,5 @@ -import { TwoFactorProviderType } from "../../enums/twoFactorProviderType"; - -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; +import { TwoFactorProviderType } from "../../enums/two-factor-provider-type"; export class IdentityTwoFactorResponse extends BaseResponse { twoFactorProviders: TwoFactorProviderType[]; diff --git a/libs/common/src/models/response/key-connector-user-key.response.ts b/libs/common/src/auth/models/response/key-connector-user-key.response.ts similarity index 72% rename from libs/common/src/models/response/key-connector-user-key.response.ts rename to libs/common/src/auth/models/response/key-connector-user-key.response.ts index 70a4cd7556..873f68a006 100644 --- a/libs/common/src/models/response/key-connector-user-key.response.ts +++ b/libs/common/src/auth/models/response/key-connector-user-key.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class KeyConnectorUserKeyResponse extends BaseResponse { key: string; diff --git a/libs/common/src/models/response/organization/organization-sso.response.ts b/libs/common/src/auth/models/response/organization-sso.response.ts similarity index 89% rename from libs/common/src/models/response/organization/organization-sso.response.ts rename to libs/common/src/auth/models/response/organization-sso.response.ts index f6c3a9f283..01a45790d9 100644 --- a/libs/common/src/models/response/organization/organization-sso.response.ts +++ b/libs/common/src/auth/models/response/organization-sso.response.ts @@ -1,5 +1,5 @@ -import { SsoConfigApi } from "../../api/sso-config.api"; -import { BaseResponse } from "../base.response"; +import { BaseResponse } from "../../../models/response/base.response"; +import { SsoConfigApi } from "../api/sso-config.api"; export class OrganizationSsoResponse extends BaseResponse { enabled: boolean; diff --git a/libs/common/src/models/response/prelogin.response.ts b/libs/common/src/auth/models/response/prelogin.response.ts similarity index 78% rename from libs/common/src/models/response/prelogin.response.ts rename to libs/common/src/auth/models/response/prelogin.response.ts index d790d625a2..3a21ad64ec 100644 --- a/libs/common/src/models/response/prelogin.response.ts +++ b/libs/common/src/auth/models/response/prelogin.response.ts @@ -1,6 +1,5 @@ -import { KdfType } from "../../enums/kdfType"; - -import { BaseResponse } from "./base.response"; +import { KdfType } from "../../../enums/kdfType"; +import { BaseResponse } from "../../../models/response/base.response"; export class PreloginResponse extends BaseResponse { kdf: KdfType; diff --git a/libs/common/src/models/response/authentication/register.response.ts b/libs/common/src/auth/models/response/register.response.ts similarity index 82% rename from libs/common/src/models/response/authentication/register.response.ts rename to libs/common/src/auth/models/response/register.response.ts index 1e52fd42c2..65f6ba6272 100644 --- a/libs/common/src/models/response/authentication/register.response.ts +++ b/libs/common/src/auth/models/response/register.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "../base.response"; +import { BaseResponse } from "../../../models/response/base.response"; import { ICaptchaProtectedResponse } from "./captcha-protected.response"; diff --git a/libs/common/src/models/response/sso-pre-validate.response.ts b/libs/common/src/auth/models/response/sso-pre-validate.response.ts similarity index 72% rename from libs/common/src/models/response/sso-pre-validate.response.ts rename to libs/common/src/auth/models/response/sso-pre-validate.response.ts index a38e99a1b1..c38eff1410 100644 --- a/libs/common/src/models/response/sso-pre-validate.response.ts +++ b/libs/common/src/auth/models/response/sso-pre-validate.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class SsoPreValidateResponse extends BaseResponse { token: string; diff --git a/libs/common/src/models/response/two-factor-authenticator.response.ts b/libs/common/src/auth/models/response/two-factor-authenticator.response.ts similarity index 78% rename from libs/common/src/models/response/two-factor-authenticator.response.ts rename to libs/common/src/auth/models/response/two-factor-authenticator.response.ts index e3ffcd81e8..05a5517eb7 100644 --- a/libs/common/src/models/response/two-factor-authenticator.response.ts +++ b/libs/common/src/auth/models/response/two-factor-authenticator.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class TwoFactorAuthenticatorResponse extends BaseResponse { enabled: boolean; diff --git a/libs/common/src/models/response/two-factor-duo.response.ts b/libs/common/src/auth/models/response/two-factor-duo.response.ts similarity index 85% rename from libs/common/src/models/response/two-factor-duo.response.ts rename to libs/common/src/auth/models/response/two-factor-duo.response.ts index cdf2966240..b91c9f0fb6 100644 --- a/libs/common/src/models/response/two-factor-duo.response.ts +++ b/libs/common/src/auth/models/response/two-factor-duo.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class TwoFactorDuoResponse extends BaseResponse { enabled: boolean; diff --git a/libs/common/src/models/response/two-factor-email.response.ts b/libs/common/src/auth/models/response/two-factor-email.response.ts similarity index 78% rename from libs/common/src/models/response/two-factor-email.response.ts rename to libs/common/src/auth/models/response/two-factor-email.response.ts index 365a8cfc03..a0c81745fe 100644 --- a/libs/common/src/models/response/two-factor-email.response.ts +++ b/libs/common/src/auth/models/response/two-factor-email.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class TwoFactorEmailResponse extends BaseResponse { enabled: boolean; diff --git a/libs/common/src/models/response/two-factor-provider.response.ts b/libs/common/src/auth/models/response/two-factor-provider.response.ts similarity index 65% rename from libs/common/src/models/response/two-factor-provider.response.ts rename to libs/common/src/auth/models/response/two-factor-provider.response.ts index b735a4fbf3..111357ee79 100644 --- a/libs/common/src/models/response/two-factor-provider.response.ts +++ b/libs/common/src/auth/models/response/two-factor-provider.response.ts @@ -1,6 +1,5 @@ -import { TwoFactorProviderType } from "../../enums/twoFactorProviderType"; - -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; +import { TwoFactorProviderType } from "../../enums/two-factor-provider-type"; export class TwoFactorProviderResponse extends BaseResponse { enabled: boolean; diff --git a/libs/common/src/models/response/two-factor-recover.response.ts b/libs/common/src/auth/models/response/two-factor-recover.response.ts similarity index 72% rename from libs/common/src/models/response/two-factor-recover.response.ts rename to libs/common/src/auth/models/response/two-factor-recover.response.ts index df2249d067..0597dc2543 100644 --- a/libs/common/src/models/response/two-factor-recover.response.ts +++ b/libs/common/src/auth/models/response/two-factor-recover.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class TwoFactorRecoverResponse extends BaseResponse { code: string; diff --git a/libs/common/src/models/response/two-factor-web-authn.response.ts b/libs/common/src/auth/models/response/two-factor-web-authn.response.ts similarity index 94% rename from libs/common/src/models/response/two-factor-web-authn.response.ts rename to libs/common/src/auth/models/response/two-factor-web-authn.response.ts index 61c5a56245..4a311095d7 100644 --- a/libs/common/src/models/response/two-factor-web-authn.response.ts +++ b/libs/common/src/auth/models/response/two-factor-web-authn.response.ts @@ -1,6 +1,5 @@ -import { Utils } from "../../misc/utils"; - -import { BaseResponse } from "./base.response"; +import { Utils } from "../../../misc/utils"; +import { BaseResponse } from "../../../models/response/base.response"; export class TwoFactorWebAuthnResponse extends BaseResponse { enabled: boolean; diff --git a/libs/common/src/models/response/two-factor-yubi-key.response.ts b/libs/common/src/auth/models/response/two-factor-yubi-key.response.ts similarity index 89% rename from libs/common/src/models/response/two-factor-yubi-key.response.ts rename to libs/common/src/auth/models/response/two-factor-yubi-key.response.ts index a7bcf12b87..cfdf41cce7 100644 --- a/libs/common/src/models/response/two-factor-yubi-key.response.ts +++ b/libs/common/src/auth/models/response/two-factor-yubi-key.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class TwoFactorYubiKeyResponse extends BaseResponse { enabled: boolean; diff --git a/libs/common/src/models/view/sso-config.view.ts b/libs/common/src/auth/models/view/sso-config.view.ts similarity index 97% rename from libs/common/src/models/view/sso-config.view.ts rename to libs/common/src/auth/models/view/sso-config.view.ts index 68155aeb69..e618dfbd2c 100644 --- a/libs/common/src/models/view/sso-config.view.ts +++ b/libs/common/src/auth/models/view/sso-config.view.ts @@ -1,14 +1,13 @@ +import { View } from "../../../models/view/view"; import { OpenIdConnectRedirectBehavior, Saml2BindingType, Saml2NameIdFormat, Saml2SigningBehavior, SsoType, -} from "../../enums/ssoEnums"; +} from "../../enums/sso"; import { SsoConfigApi } from "../api/sso-config.api"; -import { View } from "./view"; - export class SsoConfigView extends View { configType: SsoType; diff --git a/libs/common/src/services/account/account-api.service.ts b/libs/common/src/auth/services/account-api.service.ts similarity index 85% rename from libs/common/src/services/account/account-api.service.ts rename to libs/common/src/auth/services/account-api.service.ts index fe094a9891..4d96f6506f 100644 --- a/libs/common/src/services/account/account-api.service.ts +++ b/libs/common/src/auth/services/account-api.service.ts @@ -1,9 +1,9 @@ -import { AccountApiService } from "../../abstractions/account/account-api.service"; -import { InternalAccountService } from "../../abstractions/account/account.service"; import { ApiService } from "../../abstractions/api.service"; import { LogService } from "../../abstractions/log.service"; import { UserVerificationService } from "../../abstractions/userVerification/userVerification.service.abstraction"; import { Verification } from "../../types/verification"; +import { AccountApiService } from "../abstractions/account-api.service"; +import { InternalAccountService } from "../abstractions/account.service"; export class AccountApiServiceImplementation implements AccountApiService { constructor( diff --git a/libs/common/src/services/account/account.service.ts b/libs/common/src/auth/services/account.service.ts similarity index 84% rename from libs/common/src/services/account/account.service.ts rename to libs/common/src/auth/services/account.service.ts index dc11330973..8d6cd310c0 100644 --- a/libs/common/src/services/account/account.service.ts +++ b/libs/common/src/auth/services/account.service.ts @@ -1,6 +1,6 @@ -import { InternalAccountService } from "../../abstractions/account/account.service"; import { LogService } from "../../abstractions/log.service"; import { MessagingService } from "../../abstractions/messaging.service"; +import { InternalAccountService } from "../../auth/abstractions/account.service"; export class AccountServiceImplementation implements InternalAccountService { constructor(private messagingService: MessagingService, private logService: LogService) {} diff --git a/libs/common/src/services/auth.service.ts b/libs/common/src/auth/services/auth.service.ts similarity index 84% rename from libs/common/src/services/auth.service.ts rename to libs/common/src/auth/services/auth.service.ts index 29cc10698d..59c300f0a4 100644 --- a/libs/common/src/services/auth.service.ts +++ b/libs/common/src/auth/services/auth.service.ts @@ -1,28 +1,32 @@ import { Observable, Subject } from "rxjs"; -import { ApiService } from "../abstractions/api.service"; -import { AppIdService } from "../abstractions/appId.service"; +import { ApiService } from "../../abstractions/api.service"; +import { AppIdService } from "../../abstractions/appId.service"; +import { CryptoService } from "../../abstractions/crypto.service"; +import { EncryptService } from "../../abstractions/encrypt.service"; +import { EnvironmentService } from "../../abstractions/environment.service"; +import { I18nService } from "../../abstractions/i18n.service"; +import { LogService } from "../../abstractions/log.service"; +import { MessagingService } from "../../abstractions/messaging.service"; +import { PlatformUtilsService } from "../../abstractions/platformUtils.service"; +import { StateService } from "../../abstractions/state.service"; +import { KdfType } from "../../enums/kdfType"; +import { KeySuffixOptions } from "../../enums/keySuffixOptions"; +import { Utils } from "../../misc/utils"; +import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key"; +import { PreloginRequest } from "../../models/request/prelogin.request"; +import { ErrorResponse } from "../../models/response/error.response"; +import { AuthRequestPushNotification } from "../../models/response/notification.response"; import { AuthService as AuthServiceAbstraction } from "../abstractions/auth.service"; -import { CryptoService } from "../abstractions/crypto.service"; -import { EncryptService } from "../abstractions/encrypt.service"; -import { EnvironmentService } from "../abstractions/environment.service"; -import { I18nService } from "../abstractions/i18n.service"; -import { KeyConnectorService } from "../abstractions/keyConnector.service"; -import { LogService } from "../abstractions/log.service"; -import { MessagingService } from "../abstractions/messaging.service"; -import { PlatformUtilsService } from "../abstractions/platformUtils.service"; -import { StateService } from "../abstractions/state.service"; +import { KeyConnectorService } from "../abstractions/key-connector.service"; import { TokenService } from "../abstractions/token.service"; -import { TwoFactorService } from "../abstractions/twoFactor.service"; -import { AuthenticationStatus } from "../enums/authenticationStatus"; -import { AuthenticationType } from "../enums/authenticationType"; -import { KdfType } from "../enums/kdfType"; -import { KeySuffixOptions } from "../enums/keySuffixOptions"; -import { PasswordLogInStrategy } from "../misc/logInStrategies/passwordLogin.strategy"; -import { PasswordlessLogInStrategy } from "../misc/logInStrategies/passwordlessLogin.strategy"; -import { SsoLogInStrategy } from "../misc/logInStrategies/ssoLogin.strategy"; -import { UserApiLogInStrategy } from "../misc/logInStrategies/user-api-login.strategy"; -import { Utils } from "../misc/utils"; +import { TwoFactorService } from "../abstractions/two-factor.service"; +import { AuthenticationStatus } from "../enums/authentication-status"; +import { AuthenticationType } from "../enums/authentication-type"; +import { PasswordLogInStrategy } from "../login-strategies/password-login.strategy"; +import { PasswordlessLogInStrategy } from "../login-strategies/passwordless-login.strategy"; +import { SsoLogInStrategy } from "../login-strategies/sso-login.strategy"; +import { UserApiLogInStrategy } from "../login-strategies/user-api-login.strategy"; import { AuthResult } from "../models/domain/auth-result"; import { KdfConfig } from "../models/domain/kdf-config"; import { @@ -31,13 +35,9 @@ import { SsoLogInCredentials, PasswordlessLogInCredentials, } from "../models/domain/log-in-credentials"; -import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; import { TokenTwoFactorRequest } from "../models/request/identity-token/token-two-factor.request"; import { PasswordlessAuthRequest } from "../models/request/passwordless-auth.request"; -import { PreloginRequest } from "../models/request/prelogin.request"; import { AuthRequestResponse } from "../models/response/auth-request.response"; -import { ErrorResponse } from "../models/response/error.response"; -import { AuthRequestPushNotification } from "../models/response/notification.response"; const sessionTimeoutLength = 2 * 60 * 1000; // 2 minutes diff --git a/libs/common/src/services/keyConnector.service.ts b/libs/common/src/auth/services/key-connector.service.ts similarity index 84% rename from libs/common/src/services/keyConnector.service.ts rename to libs/common/src/auth/services/key-connector.service.ts index 4f7c1eb8ba..a667ed9b3e 100644 --- a/libs/common/src/services/keyConnector.service.ts +++ b/libs/common/src/auth/services/key-connector.service.ts @@ -1,18 +1,18 @@ -import { ApiService } from "../abstractions/api.service"; -import { CryptoService } from "../abstractions/crypto.service"; -import { CryptoFunctionService } from "../abstractions/cryptoFunction.service"; -import { KeyConnectorService as KeyConnectorServiceAbstraction } from "../abstractions/keyConnector.service"; -import { LogService } from "../abstractions/log.service"; -import { OrganizationService } from "../abstractions/organization/organization.service.abstraction"; -import { StateService } from "../abstractions/state.service"; +import { ApiService } from "../../abstractions/api.service"; +import { CryptoService } from "../../abstractions/crypto.service"; +import { CryptoFunctionService } from "../../abstractions/cryptoFunction.service"; +import { LogService } from "../../abstractions/log.service"; +import { OrganizationService } from "../../abstractions/organization/organization.service.abstraction"; +import { StateService } from "../../abstractions/state.service"; +import { OrganizationUserType } from "../../enums/organizationUserType"; +import { Utils } from "../../misc/utils"; +import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key"; +import { KeysRequest } from "../../models/request/keys.request"; +import { KeyConnectorService as KeyConnectorServiceAbstraction } from "../abstractions/key-connector.service"; import { TokenService } from "../abstractions/token.service"; -import { OrganizationUserType } from "../enums/organizationUserType"; -import { Utils } from "../misc/utils"; import { KdfConfig } from "../models/domain/kdf-config"; -import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; -import { SetKeyConnectorKeyRequest } from "../models/request/account/set-key-connector-key.request"; import { KeyConnectorUserKeyRequest } from "../models/request/key-connector-user-key.request"; -import { KeysRequest } from "../models/request/keys.request"; +import { SetKeyConnectorKeyRequest } from "../models/request/set-key-connector-key.request"; import { IdentityTokenResponse } from "../models/response/identity-token.response"; export class KeyConnectorService implements KeyConnectorServiceAbstraction { diff --git a/libs/common/src/services/login.service.ts b/libs/common/src/auth/services/login.service.ts similarity index 91% rename from libs/common/src/services/login.service.ts rename to libs/common/src/auth/services/login.service.ts index e40121aa55..d1ab63c566 100644 --- a/libs/common/src/services/login.service.ts +++ b/libs/common/src/auth/services/login.service.ts @@ -1,5 +1,5 @@ +import { StateService } from "../../abstractions/state.service"; import { LoginService as LoginServiceAbstraction } from "../abstractions/login.service"; -import { StateService } from "../abstractions/state.service"; export class LoginService implements LoginServiceAbstraction { private _email: string; diff --git a/libs/common/src/services/token.service.ts b/libs/common/src/auth/services/token.service.ts similarity index 97% rename from libs/common/src/services/token.service.ts rename to libs/common/src/auth/services/token.service.ts index c7eaff6421..fec1427257 100644 --- a/libs/common/src/services/token.service.ts +++ b/libs/common/src/auth/services/token.service.ts @@ -1,6 +1,6 @@ -import { StateService } from "../abstractions/state.service"; +import { StateService } from "../../abstractions/state.service"; +import { Utils } from "../../misc/utils"; import { TokenService as TokenServiceAbstraction } from "../abstractions/token.service"; -import { Utils } from "../misc/utils"; import { IdentityTokenResponse } from "../models/response/identity-token.response"; export class TokenService implements TokenServiceAbstraction { diff --git a/libs/common/src/services/twoFactor.service.ts b/libs/common/src/auth/services/two-factor.service.ts similarity index 95% rename from libs/common/src/services/twoFactor.service.ts rename to libs/common/src/auth/services/two-factor.service.ts index edcc1cecf1..542d190c04 100644 --- a/libs/common/src/services/twoFactor.service.ts +++ b/libs/common/src/auth/services/two-factor.service.ts @@ -1,10 +1,10 @@ -import { I18nService } from "../abstractions/i18n.service"; -import { PlatformUtilsService } from "../abstractions/platformUtils.service"; +import { I18nService } from "../../abstractions/i18n.service"; +import { PlatformUtilsService } from "../../abstractions/platformUtils.service"; import { TwoFactorProviderDetails, TwoFactorService as TwoFactorServiceAbstraction, -} from "../abstractions/twoFactor.service"; -import { TwoFactorProviderType } from "../enums/twoFactorProviderType"; +} from "../abstractions/two-factor.service"; +import { TwoFactorProviderType } from "../enums/two-factor-provider-type"; import { IdentityTwoFactorResponse } from "../models/response/identity-two-factor.response"; export const TwoFactorProviders: Partial> = diff --git a/libs/common/src/services/userVerification/userVerification-api.service.ts b/libs/common/src/auth/services/user-verification/user-verification-api.service.ts similarity index 61% rename from libs/common/src/services/userVerification/userVerification-api.service.ts rename to libs/common/src/auth/services/user-verification/user-verification-api.service.ts index 7bc9a43ae8..1e0d9b2c57 100644 --- a/libs/common/src/services/userVerification/userVerification-api.service.ts +++ b/libs/common/src/auth/services/user-verification/user-verification-api.service.ts @@ -1,6 +1,6 @@ -import { ApiService } from "../../abstractions/api.service"; -import { UserVerificationApiServiceAbstraction } from "../../abstractions/userVerification/userVerification-api.service.abstraction"; -import { VerifyOTPRequest } from "../../models/request/account/verify-otp.request"; +import { ApiService } from "../../../abstractions/api.service"; +import { UserVerificationApiServiceAbstraction } from "../../../abstractions/userVerification/userVerification-api.service.abstraction"; +import { VerifyOTPRequest } from "../../models/request/verify-otp.request"; export class UserVerificationApiService implements UserVerificationApiServiceAbstraction { constructor(private apiService: ApiService) {} diff --git a/libs/common/src/services/userVerification/userVerification.service.ts b/libs/common/src/auth/services/user-verification/user-verification.service.ts similarity index 83% rename from libs/common/src/services/userVerification/userVerification.service.ts rename to libs/common/src/auth/services/user-verification/user-verification.service.ts index e94e3eb80a..244db1da92 100644 --- a/libs/common/src/services/userVerification/userVerification.service.ts +++ b/libs/common/src/auth/services/user-verification/user-verification.service.ts @@ -1,11 +1,11 @@ -import { CryptoService } from "../../abstractions/crypto.service"; -import { I18nService } from "../../abstractions/i18n.service"; -import { UserVerificationApiServiceAbstraction } from "../../abstractions/userVerification/userVerification-api.service.abstraction"; -import { UserVerificationService as UserVerificationServiceAbstraction } from "../../abstractions/userVerification/userVerification.service.abstraction"; -import { VerificationType } from "../../enums/verificationType"; -import { VerifyOTPRequest } from "../../models/request/account/verify-otp.request"; +import { CryptoService } from "../../../abstractions/crypto.service"; +import { I18nService } from "../../../abstractions/i18n.service"; +import { UserVerificationApiServiceAbstraction } from "../../../abstractions/userVerification/userVerification-api.service.abstraction"; +import { UserVerificationService as UserVerificationServiceAbstraction } from "../../../abstractions/userVerification/userVerification.service.abstraction"; +import { Verification } from "../../../types/verification"; +import { VerificationType } from "../../enums/verification-type"; import { SecretVerificationRequest } from "../../models/request/secret-verification.request"; -import { Verification } from "../../types/verification"; +import { VerifyOTPRequest } from "../../models/request/verify-otp.request"; /** * Used for general-purpose user verification throughout the app. diff --git a/libs/common/src/types/authResponse.ts b/libs/common/src/auth/types/auth-response.ts similarity index 60% rename from libs/common/src/types/authResponse.ts rename to libs/common/src/auth/types/auth-response.ts index a6e7f1cb66..b5fad923de 100644 --- a/libs/common/src/types/authResponse.ts +++ b/libs/common/src/auth/types/auth-response.ts @@ -1,6 +1,6 @@ -import { VerificationType } from "../enums/verificationType"; +import { VerificationType } from "../enums/verification-type"; -import { TwoFactorResponse } from "./twoFactorResponse"; +import { TwoFactorResponse } from "./two-factor-response"; export type AuthResponseBase = { secret: string; diff --git a/libs/common/src/types/twoFactorResponse.ts b/libs/common/src/auth/types/two-factor-response.ts similarity index 100% rename from libs/common/src/types/twoFactorResponse.ts rename to libs/common/src/auth/types/two-factor-response.ts diff --git a/libs/common/src/misc/webauthn_iframe.ts b/libs/common/src/auth/webauthn-iframe.ts similarity index 100% rename from libs/common/src/misc/webauthn_iframe.ts rename to libs/common/src/auth/webauthn-iframe.ts diff --git a/libs/common/src/enums/kdfType.ts b/libs/common/src/enums/kdfType.ts index c4230ca7dd..eb8702437c 100644 --- a/libs/common/src/enums/kdfType.ts +++ b/libs/common/src/enums/kdfType.ts @@ -1,4 +1,4 @@ -import { KdfConfig } from "../models/domain/kdf-config"; +import { KdfConfig } from "../auth/models/domain/kdf-config"; export enum KdfType { PBKDF2_SHA256 = 0, diff --git a/libs/common/src/importers/bitwarden-password-protected-importer.ts b/libs/common/src/importers/bitwarden-password-protected-importer.ts index 10eeb4b9fe..1ab8894145 100644 --- a/libs/common/src/importers/bitwarden-password-protected-importer.ts +++ b/libs/common/src/importers/bitwarden-password-protected-importer.ts @@ -1,9 +1,9 @@ import { CryptoService } from "../abstractions/crypto.service"; import { I18nService } from "../abstractions/i18n.service"; +import { KdfConfig } from "../auth/models/domain/kdf-config"; import { KdfType } from "../enums/kdfType"; import { EncString } from "../models/domain/enc-string"; import { ImportResult } from "../models/domain/import-result"; -import { KdfConfig } from "../models/domain/kdf-config"; import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; import { BitwardenJsonImporter } from "./bitwarden-json-importer"; diff --git a/libs/common/src/models/domain/account.ts b/libs/common/src/models/domain/account.ts index c2f240d75e..821800e701 100644 --- a/libs/common/src/models/domain/account.ts +++ b/libs/common/src/models/domain/account.ts @@ -1,6 +1,7 @@ import { Jsonify } from "type-fest"; -import { AuthenticationStatus } from "../../enums/authenticationStatus"; +import { AuthenticationStatus } from "../../auth/enums/authentication-status"; +import { EnvironmentUrls } from "../../auth/models/domain/environment-urls"; import { KdfType } from "../../enums/kdfType"; import { UriMatchType } from "../../enums/uriMatchType"; import { Utils } from "../../misc/utils"; @@ -20,7 +21,6 @@ import { CollectionView } from "../view/collection.view"; import { SendView } from "../view/send.view"; import { EncString } from "./enc-string"; -import { EnvironmentUrls } from "./environment-urls"; import { GeneratedPasswordHistory } from "./generated-password-history"; import { Policy } from "./policy"; import { SymmetricCryptoKey } from "./symmetric-crypto-key"; diff --git a/libs/common/src/models/domain/global-state.ts b/libs/common/src/models/domain/global-state.ts index 5af13fecc8..b1c431abb7 100644 --- a/libs/common/src/models/domain/global-state.ts +++ b/libs/common/src/models/domain/global-state.ts @@ -1,7 +1,7 @@ +import { EnvironmentUrls } from "../../auth/models/domain/environment-urls"; import { StateVersion } from "../../enums/stateVersion"; import { ThemeType } from "../../enums/themeType"; -import { EnvironmentUrls } from "./environment-urls"; import { WindowState } from "./window-state"; export class GlobalState { diff --git a/libs/common/src/models/request/kdf.request.ts b/libs/common/src/models/request/kdf.request.ts index d71bb2cdcb..18e117d88a 100644 --- a/libs/common/src/models/request/kdf.request.ts +++ b/libs/common/src/models/request/kdf.request.ts @@ -1,7 +1,6 @@ +import { PasswordRequest } from "../../auth/models/request/password.request"; import { KdfType } from "../../enums/kdfType"; -import { PasswordRequest } from "./password.request"; - export class KdfRequest extends PasswordRequest { kdf: KdfType; kdfIterations: number; diff --git a/libs/common/src/models/request/organization-api-key.request.ts b/libs/common/src/models/request/organization-api-key.request.ts index d40ac004cb..77d695c523 100644 --- a/libs/common/src/models/request/organization-api-key.request.ts +++ b/libs/common/src/models/request/organization-api-key.request.ts @@ -1,6 +1,5 @@ -import { OrganizationApiKeyType } from "../../enums/organizationApiKeyType"; - -import { SecretVerificationRequest } from "./secret-verification.request"; +import { OrganizationApiKeyType } from "../../auth/enums/organization-api-key-type"; +import { SecretVerificationRequest } from "../../auth/models/request/secret-verification.request"; export class OrganizationApiKeyRequest extends SecretVerificationRequest { type: OrganizationApiKeyType = OrganizationApiKeyType.Default; diff --git a/libs/common/src/models/request/register.request.ts b/libs/common/src/models/request/register.request.ts index 34002b907d..f1419d2d59 100644 --- a/libs/common/src/models/request/register.request.ts +++ b/libs/common/src/models/request/register.request.ts @@ -1,6 +1,6 @@ +import { CaptchaProtectedRequest } from "../../auth/models/request/captcha-protected.request"; import { KdfType } from "../../enums/kdfType"; -import { CaptchaProtectedRequest } from "./captcha-protected.request"; import { KeysRequest } from "./keys.request"; import { ReferenceEventRequest } from "./reference-event.request"; diff --git a/libs/common/src/models/response/organization-api-key-information.response.ts b/libs/common/src/models/response/organization-api-key-information.response.ts index b551586e2b..0c956777bc 100644 --- a/libs/common/src/models/response/organization-api-key-information.response.ts +++ b/libs/common/src/models/response/organization-api-key-information.response.ts @@ -1,4 +1,4 @@ -import { OrganizationApiKeyType } from "../../enums/organizationApiKeyType"; +import { OrganizationApiKeyType } from "../../auth/enums/organization-api-key-type"; import { BaseResponse } from "./base.response"; diff --git a/libs/common/src/services/anonymousHub.service.ts b/libs/common/src/services/anonymousHub.service.ts index 413f100b42..3346ec1419 100644 --- a/libs/common/src/services/anonymousHub.service.ts +++ b/libs/common/src/services/anonymousHub.service.ts @@ -8,9 +8,9 @@ import { import { MessagePackHubProtocol } from "@microsoft/signalr-protocol-msgpack"; import { AnonymousHubService as AnonymousHubServiceAbstraction } from "../abstractions/anonymousHub.service"; -import { AuthService } from "../abstractions/auth.service"; import { EnvironmentService } from "../abstractions/environment.service"; import { LogService } from "../abstractions/log.service"; +import { AuthService } from "../auth/abstractions/auth.service"; import { AuthRequestPushNotification, diff --git a/libs/common/src/services/api.service.ts b/libs/common/src/services/api.service.ts index 11e8cb3d70..81dce4c854 100644 --- a/libs/common/src/services/api.service.ts +++ b/libs/common/src/services/api.service.ts @@ -2,41 +2,79 @@ import { ApiService as ApiServiceAbstraction } from "../abstractions/api.service import { AppIdService } from "../abstractions/appId.service"; import { EnvironmentService } from "../abstractions/environment.service"; import { PlatformUtilsService } from "../abstractions/platformUtils.service"; -import { TokenService } from "../abstractions/token.service"; +import { TokenService } from "../auth/abstractions/token.service"; +import { DeviceVerificationRequest } from "../auth/models/request/device-verification.request"; +import { EmailTokenRequest } from "../auth/models/request/email-token.request"; +import { EmailRequest } from "../auth/models/request/email.request"; +import { EmergencyAccessAcceptRequest } from "../auth/models/request/emergency-access-accept.request"; +import { EmergencyAccessConfirmRequest } from "../auth/models/request/emergency-access-confirm.request"; +import { EmergencyAccessInviteRequest } from "../auth/models/request/emergency-access-invite.request"; +import { EmergencyAccessPasswordRequest } from "../auth/models/request/emergency-access-password.request"; +import { EmergencyAccessUpdateRequest } from "../auth/models/request/emergency-access-update.request"; +import { DeviceRequest } from "../auth/models/request/identity-token/device.request"; +import { PasswordTokenRequest } from "../auth/models/request/identity-token/password-token.request"; +import { SsoTokenRequest } from "../auth/models/request/identity-token/sso-token.request"; +import { TokenTwoFactorRequest } from "../auth/models/request/identity-token/token-two-factor.request"; +import { UserApiTokenRequest } from "../auth/models/request/identity-token/user-api-token.request"; +import { KeyConnectorUserKeyRequest } from "../auth/models/request/key-connector-user-key.request"; +import { PasswordHintRequest } from "../auth/models/request/password-hint.request"; +import { PasswordRequest } from "../auth/models/request/password.request"; +import { PasswordlessAuthRequest } from "../auth/models/request/passwordless-auth.request"; +import { PasswordlessCreateAuthRequest } from "../auth/models/request/passwordless-create-auth.request"; +import { SecretVerificationRequest } from "../auth/models/request/secret-verification.request"; +import { SetKeyConnectorKeyRequest } from "../auth/models/request/set-key-connector-key.request"; +import { SetPasswordRequest } from "../auth/models/request/set-password.request"; +import { TwoFactorEmailRequest } from "../auth/models/request/two-factor-email.request"; +import { TwoFactorProviderRequest } from "../auth/models/request/two-factor-provider.request"; +import { TwoFactorRecoveryRequest } from "../auth/models/request/two-factor-recovery.request"; +import { UpdateProfileRequest } from "../auth/models/request/update-profile.request"; +import { UpdateTwoFactorAuthenticatorRequest } from "../auth/models/request/update-two-factor-authenticator.request"; +import { UpdateTwoFactorDuoRequest } from "../auth/models/request/update-two-factor-duo.request"; +import { UpdateTwoFactorEmailRequest } from "../auth/models/request/update-two-factor-email.request"; +import { UpdateTwoFactorWebAuthnDeleteRequest } from "../auth/models/request/update-two-factor-web-authn-delete.request"; +import { UpdateTwoFactorWebAuthnRequest } from "../auth/models/request/update-two-factor-web-authn.request"; +import { UpdateTwoFactorYubioOtpRequest } from "../auth/models/request/update-two-factor-yubio-otp.request"; +import { ApiKeyResponse } from "../auth/models/response/api-key.response"; +import { AuthRequestResponse } from "../auth/models/response/auth-request.response"; +import { DeviceVerificationResponse } from "../auth/models/response/device-verification.response"; +import { + EmergencyAccessGranteeDetailsResponse, + EmergencyAccessGrantorDetailsResponse, + EmergencyAccessTakeoverResponse, + EmergencyAccessViewResponse, +} from "../auth/models/response/emergency-access.response"; +import { IdentityCaptchaResponse } from "../auth/models/response/identity-captcha.response"; +import { IdentityTokenResponse } from "../auth/models/response/identity-token.response"; +import { IdentityTwoFactorResponse } from "../auth/models/response/identity-two-factor.response"; +import { KeyConnectorUserKeyResponse } from "../auth/models/response/key-connector-user-key.response"; +import { PreloginResponse } from "../auth/models/response/prelogin.response"; +import { RegisterResponse } from "../auth/models/response/register.response"; +import { SsoPreValidateResponse } from "../auth/models/response/sso-pre-validate.response"; +import { TwoFactorAuthenticatorResponse } from "../auth/models/response/two-factor-authenticator.response"; +import { TwoFactorDuoResponse } from "../auth/models/response/two-factor-duo.response"; +import { TwoFactorEmailResponse } from "../auth/models/response/two-factor-email.response"; +import { TwoFactorProviderResponse } from "../auth/models/response/two-factor-provider.response"; +import { TwoFactorRecoverResponse } from "../auth/models/response/two-factor-recover.response"; +import { + ChallengeResponse, + TwoFactorWebAuthnResponse, +} from "../auth/models/response/two-factor-web-authn.response"; +import { TwoFactorYubiKeyResponse } from "../auth/models/response/two-factor-yubi-key.response"; import { DeviceType } from "../enums/deviceType"; import { OrganizationConnectionType } from "../enums/organizationConnectionType"; import { Utils } from "../misc/utils"; -import { SetKeyConnectorKeyRequest } from "../models/request/account/set-key-connector-key.request"; import { BitPayInvoiceRequest } from "../models/request/bit-pay-invoice.request"; import { CollectionBulkDeleteRequest } from "../models/request/collection-bulk-delete.request"; import { CollectionRequest } from "../models/request/collection.request"; import { DeleteRecoverRequest } from "../models/request/delete-recover.request"; -import { DeviceVerificationRequest } from "../models/request/device-verification.request"; -import { DeviceRequest } from "../models/request/device.request"; -import { EmailTokenRequest } from "../models/request/email-token.request"; -import { EmailRequest } from "../models/request/email.request"; -import { EmergencyAccessAcceptRequest } from "../models/request/emergency-access-accept.request"; -import { EmergencyAccessConfirmRequest } from "../models/request/emergency-access-confirm.request"; -import { EmergencyAccessInviteRequest } from "../models/request/emergency-access-invite.request"; -import { EmergencyAccessPasswordRequest } from "../models/request/emergency-access-password.request"; -import { EmergencyAccessUpdateRequest } from "../models/request/emergency-access-update.request"; import { EventRequest } from "../models/request/event.request"; import { IapCheckRequest } from "../models/request/iap-check.request"; -import { PasswordTokenRequest } from "../models/request/identity-token/password-token.request"; -import { SsoTokenRequest } from "../models/request/identity-token/sso-token.request"; -import { TokenTwoFactorRequest } from "../models/request/identity-token/token-two-factor.request"; -import { UserApiTokenRequest } from "../models/request/identity-token/user-api-token.request"; import { KdfRequest } from "../models/request/kdf.request"; -import { KeyConnectorUserKeyRequest } from "../models/request/key-connector-user-key.request"; import { KeysRequest } from "../models/request/keys.request"; import { OrganizationConnectionRequest } from "../models/request/organization-connection.request"; import { OrganizationImportRequest } from "../models/request/organization-import.request"; import { OrganizationSponsorshipCreateRequest } from "../models/request/organization/organization-sponsorship-create.request"; import { OrganizationSponsorshipRedeemRequest } from "../models/request/organization/organization-sponsorship-redeem.request"; -import { PasswordHintRequest } from "../models/request/password-hint.request"; -import { PasswordRequest } from "../models/request/password.request"; -import { PasswordlessAuthRequest } from "../models/request/passwordless-auth.request"; -import { PasswordlessCreateAuthRequest } from "../models/request/passwordless-create-auth.request"; import { PaymentRequest } from "../models/request/payment.request"; import { PreloginRequest } from "../models/request/prelogin.request"; import { ProviderAddOrganizationRequest } from "../models/request/provider/provider-add-organization.request"; @@ -50,32 +88,17 @@ import { ProviderUserConfirmRequest } from "../models/request/provider/provider- import { ProviderUserInviteRequest } from "../models/request/provider/provider-user-invite.request"; import { ProviderUserUpdateRequest } from "../models/request/provider/provider-user-update.request"; import { RegisterRequest } from "../models/request/register.request"; -import { SecretVerificationRequest } from "../models/request/secret-verification.request"; import { SelectionReadOnlyRequest } from "../models/request/selection-read-only.request"; import { SendAccessRequest } from "../models/request/send-access.request"; import { SendRequest } from "../models/request/send.request"; -import { SetPasswordRequest } from "../models/request/set-password.request"; import { StorageRequest } from "../models/request/storage.request"; import { TaxInfoUpdateRequest } from "../models/request/tax-info-update.request"; -import { TwoFactorEmailRequest } from "../models/request/two-factor-email.request"; -import { TwoFactorProviderRequest } from "../models/request/two-factor-provider.request"; -import { TwoFactorRecoveryRequest } from "../models/request/two-factor-recovery.request"; import { UpdateAvatarRequest } from "../models/request/update-avatar.request"; import { UpdateDomainsRequest } from "../models/request/update-domains.request"; import { UpdateKeyRequest } from "../models/request/update-key.request"; -import { UpdateProfileRequest } from "../models/request/update-profile.request"; import { UpdateTempPasswordRequest } from "../models/request/update-temp-password.request"; -import { UpdateTwoFactorAuthenticatorRequest } from "../models/request/update-two-factor-authenticator.request"; -import { UpdateTwoFactorDuoRequest } from "../models/request/update-two-factor-duo.request"; -import { UpdateTwoFactorEmailRequest } from "../models/request/update-two-factor-email.request"; -import { UpdateTwoFactorWebAuthnDeleteRequest } from "../models/request/update-two-factor-web-authn-delete.request"; -import { UpdateTwoFactorWebAuthnRequest } from "../models/request/update-two-factor-web-authn.request"; -import { UpdateTwoFactorYubioOtpRequest } from "../models/request/update-two-factor-yubio-otp.request"; import { VerifyDeleteRecoverRequest } from "../models/request/verify-delete-recover.request"; import { VerifyEmailRequest } from "../models/request/verify-email.request"; -import { ApiKeyResponse } from "../models/response/api-key.response"; -import { AuthRequestResponse } from "../models/response/auth-request.response"; -import { RegisterResponse } from "../models/response/authentication/register.response"; import { BillingHistoryResponse } from "../models/response/billing-history.response"; import { BillingPaymentResponse } from "../models/response/billing-payment.response"; import { BreachAccountResponse } from "../models/response/breach-account.response"; @@ -83,20 +106,9 @@ import { CollectionAccessDetailsResponse, CollectionResponse, } from "../models/response/collection.response"; -import { DeviceVerificationResponse } from "../models/response/device-verification.response"; import { DomainsResponse } from "../models/response/domains.response"; -import { - EmergencyAccessGranteeDetailsResponse, - EmergencyAccessGrantorDetailsResponse, - EmergencyAccessTakeoverResponse, - EmergencyAccessViewResponse, -} from "../models/response/emergency-access.response"; import { ErrorResponse } from "../models/response/error.response"; import { EventResponse } from "../models/response/event.response"; -import { IdentityCaptchaResponse } from "../models/response/identity-captcha.response"; -import { IdentityTokenResponse } from "../models/response/identity-token.response"; -import { IdentityTwoFactorResponse } from "../models/response/identity-two-factor.response"; -import { KeyConnectorUserKeyResponse } from "../models/response/key-connector-user-key.response"; import { ListResponse } from "../models/response/list.response"; import { OrganizationConnectionConfigApis, @@ -107,7 +119,6 @@ import { OrganizationSponsorshipSyncStatusResponse } from "../models/response/or import { PaymentResponse } from "../models/response/payment.response"; import { PlanResponse } from "../models/response/plan.response"; import { PolicyResponse } from "../models/response/policy.response"; -import { PreloginResponse } from "../models/response/prelogin.response"; import { ProfileResponse } from "../models/response/profile.response"; import { ProviderOrganizationOrganizationDetailsResponse, @@ -125,20 +136,9 @@ import { SendAccessResponse } from "../models/response/send-access.response"; import { SendFileDownloadDataResponse } from "../models/response/send-file-download-data.response"; import { SendFileUploadDataResponse } from "../models/response/send-file-upload-data.response"; import { SendResponse } from "../models/response/send.response"; -import { SsoPreValidateResponse } from "../models/response/sso-pre-validate.response"; import { SubscriptionResponse } from "../models/response/subscription.response"; import { TaxInfoResponse } from "../models/response/tax-info.response"; import { TaxRateResponse } from "../models/response/tax-rate.response"; -import { TwoFactorAuthenticatorResponse } from "../models/response/two-factor-authenticator.response"; -import { TwoFactorDuoResponse } from "../models/response/two-factor-duo.response"; -import { TwoFactorEmailResponse } from "../models/response/two-factor-email.response"; -import { TwoFactorProviderResponse } from "../models/response/two-factor-provider.response"; -import { TwoFactorRecoverResponse } from "../models/response/two-factor-recover.response"; -import { - ChallengeResponse, - TwoFactorWebAuthnResponse, -} from "../models/response/two-factor-web-authn.response"; -import { TwoFactorYubiKeyResponse } from "../models/response/two-factor-yubi-key.response"; import { UserKeyResponse } from "../models/response/user-key.response"; import { SendAccessView } from "../models/view/send-access.view"; import { AttachmentRequest } from "../vault/models/request/attachment.request"; diff --git a/libs/common/src/services/crypto.service.ts b/libs/common/src/services/crypto.service.ts index 3ae87c1965..3381cddb31 100644 --- a/libs/common/src/services/crypto.service.ts +++ b/libs/common/src/services/crypto.service.ts @@ -6,6 +6,7 @@ import { EncryptService } from "../abstractions/encrypt.service"; import { LogService } from "../abstractions/log.service"; import { PlatformUtilsService } from "../abstractions/platformUtils.service"; import { StateService } from "../abstractions/state.service"; +import { KdfConfig } from "../auth/models/domain/kdf-config"; import { EncryptionType } from "../enums/encryptionType"; import { HashPurpose } from "../enums/hashPurpose"; import { @@ -22,7 +23,6 @@ import { EncryptedOrganizationKeyData } from "../models/data/encrypted-organizat import { EncArrayBuffer } from "../models/domain/enc-array-buffer"; import { EncString } from "../models/domain/enc-string"; import { BaseEncryptedOrganizationKey } from "../models/domain/encrypted-organization-key"; -import { KdfConfig } from "../models/domain/kdf-config"; import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; import { ProfileOrganizationResponse } from "../models/response/profile-organization.response"; import { ProfileProviderOrganizationResponse } from "../models/response/profile-provider-organization.response"; diff --git a/libs/common/src/services/environment.service.ts b/libs/common/src/services/environment.service.ts index 0e43c6ec89..e093f0891a 100644 --- a/libs/common/src/services/environment.service.ts +++ b/libs/common/src/services/environment.service.ts @@ -5,7 +5,7 @@ import { Urls, } from "../abstractions/environment.service"; import { StateService } from "../abstractions/state.service"; -import { EnvironmentUrls } from "../models/domain/environment-urls"; +import { EnvironmentUrls } from "../auth/models/domain/environment-urls"; export class EnvironmentService implements EnvironmentServiceAbstraction { private readonly urlsSubject = new Subject(); diff --git a/libs/common/src/services/export.service.ts b/libs/common/src/services/export.service.ts index fa40f18bcc..045824694c 100644 --- a/libs/common/src/services/export.service.ts +++ b/libs/common/src/services/export.service.ts @@ -7,11 +7,11 @@ import { ExportFormat, ExportService as ExportServiceAbstraction, } from "../abstractions/export.service"; +import { KdfConfig } from "../auth/models/domain/kdf-config"; import { DEFAULT_PBKDF2_ITERATIONS, KdfType } from "../enums/kdfType"; import { Utils } from "../misc/utils"; import { CollectionData } from "../models/data/collection.data"; import { Collection } from "../models/domain/collection"; -import { KdfConfig } from "../models/domain/kdf-config"; import { CipherWithIdExport as CipherExport } from "../models/export/cipher-with-ids.export"; import { CollectionWithIdExport as CollectionExport } from "../models/export/collection-with-id.export"; import { EventExport } from "../models/export/event.export"; diff --git a/libs/common/src/services/notifications.service.ts b/libs/common/src/services/notifications.service.ts index 59b9f101e9..a1ef5cd07c 100644 --- a/libs/common/src/services/notifications.service.ts +++ b/libs/common/src/services/notifications.service.ts @@ -3,13 +3,13 @@ import * as signalRMsgPack from "@microsoft/signalr-protocol-msgpack"; import { ApiService } from "../abstractions/api.service"; import { AppIdService } from "../abstractions/appId.service"; -import { AuthService } from "../abstractions/auth.service"; import { EnvironmentService } from "../abstractions/environment.service"; import { LogService } from "../abstractions/log.service"; import { MessagingService } from "../abstractions/messaging.service"; import { NotificationsService as NotificationsServiceAbstraction } from "../abstractions/notifications.service"; import { StateService } from "../abstractions/state.service"; -import { AuthenticationStatus } from "../enums/authenticationStatus"; +import { AuthService } from "../auth/abstractions/auth.service"; +import { AuthenticationStatus } from "../auth/enums/authentication-status"; import { NotificationType } from "../enums/notificationType"; import { NotificationResponse, diff --git a/libs/common/src/services/organization/organization-api.service.ts b/libs/common/src/services/organization/organization-api.service.ts index 7e18b73b69..1b86511a04 100644 --- a/libs/common/src/services/organization/organization-api.service.ts +++ b/libs/common/src/services/organization/organization-api.service.ts @@ -1,6 +1,10 @@ import { ApiService } from "../../abstractions/api.service"; import { OrganizationApiServiceAbstraction } from "../../abstractions/organization/organization-api.service.abstraction"; -import { OrganizationApiKeyType } from "../../enums/organizationApiKeyType"; +import { OrganizationApiKeyType } from "../../auth/enums/organization-api-key-type"; +import { OrganizationSsoRequest } from "../../auth/models/request/organization-sso.request"; +import { SecretVerificationRequest } from "../../auth/models/request/secret-verification.request"; +import { ApiKeyResponse } from "../../auth/models/response/api-key.response"; +import { OrganizationSsoResponse } from "../../auth/models/response/organization-sso.response"; import { ImportDirectoryRequest } from "../../models/request/import-directory.request"; import { OrganizationApiKeyRequest } from "../../models/request/organization-api-key.request"; import { OrganizationCreateRequest } from "../../models/request/organization-create.request"; @@ -9,13 +13,10 @@ import { OrganizationSubscriptionUpdateRequest } from "../../models/request/orga import { OrganizationTaxInfoUpdateRequest } from "../../models/request/organization-tax-info-update.request"; import { OrganizationUpdateRequest } from "../../models/request/organization-update.request"; import { OrganizationUpgradeRequest } from "../../models/request/organization-upgrade.request"; -import { OrganizationSsoRequest } from "../../models/request/organization/organization-sso.request"; import { PaymentRequest } from "../../models/request/payment.request"; import { SeatRequest } from "../../models/request/seat.request"; -import { SecretVerificationRequest } from "../../models/request/secret-verification.request"; import { StorageRequest } from "../../models/request/storage.request"; import { VerifyBankRequest } from "../../models/request/verify-bank.request"; -import { ApiKeyResponse } from "../../models/response/api-key.response"; import { BillingResponse } from "../../models/response/billing.response"; import { ListResponse } from "../../models/response/list.response"; import { OrganizationApiKeyInformationResponse } from "../../models/response/organization-api-key-information.response"; @@ -23,7 +24,6 @@ import { OrganizationAutoEnrollStatusResponse } from "../../models/response/orga import { OrganizationKeysResponse } from "../../models/response/organization-keys.response"; import { OrganizationSubscriptionResponse } from "../../models/response/organization-subscription.response"; import { OrganizationResponse } from "../../models/response/organization.response"; -import { OrganizationSsoResponse } from "../../models/response/organization/organization-sso.response"; import { PaymentResponse } from "../../models/response/payment.response"; import { TaxInfoResponse } from "../../models/response/tax-info.response"; import { SyncService } from "../../vault/abstractions/sync/sync.service.abstraction"; diff --git a/libs/common/src/services/state.service.ts b/libs/common/src/services/state.service.ts index 956bc64ddc..11aab653db 100644 --- a/libs/common/src/services/state.service.ts +++ b/libs/common/src/services/state.service.ts @@ -8,6 +8,8 @@ import { AbstractMemoryStorageService, AbstractStorageService, } from "../abstractions/storage.service"; +import { EnvironmentUrls } from "../auth/models/domain/environment-urls"; +import { KdfConfig } from "../auth/models/domain/kdf-config"; import { HtmlStorageLocation } from "../enums/htmlStorageLocation"; import { KdfType } from "../enums/kdfType"; import { StorageLocation } from "../enums/storageLocation"; @@ -30,10 +32,8 @@ import { AccountSettingsSettings, } from "../models/domain/account"; import { EncString } from "../models/domain/enc-string"; -import { EnvironmentUrls } from "../models/domain/environment-urls"; import { GeneratedPasswordHistory } from "../models/domain/generated-password-history"; import { GlobalState } from "../models/domain/global-state"; -import { KdfConfig } from "../models/domain/kdf-config"; import { Policy } from "../models/domain/policy"; import { State } from "../models/domain/state"; import { StorageOptions } from "../models/domain/storage-options"; diff --git a/libs/common/src/services/stateMigration.service.ts b/libs/common/src/services/stateMigration.service.ts index b2281586e2..026952e233 100644 --- a/libs/common/src/services/stateMigration.service.ts +++ b/libs/common/src/services/stateMigration.service.ts @@ -1,4 +1,6 @@ import { AbstractStorageService } from "../abstractions/storage.service"; +import { EnvironmentUrls } from "../auth/models/domain/environment-urls"; +import { TokenService } from "../auth/services/token.service"; import { HtmlStorageLocation } from "../enums/htmlStorageLocation"; import { KdfType } from "../enums/kdfType"; import { StateVersion } from "../enums/stateVersion"; @@ -17,15 +19,12 @@ import { EncryptionPair, } from "../models/domain/account"; import { EncString } from "../models/domain/enc-string"; -import { EnvironmentUrls } from "../models/domain/environment-urls"; import { GeneratedPasswordHistory } from "../models/domain/generated-password-history"; import { GlobalState } from "../models/domain/global-state"; import { StorageOptions } from "../models/domain/storage-options"; import { CipherData } from "../vault/models/data/cipher.data"; import { FolderData } from "../vault/models/data/folder.data"; -import { TokenService } from "./token.service"; - // Originally (before January 2022) storage was handled as a flat key/value pair store. // With the move to a typed object for state storage these keys should no longer be in use anywhere outside of this migration. const v1Keys: { [key: string]: string } = { diff --git a/libs/common/src/services/system.service.ts b/libs/common/src/services/system.service.ts index ee2dbf33b5..dc67a7f1e2 100644 --- a/libs/common/src/services/system.service.ts +++ b/libs/common/src/services/system.service.ts @@ -1,11 +1,11 @@ import { firstValueFrom } from "rxjs"; -import { AuthService } from "../abstractions/auth.service"; import { MessagingService } from "../abstractions/messaging.service"; import { PlatformUtilsService } from "../abstractions/platformUtils.service"; import { StateService } from "../abstractions/state.service"; import { SystemService as SystemServiceAbstraction } from "../abstractions/system.service"; -import { AuthenticationStatus } from "../enums/authenticationStatus"; +import { AuthService } from "../auth/abstractions/auth.service"; +import { AuthenticationStatus } from "../auth/enums/authentication-status"; import { Utils } from "../misc/utils"; export class SystemService implements SystemServiceAbstraction { diff --git a/libs/common/src/services/vaultTimeout/vaultTimeout.service.ts b/libs/common/src/services/vaultTimeout/vaultTimeout.service.ts index bdeb8818de..e2ac5780bd 100644 --- a/libs/common/src/services/vaultTimeout/vaultTimeout.service.ts +++ b/libs/common/src/services/vaultTimeout/vaultTimeout.service.ts @@ -1,16 +1,16 @@ import { firstValueFrom } from "rxjs"; -import { AuthService } from "../../abstractions/auth.service"; import { CollectionService } from "../../abstractions/collection.service"; import { CryptoService } from "../../abstractions/crypto.service"; -import { KeyConnectorService } from "../../abstractions/keyConnector.service"; import { MessagingService } from "../../abstractions/messaging.service"; import { PlatformUtilsService } from "../../abstractions/platformUtils.service"; import { SearchService } from "../../abstractions/search.service"; import { StateService } from "../../abstractions/state.service"; import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "../../abstractions/vaultTimeout/vaultTimeout.service"; import { VaultTimeoutSettingsService } from "../../abstractions/vaultTimeout/vaultTimeoutSettings.service"; -import { AuthenticationStatus } from "../../enums/authenticationStatus"; +import { AuthService } from "../../auth/abstractions/auth.service"; +import { KeyConnectorService } from "../../auth/abstractions/key-connector.service"; +import { AuthenticationStatus } from "../../auth/enums/authentication-status"; import { CipherService } from "../../vault/abstractions/cipher.service"; import { FolderService } from "../../vault/abstractions/folder/folder.service.abstraction"; diff --git a/libs/common/src/services/vaultTimeout/vaultTimeoutSettings.service.ts b/libs/common/src/services/vaultTimeout/vaultTimeoutSettings.service.ts index 4d8b9e0d08..ccecf54197 100644 --- a/libs/common/src/services/vaultTimeout/vaultTimeoutSettings.service.ts +++ b/libs/common/src/services/vaultTimeout/vaultTimeoutSettings.service.ts @@ -1,8 +1,8 @@ import { CryptoService } from "../../abstractions/crypto.service"; import { PolicyService } from "../../abstractions/policy/policy.service.abstraction"; import { StateService } from "../../abstractions/state.service"; -import { TokenService } from "../../abstractions/token.service"; import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } from "../../abstractions/vaultTimeout/vaultTimeoutSettings.service"; +import { TokenService } from "../../auth/abstractions/token.service"; import { PolicyType } from "../../enums/policyType"; export class VaultTimeoutSettingsService implements VaultTimeoutSettingsServiceAbstraction { diff --git a/libs/common/src/types/verification.ts b/libs/common/src/types/verification.ts index 07ca4bbf56..b3e229cbd6 100644 --- a/libs/common/src/types/verification.ts +++ b/libs/common/src/types/verification.ts @@ -1,4 +1,4 @@ -import { VerificationType } from "../enums/verificationType"; +import { VerificationType } from "../auth/enums/verification-type"; export type Verification = { type: VerificationType; diff --git a/libs/common/src/vault/services/sync/sync.service.ts b/libs/common/src/vault/services/sync/sync.service.ts index f5bacb0f41..d94424e302 100644 --- a/libs/common/src/vault/services/sync/sync.service.ts +++ b/libs/common/src/vault/services/sync/sync.service.ts @@ -1,7 +1,6 @@ import { ApiService } from "../../../abstractions/api.service"; import { CollectionService } from "../../../abstractions/collection.service"; import { CryptoService } from "../../../abstractions/crypto.service"; -import { KeyConnectorService } from "../../../abstractions/keyConnector.service"; import { LogService } from "../../../abstractions/log.service"; import { MessagingService } from "../../../abstractions/messaging.service"; import { InternalOrganizationService } from "../../../abstractions/organization/organization.service.abstraction"; @@ -10,6 +9,7 @@ import { ProviderService } from "../../../abstractions/provider.service"; import { SendService } from "../../../abstractions/send.service"; import { SettingsService } from "../../../abstractions/settings.service"; import { StateService } from "../../../abstractions/state.service"; +import { KeyConnectorService } from "../../../auth/abstractions/key-connector.service"; import { sequentialize } from "../../../misc/sequentialize"; import { CollectionData } from "../../../models/data/collection.data"; import { OrganizationData } from "../../../models/data/organization.data"; diff --git a/libs/components/src/dialog/dialog.service.ts b/libs/components/src/dialog/dialog.service.ts index 04e11f6c29..b65390c7e3 100644 --- a/libs/components/src/dialog/dialog.service.ts +++ b/libs/components/src/dialog/dialog.service.ts @@ -18,8 +18,8 @@ import { import { NavigationEnd, Router } from "@angular/router"; import { filter, Subject, switchMap, takeUntil } from "rxjs"; -import { AuthService } from "@bitwarden/common/abstractions/auth.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 { SimpleDialogOptions } from "./simple-configurable-dialog/models/simple-dialog-options"; import { SimpleConfigurableDialogComponent } from "./simple-configurable-dialog/simple-configurable-dialog.component";