diff --git a/.eslintrc.json b/.eslintrc.json index 9c211247cb..93477eebf7 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -38,7 +38,7 @@ "newlines-between": "always", "pathGroups": [ { - "pattern": "jslib-*/**", + "pattern": "@bitwarden/**", "group": "external", "position": "after" }, diff --git a/apps/browser/src/background/commands.background.ts b/apps/browser/src/background/commands.background.ts index 97b367e1d4..860f1bf077 100644 --- a/apps/browser/src/background/commands.background.ts +++ b/apps/browser/src/background/commands.background.ts @@ -1,8 +1,8 @@ -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.service"; -import { AuthenticationStatus } from "jslib-common/enums/authenticationStatus"; +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.service"; +import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; import { BrowserApi } from "../browser/browserApi"; diff --git a/apps/browser/src/background/contextMenus.background.ts b/apps/browser/src/background/contextMenus.background.ts index 29bc5254d1..b14ef79cac 100644 --- a/apps/browser/src/background/contextMenus.background.ts +++ b/apps/browser/src/background/contextMenus.background.ts @@ -1,13 +1,13 @@ -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { TotpService } from "jslib-common/abstractions/totp.service"; -import { AuthenticationStatus } from "jslib-common/enums/authenticationStatus"; -import { CipherRepromptType } from "jslib-common/enums/cipherRepromptType"; -import { EventType } from "jslib-common/enums/eventType"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { AuthService } from "@bitwarden/common/abstractions/auth.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { TotpService } from "@bitwarden/common/abstractions/totp.service"; +import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; +import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; +import { EventType } from "@bitwarden/common/enums/eventType"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; import { BrowserApi } from "../browser/browserApi"; diff --git a/apps/browser/src/background/idle.background.ts b/apps/browser/src/background/idle.background.ts index fb51968ad4..65712f5df2 100644 --- a/apps/browser/src/background/idle.background.ts +++ b/apps/browser/src/background/idle.background.ts @@ -1,5 +1,5 @@ -import { NotificationsService } from "jslib-common/abstractions/notifications.service"; -import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.service"; +import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service"; +import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout.service"; import { StateService } from "../services/abstractions/state.service"; diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts index b94b93f2a9..02a283f215 100644 --- a/apps/browser/src/background/main.background.ts +++ b/apps/browser/src/background/main.background.ts @@ -1,75 +1,75 @@ -import { ApiService as ApiServiceAbstraction } from "jslib-common/abstractions/api.service"; -import { AppIdService as AppIdServiceAbstraction } from "jslib-common/abstractions/appId.service"; -import { AuditService as AuditServiceAbstraction } from "jslib-common/abstractions/audit.service"; -import { AuthService as AuthServiceAbstraction } from "jslib-common/abstractions/auth.service"; -import { CipherService as CipherServiceAbstraction } from "jslib-common/abstractions/cipher.service"; -import { CollectionService as CollectionServiceAbstraction } from "jslib-common/abstractions/collection.service"; -import { CryptoService as CryptoServiceAbstraction } from "jslib-common/abstractions/crypto.service"; -import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "jslib-common/abstractions/cryptoFunction.service"; -import { EnvironmentService as EnvironmentServiceAbstraction } from "jslib-common/abstractions/environment.service"; -import { EventService as EventServiceAbstraction } from "jslib-common/abstractions/event.service"; -import { ExportService as ExportServiceAbstraction } from "jslib-common/abstractions/export.service"; -import { FileUploadService as FileUploadServiceAbstraction } from "jslib-common/abstractions/fileUpload.service"; -import { FolderService as FolderServiceAbstraction } from "jslib-common/abstractions/folder.service"; -import { I18nService as I18nServiceAbstraction } from "jslib-common/abstractions/i18n.service"; -import { KeyConnectorService as KeyConnectorServiceAbstraction } from "jslib-common/abstractions/keyConnector.service"; -import { LogService as LogServiceAbstraction } from "jslib-common/abstractions/log.service"; -import { MessagingService as MessagingServiceAbstraction } from "jslib-common/abstractions/messaging.service"; -import { NotificationsService as NotificationsServiceAbstraction } from "jslib-common/abstractions/notifications.service"; -import { OrganizationService as OrganizationServiceAbstraction } from "jslib-common/abstractions/organization.service"; -import { PasswordGenerationService as PasswordGenerationServiceAbstraction } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService as PolicyServiceAbstraction } from "jslib-common/abstractions/policy.service"; -import { ProviderService as ProviderServiceAbstraction } from "jslib-common/abstractions/provider.service"; -import { SearchService as SearchServiceAbstraction } from "jslib-common/abstractions/search.service"; -import { SendService as SendServiceAbstraction } from "jslib-common/abstractions/send.service"; -import { SettingsService as SettingsServiceAbstraction } from "jslib-common/abstractions/settings.service"; -import { StorageService as StorageServiceAbstraction } from "jslib-common/abstractions/storage.service"; -import { SyncService as SyncServiceAbstraction } from "jslib-common/abstractions/sync.service"; -import { SystemService as SystemServiceAbstraction } from "jslib-common/abstractions/system.service"; -import { TokenService as TokenServiceAbstraction } from "jslib-common/abstractions/token.service"; -import { TotpService as TotpServiceAbstraction } from "jslib-common/abstractions/totp.service"; -import { TwoFactorService as TwoFactorServiceAbstraction } from "jslib-common/abstractions/twoFactor.service"; -import { UserVerificationService as UserVerificationServiceAbstraction } from "jslib-common/abstractions/userVerification.service"; -import { UsernameGenerationService as UsernameGenerationServiceAbstraction } from "jslib-common/abstractions/usernameGeneration.service"; -import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "jslib-common/abstractions/vaultTimeout.service"; -import { AuthenticationStatus } from "jslib-common/enums/authenticationStatus"; -import { CipherRepromptType } from "jslib-common/enums/cipherRepromptType"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { StateFactory } from "jslib-common/factories/stateFactory"; -import { GlobalState } from "jslib-common/models/domain/globalState"; -import { CipherView } from "jslib-common/models/view/cipherView"; -import { ApiService } from "jslib-common/services/api.service"; -import { AppIdService } from "jslib-common/services/appId.service"; -import { AuditService } from "jslib-common/services/audit.service"; -import { AuthService } from "jslib-common/services/auth.service"; -import { CipherService } from "jslib-common/services/cipher.service"; -import { CollectionService } from "jslib-common/services/collection.service"; -import { ConsoleLogService } from "jslib-common/services/consoleLog.service"; -import { ContainerService } from "jslib-common/services/container.service"; -import { EnvironmentService } from "jslib-common/services/environment.service"; -import { EventService } from "jslib-common/services/event.service"; -import { ExportService } from "jslib-common/services/export.service"; -import { FileUploadService } from "jslib-common/services/fileUpload.service"; -import { FolderService } from "jslib-common/services/folder.service"; -import { KeyConnectorService } from "jslib-common/services/keyConnector.service"; -import { NotificationsService } from "jslib-common/services/notifications.service"; -import { OrganizationService } from "jslib-common/services/organization.service"; -import { PasswordGenerationService } from "jslib-common/services/passwordGeneration.service"; -import { PolicyService } from "jslib-common/services/policy.service"; -import { ProviderService } from "jslib-common/services/provider.service"; -import { SearchService } from "jslib-common/services/search.service"; -import { SendService } from "jslib-common/services/send.service"; -import { SettingsService } from "jslib-common/services/settings.service"; -import { StateMigrationService } from "jslib-common/services/stateMigration.service"; -import { SyncService } from "jslib-common/services/sync.service"; -import { SystemService } from "jslib-common/services/system.service"; -import { TokenService } from "jslib-common/services/token.service"; -import { TotpService } from "jslib-common/services/totp.service"; -import { TwoFactorService } from "jslib-common/services/twoFactor.service"; -import { UserVerificationService } from "jslib-common/services/userVerification.service"; -import { UsernameGenerationService } from "jslib-common/services/usernameGeneration.service"; -import { WebCryptoFunctionService } from "jslib-common/services/webCryptoFunction.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 { CipherService as CipherServiceAbstraction } from "@bitwarden/common/abstractions/cipher.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"; +import { EnvironmentService as EnvironmentServiceAbstraction } from "@bitwarden/common/abstractions/environment.service"; +import { EventService as EventServiceAbstraction } from "@bitwarden/common/abstractions/event.service"; +import { ExportService as ExportServiceAbstraction } from "@bitwarden/common/abstractions/export.service"; +import { FileUploadService as FileUploadServiceAbstraction } from "@bitwarden/common/abstractions/fileUpload.service"; +import { FolderService as FolderServiceAbstraction } from "@bitwarden/common/abstractions/folder.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"; +import { OrganizationService as OrganizationServiceAbstraction } from "@bitwarden/common/abstractions/organization.service"; +import { PasswordGenerationService as PasswordGenerationServiceAbstraction } from "@bitwarden/common/abstractions/passwordGeneration.service"; +import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService as PolicyServiceAbstraction } from "@bitwarden/common/abstractions/policy.service"; +import { ProviderService as ProviderServiceAbstraction } from "@bitwarden/common/abstractions/provider.service"; +import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service"; +import { SendService as SendServiceAbstraction } from "@bitwarden/common/abstractions/send.service"; +import { SettingsService as SettingsServiceAbstraction } from "@bitwarden/common/abstractions/settings.service"; +import { StorageService as StorageServiceAbstraction } from "@bitwarden/common/abstractions/storage.service"; +import { SyncService as SyncServiceAbstraction } from "@bitwarden/common/abstractions/sync.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 { UserVerificationService as UserVerificationServiceAbstraction } from "@bitwarden/common/abstractions/userVerification.service"; +import { UsernameGenerationService as UsernameGenerationServiceAbstraction } from "@bitwarden/common/abstractions/usernameGeneration.service"; +import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; +import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { StateFactory } from "@bitwarden/common/factories/stateFactory"; +import { GlobalState } from "@bitwarden/common/models/domain/globalState"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; +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 { CipherService } from "@bitwarden/common/services/cipher.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"; +import { EnvironmentService } from "@bitwarden/common/services/environment.service"; +import { EventService } from "@bitwarden/common/services/event.service"; +import { ExportService } from "@bitwarden/common/services/export.service"; +import { FileUploadService } from "@bitwarden/common/services/fileUpload.service"; +import { FolderService } from "@bitwarden/common/services/folder.service"; +import { KeyConnectorService } from "@bitwarden/common/services/keyConnector.service"; +import { NotificationsService } from "@bitwarden/common/services/notifications.service"; +import { OrganizationService } from "@bitwarden/common/services/organization.service"; +import { PasswordGenerationService } from "@bitwarden/common/services/passwordGeneration.service"; +import { PolicyService } from "@bitwarden/common/services/policy.service"; +import { ProviderService } from "@bitwarden/common/services/provider.service"; +import { SearchService } from "@bitwarden/common/services/search.service"; +import { SendService } from "@bitwarden/common/services/send.service"; +import { SettingsService } from "@bitwarden/common/services/settings.service"; +import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service"; +import { SyncService } from "@bitwarden/common/services/sync.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 { UserVerificationService } from "@bitwarden/common/services/userVerification.service"; +import { UsernameGenerationService } from "@bitwarden/common/services/usernameGeneration.service"; +import { WebCryptoFunctionService } from "@bitwarden/common/services/webCryptoFunction.service"; import { BrowserApi } from "../browser/browserApi"; import { SafariApp } from "../browser/safariApp"; diff --git a/apps/browser/src/background/nativeMessaging.background.ts b/apps/browser/src/background/nativeMessaging.background.ts index e48345be11..6e9da29811 100644 --- a/apps/browser/src/background/nativeMessaging.background.ts +++ b/apps/browser/src/background/nativeMessaging.background.ts @@ -1,16 +1,16 @@ -import { AppIdService } from "jslib-common/abstractions/appId.service"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { AuthenticationStatus } from "jslib-common/enums/authenticationStatus"; -import { Utils } from "jslib-common/misc/utils"; -import { EncString } from "jslib-common/models/domain/encString"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; +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"; +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 { Utils } from "@bitwarden/common/misc/utils"; +import { EncString } from "@bitwarden/common/models/domain/encString"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; import { BrowserApi } from "../browser/browserApi"; diff --git a/apps/browser/src/background/notification.background.ts b/apps/browser/src/background/notification.background.ts index 366eddc61a..b44ce82007 100644 --- a/apps/browser/src/background/notification.background.ts +++ b/apps/browser/src/background/notification.background.ts @@ -1,14 +1,14 @@ -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { AuthenticationStatus } from "jslib-common/enums/authenticationStatus"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { PolicyType } from "jslib-common/enums/policyType"; -import { Utils } from "jslib-common/misc/utils"; -import { CipherView } from "jslib-common/models/view/cipherView"; -import { LoginUriView } from "jslib-common/models/view/loginUriView"; -import { LoginView } from "jslib-common/models/view/loginView"; +import { AuthService } from "@bitwarden/common/abstractions/auth.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { FolderService } from "@bitwarden/common/abstractions/folder.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { LoginUriView } from "@bitwarden/common/models/view/loginUriView"; +import { LoginView } from "@bitwarden/common/models/view/loginView"; import { BrowserApi } from "../browser/browserApi"; import { AutofillService } from "../services/abstractions/autofill.service"; diff --git a/apps/browser/src/background/runtime.background.ts b/apps/browser/src/background/runtime.background.ts index 9c5ce75fac..24513ed5bb 100644 --- a/apps/browser/src/background/runtime.background.ts +++ b/apps/browser/src/background/runtime.background.ts @@ -1,10 +1,10 @@ -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { NotificationsService } from "jslib-common/abstractions/notifications.service"; -import { SystemService } from "jslib-common/abstractions/system.service"; -import { Utils } from "jslib-common/misc/utils"; +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 { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service"; +import { SystemService } from "@bitwarden/common/abstractions/system.service"; +import { Utils } from "@bitwarden/common/misc/utils"; import { BrowserApi } from "../browser/browserApi"; import { AutofillService } from "../services/abstractions/autofill.service"; diff --git a/apps/browser/src/background/webRequest.background.ts b/apps/browser/src/background/webRequest.background.ts index ad78ae7085..0afbfc4112 100644 --- a/apps/browser/src/background/webRequest.background.ts +++ b/apps/browser/src/background/webRequest.background.ts @@ -1,8 +1,8 @@ -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { AuthenticationStatus } from "jslib-common/enums/authenticationStatus"; -import { UriMatchType } from "jslib-common/enums/uriMatchType"; +import { AuthService } from "@bitwarden/common/abstractions/auth.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; +import { UriMatchType } from "@bitwarden/common/enums/uriMatchType"; export default class WebRequestBackground { private pendingAuthRequests: any[] = []; diff --git a/apps/browser/src/browser/browserApi.ts b/apps/browser/src/browser/browserApi.ts index bc421fad4b..ad4d7b2788 100644 --- a/apps/browser/src/browser/browserApi.ts +++ b/apps/browser/src/browser/browserApi.ts @@ -1,4 +1,4 @@ -import { Utils } from "jslib-common/misc/utils"; +import { Utils } from "@bitwarden/common/misc/utils"; import { SafariApp } from "./safariApp"; diff --git a/apps/browser/src/models/account.ts b/apps/browser/src/models/account.ts index e06f260efb..f49c55d290 100644 --- a/apps/browser/src/models/account.ts +++ b/apps/browser/src/models/account.ts @@ -1,7 +1,7 @@ import { Account as BaseAccount, AccountSettings as BaseAccountSettings, -} from "jslib-common/models/domain/account"; +} from "@bitwarden/common/models/domain/account"; import { BrowserComponentState } from "./browserComponentState"; import { BrowserGroupingsComponentState } from "./browserGroupingsComponentState"; diff --git a/apps/browser/src/models/browserGroupingsComponentState.ts b/apps/browser/src/models/browserGroupingsComponentState.ts index 8c539b4144..3e244f9a52 100644 --- a/apps/browser/src/models/browserGroupingsComponentState.ts +++ b/apps/browser/src/models/browserGroupingsComponentState.ts @@ -1,7 +1,7 @@ -import { CipherType } from "jslib-common/enums/cipherType"; -import { CipherView } from "jslib-common/models/view/cipherView"; -import { CollectionView } from "jslib-common/models/view/collectionView"; -import { FolderView } from "jslib-common/models/view/folderView"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CollectionView } from "@bitwarden/common/models/view/collectionView"; +import { FolderView } from "@bitwarden/common/models/view/folderView"; import { BrowserComponentState } from "./browserComponentState"; diff --git a/apps/browser/src/models/browserSendComponentState.ts b/apps/browser/src/models/browserSendComponentState.ts index 108d4363c3..8ba2407c5f 100644 --- a/apps/browser/src/models/browserSendComponentState.ts +++ b/apps/browser/src/models/browserSendComponentState.ts @@ -1,5 +1,5 @@ -import { SendType } from "jslib-common/enums/sendType"; -import { SendView } from "jslib-common/models/view/sendView"; +import { SendType } from "@bitwarden/common/enums/sendType"; +import { SendView } from "@bitwarden/common/models/view/sendView"; import { BrowserComponentState } from "./browserComponentState"; diff --git a/apps/browser/src/popup/accounts/environment.component.ts b/apps/browser/src/popup/accounts/environment.component.ts index 615c8e6470..f4004b5c7d 100644 --- a/apps/browser/src/popup/accounts/environment.component.ts +++ b/apps/browser/src/popup/accounts/environment.component.ts @@ -1,10 +1,10 @@ import { Component } from "@angular/core"; import { Router } from "@angular/router"; -import { EnvironmentComponent as BaseEnvironmentComponent } from "jslib-angular/components/environment.component"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { EnvironmentComponent as BaseEnvironmentComponent } from "@bitwarden/angular/components/environment.component"; +import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; @Component({ selector: "app-environment", diff --git a/apps/browser/src/popup/accounts/hint.component.ts b/apps/browser/src/popup/accounts/hint.component.ts index 5bed1b5858..7ecc9ef1cb 100644 --- a/apps/browser/src/popup/accounts/hint.component.ts +++ b/apps/browser/src/popup/accounts/hint.component.ts @@ -1,11 +1,11 @@ import { Component } from "@angular/core"; import { Router } from "@angular/router"; -import { HintComponent as BaseHintComponent } from "jslib-angular/components/hint.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { HintComponent as BaseHintComponent } from "@bitwarden/angular/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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; @Component({ selector: "app-hint", diff --git a/apps/browser/src/popup/accounts/home.component.ts b/apps/browser/src/popup/accounts/home.component.ts index ca74774024..8414395901 100644 --- a/apps/browser/src/popup/accounts/home.component.ts +++ b/apps/browser/src/popup/accounts/home.component.ts @@ -1,11 +1,11 @@ import { Component } from "@angular/core"; -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { Utils } from "jslib-common/misc/utils"; +import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; +import { EnvironmentService } from "@bitwarden/common/abstractions/environment.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 { Utils } from "@bitwarden/common/misc/utils"; @Component({ selector: "app-home", diff --git a/apps/browser/src/popup/accounts/lock.component.ts b/apps/browser/src/popup/accounts/lock.component.ts index e1bee7fc78..5b05207872 100644 --- a/apps/browser/src/popup/accounts/lock.component.ts +++ b/apps/browser/src/popup/accounts/lock.component.ts @@ -1,19 +1,19 @@ import { Component, NgZone } from "@angular/core"; import { Router } from "@angular/router"; -import { LockComponent as BaseLockComponent } from "jslib-angular/components/lock.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.service"; -import { AuthenticationStatus } from "jslib-common/enums/authenticationStatus"; +import { LockComponent as BaseLockComponent } from "@bitwarden/angular/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.service"; +import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; import { BiometricErrors, BiometricErrorTypes } from "../../models/biometricErrors"; diff --git a/apps/browser/src/popup/accounts/login.component.ts b/apps/browser/src/popup/accounts/login.component.ts index cb0567c8d9..edd197ca18 100644 --- a/apps/browser/src/popup/accounts/login.component.ts +++ b/apps/browser/src/popup/accounts/login.component.ts @@ -1,16 +1,16 @@ import { Component, NgZone } from "@angular/core"; import { Router } from "@angular/router"; -import { LoginComponent as BaseLoginComponent } from "jslib-angular/components/login.component"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; +import { LoginComponent as BaseLoginComponent } from "@bitwarden/angular/components/login.component"; +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"; +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 { SyncService } from "@bitwarden/common/abstractions/sync.service"; @Component({ selector: "app-login", diff --git a/apps/browser/src/popup/accounts/register.component.ts b/apps/browser/src/popup/accounts/register.component.ts index 98412cd0c9..04df667cc0 100644 --- a/apps/browser/src/popup/accounts/register.component.ts +++ b/apps/browser/src/popup/accounts/register.component.ts @@ -1,16 +1,16 @@ import { Component } from "@angular/core"; import { Router } from "@angular/router"; -import { RegisterComponent as BaseRegisterComponent } from "jslib-angular/components/register.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; +import { RegisterComponent as BaseRegisterComponent } from "@bitwarden/angular/components/register.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 { 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"; @Component({ selector: "app-register", diff --git a/apps/browser/src/popup/accounts/remove-password.component.ts b/apps/browser/src/popup/accounts/remove-password.component.ts index cdb75058ab..89ebd4a620 100644 --- a/apps/browser/src/popup/accounts/remove-password.component.ts +++ b/apps/browser/src/popup/accounts/remove-password.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { RemovePasswordComponent as BaseRemovePasswordComponent } from "jslib-angular/components/remove-password.component"; +import { RemovePasswordComponent as BaseRemovePasswordComponent } from "@bitwarden/angular/components/remove-password.component"; @Component({ selector: "app-remove-password", diff --git a/apps/browser/src/popup/accounts/set-password.component.ts b/apps/browser/src/popup/accounts/set-password.component.ts index 668f98bb1b..ad68fbc2f5 100644 --- a/apps/browser/src/popup/accounts/set-password.component.ts +++ b/apps/browser/src/popup/accounts/set-password.component.ts @@ -1,16 +1,16 @@ import { Component } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; -import { SetPasswordComponent as BaseSetPasswordComponent } from "jslib-angular/components/set-password.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; +import { SetPasswordComponent as BaseSetPasswordComponent } from "@bitwarden/angular/components/set-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 { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; @Component({ selector: "app-set-password", diff --git a/apps/browser/src/popup/accounts/sso.component.ts b/apps/browser/src/popup/accounts/sso.component.ts index 29af3db6ae..d737bc724b 100644 --- a/apps/browser/src/popup/accounts/sso.component.ts +++ b/apps/browser/src/popup/accounts/sso.component.ts @@ -1,19 +1,19 @@ import { Component } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; -import { SsoComponent as BaseSsoComponent } from "jslib-angular/components/sso.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.service"; -import { AuthenticationStatus } from "jslib-common/enums/authenticationStatus"; +import { SsoComponent as BaseSsoComponent } from "@bitwarden/angular/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"; +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 { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; import { BrowserApi } from "../../browser/browserApi"; diff --git a/apps/browser/src/popup/accounts/two-factor-options.component.ts b/apps/browser/src/popup/accounts/two-factor-options.component.ts index e08e6e7b90..ddb1a42e14 100644 --- a/apps/browser/src/popup/accounts/two-factor-options.component.ts +++ b/apps/browser/src/popup/accounts/two-factor-options.component.ts @@ -1,10 +1,10 @@ import { Component } from "@angular/core"; import { Router } from "@angular/router"; -import { TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent } from "jslib-angular/components/two-factor-options.component"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service"; +import { TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent } from "@bitwarden/angular/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"; @Component({ selector: "app-two-factor-options", diff --git a/apps/browser/src/popup/accounts/two-factor.component.ts b/apps/browser/src/popup/accounts/two-factor.component.ts index d7e2d3771b..01e4490962 100644 --- a/apps/browser/src/popup/accounts/two-factor.component.ts +++ b/apps/browser/src/popup/accounts/two-factor.component.ts @@ -2,20 +2,20 @@ import { Component } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { TwoFactorComponent as BaseTwoFactorComponent } from "jslib-angular/components/two-factor.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AppIdService } from "jslib-common/abstractions/appId.service"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service"; -import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType"; +import { TwoFactorComponent as BaseTwoFactorComponent } from "@bitwarden/angular/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 { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service"; +import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; import { BrowserApi } from "../../browser/browserApi"; import { PopupUtilsService } from "../services/popup-utils.service"; diff --git a/apps/browser/src/popup/accounts/update-temp-password.component.ts b/apps/browser/src/popup/accounts/update-temp-password.component.ts index 7ffbad1927..e04b769df9 100644 --- a/apps/browser/src/popup/accounts/update-temp-password.component.ts +++ b/apps/browser/src/popup/accounts/update-temp-password.component.ts @@ -1,16 +1,16 @@ import { Component } from "@angular/core"; -import { UpdateTempPasswordComponent as BaseUpdateTempPasswordComponent } from "jslib-angular/components/update-temp-password.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; +import { UpdateTempPasswordComponent as BaseUpdateTempPasswordComponent } from "@bitwarden/angular/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"; +import { LogService } from "@bitwarden/common/abstractions/log.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 { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; interface MasterPasswordScore { Color: string; diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts index b9d741615a..d20a914249 100644 --- a/apps/browser/src/popup/app-routing.module.ts +++ b/apps/browser/src/popup/app-routing.module.ts @@ -1,9 +1,9 @@ import { Injectable, NgModule } from "@angular/core"; import { ActivatedRouteSnapshot, RouteReuseStrategy, RouterModule, Routes } from "@angular/router"; -import { AuthGuard } from "jslib-angular/guards/auth.guard"; -import { LockGuard } from "jslib-angular/guards/lock.guard"; -import { UnauthGuard } from "jslib-angular/guards/unauth.guard"; +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 { EnvironmentComponent } from "./accounts/environment.component"; import { HintComponent } from "./accounts/hint.component"; diff --git a/apps/browser/src/popup/app.component.ts b/apps/browser/src/popup/app.component.ts index 62872f35b7..7f401461b1 100644 --- a/apps/browser/src/popup/app.component.ts +++ b/apps/browser/src/popup/app.component.ts @@ -4,11 +4,11 @@ import { NavigationEnd, Router, RouterOutlet } from "@angular/router"; import { IndividualConfig, ToastrService } from "ngx-toastr"; import Swal, { SweetAlertIcon } from "sweetalert2"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +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 { BrowserApi } from "../browser/browserApi"; import { StateService } from "../services/abstractions/state.service"; diff --git a/apps/browser/src/popup/app.module.ts b/apps/browser/src/popup/app.module.ts index 8fc728ffcf..343ad24a23 100644 --- a/apps/browser/src/popup/app.module.ts +++ b/apps/browser/src/popup/app.module.ts @@ -59,8 +59,8 @@ import { FormsModule, ReactiveFormsModule } from "@angular/forms"; import { BrowserModule } from "@angular/platform-browser"; import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; -import { BitwardenToastModule } from "jslib-angular/components/toastr.component"; -import { JslibModule } from "jslib-angular/jslib.module"; +import { BitwardenToastModule } from "@bitwarden/angular/components/toastr.component"; +import { JslibModule } from "@bitwarden/angular/jslib.module"; import { EnvironmentComponent } from "./accounts/environment.component"; import { HintComponent } from "./accounts/hint.component"; diff --git a/apps/browser/src/popup/components/action-buttons.component.ts b/apps/browser/src/popup/components/action-buttons.component.ts index 8568e0b4ff..5fd76bb4be 100644 --- a/apps/browser/src/popup/components/action-buttons.component.ts +++ b/apps/browser/src/popup/components/action-buttons.component.ts @@ -1,15 +1,15 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { TotpService } from "jslib-common/abstractions/totp.service"; -import { CipherRepromptType } from "jslib-common/enums/cipherRepromptType"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { EventType } from "jslib-common/enums/eventType"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { TotpService } from "@bitwarden/common/abstractions/totp.service"; +import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { EventType } from "@bitwarden/common/enums/eventType"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; @Component({ selector: "app-action-buttons", diff --git a/apps/browser/src/popup/components/cipher-row.component.ts b/apps/browser/src/popup/components/cipher-row.component.ts index fa2b66c1b1..41fe8e0786 100644 --- a/apps/browser/src/popup/components/cipher-row.component.ts +++ b/apps/browser/src/popup/components/cipher-row.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; @Component({ selector: "app-cipher-row", diff --git a/apps/browser/src/popup/components/password-reprompt.component.ts b/apps/browser/src/popup/components/password-reprompt.component.ts index 442a0ab5ee..ef72c8a7a1 100644 --- a/apps/browser/src/popup/components/password-reprompt.component.ts +++ b/apps/browser/src/popup/components/password-reprompt.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { PasswordRepromptComponent as BasePasswordRepromptComponent } from "jslib-angular/components/password-reprompt.component"; +import { PasswordRepromptComponent as BasePasswordRepromptComponent } from "@bitwarden/angular/components/password-reprompt.component"; @Component({ templateUrl: "password-reprompt.component.html", diff --git a/apps/browser/src/popup/components/pop-out.component.ts b/apps/browser/src/popup/components/pop-out.component.ts index 94a4b3a8de..f3cf66c13f 100644 --- a/apps/browser/src/popup/components/pop-out.component.ts +++ b/apps/browser/src/popup/components/pop-out.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnInit } from "@angular/core"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { PopupUtilsService } from "../services/popup-utils.service"; diff --git a/apps/browser/src/popup/components/send-list.component.ts b/apps/browser/src/popup/components/send-list.component.ts index 60e61edc4b..f019510b36 100644 --- a/apps/browser/src/popup/components/send-list.component.ts +++ b/apps/browser/src/popup/components/send-list.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; -import { SendType } from "jslib-common/enums/sendType"; -import { SendView } from "jslib-common/models/view/sendView"; +import { SendType } from "@bitwarden/common/enums/sendType"; +import { SendView } from "@bitwarden/common/models/view/sendView"; @Component({ selector: "app-send-list", diff --git a/apps/browser/src/popup/components/set-pin.component.ts b/apps/browser/src/popup/components/set-pin.component.ts index 4497f7e774..47b8fd7212 100644 --- a/apps/browser/src/popup/components/set-pin.component.ts +++ b/apps/browser/src/popup/components/set-pin.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { SetPinComponent as BaseSetPinComponent } from "jslib-angular/components/set-pin.component"; +import { SetPinComponent as BaseSetPinComponent } from "@bitwarden/angular/components/set-pin.component"; @Component({ templateUrl: "set-pin.component.html", diff --git a/apps/browser/src/popup/components/user-verification.component.ts b/apps/browser/src/popup/components/user-verification.component.ts index dc12c94a78..2eb89c2833 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 "jslib-angular/components/user-verification.component"; +import { UserVerificationComponent as BaseComponent } from "@bitwarden/angular/components/user-verification.component"; @Component({ selector: "app-user-verification", diff --git a/apps/browser/src/popup/generator/generator.component.ts b/apps/browser/src/popup/generator/generator.component.ts index 4e9f710c5b..41a033b980 100644 --- a/apps/browser/src/popup/generator/generator.component.ts +++ b/apps/browser/src/popup/generator/generator.component.ts @@ -2,14 +2,14 @@ import { Location } from "@angular/common"; import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { GeneratorComponent as BaseGeneratorComponent } from "jslib-angular/components/generator.component"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { UsernameGenerationService } from "jslib-common/abstractions/usernameGeneration.service"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { GeneratorComponent as BaseGeneratorComponent } from "@bitwarden/angular/components/generator.component"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +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 { UsernameGenerationService } from "@bitwarden/common/abstractions/usernameGeneration.service"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; @Component({ selector: "app-generator", diff --git a/apps/browser/src/popup/generator/password-generator-history.component.ts b/apps/browser/src/popup/generator/password-generator-history.component.ts index 2de2996bc5..ca586d8f99 100644 --- a/apps/browser/src/popup/generator/password-generator-history.component.ts +++ b/apps/browser/src/popup/generator/password-generator-history.component.ts @@ -1,10 +1,10 @@ import { Location } from "@angular/common"; import { Component } from "@angular/core"; -import { PasswordGeneratorHistoryComponent as BasePasswordGeneratorHistoryComponent } from "jslib-angular/components/password-generator-history.component"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { PasswordGeneratorHistoryComponent as BasePasswordGeneratorHistoryComponent } from "@bitwarden/angular/components/password-generator-history.component"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; @Component({ selector: "app-password-generator-history", diff --git a/apps/browser/src/popup/scss/popup.scss b/apps/browser/src/popup/scss/popup.scss index 8a7b648545..c8f0da65b5 100644 --- a/apps/browser/src/popup/scss/popup.scss +++ b/apps/browser/src/popup/scss/popup.scss @@ -1,6 +1,3 @@ -$icomoon-font-path: "../../../../../libs/angular/src/scss/bwicons/fonts/"; -$card-icons-base: "../../../../../libs/angular/src/images/cards/"; - @import "../../../../../libs/angular/src/scss/webfonts.css"; @import "../../../../../libs/angular/src/scss/bwicons/styles/style.scss"; @import "variables.scss"; diff --git a/apps/browser/src/popup/send/efflux-dates.component.ts b/apps/browser/src/popup/send/efflux-dates.component.ts index 2683720bf0..8a58756dad 100644 --- a/apps/browser/src/popup/send/efflux-dates.component.ts +++ b/apps/browser/src/popup/send/efflux-dates.component.ts @@ -2,9 +2,9 @@ import { DatePipe } from "@angular/common"; import { Component, EventEmitter, Input, Output } from "@angular/core"; import { ControlContainer, NgForm } from "@angular/forms"; -import { EffluxDatesComponent as BaseEffluxDatesComponent } from "jslib-angular/components/send/efflux-dates.component"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { EffluxDatesComponent as BaseEffluxDatesComponent } from "@bitwarden/angular/components/send/efflux-dates.component"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; @Component({ selector: "app-send-efflux-dates", diff --git a/apps/browser/src/popup/send/send-add-edit.component.ts b/apps/browser/src/popup/send/send-add-edit.component.ts index 0087b0ba53..87c64777ed 100644 --- a/apps/browser/src/popup/send/send-add-edit.component.ts +++ b/apps/browser/src/popup/send/send-add-edit.component.ts @@ -3,14 +3,14 @@ import { Component } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { AddEditComponent as BaseAddEditComponent } from "jslib-angular/components/send/add-edit.component"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { SendService } from "jslib-common/abstractions/send.service"; +import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/components/send/add-edit.component"; +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 { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { SendService } from "@bitwarden/common/abstractions/send.service"; import { StateService } from "../../services/abstractions/state.service"; import { PopupUtilsService } from "../services/popup-utils.service"; diff --git a/apps/browser/src/popup/send/send-groupings.component.ts b/apps/browser/src/popup/send/send-groupings.component.ts index 8aebbfcd59..b8dc683137 100644 --- a/apps/browser/src/popup/send/send-groupings.component.ts +++ b/apps/browser/src/popup/send/send-groupings.component.ts @@ -1,18 +1,18 @@ import { ChangeDetectorRef, Component, NgZone } from "@angular/core"; import { Router } from "@angular/router"; -import { SendComponent as BaseSendComponent } from "jslib-angular/components/send/send.component"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { SearchService } from "jslib-common/abstractions/search.service"; -import { SendService } from "jslib-common/abstractions/send.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { SendType } from "jslib-common/enums/sendType"; -import { SendView } from "jslib-common/models/view/sendView"; +import { SendComponent as BaseSendComponent } from "@bitwarden/angular/components/send/send.component"; +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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { SearchService } from "@bitwarden/common/abstractions/search.service"; +import { SendService } from "@bitwarden/common/abstractions/send.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { SendType } from "@bitwarden/common/enums/sendType"; +import { SendView } from "@bitwarden/common/models/view/sendView"; import { BrowserSendComponentState } from "../../models/browserSendComponentState"; import { StateService } from "../../services/abstractions/state.service"; diff --git a/apps/browser/src/popup/send/send-type.component.ts b/apps/browser/src/popup/send/send-type.component.ts index 8b4d5039af..c47ff79255 100644 --- a/apps/browser/src/popup/send/send-type.component.ts +++ b/apps/browser/src/popup/send/send-type.component.ts @@ -3,17 +3,17 @@ import { ChangeDetectorRef, Component, NgZone } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { SendComponent as BaseSendComponent } from "jslib-angular/components/send/send.component"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { SearchService } from "jslib-common/abstractions/search.service"; -import { SendService } from "jslib-common/abstractions/send.service"; -import { SendType } from "jslib-common/enums/sendType"; -import { SendView } from "jslib-common/models/view/sendView"; +import { SendComponent as BaseSendComponent } from "@bitwarden/angular/components/send/send.component"; +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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { SearchService } from "@bitwarden/common/abstractions/search.service"; +import { SendService } from "@bitwarden/common/abstractions/send.service"; +import { SendType } from "@bitwarden/common/enums/sendType"; +import { SendView } from "@bitwarden/common/models/view/sendView"; import { BrowserComponentState } from "../../models/browserComponentState"; import { StateService } from "../../services/abstractions/state.service"; diff --git a/apps/browser/src/popup/services/init.service.ts b/apps/browser/src/popup/services/init.service.ts index e128e9c090..e95a2e154c 100644 --- a/apps/browser/src/popup/services/init.service.ts +++ b/apps/browser/src/popup/services/init.service.ts @@ -1,9 +1,9 @@ import { Injectable } from "@angular/core"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService as LogServiceAbstraction } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { ThemeType } from "jslib-common/enums/themeType"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { LogService as LogServiceAbstraction } from "@bitwarden/common/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { ThemeType } from "@bitwarden/common/enums/themeType"; import { StateService as StateServiceAbstraction } from "../../services/abstractions/state.service"; diff --git a/apps/browser/src/popup/services/lock-guard.service.ts b/apps/browser/src/popup/services/lock-guard.service.ts index ad62951568..13f92f0342 100644 --- a/apps/browser/src/popup/services/lock-guard.service.ts +++ b/apps/browser/src/popup/services/lock-guard.service.ts @@ -1,6 +1,6 @@ import { Injectable } from "@angular/core"; -import { LockGuard as BaseLockGuardService } from "jslib-angular/guards/lock.guard"; +import { LockGuard as BaseLockGuardService } from "@bitwarden/angular/guards/lock.guard"; @Injectable() export class LockGuardService extends BaseLockGuardService { diff --git a/apps/browser/src/popup/services/password-reprompt.service.ts b/apps/browser/src/popup/services/password-reprompt.service.ts index 33b26bfeb8..fdd176e42d 100644 --- a/apps/browser/src/popup/services/password-reprompt.service.ts +++ b/apps/browser/src/popup/services/password-reprompt.service.ts @@ -1,6 +1,6 @@ import { Injectable } from "@angular/core"; -import { PasswordRepromptService as BasePasswordRepromptService } from "jslib-angular/services/passwordReprompt.service"; +import { PasswordRepromptService as BasePasswordRepromptService } from "@bitwarden/angular/services/passwordReprompt.service"; import { PasswordRepromptComponent } from "../components/password-reprompt.component"; diff --git a/apps/browser/src/popup/services/popup-search.service.ts b/apps/browser/src/popup/services/popup-search.service.ts index a6745baf0b..bf65522b8f 100644 --- a/apps/browser/src/popup/services/popup-search.service.ts +++ b/apps/browser/src/popup/services/popup-search.service.ts @@ -1,7 +1,7 @@ -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { ConsoleLogService } from "jslib-common/services/consoleLog.service"; -import { SearchService } from "jslib-common/services/search.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; +import { SearchService } from "@bitwarden/common/services/search.service"; export class PopupSearchService extends SearchService { constructor( diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts index bb38a01e12..265776ab23 100644 --- a/apps/browser/src/popup/services/services.module.ts +++ b/apps/browser/src/popup/services/services.module.ts @@ -1,47 +1,50 @@ import { APP_INITIALIZER, LOCALE_ID, NgModule } from "@angular/core"; -import { LockGuard as BaseLockGuardService } from "jslib-angular/guards/lock.guard"; -import { UnauthGuard as BaseUnauthGuardService } from "jslib-angular/guards/unauth.guard"; -import { JslibServicesModule, SECURE_STORAGE } from "jslib-angular/services/jslib-services.module"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AppIdService } from "jslib-common/abstractions/appId.service"; -import { AuditService } from "jslib-common/abstractions/audit.service"; -import { AuthService as AuthServiceAbstraction } from "jslib-common/abstractions/auth.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { ExportService } from "jslib-common/abstractions/export.service"; -import { FileUploadService } from "jslib-common/abstractions/fileUpload.service"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service"; -import { LogService as LogServiceAbstraction } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { NotificationsService } from "jslib-common/abstractions/notifications.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "jslib-common/abstractions/passwordReprompt.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { ProviderService } from "jslib-common/abstractions/provider.service"; -import { SearchService as SearchServiceAbstraction } from "jslib-common/abstractions/search.service"; -import { SendService } from "jslib-common/abstractions/send.service"; -import { SettingsService } from "jslib-common/abstractions/settings.service"; -import { StateService as BaseStateServiceAbstraction } from "jslib-common/abstractions/state.service"; -import { StorageService as StorageServiceAbstraction } from "jslib-common/abstractions/storage.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { TokenService } from "jslib-common/abstractions/token.service"; -import { TotpService } from "jslib-common/abstractions/totp.service"; -import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service"; -import { UserVerificationService } from "jslib-common/abstractions/userVerification.service"; -import { UsernameGenerationService } from "jslib-common/abstractions/usernameGeneration.service"; -import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.service"; -import { AuthService } from "jslib-common/services/auth.service"; -import { ConsoleLogService } from "jslib-common/services/consoleLog.service"; -import { SearchService } from "jslib-common/services/search.service"; +import { LockGuard as BaseLockGuardService } from "@bitwarden/angular/guards/lock.guard"; +import { UnauthGuard as BaseUnauthGuardService } from "@bitwarden/angular/guards/unauth.guard"; +import { + JslibServicesModule, + SECURE_STORAGE, +} from "@bitwarden/angular/services/jslib-services.module"; +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 { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.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 { EventService } from "@bitwarden/common/abstractions/event.service"; +import { ExportService } from "@bitwarden/common/abstractions/export.service"; +import { FileUploadService } from "@bitwarden/common/abstractions/fileUpload.service"; +import { FolderService } from "@bitwarden/common/abstractions/folder.service"; +import { I18nService } 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 { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; +import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/abstractions/passwordReprompt.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; +import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service"; +import { SendService } from "@bitwarden/common/abstractions/send.service"; +import { SettingsService } from "@bitwarden/common/abstractions/settings.service"; +import { StateService as BaseStateServiceAbstraction } from "@bitwarden/common/abstractions/state.service"; +import { StorageService as StorageServiceAbstraction } from "@bitwarden/common/abstractions/storage.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.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.service"; +import { UsernameGenerationService } from "@bitwarden/common/abstractions/usernameGeneration.service"; +import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { AuthService } from "@bitwarden/common/services/auth.service"; +import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; +import { SearchService } from "@bitwarden/common/services/search.service"; import MainBackground from "../../background/main.background"; import { BrowserApi } from "../../browser/browserApi"; diff --git a/apps/browser/src/popup/services/unauth-guard.service.ts b/apps/browser/src/popup/services/unauth-guard.service.ts index 71a497e03c..7b9c33b2d6 100644 --- a/apps/browser/src/popup/services/unauth-guard.service.ts +++ b/apps/browser/src/popup/services/unauth-guard.service.ts @@ -1,6 +1,6 @@ import { Injectable } from "@angular/core"; -import { UnauthGuard as BaseUnauthGuardService } from "jslib-angular/guards/unauth.guard"; +import { UnauthGuard as BaseUnauthGuardService } from "@bitwarden/angular/guards/unauth.guard"; @Injectable() export class UnauthGuardService extends BaseUnauthGuardService { diff --git a/apps/browser/src/popup/settings/excluded-domains.component.ts b/apps/browser/src/popup/settings/excluded-domains.component.ts index b6a47932c9..18b1bec4ff 100644 --- a/apps/browser/src/popup/settings/excluded-domains.component.ts +++ b/apps/browser/src/popup/settings/excluded-domains.component.ts @@ -1,11 +1,11 @@ import { Component, NgZone, OnDestroy, OnInit } from "@angular/core"; import { Router } from "@angular/router"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { Utils } from "jslib-common/misc/utils"; +import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.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 { Utils } from "@bitwarden/common/misc/utils"; import { BrowserApi } from "../../browser/browserApi"; diff --git a/apps/browser/src/popup/settings/export.component.ts b/apps/browser/src/popup/settings/export.component.ts index 104f298e14..f049c037ac 100644 --- a/apps/browser/src/popup/settings/export.component.ts +++ b/apps/browser/src/popup/settings/export.component.ts @@ -2,15 +2,15 @@ import { Component } from "@angular/core"; import { FormBuilder } from "@angular/forms"; import { Router } from "@angular/router"; -import { ExportComponent as BaseExportComponent } from "jslib-angular/components/export.component"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { ExportService } from "jslib-common/abstractions/export.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { UserVerificationService } from "jslib-common/abstractions/userVerification.service"; +import { ExportComponent as BaseExportComponent } from "@bitwarden/angular/components/export.component"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { ExportService } from "@bitwarden/common/abstractions/export.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 { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service"; @Component({ selector: "app-export", diff --git a/apps/browser/src/popup/settings/folder-add-edit.component.ts b/apps/browser/src/popup/settings/folder-add-edit.component.ts index d00eefcb79..6b8a2718e0 100644 --- a/apps/browser/src/popup/settings/folder-add-edit.component.ts +++ b/apps/browser/src/popup/settings/folder-add-edit.component.ts @@ -2,11 +2,11 @@ import { Component } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { FolderAddEditComponent as BaseFolderAddEditComponent } from "jslib-angular/components/folder-add-edit.component"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { FolderAddEditComponent as BaseFolderAddEditComponent } from "@bitwarden/angular/components/folder-add-edit.component"; +import { FolderService } from "@bitwarden/common/abstractions/folder.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"; @Component({ selector: "app-folder-add-edit", diff --git a/apps/browser/src/popup/settings/folders.component.ts b/apps/browser/src/popup/settings/folders.component.ts index dd8e7566a5..eb289e8dcf 100644 --- a/apps/browser/src/popup/settings/folders.component.ts +++ b/apps/browser/src/popup/settings/folders.component.ts @@ -1,8 +1,8 @@ import { Component, OnInit } from "@angular/core"; import { Router } from "@angular/router"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { FolderView } from "jslib-common/models/view/folderView"; +import { FolderService } from "@bitwarden/common/abstractions/folder.service"; +import { FolderView } from "@bitwarden/common/models/view/folderView"; @Component({ selector: "app-folders", diff --git a/apps/browser/src/popup/settings/options.component.ts b/apps/browser/src/popup/settings/options.component.ts index 8c3ea8cdc4..21c3deb0f2 100644 --- a/apps/browser/src/popup/settings/options.component.ts +++ b/apps/browser/src/popup/settings/options.component.ts @@ -1,11 +1,11 @@ import { Component, OnInit } from "@angular/core"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { TotpService } from "jslib-common/abstractions/totp.service"; -import { ThemeType } from "jslib-common/enums/themeType"; -import { UriMatchType } from "jslib-common/enums/uriMatchType"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { TotpService } from "@bitwarden/common/abstractions/totp.service"; +import { ThemeType } from "@bitwarden/common/enums/themeType"; +import { UriMatchType } from "@bitwarden/common/enums/uriMatchType"; @Component({ selector: "app-options", diff --git a/apps/browser/src/popup/settings/premium.component.ts b/apps/browser/src/popup/settings/premium.component.ts index 040d872130..b821391924 100644 --- a/apps/browser/src/popup/settings/premium.component.ts +++ b/apps/browser/src/popup/settings/premium.component.ts @@ -1,12 +1,12 @@ import { CurrencyPipe } from "@angular/common"; import { Component } from "@angular/core"; -import { PremiumComponent as BasePremiumComponent } from "jslib-angular/components/premium.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; +import { PremiumComponent as BasePremiumComponent } from "@bitwarden/angular/components/premium.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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; @Component({ selector: "app-premium", diff --git a/apps/browser/src/popup/settings/settings.component.ts b/apps/browser/src/popup/settings/settings.component.ts index a616b39a41..4291639c56 100644 --- a/apps/browser/src/popup/settings/settings.component.ts +++ b/apps/browser/src/popup/settings/settings.component.ts @@ -3,16 +3,16 @@ import { FormControl } from "@angular/forms"; import { Router } from "@angular/router"; import Swal from "sweetalert2"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.service"; -import { DeviceType } from "jslib-common/enums/deviceType"; +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.service"; +import { DeviceType } from "@bitwarden/common/enums/deviceType"; import { BrowserApi } from "../../browser/browserApi"; import { BiometricErrors, BiometricErrorTypes } from "../../models/biometricErrors"; diff --git a/apps/browser/src/popup/settings/sync.component.ts b/apps/browser/src/popup/settings/sync.component.ts index c0f9ae7959..9647178906 100644 --- a/apps/browser/src/popup/settings/sync.component.ts +++ b/apps/browser/src/popup/settings/sync.component.ts @@ -1,8 +1,8 @@ import { Component, OnInit } from "@angular/core"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; @Component({ selector: "app-sync", diff --git a/apps/browser/src/popup/settings/vault-timeout-input.component.ts b/apps/browser/src/popup/settings/vault-timeout-input.component.ts index 8eb308b4c0..75c3c9e9e0 100644 --- a/apps/browser/src/popup/settings/vault-timeout-input.component.ts +++ b/apps/browser/src/popup/settings/vault-timeout-input.component.ts @@ -1,7 +1,7 @@ import { Component } from "@angular/core"; import { NG_VALIDATORS, NG_VALUE_ACCESSOR } from "@angular/forms"; -import { VaultTimeoutInputComponent as VaultTimeoutInputComponentBase } from "jslib-angular/components/settings/vault-timeout-input.component"; +import { VaultTimeoutInputComponent as VaultTimeoutInputComponentBase } from "@bitwarden/angular/components/settings/vault-timeout-input.component"; @Component({ selector: "app-vault-timeout-input", diff --git a/apps/browser/src/popup/vault/add-edit-custom-fields.component.ts b/apps/browser/src/popup/vault/add-edit-custom-fields.component.ts index 5ce773e014..7e6e91686f 100644 --- a/apps/browser/src/popup/vault/add-edit-custom-fields.component.ts +++ b/apps/browser/src/popup/vault/add-edit-custom-fields.component.ts @@ -1,8 +1,8 @@ import { Component } from "@angular/core"; -import { AddEditCustomFieldsComponent as BaseAddEditCustomFieldsComponent } from "jslib-angular/components/add-edit-custom-fields.component"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; +import { AddEditCustomFieldsComponent as BaseAddEditCustomFieldsComponent } from "@bitwarden/angular/components/add-edit-custom-fields.component"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; @Component({ selector: "app-vault-add-edit-custom-fields", diff --git a/apps/browser/src/popup/vault/add-edit.component.ts b/apps/browser/src/popup/vault/add-edit.component.ts index d286b96875..237c3d40fa 100644 --- a/apps/browser/src/popup/vault/add-edit.component.ts +++ b/apps/browser/src/popup/vault/add-edit.component.ts @@ -3,22 +3,22 @@ import { Component } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { AddEditComponent as BaseAddEditComponent } from "jslib-angular/components/add-edit.component"; -import { AuditService } from "jslib-common/abstractions/audit.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { LoginUriView } from "jslib-common/models/view/loginUriView"; +import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/components/add-edit.component"; +import { AuditService } from "@bitwarden/common/abstractions/audit.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { FolderService } from "@bitwarden/common/abstractions/folder.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { LoginUriView } from "@bitwarden/common/models/view/loginUriView"; import { BrowserApi } from "../../browser/browserApi"; import { PopupUtilsService } from "../services/popup-utils.service"; diff --git a/apps/browser/src/popup/vault/attachments.component.ts b/apps/browser/src/popup/vault/attachments.component.ts index bec18333c3..b36a064a60 100644 --- a/apps/browser/src/popup/vault/attachments.component.ts +++ b/apps/browser/src/popup/vault/attachments.component.ts @@ -3,14 +3,14 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { first } from "rxjs/operators"; -import { AttachmentsComponent as BaseAttachmentsComponent } from "jslib-angular/components/attachments.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; +import { AttachmentsComponent as BaseAttachmentsComponent } from "@bitwarden/angular/components/attachments.component"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.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 { StateService } from "@bitwarden/common/abstractions/state.service"; @Component({ selector: "app-vault-attachments", diff --git a/apps/browser/src/popup/vault/ciphers.component.ts b/apps/browser/src/popup/vault/ciphers.component.ts index fd58a8e713..8c3675101f 100644 --- a/apps/browser/src/popup/vault/ciphers.component.ts +++ b/apps/browser/src/popup/vault/ciphers.component.ts @@ -3,21 +3,21 @@ import { ChangeDetectorRef, Component, NgZone, OnDestroy, OnInit } from "@angula import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { CiphersComponent as BaseCiphersComponent } from "jslib-angular/components/ciphers.component"; -import { VaultFilter } from "jslib-angular/modules/vault-filter/models/vault-filter.model"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { SearchService } from "jslib-common/abstractions/search.service"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { TreeNode } from "jslib-common/models/domain/treeNode"; -import { CipherView } from "jslib-common/models/view/cipherView"; -import { CollectionView } from "jslib-common/models/view/collectionView"; -import { FolderView } from "jslib-common/models/view/folderView"; +import { CiphersComponent as BaseCiphersComponent } from "@bitwarden/angular/components/ciphers.component"; +import { VaultFilter } from "@bitwarden/angular/modules/vault-filter/models/vault-filter.model"; +import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; +import { FolderService } from "@bitwarden/common/abstractions/folder.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { SearchService } from "@bitwarden/common/abstractions/search.service"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { TreeNode } from "@bitwarden/common/models/domain/treeNode"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CollectionView } from "@bitwarden/common/models/view/collectionView"; +import { FolderView } from "@bitwarden/common/models/view/folderView"; import { BrowserComponentState } from "src/models/browserComponentState"; diff --git a/apps/browser/src/popup/vault/collections.component.ts b/apps/browser/src/popup/vault/collections.component.ts index ea01e3f061..286a585e8f 100644 --- a/apps/browser/src/popup/vault/collections.component.ts +++ b/apps/browser/src/popup/vault/collections.component.ts @@ -3,12 +3,12 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { first } from "rxjs/operators"; -import { CollectionsComponent as BaseCollectionsComponent } from "jslib-angular/components/collections.component"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { CollectionsComponent as BaseCollectionsComponent } from "@bitwarden/angular/components/collections.component"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.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"; @Component({ selector: "app-vault-collections", diff --git a/apps/browser/src/popup/vault/current-tab.component.ts b/apps/browser/src/popup/vault/current-tab.component.ts index 726a291689..97c0af2234 100644 --- a/apps/browser/src/popup/vault/current-tab.component.ts +++ b/apps/browser/src/popup/vault/current-tab.component.ts @@ -1,19 +1,19 @@ import { ChangeDetectorRef, Component, NgZone, OnDestroy, OnInit } from "@angular/core"; import { Router } from "@angular/router"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { SearchService } from "jslib-common/abstractions/search.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { CipherRepromptType } from "jslib-common/enums/cipherRepromptType"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { Utils } from "jslib-common/misc/utils"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; +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 { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; import { BrowserApi } from "../../browser/browserApi"; import { AutofillService } from "../../services/abstractions/autofill.service"; diff --git a/apps/browser/src/popup/vault/password-history.component.ts b/apps/browser/src/popup/vault/password-history.component.ts index 96e3a6c2d1..83a5a12d5a 100644 --- a/apps/browser/src/popup/vault/password-history.component.ts +++ b/apps/browser/src/popup/vault/password-history.component.ts @@ -3,10 +3,10 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { first } from "rxjs/operators"; -import { PasswordHistoryComponent as BasePasswordHistoryComponent } from "jslib-angular/components/password-history.component"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { PasswordHistoryComponent as BasePasswordHistoryComponent } from "@bitwarden/angular/components/password-history.component"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; @Component({ selector: "app-password-history", diff --git a/apps/browser/src/popup/vault/share.component.ts b/apps/browser/src/popup/vault/share.component.ts index edd53225be..a57a1a6398 100644 --- a/apps/browser/src/popup/vault/share.component.ts +++ b/apps/browser/src/popup/vault/share.component.ts @@ -2,13 +2,13 @@ import { Component } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { ShareComponent as BaseShareComponent } from "jslib-angular/components/share.component"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { ShareComponent as BaseShareComponent } from "@bitwarden/angular/components/share.component"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; @Component({ selector: "app-vault-share", diff --git a/apps/browser/src/popup/vault/vault-filter.component.ts b/apps/browser/src/popup/vault/vault-filter.component.ts index 9c663d8a91..d068686e54 100644 --- a/apps/browser/src/popup/vault/vault-filter.component.ts +++ b/apps/browser/src/popup/vault/vault-filter.component.ts @@ -3,17 +3,17 @@ import { ChangeDetectorRef, Component, NgZone, OnDestroy, OnInit } from "@angula import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { VaultFilter } from "jslib-angular/modules/vault-filter/models/vault-filter.model"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { SearchService } from "jslib-common/abstractions/search.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { TreeNode } from "jslib-common/models/domain/treeNode"; -import { CipherView } from "jslib-common/models/view/cipherView"; -import { CollectionView } from "jslib-common/models/view/collectionView"; -import { FolderView } from "jslib-common/models/view/folderView"; +import { VaultFilter } from "@bitwarden/angular/modules/vault-filter/models/vault-filter.model"; +import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { SearchService } from "@bitwarden/common/abstractions/search.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { TreeNode } from "@bitwarden/common/models/domain/treeNode"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CollectionView } from "@bitwarden/common/models/view/collectionView"; +import { FolderView } from "@bitwarden/common/models/view/folderView"; import { BrowserGroupingsComponentState } from "src/models/browserGroupingsComponentState"; diff --git a/apps/browser/src/popup/vault/vault-select.component.ts b/apps/browser/src/popup/vault/vault-select.component.ts index fb5178cfd4..745086104f 100644 --- a/apps/browser/src/popup/vault/vault-select.component.ts +++ b/apps/browser/src/popup/vault/vault-select.component.ts @@ -14,10 +14,10 @@ import { } from "@angular/core"; import { merge } from "rxjs"; -import { VaultFilter } from "jslib-angular/modules/vault-filter/models/vault-filter.model"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { Organization } from "jslib-common/models/domain/organization"; +import { VaultFilter } from "@bitwarden/angular/modules/vault-filter/models/vault-filter.model"; +import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { Organization } from "@bitwarden/common/models/domain/organization"; import { VaultFilterService } from "../../services/vaultFilter.service"; diff --git a/apps/browser/src/popup/vault/view-custom-fields.component.ts b/apps/browser/src/popup/vault/view-custom-fields.component.ts index 30046a3110..7d9b338f0f 100644 --- a/apps/browser/src/popup/vault/view-custom-fields.component.ts +++ b/apps/browser/src/popup/vault/view-custom-fields.component.ts @@ -1,7 +1,7 @@ import { Component } from "@angular/core"; -import { ViewCustomFieldsComponent as BaseViewCustomFieldsComponent } from "jslib-angular/components/view-custom-fields.component"; -import { EventService } from "jslib-common/abstractions/event.service"; +import { ViewCustomFieldsComponent as BaseViewCustomFieldsComponent } from "@bitwarden/angular/components/view-custom-fields.component"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; @Component({ selector: "app-vault-view-custom-fields", diff --git a/apps/browser/src/popup/vault/view.component.ts b/apps/browser/src/popup/vault/view.component.ts index 4f08171bf8..190a0538b9 100644 --- a/apps/browser/src/popup/vault/view.component.ts +++ b/apps/browser/src/popup/vault/view.component.ts @@ -3,24 +3,24 @@ import { ChangeDetectorRef, Component, NgZone } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { ViewComponent as BaseViewComponent } from "jslib-angular/components/view.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AuditService } from "jslib-common/abstractions/audit.service"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { TokenService } from "jslib-common/abstractions/token.service"; -import { TotpService } from "jslib-common/abstractions/totp.service"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { Cipher } from "jslib-common/models/domain/cipher"; -import { LoginUriView } from "jslib-common/models/view/loginUriView"; +import { ViewComponent as BaseViewComponent } from "@bitwarden/angular/components/view.component"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { AuditService } from "@bitwarden/common/abstractions/audit.service"; +import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.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 { CipherType } from "@bitwarden/common/enums/cipherType"; +import { Cipher } from "@bitwarden/common/models/domain/cipher"; +import { LoginUriView } from "@bitwarden/common/models/view/loginUriView"; import { BrowserApi } from "../../browser/browserApi"; import { AutofillService } from "../../services/abstractions/autofill.service"; diff --git a/apps/browser/src/services/abstractions/state.service.ts b/apps/browser/src/services/abstractions/state.service.ts index 4d61cd61cf..1ed5ae24a2 100644 --- a/apps/browser/src/services/abstractions/state.service.ts +++ b/apps/browser/src/services/abstractions/state.service.ts @@ -1,5 +1,5 @@ -import { StateService as BaseStateServiceAbstraction } from "jslib-common/abstractions/state.service"; -import { StorageOptions } from "jslib-common/models/domain/storageOptions"; +import { StateService as BaseStateServiceAbstraction } from "@bitwarden/common/abstractions/state.service"; +import { StorageOptions } from "@bitwarden/common/models/domain/storageOptions"; import { Account } from "src/models/account"; import { BrowserComponentState } from "src/models/browserComponentState"; diff --git a/apps/browser/src/services/autofill.service.ts b/apps/browser/src/services/autofill.service.ts index 406bc15547..442d4c74eb 100644 --- a/apps/browser/src/services/autofill.service.ts +++ b/apps/browser/src/services/autofill.service.ts @@ -1,13 +1,13 @@ -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { TotpService } from "jslib-common/abstractions/totp.service"; -import { CipherRepromptType } from "jslib-common/enums/cipherRepromptType"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { EventType } from "jslib-common/enums/eventType"; -import { FieldType } from "jslib-common/enums/fieldType"; -import { CipherView } from "jslib-common/models/view/cipherView"; -import { FieldView } from "jslib-common/models/view/fieldView"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { TotpService } from "@bitwarden/common/abstractions/totp.service"; +import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { EventType } from "@bitwarden/common/enums/eventType"; +import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { FieldView } from "@bitwarden/common/models/view/fieldView"; import { BrowserApi } from "../browser/browserApi"; import AutofillField from "../models/autofillField"; diff --git a/apps/browser/src/services/browserCrypto.service.ts b/apps/browser/src/services/browserCrypto.service.ts index 0eb0f94b17..14cd4de819 100644 --- a/apps/browser/src/services/browserCrypto.service.ts +++ b/apps/browser/src/services/browserCrypto.service.ts @@ -1,5 +1,5 @@ -import { KeySuffixOptions } from "jslib-common/enums/keySuffixOptions"; -import { CryptoService } from "jslib-common/services/crypto.service"; +import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions"; +import { CryptoService } from "@bitwarden/common/services/crypto.service"; export class BrowserCryptoService extends CryptoService { protected async retrieveKeyFromStorage(keySuffix: KeySuffixOptions) { diff --git a/apps/browser/src/services/browserMessaging.service.ts b/apps/browser/src/services/browserMessaging.service.ts index f59ac88774..ae121793a0 100644 --- a/apps/browser/src/services/browserMessaging.service.ts +++ b/apps/browser/src/services/browserMessaging.service.ts @@ -1,4 +1,4 @@ -import { MessagingService } from "jslib-common/abstractions/messaging.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; export default class BrowserMessagingService implements MessagingService { send(subscriber: string, arg: any = {}) { diff --git a/apps/browser/src/services/browserMessagingPrivateModeBackground.service.ts b/apps/browser/src/services/browserMessagingPrivateModeBackground.service.ts index 4ffdf763da..6d0bcd81af 100644 --- a/apps/browser/src/services/browserMessagingPrivateModeBackground.service.ts +++ b/apps/browser/src/services/browserMessagingPrivateModeBackground.service.ts @@ -1,4 +1,4 @@ -import { MessagingService } from "jslib-common/abstractions/messaging.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; export default class BrowserMessagingPrivateModeBackgroundService implements MessagingService { send(subscriber: string, arg: any = {}) { diff --git a/apps/browser/src/services/browserMessagingPrivateModePopup.service.ts b/apps/browser/src/services/browserMessagingPrivateModePopup.service.ts index 0f3af10d86..a0a3c938ac 100644 --- a/apps/browser/src/services/browserMessagingPrivateModePopup.service.ts +++ b/apps/browser/src/services/browserMessagingPrivateModePopup.service.ts @@ -1,4 +1,4 @@ -import { MessagingService } from "jslib-common/abstractions/messaging.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; export default class BrowserMessagingPrivateModePopupService implements MessagingService { send(subscriber: string, arg: any = {}) { diff --git a/apps/browser/src/services/browserPlatformUtils.service.spec.ts b/apps/browser/src/services/browserPlatformUtils.service.spec.ts index 8b93e15c21..cc60288805 100644 --- a/apps/browser/src/services/browserPlatformUtils.service.spec.ts +++ b/apps/browser/src/services/browserPlatformUtils.service.spec.ts @@ -1,4 +1,4 @@ -import { DeviceType } from "jslib-common/enums/deviceType"; +import { DeviceType } from "@bitwarden/common/enums/deviceType"; import BrowserPlatformUtilsService from "./browserPlatformUtils.service"; diff --git a/apps/browser/src/services/browserPlatformUtils.service.ts b/apps/browser/src/services/browserPlatformUtils.service.ts index f641d14950..415a6a5ccf 100644 --- a/apps/browser/src/services/browserPlatformUtils.service.ts +++ b/apps/browser/src/services/browserPlatformUtils.service.ts @@ -1,8 +1,8 @@ -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { ClientType } from "jslib-common/enums/clientType"; -import { DeviceType } from "jslib-common/enums/deviceType"; -import { ThemeType } from "jslib-common/enums/themeType"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { ClientType } from "@bitwarden/common/enums/clientType"; +import { DeviceType } from "@bitwarden/common/enums/deviceType"; +import { ThemeType } from "@bitwarden/common/enums/themeType"; import { BrowserApi } from "../browser/browserApi"; import { SafariApp } from "../browser/safariApp"; diff --git a/apps/browser/src/services/browserStorage.service.ts b/apps/browser/src/services/browserStorage.service.ts index 455d541959..842363ecdb 100644 --- a/apps/browser/src/services/browserStorage.service.ts +++ b/apps/browser/src/services/browserStorage.service.ts @@ -1,4 +1,4 @@ -import { StorageService } from "jslib-common/abstractions/storage.service"; +import { StorageService } from "@bitwarden/common/abstractions/storage.service"; export default class BrowserStorageService implements StorageService { private chromeStorageApi: any; diff --git a/apps/browser/src/services/i18n.service.ts b/apps/browser/src/services/i18n.service.ts index eab97affed..9f223b31d5 100644 --- a/apps/browser/src/services/i18n.service.ts +++ b/apps/browser/src/services/i18n.service.ts @@ -1,4 +1,4 @@ -import { I18nService as BaseI18nService } from "jslib-common/services/i18n.service"; +import { I18nService as BaseI18nService } from "@bitwarden/common/services/i18n.service"; export default class I18nService extends BaseI18nService { constructor(systemLanguage: string) { diff --git a/apps/browser/src/services/state.service.ts b/apps/browser/src/services/state.service.ts index 4d632baa43..ece59ccabb 100644 --- a/apps/browser/src/services/state.service.ts +++ b/apps/browser/src/services/state.service.ts @@ -1,6 +1,6 @@ -import { GlobalState } from "jslib-common/models/domain/globalState"; -import { StorageOptions } from "jslib-common/models/domain/storageOptions"; -import { StateService as BaseStateService } from "jslib-common/services/state.service"; +import { GlobalState } from "@bitwarden/common/models/domain/globalState"; +import { StorageOptions } from "@bitwarden/common/models/domain/storageOptions"; +import { StateService as BaseStateService } from "@bitwarden/common/services/state.service"; import { Account } from "../models/account"; import { BrowserComponentState } from "../models/browserComponentState"; diff --git a/apps/browser/src/services/vaultFilter.service.ts b/apps/browser/src/services/vaultFilter.service.ts index 28ada46ae1..117cb90119 100644 --- a/apps/browser/src/services/vaultFilter.service.ts +++ b/apps/browser/src/services/vaultFilter.service.ts @@ -1,12 +1,12 @@ -import { VaultFilter } from "jslib-angular/modules/vault-filter/models/vault-filter.model"; -import { VaultFilterService as BaseVaultFilterService } from "jslib-angular/modules/vault-filter/vault-filter.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { VaultFilter } from "@bitwarden/angular/modules/vault-filter/models/vault-filter.model"; +import { VaultFilterService as BaseVaultFilterService } from "@bitwarden/angular/modules/vault-filter/vault-filter.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; +import { FolderService } from "@bitwarden/common/abstractions/folder.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; export class VaultFilterService extends BaseVaultFilterService { vaultFilter: VaultFilter = new VaultFilter(); diff --git a/apps/browser/src/services/vaultTimeout.service.ts b/apps/browser/src/services/vaultTimeout.service.ts index 4678a4f522..8dc67a494b 100644 --- a/apps/browser/src/services/vaultTimeout.service.ts +++ b/apps/browser/src/services/vaultTimeout.service.ts @@ -1,4 +1,4 @@ -import { VaultTimeoutService as BaseVaultTimeoutService } from "jslib-common/services/vaultTimeout.service"; +import { VaultTimeoutService as BaseVaultTimeoutService } from "@bitwarden/common/services/vaultTimeout.service"; import { SafariApp } from "../browser/safariApp"; diff --git a/apps/browser/tsconfig.json b/apps/browser/tsconfig.json index 17b727079c..5c35b45fde 100644 --- a/apps/browser/tsconfig.json +++ b/apps/browser/tsconfig.json @@ -10,8 +10,8 @@ "sourceMap": true, "baseUrl": ".", "paths": { - "jslib-common/*": ["../../libs/common/src/*"], - "jslib-angular/*": ["../../libs/angular/src/*"] + "@bitwarden/common/*": ["../../libs/common/src/*"], + "@bitwarden/angular/*": ["../../libs/angular/src/*"] } }, "angularCompilerOptions": { diff --git a/apps/cli/package.json b/apps/cli/package.json index 99d2331ccd..e994f331fd 100644 --- a/apps/cli/package.json +++ b/apps/cli/package.json @@ -46,27 +46,27 @@ "dependencies": { "@koa/multer": "^3.0.0", "@koa/router": "^10.1.1", - "big-integer": "1.6.48", + "big-integer": "^1.6.51", "browser-hrtime": "^1.1.8", "chalk": "^4.1.1", "commander": "7.2.0", "form-data": "4.0.0", "https-proxy-agent": "5.0.0", "inquirer": "8.0.0", - "jsdom": "^16.5.3", - "jszip": "^3.7.1", + "jsdom": "^16.7.0", + "jszip": "^3.10.0", "koa": "^2.13.4", "koa-bodyparser": "^4.3.0", "koa-json": "^2.0.2", "lowdb": "1.0.0", "lunr": "^2.3.9", - "multer": "^1.4.4", - "node-fetch": "^2.6.1", + "multer": "^1.4.5-lts.1", + "node-fetch": "^2.6.7", "node-forge": "1.3.1", - "open": "^8.0.8", - "papaparse": "^5.3.0", + "open": "^8.4.0", + "papaparse": "^5.3.2", "proper-lockfile": "^4.1.2", - "rxjs": "6.6.7", + "rxjs": "^7.5.5", "tldjs": "^2.3.1", "zxcvbn": "^4.4.2" } diff --git a/apps/cli/src/bw.ts b/apps/cli/src/bw.ts index 7006a18d21..7647d6b0b7 100644 --- a/apps/cli/src/bw.ts +++ b/apps/cli/src/bw.ts @@ -4,45 +4,45 @@ import * as path from "path"; import * as program from "commander"; import * as jsdom from "jsdom"; -import { ClientType } from "jslib-common/enums/clientType"; -import { KeySuffixOptions } from "jslib-common/enums/keySuffixOptions"; -import { LogLevelType } from "jslib-common/enums/logLevelType"; -import { StateFactory } from "jslib-common/factories/stateFactory"; -import { Account } from "jslib-common/models/domain/account"; -import { GlobalState } from "jslib-common/models/domain/globalState"; -import { AppIdService } from "jslib-common/services/appId.service"; -import { AuditService } from "jslib-common/services/audit.service"; -import { AuthService } from "jslib-common/services/auth.service"; -import { CipherService } from "jslib-common/services/cipher.service"; -import { CollectionService } from "jslib-common/services/collection.service"; -import { ContainerService } from "jslib-common/services/container.service"; -import { CryptoService } from "jslib-common/services/crypto.service"; -import { EnvironmentService } from "jslib-common/services/environment.service"; -import { ExportService } from "jslib-common/services/export.service"; -import { FileUploadService } from "jslib-common/services/fileUpload.service"; -import { FolderService } from "jslib-common/services/folder.service"; -import { ImportService } from "jslib-common/services/import.service"; -import { KeyConnectorService } from "jslib-common/services/keyConnector.service"; -import { NoopMessagingService } from "jslib-common/services/noopMessaging.service"; -import { OrganizationService } from "jslib-common/services/organization.service"; -import { PasswordGenerationService } from "jslib-common/services/passwordGeneration.service"; -import { PolicyService } from "jslib-common/services/policy.service"; -import { ProviderService } from "jslib-common/services/provider.service"; -import { SearchService } from "jslib-common/services/search.service"; -import { SendService } from "jslib-common/services/send.service"; -import { SettingsService } from "jslib-common/services/settings.service"; -import { StateService } from "jslib-common/services/state.service"; -import { StateMigrationService } from "jslib-common/services/stateMigration.service"; -import { SyncService } from "jslib-common/services/sync.service"; -import { TokenService } from "jslib-common/services/token.service"; -import { TotpService } from "jslib-common/services/totp.service"; -import { TwoFactorService } from "jslib-common/services/twoFactor.service"; -import { UserVerificationService } from "jslib-common/services/userVerification.service"; -import { VaultTimeoutService } from "jslib-common/services/vaultTimeout.service"; -import { CliPlatformUtilsService } from "jslib-node/cli/services/cliPlatformUtils.service"; -import { ConsoleLogService } from "jslib-node/cli/services/consoleLog.service"; -import { NodeApiService } from "jslib-node/services/nodeApi.service"; -import { NodeCryptoFunctionService } from "jslib-node/services/nodeCryptoFunction.service"; +import { ClientType } from "@bitwarden/common/enums/clientType"; +import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions"; +import { LogLevelType } from "@bitwarden/common/enums/logLevelType"; +import { StateFactory } from "@bitwarden/common/factories/stateFactory"; +import { Account } from "@bitwarden/common/models/domain/account"; +import { GlobalState } from "@bitwarden/common/models/domain/globalState"; +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 { CipherService } from "@bitwarden/common/services/cipher.service"; +import { CollectionService } from "@bitwarden/common/services/collection.service"; +import { ContainerService } from "@bitwarden/common/services/container.service"; +import { CryptoService } from "@bitwarden/common/services/crypto.service"; +import { EnvironmentService } from "@bitwarden/common/services/environment.service"; +import { ExportService } from "@bitwarden/common/services/export.service"; +import { FileUploadService } from "@bitwarden/common/services/fileUpload.service"; +import { FolderService } from "@bitwarden/common/services/folder.service"; +import { ImportService } from "@bitwarden/common/services/import.service"; +import { KeyConnectorService } from "@bitwarden/common/services/keyConnector.service"; +import { NoopMessagingService } from "@bitwarden/common/services/noopMessaging.service"; +import { OrganizationService } from "@bitwarden/common/services/organization.service"; +import { PasswordGenerationService } from "@bitwarden/common/services/passwordGeneration.service"; +import { PolicyService } from "@bitwarden/common/services/policy.service"; +import { ProviderService } from "@bitwarden/common/services/provider.service"; +import { SearchService } from "@bitwarden/common/services/search.service"; +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 { SyncService } from "@bitwarden/common/services/sync.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 { UserVerificationService } from "@bitwarden/common/services/userVerification.service"; +import { VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout.service"; +import { CliPlatformUtilsService } from "@bitwarden/node/cli/services/cliPlatformUtils.service"; +import { ConsoleLogService } from "@bitwarden/node/cli/services/consoleLog.service"; +import { NodeApiService } from "@bitwarden/node/services/nodeApi.service"; +import { NodeCryptoFunctionService } from "@bitwarden/node/services/nodeCryptoFunction.service"; import { Program } from "./program"; import { SendProgram } from "./send.program"; diff --git a/apps/cli/src/commands/completion.command.ts b/apps/cli/src/commands/completion.command.ts index 2deaef4903..c175f9b6a1 100644 --- a/apps/cli/src/commands/completion.command.ts +++ b/apps/cli/src/commands/completion.command.ts @@ -1,7 +1,7 @@ import * as program from "commander"; -import { Response } from "jslib-node/cli/models/response"; -import { MessageResponse } from "jslib-node/cli/models/response/messageResponse"; +import { Response } from "@bitwarden/node/cli/models/response"; +import { MessageResponse } from "@bitwarden/node/cli/models/response/messageResponse"; interface IOption { long?: string; diff --git a/apps/cli/src/commands/config.command.ts b/apps/cli/src/commands/config.command.ts index 89fc81296f..2fa33c9edc 100644 --- a/apps/cli/src/commands/config.command.ts +++ b/apps/cli/src/commands/config.command.ts @@ -1,9 +1,9 @@ import * as program from "commander"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { Response } from "jslib-node/cli/models/response"; -import { MessageResponse } from "jslib-node/cli/models/response/messageResponse"; -import { StringResponse } from "jslib-node/cli/models/response/stringResponse"; +import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; +import { Response } from "@bitwarden/node/cli/models/response"; +import { MessageResponse } from "@bitwarden/node/cli/models/response/messageResponse"; +import { StringResponse } from "@bitwarden/node/cli/models/response/stringResponse"; export class ConfigCommand { constructor(private environmentService: EnvironmentService) {} diff --git a/apps/cli/src/commands/confirm.command.ts b/apps/cli/src/commands/confirm.command.ts index 68c203be5c..1eb469908a 100644 --- a/apps/cli/src/commands/confirm.command.ts +++ b/apps/cli/src/commands/confirm.command.ts @@ -1,8 +1,8 @@ -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { Utils } from "jslib-common/misc/utils"; -import { OrganizationUserConfirmRequest } from "jslib-common/models/request/organizationUserConfirmRequest"; -import { Response } from "jslib-node/cli/models/response"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { OrganizationUserConfirmRequest } from "@bitwarden/common/models/request/organizationUserConfirmRequest"; +import { Response } from "@bitwarden/node/cli/models/response"; export class ConfirmCommand { constructor(private apiService: ApiService, private cryptoService: CryptoService) {} diff --git a/apps/cli/src/commands/convertToKeyConnector.command.ts b/apps/cli/src/commands/convertToKeyConnector.command.ts index 7774f79a69..f70f022b0c 100644 --- a/apps/cli/src/commands/convertToKeyConnector.command.ts +++ b/apps/cli/src/commands/convertToKeyConnector.command.ts @@ -1,11 +1,11 @@ import * as inquirer from "inquirer"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { Response } from "jslib-node/cli/models/response"; -import { MessageResponse } from "jslib-node/cli/models/response/messageResponse"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; +import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { Response } from "@bitwarden/node/cli/models/response"; +import { MessageResponse } from "@bitwarden/node/cli/models/response/messageResponse"; export class ConvertToKeyConnectorCommand { constructor( diff --git a/apps/cli/src/commands/create.command.ts b/apps/cli/src/commands/create.command.ts index fa80861654..3951c9ec78 100644 --- a/apps/cli/src/commands/create.command.ts +++ b/apps/cli/src/commands/create.command.ts @@ -1,18 +1,18 @@ import * as fs from "fs"; import * as path from "path"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { Utils } from "jslib-common/misc/utils"; -import { CipherExport } from "jslib-common/models/export/cipherExport"; -import { CollectionExport } from "jslib-common/models/export/collectionExport"; -import { FolderExport } from "jslib-common/models/export/folderExport"; -import { CollectionRequest } from "jslib-common/models/request/collectionRequest"; -import { SelectionReadOnlyRequest } from "jslib-common/models/request/selectionReadOnlyRequest"; -import { Response } from "jslib-node/cli/models/response"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { FolderService } from "@bitwarden/common/abstractions/folder.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { CipherExport } from "@bitwarden/common/models/export/cipherExport"; +import { CollectionExport } from "@bitwarden/common/models/export/collectionExport"; +import { FolderExport } from "@bitwarden/common/models/export/folderExport"; +import { CollectionRequest } from "@bitwarden/common/models/request/collectionRequest"; +import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selectionReadOnlyRequest"; +import { Response } from "@bitwarden/node/cli/models/response"; import { OrganizationCollectionRequest } from "../models/request/organizationCollectionRequest"; import { CipherResponse } from "../models/response/cipherResponse"; diff --git a/apps/cli/src/commands/delete.command.ts b/apps/cli/src/commands/delete.command.ts index 7fee0d485e..2a35b46637 100644 --- a/apps/cli/src/commands/delete.command.ts +++ b/apps/cli/src/commands/delete.command.ts @@ -1,9 +1,9 @@ -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { Utils } from "jslib-common/misc/utils"; -import { Response } from "jslib-node/cli/models/response"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { FolderService } from "@bitwarden/common/abstractions/folder.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { Response } from "@bitwarden/node/cli/models/response"; import { CliUtils } from "src/utils"; diff --git a/apps/cli/src/commands/download.command.ts b/apps/cli/src/commands/download.command.ts index bf3773a16d..ae3c35f00c 100644 --- a/apps/cli/src/commands/download.command.ts +++ b/apps/cli/src/commands/download.command.ts @@ -1,9 +1,9 @@ import * as fet from "node-fetch"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; -import { Response } from "jslib-node/cli/models/response"; -import { FileResponse } from "jslib-node/cli/models/response/fileResponse"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { Response } from "@bitwarden/node/cli/models/response"; +import { FileResponse } from "@bitwarden/node/cli/models/response/fileResponse"; import { CliUtils } from "../utils"; diff --git a/apps/cli/src/commands/edit.command.ts b/apps/cli/src/commands/edit.command.ts index 17b1c4b58b..b331b0551b 100644 --- a/apps/cli/src/commands/edit.command.ts +++ b/apps/cli/src/commands/edit.command.ts @@ -1,14 +1,14 @@ -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { Utils } from "jslib-common/misc/utils"; -import { CipherExport } from "jslib-common/models/export/cipherExport"; -import { CollectionExport } from "jslib-common/models/export/collectionExport"; -import { FolderExport } from "jslib-common/models/export/folderExport"; -import { CollectionRequest } from "jslib-common/models/request/collectionRequest"; -import { SelectionReadOnlyRequest } from "jslib-common/models/request/selectionReadOnlyRequest"; -import { Response } from "jslib-node/cli/models/response"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { FolderService } from "@bitwarden/common/abstractions/folder.service"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { CipherExport } from "@bitwarden/common/models/export/cipherExport"; +import { CollectionExport } from "@bitwarden/common/models/export/collectionExport"; +import { FolderExport } from "@bitwarden/common/models/export/folderExport"; +import { CollectionRequest } from "@bitwarden/common/models/request/collectionRequest"; +import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selectionReadOnlyRequest"; +import { Response } from "@bitwarden/node/cli/models/response"; import { OrganizationCollectionRequest } from "../models/request/organizationCollectionRequest"; import { CipherResponse } from "../models/response/cipherResponse"; diff --git a/apps/cli/src/commands/encode.command.ts b/apps/cli/src/commands/encode.command.ts index c7de9a11b3..1c957d26fa 100644 --- a/apps/cli/src/commands/encode.command.ts +++ b/apps/cli/src/commands/encode.command.ts @@ -1,5 +1,5 @@ -import { Response } from "jslib-node/cli/models/response"; -import { StringResponse } from "jslib-node/cli/models/response/stringResponse"; +import { Response } from "@bitwarden/node/cli/models/response"; +import { StringResponse } from "@bitwarden/node/cli/models/response/stringResponse"; import { CliUtils } from "../utils"; diff --git a/apps/cli/src/commands/export.command.ts b/apps/cli/src/commands/export.command.ts index e8ed33423a..eb8f3926ae 100644 --- a/apps/cli/src/commands/export.command.ts +++ b/apps/cli/src/commands/export.command.ts @@ -1,11 +1,11 @@ import * as program from "commander"; import * as inquirer from "inquirer"; -import { ExportFormat, ExportService } from "jslib-common/abstractions/export.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { PolicyType } from "jslib-common/enums/policyType"; -import { Utils } from "jslib-common/misc/utils"; -import { Response } from "jslib-node/cli/models/response"; +import { ExportFormat, ExportService } from "@bitwarden/common/abstractions/export.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { Response } from "@bitwarden/node/cli/models/response"; import { CliUtils } from "../utils"; diff --git a/apps/cli/src/commands/generate.command.ts b/apps/cli/src/commands/generate.command.ts index d6d0c89819..3fb8a7fd8b 100644 --- a/apps/cli/src/commands/generate.command.ts +++ b/apps/cli/src/commands/generate.command.ts @@ -1,7 +1,7 @@ -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { Response } from "jslib-node/cli/models/response"; -import { StringResponse } from "jslib-node/cli/models/response/stringResponse"; +import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { Response } from "@bitwarden/node/cli/models/response"; +import { StringResponse } from "@bitwarden/node/cli/models/response/stringResponse"; import { CliUtils } from "../utils"; diff --git a/apps/cli/src/commands/get.command.ts b/apps/cli/src/commands/get.command.ts index 27ad8a99ea..8fa9598dc9 100644 --- a/apps/cli/src/commands/get.command.ts +++ b/apps/cli/src/commands/get.command.ts @@ -1,33 +1,33 @@ -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AuditService } from "jslib-common/abstractions/audit.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { SearchService } from "jslib-common/abstractions/search.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { TotpService } from "jslib-common/abstractions/totp.service"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { SendType } from "jslib-common/enums/sendType"; -import { Utils } from "jslib-common/misc/utils"; -import { EncString } from "jslib-common/models/domain/encString"; -import { Organization } from "jslib-common/models/domain/organization"; -import { CardExport } from "jslib-common/models/export/cardExport"; -import { CipherExport } from "jslib-common/models/export/cipherExport"; -import { CollectionExport } from "jslib-common/models/export/collectionExport"; -import { FieldExport } from "jslib-common/models/export/fieldExport"; -import { FolderExport } from "jslib-common/models/export/folderExport"; -import { IdentityExport } from "jslib-common/models/export/identityExport"; -import { LoginExport } from "jslib-common/models/export/loginExport"; -import { LoginUriExport } from "jslib-common/models/export/loginUriExport"; -import { SecureNoteExport } from "jslib-common/models/export/secureNoteExport"; -import { ErrorResponse } from "jslib-common/models/response/errorResponse"; -import { CipherView } from "jslib-common/models/view/cipherView"; -import { CollectionView } from "jslib-common/models/view/collectionView"; -import { FolderView } from "jslib-common/models/view/folderView"; -import { Response } from "jslib-node/cli/models/response"; -import { StringResponse } from "jslib-node/cli/models/response/stringResponse"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { AuditService } from "@bitwarden/common/abstractions/audit.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { FolderService } from "@bitwarden/common/abstractions/folder.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { SearchService } from "@bitwarden/common/abstractions/search.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { TotpService } from "@bitwarden/common/abstractions/totp.service"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { SendType } from "@bitwarden/common/enums/sendType"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { EncString } from "@bitwarden/common/models/domain/encString"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { CardExport } from "@bitwarden/common/models/export/cardExport"; +import { CipherExport } from "@bitwarden/common/models/export/cipherExport"; +import { CollectionExport } from "@bitwarden/common/models/export/collectionExport"; +import { FieldExport } from "@bitwarden/common/models/export/fieldExport"; +import { FolderExport } from "@bitwarden/common/models/export/folderExport"; +import { IdentityExport } from "@bitwarden/common/models/export/identityExport"; +import { LoginExport } from "@bitwarden/common/models/export/loginExport"; +import { LoginUriExport } from "@bitwarden/common/models/export/loginUriExport"; +import { SecureNoteExport } from "@bitwarden/common/models/export/secureNoteExport"; +import { ErrorResponse } from "@bitwarden/common/models/response/errorResponse"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CollectionView } from "@bitwarden/common/models/view/collectionView"; +import { FolderView } from "@bitwarden/common/models/view/folderView"; +import { Response } from "@bitwarden/node/cli/models/response"; +import { StringResponse } from "@bitwarden/node/cli/models/response/stringResponse"; import { OrganizationCollectionRequest } from "../models/request/organizationCollectionRequest"; import { CipherResponse } from "../models/response/cipherResponse"; diff --git a/apps/cli/src/commands/import.command.ts b/apps/cli/src/commands/import.command.ts index 23f5ddaa1d..f3b04a5f56 100644 --- a/apps/cli/src/commands/import.command.ts +++ b/apps/cli/src/commands/import.command.ts @@ -1,12 +1,12 @@ import * as program from "commander"; import * as inquirer from "inquirer"; -import { ImportService } from "jslib-common/abstractions/import.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { ImportType } from "jslib-common/enums/importOptions"; -import { Importer } from "jslib-common/importers/importer"; -import { Response } from "jslib-node/cli/models/response"; -import { MessageResponse } from "jslib-node/cli/models/response/messageResponse"; +import { ImportService } from "@bitwarden/common/abstractions/import.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { ImportType } from "@bitwarden/common/enums/importOptions"; +import { Importer } from "@bitwarden/common/importers/importer"; +import { Response } from "@bitwarden/node/cli/models/response"; +import { MessageResponse } from "@bitwarden/node/cli/models/response/messageResponse"; import { CliUtils } from "../utils"; diff --git a/apps/cli/src/commands/list.command.ts b/apps/cli/src/commands/list.command.ts index 04727a4f45..e7dfef3104 100644 --- a/apps/cli/src/commands/list.command.ts +++ b/apps/cli/src/commands/list.command.ts @@ -1,20 +1,20 @@ -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { SearchService } from "jslib-common/abstractions/search.service"; -import { Utils } from "jslib-common/misc/utils"; -import { CollectionData } from "jslib-common/models/data/collectionData"; -import { Collection } from "jslib-common/models/domain/collection"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; +import { FolderService } from "@bitwarden/common/abstractions/folder.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { SearchService } from "@bitwarden/common/abstractions/search.service"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { CollectionData } from "@bitwarden/common/models/data/collectionData"; +import { Collection } from "@bitwarden/common/models/domain/collection"; import { CollectionDetailsResponse as ApiCollectionDetailsResponse, CollectionResponse as ApiCollectionResponse, -} from "jslib-common/models/response/collectionResponse"; -import { ListResponse as ApiListResponse } from "jslib-common/models/response/listResponse"; -import { CipherView } from "jslib-common/models/view/cipherView"; -import { Response } from "jslib-node/cli/models/response"; -import { ListResponse } from "jslib-node/cli/models/response/listResponse"; +} from "@bitwarden/common/models/response/collectionResponse"; +import { ListResponse as ApiListResponse } from "@bitwarden/common/models/response/listResponse"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { Response } from "@bitwarden/node/cli/models/response"; +import { ListResponse } from "@bitwarden/node/cli/models/response/listResponse"; import { CipherResponse } from "../models/response/cipherResponse"; import { CollectionResponse } from "../models/response/collectionResponse"; diff --git a/apps/cli/src/commands/lock.command.ts b/apps/cli/src/commands/lock.command.ts index 52f331ab5e..9a7e807d0f 100644 --- a/apps/cli/src/commands/lock.command.ts +++ b/apps/cli/src/commands/lock.command.ts @@ -1,6 +1,6 @@ -import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.service"; -import { Response } from "jslib-node/cli/models/response"; -import { MessageResponse } from "jslib-node/cli/models/response/messageResponse"; +import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { Response } from "@bitwarden/node/cli/models/response"; +import { MessageResponse } from "@bitwarden/node/cli/models/response/messageResponse"; export class LockCommand { constructor(private vaultTimeoutService: VaultTimeoutService) {} diff --git a/apps/cli/src/commands/login.command.ts b/apps/cli/src/commands/login.command.ts index 6fa1b12c61..dd841e2b9e 100644 --- a/apps/cli/src/commands/login.command.ts +++ b/apps/cli/src/commands/login.command.ts @@ -1,21 +1,21 @@ import * as program from "commander"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service"; -import { Utils } from "jslib-common/misc/utils"; -import { LoginCommand as BaseLoginCommand } from "jslib-node/cli/commands/login.command"; -import { MessageResponse } from "jslib-node/cli/models/response/messageResponse"; +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 { I18nService } from "@bitwarden/common/abstractions/i18n.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.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { LoginCommand as BaseLoginCommand } from "@bitwarden/node/cli/commands/login.command"; +import { MessageResponse } from "@bitwarden/node/cli/models/response/messageResponse"; export class LoginCommand extends BaseLoginCommand { private options: program.OptionValues; diff --git a/apps/cli/src/commands/restore.command.ts b/apps/cli/src/commands/restore.command.ts index 51247698db..75e50dabfd 100644 --- a/apps/cli/src/commands/restore.command.ts +++ b/apps/cli/src/commands/restore.command.ts @@ -1,5 +1,5 @@ -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { Response } from "jslib-node/cli/models/response"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { Response } from "@bitwarden/node/cli/models/response"; export class RestoreCommand { constructor(private cipherService: CipherService) {} diff --git a/apps/cli/src/commands/send/create.command.ts b/apps/cli/src/commands/send/create.command.ts index bbf0adc65a..cfea2e863c 100644 --- a/apps/cli/src/commands/send/create.command.ts +++ b/apps/cli/src/commands/send/create.command.ts @@ -1,12 +1,12 @@ import * as fs from "fs"; import * as path from "path"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { SendService } from "jslib-common/abstractions/send.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SendType } from "jslib-common/enums/sendType"; -import { NodeUtils } from "jslib-common/misc/nodeUtils"; -import { Response } from "jslib-node/cli/models/response"; +import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; +import { SendService } from "@bitwarden/common/abstractions/send.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { SendType } from "@bitwarden/common/enums/sendType"; +import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; +import { Response } from "@bitwarden/node/cli/models/response"; import { SendResponse } from "../../models/response/sendResponse"; import { SendTextResponse } from "../../models/response/sendTextResponse"; diff --git a/apps/cli/src/commands/send/delete.command.ts b/apps/cli/src/commands/send/delete.command.ts index 72a9cbf600..71778a6fc8 100644 --- a/apps/cli/src/commands/send/delete.command.ts +++ b/apps/cli/src/commands/send/delete.command.ts @@ -1,5 +1,5 @@ -import { SendService } from "jslib-common/abstractions/send.service"; -import { Response } from "jslib-node/cli/models/response"; +import { SendService } from "@bitwarden/common/abstractions/send.service"; +import { Response } from "@bitwarden/node/cli/models/response"; export class SendDeleteCommand { constructor(private sendService: SendService) {} diff --git a/apps/cli/src/commands/send/edit.command.ts b/apps/cli/src/commands/send/edit.command.ts index 4aac124079..bb4d467eaf 100644 --- a/apps/cli/src/commands/send/edit.command.ts +++ b/apps/cli/src/commands/send/edit.command.ts @@ -1,7 +1,7 @@ -import { SendService } from "jslib-common/abstractions/send.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SendType } from "jslib-common/enums/sendType"; -import { Response } from "jslib-node/cli/models/response"; +import { SendService } from "@bitwarden/common/abstractions/send.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { SendType } from "@bitwarden/common/enums/sendType"; +import { Response } from "@bitwarden/node/cli/models/response"; import { SendResponse } from "../../models/response/sendResponse"; import { CliUtils } from "../../utils"; diff --git a/apps/cli/src/commands/send/get.command.ts b/apps/cli/src/commands/send/get.command.ts index cef7d66256..f47d8fbc5d 100644 --- a/apps/cli/src/commands/send/get.command.ts +++ b/apps/cli/src/commands/send/get.command.ts @@ -1,12 +1,12 @@ import * as program from "commander"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { SearchService } from "jslib-common/abstractions/search.service"; -import { SendService } from "jslib-common/abstractions/send.service"; -import { Utils } from "jslib-common/misc/utils"; -import { SendView } from "jslib-common/models/view/sendView"; -import { Response } from "jslib-node/cli/models/response"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; +import { SearchService } from "@bitwarden/common/abstractions/search.service"; +import { SendService } from "@bitwarden/common/abstractions/send.service"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { SendView } from "@bitwarden/common/models/view/sendView"; +import { Response } from "@bitwarden/node/cli/models/response"; import { SendResponse } from "../../models/response/sendResponse"; import { DownloadCommand } from "../download.command"; diff --git a/apps/cli/src/commands/send/list.command.ts b/apps/cli/src/commands/send/list.command.ts index 3b888d3345..149c34d69d 100644 --- a/apps/cli/src/commands/send/list.command.ts +++ b/apps/cli/src/commands/send/list.command.ts @@ -1,8 +1,8 @@ -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { SearchService } from "jslib-common/abstractions/search.service"; -import { SendService } from "jslib-common/abstractions/send.service"; -import { Response } from "jslib-node/cli/models/response"; -import { ListResponse } from "jslib-node/cli/models/response/listResponse"; +import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; +import { SearchService } from "@bitwarden/common/abstractions/search.service"; +import { SendService } from "@bitwarden/common/abstractions/send.service"; +import { Response } from "@bitwarden/node/cli/models/response"; +import { ListResponse } from "@bitwarden/node/cli/models/response/listResponse"; import { SendResponse } from "../..//models/response/sendResponse"; diff --git a/apps/cli/src/commands/send/receive.command.ts b/apps/cli/src/commands/send/receive.command.ts index 6cab9dfb68..21ab10eba9 100644 --- a/apps/cli/src/commands/send/receive.command.ts +++ b/apps/cli/src/commands/send/receive.command.ts @@ -1,20 +1,20 @@ import * as program from "commander"; import * as inquirer from "inquirer"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { SendType } from "jslib-common/enums/sendType"; -import { NodeUtils } from "jslib-common/misc/nodeUtils"; -import { Utils } from "jslib-common/misc/utils"; -import { SendAccess } from "jslib-common/models/domain/sendAccess"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; -import { SendAccessRequest } from "jslib-common/models/request/sendAccessRequest"; -import { ErrorResponse } from "jslib-common/models/response/errorResponse"; -import { SendAccessView } from "jslib-common/models/view/sendAccessView"; -import { Response } from "jslib-node/cli/models/response"; +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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { SendType } from "@bitwarden/common/enums/sendType"; +import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { SendAccess } from "@bitwarden/common/models/domain/sendAccess"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { SendAccessRequest } from "@bitwarden/common/models/request/sendAccessRequest"; +import { ErrorResponse } from "@bitwarden/common/models/response/errorResponse"; +import { SendAccessView } from "@bitwarden/common/models/view/sendAccessView"; +import { Response } from "@bitwarden/node/cli/models/response"; import { SendAccessResponse } from "../../models/response/sendAccessResponse"; import { DownloadCommand } from "../download.command"; diff --git a/apps/cli/src/commands/send/removePassword.command.ts b/apps/cli/src/commands/send/removePassword.command.ts index 1da6becf28..53e82b7d72 100644 --- a/apps/cli/src/commands/send/removePassword.command.ts +++ b/apps/cli/src/commands/send/removePassword.command.ts @@ -1,5 +1,5 @@ -import { SendService } from "jslib-common/abstractions/send.service"; -import { Response } from "jslib-node/cli/models/response"; +import { SendService } from "@bitwarden/common/abstractions/send.service"; +import { Response } from "@bitwarden/node/cli/models/response"; import { SendResponse } from "../../models/response/sendResponse"; diff --git a/apps/cli/src/commands/serve.command.ts b/apps/cli/src/commands/serve.command.ts index f5685efeac..2ce8b90409 100644 --- a/apps/cli/src/commands/serve.command.ts +++ b/apps/cli/src/commands/serve.command.ts @@ -5,9 +5,9 @@ import * as koa from "koa"; import * as koaBodyParser from "koa-bodyparser"; import * as koaJson from "koa-json"; -import { KeySuffixOptions } from "jslib-common/enums/keySuffixOptions"; -import { Response } from "jslib-node/cli/models/response"; -import { FileResponse } from "jslib-node/cli/models/response/fileResponse"; +import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions"; +import { Response } from "@bitwarden/node/cli/models/response"; +import { FileResponse } from "@bitwarden/node/cli/models/response/fileResponse"; import { Main } from "../bw"; diff --git a/apps/cli/src/commands/share.command.ts b/apps/cli/src/commands/share.command.ts index 924ed01259..8766baea8f 100644 --- a/apps/cli/src/commands/share.command.ts +++ b/apps/cli/src/commands/share.command.ts @@ -1,5 +1,5 @@ -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { Response } from "jslib-node/cli/models/response"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { Response } from "@bitwarden/node/cli/models/response"; import { CipherResponse } from "../models/response/cipherResponse"; import { CliUtils } from "../utils"; diff --git a/apps/cli/src/commands/status.command.ts b/apps/cli/src/commands/status.command.ts index 724b2b03d5..6ea053888e 100644 --- a/apps/cli/src/commands/status.command.ts +++ b/apps/cli/src/commands/status.command.ts @@ -1,9 +1,9 @@ -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { AuthenticationStatus } from "jslib-common/enums/authenticationStatus"; -import { Response } from "jslib-node/cli/models/response"; +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 { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; +import { Response } from "@bitwarden/node/cli/models/response"; import { TemplateResponse } from "../models/response/templateResponse"; diff --git a/apps/cli/src/commands/sync.command.ts b/apps/cli/src/commands/sync.command.ts index 7df7510c19..377a3f23b9 100644 --- a/apps/cli/src/commands/sync.command.ts +++ b/apps/cli/src/commands/sync.command.ts @@ -1,7 +1,7 @@ -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { Response } from "jslib-node/cli/models/response"; -import { MessageResponse } from "jslib-node/cli/models/response/messageResponse"; -import { StringResponse } from "jslib-node/cli/models/response/stringResponse"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { Response } from "@bitwarden/node/cli/models/response"; +import { MessageResponse } from "@bitwarden/node/cli/models/response/messageResponse"; +import { StringResponse } from "@bitwarden/node/cli/models/response/stringResponse"; import { CliUtils } from "src/utils"; diff --git a/apps/cli/src/commands/unlock.command.ts b/apps/cli/src/commands/unlock.command.ts index 9332a2a83c..3ed4fa879e 100644 --- a/apps/cli/src/commands/unlock.command.ts +++ b/apps/cli/src/commands/unlock.command.ts @@ -1,16 +1,16 @@ -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { HashPurpose } from "jslib-common/enums/hashPurpose"; -import { Utils } from "jslib-common/misc/utils"; -import { SecretVerificationRequest } from "jslib-common/models/request/secretVerificationRequest"; -import { ConsoleLogService } from "jslib-common/services/consoleLog.service"; -import { Response } from "jslib-node/cli/models/response"; -import { MessageResponse } from "jslib-node/cli/models/response/messageResponse"; +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 { StateService } from "@bitwarden/common/abstractions/state.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { HashPurpose } from "@bitwarden/common/enums/hashPurpose"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { SecretVerificationRequest } from "@bitwarden/common/models/request/secretVerificationRequest"; +import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; +import { Response } from "@bitwarden/node/cli/models/response"; +import { MessageResponse } from "@bitwarden/node/cli/models/response/messageResponse"; import { CliUtils } from "../utils"; diff --git a/apps/cli/src/models/request/organizationCollectionRequest.ts b/apps/cli/src/models/request/organizationCollectionRequest.ts index 71106ef70b..79e85847c6 100644 --- a/apps/cli/src/models/request/organizationCollectionRequest.ts +++ b/apps/cli/src/models/request/organizationCollectionRequest.ts @@ -1,4 +1,4 @@ -import { CollectionExport } from "jslib-common/models/export/collectionExport"; +import { CollectionExport } from "@bitwarden/common/models/export/collectionExport"; import { SelectionReadOnly } from "../selectionReadOnly"; diff --git a/apps/cli/src/models/response/attachmentResponse.ts b/apps/cli/src/models/response/attachmentResponse.ts index d67cfc9c2d..c8fcb875af 100644 --- a/apps/cli/src/models/response/attachmentResponse.ts +++ b/apps/cli/src/models/response/attachmentResponse.ts @@ -1,4 +1,4 @@ -import { AttachmentView } from "jslib-common/models/view/attachmentView"; +import { AttachmentView } from "@bitwarden/common/models/view/attachmentView"; export class AttachmentResponse { id: string; diff --git a/apps/cli/src/models/response/cipherResponse.ts b/apps/cli/src/models/response/cipherResponse.ts index 3c61a5347b..a52084de77 100644 --- a/apps/cli/src/models/response/cipherResponse.ts +++ b/apps/cli/src/models/response/cipherResponse.ts @@ -1,7 +1,7 @@ -import { CipherType } from "jslib-common/enums/cipherType"; -import { CipherWithIdExport } from "jslib-common/models/export/cipherWithIdsExport"; -import { CipherView } from "jslib-common/models/view/cipherView"; -import { BaseResponse } from "jslib-node/cli/models/response/baseResponse"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { CipherWithIdExport } from "@bitwarden/common/models/export/cipherWithIdsExport"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { BaseResponse } from "@bitwarden/node/cli/models/response/baseResponse"; import { AttachmentResponse } from "./attachmentResponse"; import { LoginResponse } from "./loginResponse"; diff --git a/apps/cli/src/models/response/collectionResponse.ts b/apps/cli/src/models/response/collectionResponse.ts index 6a7228b237..866b5687dc 100644 --- a/apps/cli/src/models/response/collectionResponse.ts +++ b/apps/cli/src/models/response/collectionResponse.ts @@ -1,6 +1,6 @@ -import { CollectionWithIdExport } from "jslib-common/models/export/collectionWithIdExport"; -import { CollectionView } from "jslib-common/models/view/collectionView"; -import { BaseResponse } from "jslib-node/cli/models/response/baseResponse"; +import { CollectionWithIdExport } from "@bitwarden/common/models/export/collectionWithIdExport"; +import { CollectionView } from "@bitwarden/common/models/view/collectionView"; +import { BaseResponse } from "@bitwarden/node/cli/models/response/baseResponse"; export class CollectionResponse extends CollectionWithIdExport implements BaseResponse { object: string; diff --git a/apps/cli/src/models/response/folderResponse.ts b/apps/cli/src/models/response/folderResponse.ts index f1bc18eb31..6baa0df759 100644 --- a/apps/cli/src/models/response/folderResponse.ts +++ b/apps/cli/src/models/response/folderResponse.ts @@ -1,6 +1,6 @@ -import { FolderWithIdExport } from "jslib-common/models/export/folderWithIdExport"; -import { FolderView } from "jslib-common/models/view/folderView"; -import { BaseResponse } from "jslib-node/cli/models/response/baseResponse"; +import { FolderWithIdExport } from "@bitwarden/common/models/export/folderWithIdExport"; +import { FolderView } from "@bitwarden/common/models/view/folderView"; +import { BaseResponse } from "@bitwarden/node/cli/models/response/baseResponse"; export class FolderResponse extends FolderWithIdExport implements BaseResponse { object: string; diff --git a/apps/cli/src/models/response/loginResponse.ts b/apps/cli/src/models/response/loginResponse.ts index 226ca4e8c5..9ebebcae9f 100644 --- a/apps/cli/src/models/response/loginResponse.ts +++ b/apps/cli/src/models/response/loginResponse.ts @@ -1,5 +1,5 @@ -import { LoginExport } from "jslib-common/models/export/loginExport"; -import { LoginView } from "jslib-common/models/view/loginView"; +import { LoginExport } from "@bitwarden/common/models/export/loginExport"; +import { LoginView } from "@bitwarden/common/models/view/loginView"; export class LoginResponse extends LoginExport { passwordRevisionDate: Date; diff --git a/apps/cli/src/models/response/organizationCollectionResponse.ts b/apps/cli/src/models/response/organizationCollectionResponse.ts index 66cb2ab90e..812cc5de92 100644 --- a/apps/cli/src/models/response/organizationCollectionResponse.ts +++ b/apps/cli/src/models/response/organizationCollectionResponse.ts @@ -1,4 +1,4 @@ -import { CollectionView } from "jslib-common/models/view/collectionView"; +import { CollectionView } from "@bitwarden/common/models/view/collectionView"; import { SelectionReadOnly } from "../selectionReadOnly"; diff --git a/apps/cli/src/models/response/organizationResponse.ts b/apps/cli/src/models/response/organizationResponse.ts index 7ca1e96234..989623e35f 100644 --- a/apps/cli/src/models/response/organizationResponse.ts +++ b/apps/cli/src/models/response/organizationResponse.ts @@ -1,7 +1,7 @@ -import { OrganizationUserStatusType } from "jslib-common/enums/organizationUserStatusType"; -import { OrganizationUserType } from "jslib-common/enums/organizationUserType"; -import { Organization } from "jslib-common/models/domain/organization"; -import { BaseResponse } from "jslib-node/cli/models/response/baseResponse"; +import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; +import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { BaseResponse } from "@bitwarden/node/cli/models/response/baseResponse"; export class OrganizationResponse implements BaseResponse { object: string; diff --git a/apps/cli/src/models/response/organizationUserResponse.ts b/apps/cli/src/models/response/organizationUserResponse.ts index 6a200a8735..962fdb23bc 100644 --- a/apps/cli/src/models/response/organizationUserResponse.ts +++ b/apps/cli/src/models/response/organizationUserResponse.ts @@ -1,6 +1,6 @@ -import { OrganizationUserStatusType } from "jslib-common/enums/organizationUserStatusType"; -import { OrganizationUserType } from "jslib-common/enums/organizationUserType"; -import { BaseResponse } from "jslib-node/cli/models/response/baseResponse"; +import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; +import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType"; +import { BaseResponse } from "@bitwarden/node/cli/models/response/baseResponse"; export class OrganizationUserResponse implements BaseResponse { object: string; diff --git a/apps/cli/src/models/response/passwordHistoryResponse.ts b/apps/cli/src/models/response/passwordHistoryResponse.ts index 628ed13f84..55a626309b 100644 --- a/apps/cli/src/models/response/passwordHistoryResponse.ts +++ b/apps/cli/src/models/response/passwordHistoryResponse.ts @@ -1,4 +1,4 @@ -import { PasswordHistoryView } from "jslib-common/models/view/passwordHistoryView"; +import { PasswordHistoryView } from "@bitwarden/common/models/view/passwordHistoryView"; export class PasswordHistoryResponse { lastUsedDate: Date; diff --git a/apps/cli/src/models/response/sendAccessResponse.ts b/apps/cli/src/models/response/sendAccessResponse.ts index 40b5d2d7da..4417b15a1e 100644 --- a/apps/cli/src/models/response/sendAccessResponse.ts +++ b/apps/cli/src/models/response/sendAccessResponse.ts @@ -1,6 +1,6 @@ -import { SendType } from "jslib-common/enums/sendType"; -import { SendAccessView } from "jslib-common/models/view/sendAccessView"; -import { BaseResponse } from "jslib-node/cli/models/response/baseResponse"; +import { SendType } from "@bitwarden/common/enums/sendType"; +import { SendAccessView } from "@bitwarden/common/models/view/sendAccessView"; +import { BaseResponse } from "@bitwarden/node/cli/models/response/baseResponse"; import { SendFileResponse } from "./sendFileResponse"; import { SendTextResponse } from "./sendTextResponse"; diff --git a/apps/cli/src/models/response/sendFileResponse.ts b/apps/cli/src/models/response/sendFileResponse.ts index 384646167a..6f80904ea9 100644 --- a/apps/cli/src/models/response/sendFileResponse.ts +++ b/apps/cli/src/models/response/sendFileResponse.ts @@ -1,4 +1,4 @@ -import { SendFileView } from "jslib-common/models/view/sendFileView"; +import { SendFileView } from "@bitwarden/common/models/view/sendFileView"; export class SendFileResponse { static template(fileName = "file attachment location"): SendFileResponse { diff --git a/apps/cli/src/models/response/sendResponse.ts b/apps/cli/src/models/response/sendResponse.ts index c41e7aaceb..b2c715d8f7 100644 --- a/apps/cli/src/models/response/sendResponse.ts +++ b/apps/cli/src/models/response/sendResponse.ts @@ -1,7 +1,7 @@ -import { SendType } from "jslib-common/enums/sendType"; -import { Utils } from "jslib-common/misc/utils"; -import { SendView } from "jslib-common/models/view/sendView"; -import { BaseResponse } from "jslib-node/cli/models/response/baseResponse"; +import { SendType } from "@bitwarden/common/enums/sendType"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { SendView } from "@bitwarden/common/models/view/sendView"; +import { BaseResponse } from "@bitwarden/node/cli/models/response/baseResponse"; import { SendFileResponse } from "./sendFileResponse"; import { SendTextResponse } from "./sendTextResponse"; diff --git a/apps/cli/src/models/response/sendTextResponse.ts b/apps/cli/src/models/response/sendTextResponse.ts index 68decd9fb7..330f9d9460 100644 --- a/apps/cli/src/models/response/sendTextResponse.ts +++ b/apps/cli/src/models/response/sendTextResponse.ts @@ -1,4 +1,4 @@ -import { SendTextView } from "jslib-common/models/view/sendTextView"; +import { SendTextView } from "@bitwarden/common/models/view/sendTextView"; export class SendTextResponse { static template(text = "Text contained in the send.", hidden = false): SendTextResponse { diff --git a/apps/cli/src/models/response/templateResponse.ts b/apps/cli/src/models/response/templateResponse.ts index aa494af342..15944b0780 100644 --- a/apps/cli/src/models/response/templateResponse.ts +++ b/apps/cli/src/models/response/templateResponse.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "jslib-node/cli/models/response/baseResponse"; +import { BaseResponse } from "@bitwarden/node/cli/models/response/baseResponse"; export class TemplateResponse implements BaseResponse { object: string; diff --git a/apps/cli/src/program.ts b/apps/cli/src/program.ts index 4299eb34d3..f3f04b6d51 100644 --- a/apps/cli/src/program.ts +++ b/apps/cli/src/program.ts @@ -1,13 +1,13 @@ import * as chalk from "chalk"; import * as program from "commander"; -import { AuthenticationStatus } from "jslib-common/enums/authenticationStatus"; -import { KeySuffixOptions } from "jslib-common/enums/keySuffixOptions"; -import { BaseProgram } from "jslib-node/cli/baseProgram"; -import { LogoutCommand } from "jslib-node/cli/commands/logout.command"; -import { UpdateCommand } from "jslib-node/cli/commands/update.command"; -import { Response } from "jslib-node/cli/models/response"; -import { MessageResponse } from "jslib-node/cli/models/response/messageResponse"; +import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; +import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions"; +import { BaseProgram } from "@bitwarden/node/cli/baseProgram"; +import { LogoutCommand } from "@bitwarden/node/cli/commands/logout.command"; +import { UpdateCommand } from "@bitwarden/node/cli/commands/update.command"; +import { Response } from "@bitwarden/node/cli/models/response"; +import { MessageResponse } from "@bitwarden/node/cli/models/response/messageResponse"; import { Main } from "./bw"; import { CompletionCommand } from "./commands/completion.command"; diff --git a/apps/cli/src/send.program.ts b/apps/cli/src/send.program.ts index 15d1d766b9..69e5eeaedf 100644 --- a/apps/cli/src/send.program.ts +++ b/apps/cli/src/send.program.ts @@ -4,9 +4,9 @@ import * as path from "path"; import * as chalk from "chalk"; import * as program from "commander"; -import { SendType } from "jslib-common/enums/sendType"; -import { Utils } from "jslib-common/misc/utils"; -import { Response } from "jslib-node/cli/models/response"; +import { SendType } from "@bitwarden/common/enums/sendType"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { Response } from "@bitwarden/node/cli/models/response"; import { Main } from "./bw"; import { GetCommand } from "./commands/get.command"; diff --git a/apps/cli/src/services/i18n.service.ts b/apps/cli/src/services/i18n.service.ts index d408c4ef6f..f3e6eabc60 100644 --- a/apps/cli/src/services/i18n.service.ts +++ b/apps/cli/src/services/i18n.service.ts @@ -1,7 +1,7 @@ import * as fs from "fs"; import * as path from "path"; -import { I18nService as BaseI18nService } from "jslib-common/services/i18n.service"; +import { I18nService as BaseI18nService } from "@bitwarden/common/services/i18n.service"; export class I18nService extends BaseI18nService { constructor(systemLanguage: string, localesDirectory: string) { diff --git a/apps/cli/src/services/lowdbStorage.service.ts b/apps/cli/src/services/lowdbStorage.service.ts index e46997d529..e01a161c51 100644 --- a/apps/cli/src/services/lowdbStorage.service.ts +++ b/apps/cli/src/services/lowdbStorage.service.ts @@ -1,9 +1,9 @@ import * as lock from "proper-lockfile"; import { OperationOptions } from "retry"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { Utils } from "jslib-common/misc/utils"; -import { LowdbStorageService as LowdbStorageServiceBase } from "jslib-node/services/lowdbStorage.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { LowdbStorageService as LowdbStorageServiceBase } from "@bitwarden/node/services/lowdbStorage.service"; const retries: OperationOptions = { retries: 50, diff --git a/apps/cli/src/services/nodeEnvSecureStorage.service.ts b/apps/cli/src/services/nodeEnvSecureStorage.service.ts index facba943fc..722ade781e 100644 --- a/apps/cli/src/services/nodeEnvSecureStorage.service.ts +++ b/apps/cli/src/services/nodeEnvSecureStorage.service.ts @@ -1,8 +1,8 @@ -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { StorageService } from "jslib-common/abstractions/storage.service"; -import { Utils } from "jslib-common/misc/utils"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { StorageService } from "@bitwarden/common/abstractions/storage.service"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; export class NodeEnvSecureStorageService implements StorageService { constructor( diff --git a/apps/cli/src/utils.ts b/apps/cli/src/utils.ts index deb4085398..8abcaddc6e 100644 --- a/apps/cli/src/utils.ts +++ b/apps/cli/src/utils.ts @@ -4,14 +4,14 @@ import * as path from "path"; import * as inquirer from "inquirer"; import * as JSZip from "jszip"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { NodeUtils } from "jslib-common/misc/nodeUtils"; -import { Utils } from "jslib-common/misc/utils"; -import { Organization } from "jslib-common/models/domain/organization"; -import { CollectionView } from "jslib-common/models/view/collectionView"; -import { FolderView } from "jslib-common/models/view/folderView"; -import { Response } from "jslib-node/cli/models/response"; -import { MessageResponse } from "jslib-node/cli/models/response/messageResponse"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { CollectionView } from "@bitwarden/common/models/view/collectionView"; +import { FolderView } from "@bitwarden/common/models/view/folderView"; +import { Response } from "@bitwarden/node/cli/models/response"; +import { MessageResponse } from "@bitwarden/node/cli/models/response/messageResponse"; import { FlagName, Flags } from "./flags"; diff --git a/apps/cli/src/vault.program.ts b/apps/cli/src/vault.program.ts index df909bf8b2..0237b164d1 100644 --- a/apps/cli/src/vault.program.ts +++ b/apps/cli/src/vault.program.ts @@ -1,6 +1,6 @@ import * as program from "commander"; -import { Response } from "jslib-node/cli/models/response"; +import { Response } from "@bitwarden/node/cli/models/response"; import { Main } from "./bw"; import { ConfirmCommand } from "./commands/confirm.command"; diff --git a/apps/cli/tsconfig.json b/apps/cli/tsconfig.json index a39ab45d7a..da47ac52d8 100644 --- a/apps/cli/tsconfig.json +++ b/apps/cli/tsconfig.json @@ -12,8 +12,8 @@ "sourceMap": true, "baseUrl": ".", "paths": { - "jslib-common/*": ["../../libs/common/src/*"], - "jslib-node/*": ["../../libs/node/src/*"] + "@bitwarden/common/*": ["../../libs/common/src/*"], + "@bitwarden/node/*": ["../../libs/node/src/*"] } }, "include": ["src"] diff --git a/apps/cli/webpack.config.js b/apps/cli/webpack.config.js index e631627cd7..5acbf538d0 100644 --- a/apps/cli/webpack.config.js +++ b/apps/cli/webpack.config.js @@ -77,6 +77,7 @@ const webpackConfig = { externals: [ nodeExternals({ modulesDir: "../../node_modules", + allowlist: [/@bitwarden/], }), ], }; diff --git a/apps/desktop/package.json b/apps/desktop/package.json index c1efa274cb..d6bfea2929 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -16,9 +16,8 @@ }, "license": "GPL-3.0", "scripts": { - "start": "cross-env ELECTRON_IS_DEV=0 ELECTRON_NO_UPDATER=1 electron ./build", - "preinstall": "npm run sub:init", "postinstall": "electron-rebuild", + "start": "cross-env ELECTRON_IS_DEV=0 ELECTRON_NO_UPDATER=1 electron ./build", "build": "concurrently -n Main,Rend -c yellow,cyan \"npm run build:main\" \"npm run build:renderer\"", "build:dev": "concurrently -n Main,Rend -c yellow,cyan \"npm run build:main:dev\" \"npm run build:renderer:dev\"", "build:main": "cross-env NODE_ENV=production webpack --config webpack.main.js", diff --git a/apps/desktop/src/app/accounts/accessibility-cookie.component.ts b/apps/desktop/src/app/accounts/accessibility-cookie.component.ts index 968ed6702c..a1b4d3afa7 100644 --- a/apps/desktop/src/app/accounts/accessibility-cookie.component.ts +++ b/apps/desktop/src/app/accounts/accessibility-cookie.component.ts @@ -2,12 +2,12 @@ import { Component, NgZone } from "@angular/core"; import { FormControl, FormGroup, Validators } from "@angular/forms"; import { Router } from "@angular/router"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { Utils } from "jslib-common/misc/utils"; -import { getCookie } from "jslib-electron/utils"; +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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { getCookie } from "@bitwarden/electron/utils"; const BroadcasterSubscriptionId = "AccessibilityCookieComponent"; diff --git a/apps/desktop/src/app/accounts/environment.component.ts b/apps/desktop/src/app/accounts/environment.component.ts index e9077384b2..a3c0d40e5b 100644 --- a/apps/desktop/src/app/accounts/environment.component.ts +++ b/apps/desktop/src/app/accounts/environment.component.ts @@ -1,9 +1,9 @@ import { Component } from "@angular/core"; -import { EnvironmentComponent as BaseEnvironmentComponent } from "jslib-angular/components/environment.component"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { EnvironmentComponent as BaseEnvironmentComponent } from "@bitwarden/angular/components/environment.component"; +import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; @Component({ selector: "app-environment", diff --git a/apps/desktop/src/app/accounts/hint.component.ts b/apps/desktop/src/app/accounts/hint.component.ts index 5bed1b5858..7ecc9ef1cb 100644 --- a/apps/desktop/src/app/accounts/hint.component.ts +++ b/apps/desktop/src/app/accounts/hint.component.ts @@ -1,11 +1,11 @@ import { Component } from "@angular/core"; import { Router } from "@angular/router"; -import { HintComponent as BaseHintComponent } from "jslib-angular/components/hint.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { HintComponent as BaseHintComponent } from "@bitwarden/angular/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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; @Component({ selector: "app-hint", diff --git a/apps/desktop/src/app/accounts/lock.component.ts b/apps/desktop/src/app/accounts/lock.component.ts index 4720e49894..824dd00a1b 100644 --- a/apps/desktop/src/app/accounts/lock.component.ts +++ b/apps/desktop/src/app/accounts/lock.component.ts @@ -2,18 +2,18 @@ import { Component, NgZone, OnDestroy } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { ipcRenderer } from "electron"; -import { LockComponent as BaseLockComponent } from "jslib-angular/components/lock.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.service"; +import { LockComponent as BaseLockComponent } from "@bitwarden/angular/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.service"; const BroadcasterSubscriptionId = "LockComponent"; diff --git a/apps/desktop/src/app/accounts/login.component.ts b/apps/desktop/src/app/accounts/login.component.ts index 022aae21ea..22731b21f2 100644 --- a/apps/desktop/src/app/accounts/login.component.ts +++ b/apps/desktop/src/app/accounts/login.component.ts @@ -1,19 +1,19 @@ import { Component, NgZone, OnDestroy, ViewChild, ViewContainerRef } from "@angular/core"; import { Router } from "@angular/router"; -import { LoginComponent as BaseLoginComponent } from "jslib-angular/components/login.component"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; +import { LoginComponent as BaseLoginComponent } from "@bitwarden/angular/components/login.component"; +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 { 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 { 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 { SyncService } from "@bitwarden/common/abstractions/sync.service"; import { EnvironmentComponent } from "./environment.component"; diff --git a/apps/desktop/src/app/accounts/premium.component.ts b/apps/desktop/src/app/accounts/premium.component.ts index 7e97860f74..c18584b0eb 100644 --- a/apps/desktop/src/app/accounts/premium.component.ts +++ b/apps/desktop/src/app/accounts/premium.component.ts @@ -1,11 +1,11 @@ import { Component } from "@angular/core"; -import { PremiumComponent as BasePremiumComponent } from "jslib-angular/components/premium.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; +import { PremiumComponent as BasePremiumComponent } from "@bitwarden/angular/components/premium.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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; @Component({ selector: "app-premium", diff --git a/apps/desktop/src/app/accounts/register.component.ts b/apps/desktop/src/app/accounts/register.component.ts index 4188a19495..9559d63d1f 100644 --- a/apps/desktop/src/app/accounts/register.component.ts +++ b/apps/desktop/src/app/accounts/register.component.ts @@ -1,17 +1,17 @@ import { Component, NgZone, OnDestroy, OnInit } from "@angular/core"; import { Router } from "@angular/router"; -import { RegisterComponent as BaseRegisterComponent } from "jslib-angular/components/register.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; +import { RegisterComponent as BaseRegisterComponent } from "@bitwarden/angular/components/register.component"; +import { ApiService } from "@bitwarden/common/abstractions/api.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"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +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"; const BroadcasterSubscriptionId = "RegisterComponent"; diff --git a/apps/desktop/src/app/accounts/remove-password.component.ts b/apps/desktop/src/app/accounts/remove-password.component.ts index cdb75058ab..89ebd4a620 100644 --- a/apps/desktop/src/app/accounts/remove-password.component.ts +++ b/apps/desktop/src/app/accounts/remove-password.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { RemovePasswordComponent as BaseRemovePasswordComponent } from "jslib-angular/components/remove-password.component"; +import { RemovePasswordComponent as BaseRemovePasswordComponent } from "@bitwarden/angular/components/remove-password.component"; @Component({ selector: "app-remove-password", diff --git a/apps/desktop/src/app/accounts/set-password.component.ts b/apps/desktop/src/app/accounts/set-password.component.ts index b2aa69738f..d4bd103950 100644 --- a/apps/desktop/src/app/accounts/set-password.component.ts +++ b/apps/desktop/src/app/accounts/set-password.component.ts @@ -1,17 +1,17 @@ import { Component, NgZone, OnDestroy } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; -import { SetPasswordComponent as BaseSetPasswordComponent } from "jslib-angular/components/set-password.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; +import { SetPasswordComponent as BaseSetPasswordComponent } from "@bitwarden/angular/components/set-password.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 { I18nService } from "@bitwarden/common/abstractions/i18n.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 { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; const BroadcasterSubscriptionId = "SetPasswordComponent"; diff --git a/apps/desktop/src/app/accounts/settings.component.ts b/apps/desktop/src/app/accounts/settings.component.ts index 78ae76ea29..eaa1073884 100644 --- a/apps/desktop/src/app/accounts/settings.component.ts +++ b/apps/desktop/src/app/accounts/settings.component.ts @@ -2,18 +2,18 @@ import { Component, OnInit } from "@angular/core"; import { FormControl } from "@angular/forms"; import { debounceTime } from "rxjs/operators"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.service"; -import { DeviceType } from "jslib-common/enums/deviceType"; -import { StorageLocation } from "jslib-common/enums/storageLocation"; -import { ThemeType } from "jslib-common/enums/themeType"; -import { Utils } from "jslib-common/misc/utils"; -import { isWindowsStore } from "jslib-electron/utils"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.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 { StateService } from "@bitwarden/common/abstractions/state.service"; +import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { DeviceType } from "@bitwarden/common/enums/deviceType"; +import { StorageLocation } from "@bitwarden/common/enums/storageLocation"; +import { ThemeType } from "@bitwarden/common/enums/themeType"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { isWindowsStore } from "@bitwarden/electron/utils"; import { SetPinComponent } from "../components/set-pin.component"; diff --git a/apps/desktop/src/app/accounts/sso.component.ts b/apps/desktop/src/app/accounts/sso.component.ts index d23dc0ee6b..ff0831de49 100644 --- a/apps/desktop/src/app/accounts/sso.component.ts +++ b/apps/desktop/src/app/accounts/sso.component.ts @@ -1,17 +1,17 @@ import { Component } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; -import { SsoComponent as BaseSsoComponent } from "jslib-angular/components/sso.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; +import { SsoComponent as BaseSsoComponent } from "@bitwarden/angular/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"; +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 { SyncService } from "@bitwarden/common/abstractions/sync.service"; @Component({ selector: "app-sso", diff --git a/apps/desktop/src/app/accounts/two-factor-options.component.ts b/apps/desktop/src/app/accounts/two-factor-options.component.ts index 892c971bf9..89a089d8f1 100644 --- a/apps/desktop/src/app/accounts/two-factor-options.component.ts +++ b/apps/desktop/src/app/accounts/two-factor-options.component.ts @@ -1,10 +1,10 @@ import { Component } from "@angular/core"; import { Router } from "@angular/router"; -import { TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent } from "jslib-angular/components/two-factor-options.component"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service"; +import { TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent } from "@bitwarden/angular/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"; @Component({ selector: "app-two-factor-options", diff --git a/apps/desktop/src/app/accounts/two-factor.component.ts b/apps/desktop/src/app/accounts/two-factor.component.ts index acf8919f49..d281841f2c 100644 --- a/apps/desktop/src/app/accounts/two-factor.component.ts +++ b/apps/desktop/src/app/accounts/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 "jslib-angular/components/two-factor.component"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AppIdService } from "jslib-common/abstractions/appId.service"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service"; -import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType"; +import { TwoFactorComponent as BaseTwoFactorComponent } from "@bitwarden/angular/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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service"; +import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; import { TwoFactorOptionsComponent } from "./two-factor-options.component"; diff --git a/apps/desktop/src/app/accounts/update-temp-password.component.ts b/apps/desktop/src/app/accounts/update-temp-password.component.ts index f12191a163..8b6ab78404 100644 --- a/apps/desktop/src/app/accounts/update-temp-password.component.ts +++ b/apps/desktop/src/app/accounts/update-temp-password.component.ts @@ -1,16 +1,16 @@ import { Component } from "@angular/core"; -import { UpdateTempPasswordComponent as BaseUpdateTempPasswordComponent } from "jslib-angular/components/update-temp-password.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; +import { UpdateTempPasswordComponent as BaseUpdateTempPasswordComponent } from "@bitwarden/angular/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"; +import { LogService } from "@bitwarden/common/abstractions/log.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 { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; interface MasterPasswordScore { Color: string; diff --git a/apps/desktop/src/app/accounts/vault-timeout-input.component.ts b/apps/desktop/src/app/accounts/vault-timeout-input.component.ts index 8eb308b4c0..75c3c9e9e0 100644 --- a/apps/desktop/src/app/accounts/vault-timeout-input.component.ts +++ b/apps/desktop/src/app/accounts/vault-timeout-input.component.ts @@ -1,7 +1,7 @@ import { Component } from "@angular/core"; import { NG_VALIDATORS, NG_VALUE_ACCESSOR } from "@angular/forms"; -import { VaultTimeoutInputComponent as VaultTimeoutInputComponentBase } from "jslib-angular/components/settings/vault-timeout-input.component"; +import { VaultTimeoutInputComponent as VaultTimeoutInputComponentBase } from "@bitwarden/angular/components/settings/vault-timeout-input.component"; @Component({ selector: "app-vault-timeout-input", diff --git a/apps/desktop/src/app/app-routing.module.ts b/apps/desktop/src/app/app-routing.module.ts index 1d75d2ea1b..239c14b203 100644 --- a/apps/desktop/src/app/app-routing.module.ts +++ b/apps/desktop/src/app/app-routing.module.ts @@ -1,8 +1,8 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; -import { AuthGuard } from "jslib-angular/guards/auth.guard"; -import { LockGuard } from "jslib-angular/guards/lock.guard"; +import { AuthGuard } from "@bitwarden/angular/guards/auth.guard"; +import { LockGuard } from "@bitwarden/angular/guards/lock.guard"; import { AccessibilityCookieComponent } from "./accounts/accessibility-cookie.component"; import { HintComponent } from "./accounts/hint.component"; diff --git a/apps/desktop/src/app/app.component.ts b/apps/desktop/src/app/app.component.ts index b824b5fe3a..300104ee72 100644 --- a/apps/desktop/src/app/app.component.ts +++ b/apps/desktop/src/app/app.component.ts @@ -11,32 +11,32 @@ import { DomSanitizer } from "@angular/platform-browser"; import { Router } from "@angular/router"; import { IndividualConfig, ToastrService } from "ngx-toastr"; -import { ModalRef } from "jslib-angular/components/modal/modal.ref"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { NotificationsService } from "jslib-common/abstractions/notifications.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { SearchService } from "jslib-common/abstractions/search.service"; -import { SettingsService } from "jslib-common/abstractions/settings.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { SystemService } from "jslib-common/abstractions/system.service"; -import { TokenService } from "jslib-common/abstractions/token.service"; -import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.service"; -import { AuthenticationStatus } from "jslib-common/enums/authenticationStatus"; -import { CipherType } from "jslib-common/enums/cipherType"; +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 { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { FolderService } from "@bitwarden/common/abstractions/folder.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"; +import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +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 { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { SystemService } from "@bitwarden/common/abstractions/system.service"; +import { TokenService } from "@bitwarden/common/abstractions/token.service"; +import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; import { MenuUpdateRequest } from "../main/menu/menu.updater"; diff --git a/apps/desktop/src/app/components/password-reprompt.component.ts b/apps/desktop/src/app/components/password-reprompt.component.ts index 442a0ab5ee..ef72c8a7a1 100644 --- a/apps/desktop/src/app/components/password-reprompt.component.ts +++ b/apps/desktop/src/app/components/password-reprompt.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { PasswordRepromptComponent as BasePasswordRepromptComponent } from "jslib-angular/components/password-reprompt.component"; +import { PasswordRepromptComponent as BasePasswordRepromptComponent } from "@bitwarden/angular/components/password-reprompt.component"; @Component({ templateUrl: "password-reprompt.component.html", diff --git a/apps/desktop/src/app/components/set-pin.component.ts b/apps/desktop/src/app/components/set-pin.component.ts index 4497f7e774..47b8fd7212 100644 --- a/apps/desktop/src/app/components/set-pin.component.ts +++ b/apps/desktop/src/app/components/set-pin.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { SetPinComponent as BaseSetPinComponent } from "jslib-angular/components/set-pin.component"; +import { SetPinComponent as BaseSetPinComponent } from "@bitwarden/angular/components/set-pin.component"; @Component({ templateUrl: "set-pin.component.html", diff --git a/apps/desktop/src/app/components/user-verification.component.ts b/apps/desktop/src/app/components/user-verification.component.ts index dc12c94a78..2eb89c2833 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 "jslib-angular/components/user-verification.component"; +import { UserVerificationComponent as BaseComponent } from "@bitwarden/angular/components/user-verification.component"; @Component({ selector: "app-user-verification", diff --git a/apps/desktop/src/app/guards/login.guard.ts b/apps/desktop/src/app/guards/login.guard.ts index dcf8bbc3b9..4957f80c8c 100644 --- a/apps/desktop/src/app/guards/login.guard.ts +++ b/apps/desktop/src/app/guards/login.guard.ts @@ -1,9 +1,9 @@ import { Injectable } from "@angular/core"; import { CanActivate } from "@angular/router"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.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"; const maxAllowedAccounts = 5; diff --git a/apps/desktop/src/app/layout/account-switcher.component.ts b/apps/desktop/src/app/layout/account-switcher.component.ts index 1958bed73c..ecb25d481b 100644 --- a/apps/desktop/src/app/layout/account-switcher.component.ts +++ b/apps/desktop/src/app/layout/account-switcher.component.ts @@ -2,12 +2,12 @@ import { animate, state, style, transition, trigger } from "@angular/animations" import { ConnectedPosition } from "@angular/cdk/overlay"; import { Component, OnInit } from "@angular/core"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { AuthenticationStatus } from "jslib-common/enums/authenticationStatus"; -import { Utils } from "jslib-common/misc/utils"; -import { Account } from "jslib-common/models/domain/account"; +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 { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { Account } from "@bitwarden/common/models/domain/account"; export class SwitcherAccount extends Account { get serverUrl() { diff --git a/apps/desktop/src/app/layout/nav.component.ts b/apps/desktop/src/app/layout/nav.component.ts index 9cbb6172f5..4a1a4b21e0 100644 --- a/apps/desktop/src/app/layout/nav.component.ts +++ b/apps/desktop/src/app/layout/nav.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; @Component({ selector: "app-nav", diff --git a/apps/desktop/src/app/layout/search/search.component.ts b/apps/desktop/src/app/layout/search/search.component.ts index 9e2bab6565..92b312782a 100644 --- a/apps/desktop/src/app/layout/search/search.component.ts +++ b/apps/desktop/src/app/layout/search/search.component.ts @@ -1,7 +1,7 @@ import { Component, OnDestroy, OnInit } from "@angular/core"; import { FormControl } from "@angular/forms"; -import { StateService } from "jslib-common/abstractions/state.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; import { SearchBarService, SearchBarState } from "./search-bar.service"; diff --git a/apps/desktop/src/app/main.ts b/apps/desktop/src/app/main.ts index c5ae1b187d..4db6a9419b 100644 --- a/apps/desktop/src/app/main.ts +++ b/apps/desktop/src/app/main.ts @@ -1,7 +1,7 @@ import { enableProdMode } from "@angular/core"; import { platformBrowserDynamic } from "@angular/platform-browser-dynamic"; -import { isDev } from "jslib-electron/utils"; +import { isDev } from "@bitwarden/electron/utils"; // tslint:disable-next-line require("../scss/styles.scss"); diff --git a/apps/desktop/src/app/modules/shared.module.ts b/apps/desktop/src/app/modules/shared.module.ts index 5108e9b281..849880435a 100644 --- a/apps/desktop/src/app/modules/shared.module.ts +++ b/apps/desktop/src/app/modules/shared.module.ts @@ -8,7 +8,7 @@ import { FormsModule, ReactiveFormsModule } from "@angular/forms"; import { BrowserModule } from "@angular/platform-browser"; import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; -import { JslibModule } from "jslib-angular/jslib.module"; +import { JslibModule } from "@bitwarden/angular/jslib.module"; import { ServicesModule } from "../services/services.module"; diff --git a/apps/desktop/src/app/modules/vault-filter/components/collection-filter.component.ts b/apps/desktop/src/app/modules/vault-filter/components/collection-filter.component.ts index e08c724a5a..9f18186ae8 100644 --- a/apps/desktop/src/app/modules/vault-filter/components/collection-filter.component.ts +++ b/apps/desktop/src/app/modules/vault-filter/components/collection-filter.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { CollectionFilterComponent as BaseCollectionFilterComponent } from "jslib-angular/modules/vault-filter/components/collection-filter.component"; +import { CollectionFilterComponent as BaseCollectionFilterComponent } from "@bitwarden/angular/modules/vault-filter/components/collection-filter.component"; @Component({ selector: "app-collection-filter", diff --git a/apps/desktop/src/app/modules/vault-filter/components/folder-filter.component.ts b/apps/desktop/src/app/modules/vault-filter/components/folder-filter.component.ts index 6205239f77..20b1372359 100644 --- a/apps/desktop/src/app/modules/vault-filter/components/folder-filter.component.ts +++ b/apps/desktop/src/app/modules/vault-filter/components/folder-filter.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { FolderFilterComponent as BaseFolderFilterComponent } from "jslib-angular/modules/vault-filter/components/folder-filter.component"; +import { FolderFilterComponent as BaseFolderFilterComponent } from "@bitwarden/angular/modules/vault-filter/components/folder-filter.component"; @Component({ selector: "app-folder-filter", diff --git a/apps/desktop/src/app/modules/vault-filter/components/organization-filter.component.ts b/apps/desktop/src/app/modules/vault-filter/components/organization-filter.component.ts index 8703102cf6..6131cf739d 100644 --- a/apps/desktop/src/app/modules/vault-filter/components/organization-filter.component.ts +++ b/apps/desktop/src/app/modules/vault-filter/components/organization-filter.component.ts @@ -1,7 +1,7 @@ import { Component } from "@angular/core"; -import { OrganizationFilterComponent as BaseOrganizationFilterComponent } from "jslib-angular/modules/vault-filter/components/organization-filter.component"; -import { DisplayMode } from "jslib-angular/modules/vault-filter/models/display-mode"; +import { OrganizationFilterComponent as BaseOrganizationFilterComponent } from "@bitwarden/angular/modules/vault-filter/components/organization-filter.component"; +import { DisplayMode } from "@bitwarden/angular/modules/vault-filter/models/display-mode"; @Component({ selector: "app-organization-filter", diff --git a/apps/desktop/src/app/modules/vault-filter/components/status-filter.component.ts b/apps/desktop/src/app/modules/vault-filter/components/status-filter.component.ts index c7c38aa6aa..6ab853488c 100644 --- a/apps/desktop/src/app/modules/vault-filter/components/status-filter.component.ts +++ b/apps/desktop/src/app/modules/vault-filter/components/status-filter.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { StatusFilterComponent as BaseStatusFilterComponent } from "jslib-angular/modules/vault-filter/components/status-filter.component"; +import { StatusFilterComponent as BaseStatusFilterComponent } from "@bitwarden/angular/modules/vault-filter/components/status-filter.component"; @Component({ selector: "app-status-filter", diff --git a/apps/desktop/src/app/modules/vault-filter/components/type-filter.component.ts b/apps/desktop/src/app/modules/vault-filter/components/type-filter.component.ts index 794fc49787..94e554d79f 100644 --- a/apps/desktop/src/app/modules/vault-filter/components/type-filter.component.ts +++ b/apps/desktop/src/app/modules/vault-filter/components/type-filter.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { TypeFilterComponent as BaseTypeFilterComponent } from "jslib-angular/modules/vault-filter/components/type-filter.component"; +import { TypeFilterComponent as BaseTypeFilterComponent } from "@bitwarden/angular/modules/vault-filter/components/type-filter.component"; @Component({ selector: "app-type-filter", diff --git a/apps/desktop/src/app/modules/vault-filter/vault-filter.component.ts b/apps/desktop/src/app/modules/vault-filter/vault-filter.component.ts index b8a4a3605b..ad47eb67e1 100644 --- a/apps/desktop/src/app/modules/vault-filter/vault-filter.component.ts +++ b/apps/desktop/src/app/modules/vault-filter/vault-filter.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { VaultFilterComponent as BaseVaultFilterComponent } from "jslib-angular/modules/vault-filter/vault-filter.component"; +import { VaultFilterComponent as BaseVaultFilterComponent } from "@bitwarden/angular/modules/vault-filter/vault-filter.component"; @Component({ selector: "app-vault-filter", diff --git a/apps/desktop/src/app/modules/vault-filter/vault-filter.module.ts b/apps/desktop/src/app/modules/vault-filter/vault-filter.module.ts index 9aad2bba52..429ca37044 100644 --- a/apps/desktop/src/app/modules/vault-filter/vault-filter.module.ts +++ b/apps/desktop/src/app/modules/vault-filter/vault-filter.module.ts @@ -1,8 +1,8 @@ import { NgModule } from "@angular/core"; import { BrowserModule } from "@angular/platform-browser"; -import { JslibModule } from "jslib-angular/jslib.module"; -import { VaultFilterService } from "jslib-angular/modules/vault-filter/vault-filter.service"; +import { JslibModule } from "@bitwarden/angular/jslib.module"; +import { VaultFilterService } from "@bitwarden/angular/modules/vault-filter/vault-filter.service"; import { CollectionFilterComponent } from "./components/collection-filter.component"; import { FolderFilterComponent } from "./components/folder-filter.component"; diff --git a/apps/desktop/src/app/send/add-edit.component.ts b/apps/desktop/src/app/send/add-edit.component.ts index a3e20dc874..8440a636ca 100644 --- a/apps/desktop/src/app/send/add-edit.component.ts +++ b/apps/desktop/src/app/send/add-edit.component.ts @@ -1,15 +1,15 @@ import { DatePipe } from "@angular/common"; import { Component } from "@angular/core"; -import { AddEditComponent as BaseAddEditComponent } from "jslib-angular/components/send/add-edit.component"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { SendService } from "jslib-common/abstractions/send.service"; -import { StateService } from "jslib-common/abstractions/state.service"; +import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/components/send/add-edit.component"; +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 { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { SendService } from "@bitwarden/common/abstractions/send.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; @Component({ selector: "app-send-add-edit", diff --git a/apps/desktop/src/app/send/efflux-dates.component.ts b/apps/desktop/src/app/send/efflux-dates.component.ts index db5281da79..9ec410aea6 100644 --- a/apps/desktop/src/app/send/efflux-dates.component.ts +++ b/apps/desktop/src/app/send/efflux-dates.component.ts @@ -2,9 +2,9 @@ import { DatePipe } from "@angular/common"; import { Component, OnChanges } from "@angular/core"; import { ControlContainer, NgForm } from "@angular/forms"; -import { EffluxDatesComponent as BaseEffluxDatesComponent } from "jslib-angular/components/send/efflux-dates.component"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { EffluxDatesComponent as BaseEffluxDatesComponent } from "@bitwarden/angular/components/send/efflux-dates.component"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; @Component({ selector: "app-send-efflux-dates", diff --git a/apps/desktop/src/app/send/send.component.ts b/apps/desktop/src/app/send/send.component.ts index b2ab75dd3a..e927256d81 100644 --- a/apps/desktop/src/app/send/send.component.ts +++ b/apps/desktop/src/app/send/send.component.ts @@ -1,16 +1,16 @@ import { Component, NgZone, OnDestroy, OnInit, ViewChild } from "@angular/core"; -import { SendComponent as BaseSendComponent } from "jslib-angular/components/send/send.component"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { SearchService } from "jslib-common/abstractions/search.service"; -import { SendService } from "jslib-common/abstractions/send.service"; -import { SendView } from "jslib-common/models/view/sendView"; -import { invokeMenu, RendererMenuItem } from "jslib-electron/utils"; +import { SendComponent as BaseSendComponent } from "@bitwarden/angular/components/send/send.component"; +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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { SearchService } from "@bitwarden/common/abstractions/search.service"; +import { SendService } from "@bitwarden/common/abstractions/send.service"; +import { SendView } from "@bitwarden/common/models/view/sendView"; +import { invokeMenu, RendererMenuItem } from "@bitwarden/electron/utils"; import { SearchBarService } from "../layout/search/search-bar.service"; diff --git a/apps/desktop/src/app/services/init.service.ts b/apps/desktop/src/app/services/init.service.ts index 3bc3d49aa9..5aaacabd19 100644 --- a/apps/desktop/src/app/services/init.service.ts +++ b/apps/desktop/src/app/services/init.service.ts @@ -1,20 +1,20 @@ import { Inject, Injectable } from "@angular/core"; -import { WINDOW } from "jslib-angular/services/jslib-services.module"; -import { CryptoService as CryptoServiceAbstraction } from "jslib-common/abstractions/crypto.service"; -import { EnvironmentService as EnvironmentServiceAbstraction } from "jslib-common/abstractions/environment.service"; -import { EventService as EventServiceAbstraction } from "jslib-common/abstractions/event.service"; -import { I18nService as I18nServiceAbstraction } from "jslib-common/abstractions/i18n.service"; -import { NotificationsService as NotificationsServiceAbstraction } from "jslib-common/abstractions/notifications.service"; -import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "jslib-common/abstractions/platformUtils.service"; -import { StateService as StateServiceAbstraction } from "jslib-common/abstractions/state.service"; -import { SyncService as SyncServiceAbstraction } from "jslib-common/abstractions/sync.service"; -import { TwoFactorService as TwoFactorServiceAbstraction } from "jslib-common/abstractions/twoFactor.service"; -import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "jslib-common/abstractions/vaultTimeout.service"; -import { ThemeType } from "jslib-common/enums/themeType"; -import { ContainerService } from "jslib-common/services/container.service"; -import { EventService } from "jslib-common/services/event.service"; -import { VaultTimeoutService } from "jslib-common/services/vaultTimeout.service"; +import { WINDOW } from "@bitwarden/angular/services/jslib-services.module"; +import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/abstractions/crypto.service"; +import { EnvironmentService as EnvironmentServiceAbstraction } from "@bitwarden/common/abstractions/environment.service"; +import { EventService as EventServiceAbstraction } from "@bitwarden/common/abstractions/event.service"; +import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service"; +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 { SyncService as SyncServiceAbstraction } from "@bitwarden/common/abstractions/sync.service"; +import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/common/abstractions/twoFactor.service"; +import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { ThemeType } from "@bitwarden/common/enums/themeType"; +import { ContainerService } from "@bitwarden/common/services/container.service"; +import { EventService } from "@bitwarden/common/services/event.service"; +import { VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout.service"; import { I18nService } from "../../services/i18n.service"; import { NativeMessagingService } from "../../services/nativeMessaging.service"; diff --git a/apps/desktop/src/app/services/services.module.ts b/apps/desktop/src/app/services/services.module.ts index e014b165c8..78e9efbdf2 100644 --- a/apps/desktop/src/app/services/services.module.ts +++ b/apps/desktop/src/app/services/services.module.ts @@ -8,32 +8,32 @@ import { CLIENT_TYPE, LOCALES_DIRECTORY, SYSTEM_LANGUAGE, -} from "jslib-angular/services/jslib-services.module"; -import { BroadcasterService as BroadcasterServiceAbstraction } from "jslib-common/abstractions/broadcaster.service"; -import { CryptoService as CryptoServiceAbstraction } from "jslib-common/abstractions/crypto.service"; -import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "jslib-common/abstractions/cryptoFunction.service"; -import { I18nService as I18nServiceAbstraction } from "jslib-common/abstractions/i18n.service"; +} from "@bitwarden/angular/services/jslib-services.module"; +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"; +import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service"; import { LogService, LogService as LogServiceAbstraction, -} from "jslib-common/abstractions/log.service"; -import { MessagingService as MessagingServiceAbstraction } from "jslib-common/abstractions/messaging.service"; -import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "jslib-common/abstractions/passwordReprompt.service"; -import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "jslib-common/abstractions/platformUtils.service"; -import { StateService as StateServiceAbstraction } from "jslib-common/abstractions/state.service"; -import { StateMigrationService as StateMigrationServiceAbstraction } from "jslib-common/abstractions/stateMigration.service"; -import { StorageService as StorageServiceAbstraction } from "jslib-common/abstractions/storage.service"; -import { SystemService as SystemServiceAbstraction } from "jslib-common/abstractions/system.service"; -import { ClientType } from "jslib-common/enums/clientType"; -import { StateFactory } from "jslib-common/factories/stateFactory"; -import { GlobalState } from "jslib-common/models/domain/globalState"; -import { SystemService } from "jslib-common/services/system.service"; -import { ElectronCryptoService } from "jslib-electron/services/electronCrypto.service"; -import { ElectronLogService } from "jslib-electron/services/electronLog.service"; -import { ElectronPlatformUtilsService } from "jslib-electron/services/electronPlatformUtils.service"; -import { ElectronRendererMessagingService } from "jslib-electron/services/electronRendererMessaging.service"; -import { ElectronRendererSecureStorageService } from "jslib-electron/services/electronRendererSecureStorage.service"; -import { ElectronRendererStorageService } from "jslib-electron/services/electronRendererStorage.service"; +} from "@bitwarden/common/abstractions/log.service"; +import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/abstractions/messaging.service"; +import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/abstractions/passwordReprompt.service"; +import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/abstractions/platformUtils.service"; +import { StateService as StateServiceAbstraction } from "@bitwarden/common/abstractions/state.service"; +import { StateMigrationService as StateMigrationServiceAbstraction } from "@bitwarden/common/abstractions/stateMigration.service"; +import { StorageService as StorageServiceAbstraction } from "@bitwarden/common/abstractions/storage.service"; +import { SystemService as SystemServiceAbstraction } from "@bitwarden/common/abstractions/system.service"; +import { ClientType } from "@bitwarden/common/enums/clientType"; +import { StateFactory } from "@bitwarden/common/factories/stateFactory"; +import { GlobalState } from "@bitwarden/common/models/domain/globalState"; +import { SystemService } from "@bitwarden/common/services/system.service"; +import { ElectronCryptoService } from "@bitwarden/electron/services/electronCrypto.service"; +import { ElectronLogService } from "@bitwarden/electron/services/electronLog.service"; +import { ElectronPlatformUtilsService } from "@bitwarden/electron/services/electronPlatformUtils.service"; +import { ElectronRendererMessagingService } from "@bitwarden/electron/services/electronRendererMessaging.service"; +import { ElectronRendererSecureStorageService } from "@bitwarden/electron/services/electronRendererSecureStorage.service"; +import { ElectronRendererStorageService } from "@bitwarden/electron/services/electronRendererStorage.service"; import { Account } from "../../models/account"; import { I18nService } from "../../services/i18n.service"; diff --git a/apps/desktop/src/app/vault/add-edit-custom-fields.component.ts b/apps/desktop/src/app/vault/add-edit-custom-fields.component.ts index 5ce773e014..7e6e91686f 100644 --- a/apps/desktop/src/app/vault/add-edit-custom-fields.component.ts +++ b/apps/desktop/src/app/vault/add-edit-custom-fields.component.ts @@ -1,8 +1,8 @@ import { Component } from "@angular/core"; -import { AddEditCustomFieldsComponent as BaseAddEditCustomFieldsComponent } from "jslib-angular/components/add-edit-custom-fields.component"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; +import { AddEditCustomFieldsComponent as BaseAddEditCustomFieldsComponent } from "@bitwarden/angular/components/add-edit-custom-fields.component"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; @Component({ selector: "app-vault-add-edit-custom-fields", diff --git a/apps/desktop/src/app/vault/add-edit.component.ts b/apps/desktop/src/app/vault/add-edit.component.ts index 7205986144..b37d27b8ec 100644 --- a/apps/desktop/src/app/vault/add-edit.component.ts +++ b/apps/desktop/src/app/vault/add-edit.component.ts @@ -1,21 +1,21 @@ import { Component, NgZone, OnChanges, OnDestroy, ViewChild } from "@angular/core"; import { NgForm } from "@angular/forms"; -import { AddEditComponent as BaseAddEditComponent } from "jslib-angular/components/add-edit.component"; -import { AuditService } from "jslib-common/abstractions/audit.service"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; +import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/components/add-edit.component"; +import { AuditService } from "@bitwarden/common/abstractions/audit.service"; +import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { FolderService } from "@bitwarden/common/abstractions/folder.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; const BroadcasterSubscriptionId = "AddEditComponent"; diff --git a/apps/desktop/src/app/vault/attachments.component.ts b/apps/desktop/src/app/vault/attachments.component.ts index 660e0a6f3a..5c950c295f 100644 --- a/apps/desktop/src/app/vault/attachments.component.ts +++ b/apps/desktop/src/app/vault/attachments.component.ts @@ -1,13 +1,13 @@ import { Component } from "@angular/core"; -import { AttachmentsComponent as BaseAttachmentsComponent } from "jslib-angular/components/attachments.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; +import { AttachmentsComponent as BaseAttachmentsComponent } from "@bitwarden/angular/components/attachments.component"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.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 { StateService } from "@bitwarden/common/abstractions/state.service"; @Component({ selector: "app-vault-attachments", diff --git a/apps/desktop/src/app/vault/ciphers.component.ts b/apps/desktop/src/app/vault/ciphers.component.ts index 438ffab817..7505206f50 100644 --- a/apps/desktop/src/app/vault/ciphers.component.ts +++ b/apps/desktop/src/app/vault/ciphers.component.ts @@ -1,8 +1,8 @@ import { Component } from "@angular/core"; -import { CiphersComponent as BaseCiphersComponent } from "jslib-angular/components/ciphers.component"; -import { SearchService } from "jslib-common/abstractions/search.service"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { CiphersComponent as BaseCiphersComponent } from "@bitwarden/angular/components/ciphers.component"; +import { SearchService } from "@bitwarden/common/abstractions/search.service"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; import { SearchBarService } from "../layout/search/search-bar.service"; diff --git a/apps/desktop/src/app/vault/collections.component.ts b/apps/desktop/src/app/vault/collections.component.ts index 2ae20bd53e..4b53f4d868 100644 --- a/apps/desktop/src/app/vault/collections.component.ts +++ b/apps/desktop/src/app/vault/collections.component.ts @@ -1,11 +1,11 @@ import { Component } from "@angular/core"; -import { CollectionsComponent as BaseCollectionsComponent } from "jslib-angular/components/collections.component"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { CollectionsComponent as BaseCollectionsComponent } from "@bitwarden/angular/components/collections.component"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.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"; @Component({ selector: "app-vault-collections", diff --git a/apps/desktop/src/app/vault/export.component.ts b/apps/desktop/src/app/vault/export.component.ts index 1da90e662a..b1e48abcdd 100644 --- a/apps/desktop/src/app/vault/export.component.ts +++ b/apps/desktop/src/app/vault/export.component.ts @@ -3,16 +3,16 @@ import * as os from "os"; import { Component, OnInit } from "@angular/core"; import { FormBuilder } from "@angular/forms"; -import { ExportComponent as BaseExportComponent } from "jslib-angular/components/export.component"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { ExportService } from "jslib-common/abstractions/export.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { UserVerificationService } from "jslib-common/abstractions/userVerification.service"; +import { ExportComponent as BaseExportComponent } from "@bitwarden/angular/components/export.component"; +import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { ExportService } from "@bitwarden/common/abstractions/export.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 { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service"; const BroadcasterSubscriptionId = "ExportComponent"; diff --git a/apps/desktop/src/app/vault/folder-add-edit.component.ts b/apps/desktop/src/app/vault/folder-add-edit.component.ts index a65f3f0226..9c7369ac87 100644 --- a/apps/desktop/src/app/vault/folder-add-edit.component.ts +++ b/apps/desktop/src/app/vault/folder-add-edit.component.ts @@ -1,10 +1,10 @@ import { Component } from "@angular/core"; -import { FolderAddEditComponent as BaseFolderAddEditComponent } from "jslib-angular/components/folder-add-edit.component"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { FolderAddEditComponent as BaseFolderAddEditComponent } from "@bitwarden/angular/components/folder-add-edit.component"; +import { FolderService } from "@bitwarden/common/abstractions/folder.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"; @Component({ selector: "app-folder-add-edit", diff --git a/apps/desktop/src/app/vault/generator.component.ts b/apps/desktop/src/app/vault/generator.component.ts index 471fd971af..aaa134aef9 100644 --- a/apps/desktop/src/app/vault/generator.component.ts +++ b/apps/desktop/src/app/vault/generator.component.ts @@ -1,13 +1,13 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { GeneratorComponent as BaseGeneratorComponent } from "jslib-angular/components/generator.component"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { UsernameGenerationService } from "jslib-common/abstractions/usernameGeneration.service"; +import { GeneratorComponent as BaseGeneratorComponent } from "@bitwarden/angular/components/generator.component"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +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 { UsernameGenerationService } from "@bitwarden/common/abstractions/usernameGeneration.service"; @Component({ selector: "app-generator", diff --git a/apps/desktop/src/app/vault/password-generator-history.component.ts b/apps/desktop/src/app/vault/password-generator-history.component.ts index d7f344365f..71c57932aa 100644 --- a/apps/desktop/src/app/vault/password-generator-history.component.ts +++ b/apps/desktop/src/app/vault/password-generator-history.component.ts @@ -1,9 +1,9 @@ import { Component } from "@angular/core"; -import { PasswordGeneratorHistoryComponent as BasePasswordGeneratorHistoryComponent } from "jslib-angular/components/password-generator-history.component"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { PasswordGeneratorHistoryComponent as BasePasswordGeneratorHistoryComponent } from "@bitwarden/angular/components/password-generator-history.component"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; @Component({ selector: "app-password-generator-history", diff --git a/apps/desktop/src/app/vault/password-history.component.ts b/apps/desktop/src/app/vault/password-history.component.ts index 06d5158e92..0413e9f67a 100644 --- a/apps/desktop/src/app/vault/password-history.component.ts +++ b/apps/desktop/src/app/vault/password-history.component.ts @@ -1,9 +1,9 @@ import { Component } from "@angular/core"; -import { PasswordHistoryComponent as BasePasswordHistoryComponent } from "jslib-angular/components/password-history.component"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { PasswordHistoryComponent as BasePasswordHistoryComponent } from "@bitwarden/angular/components/password-history.component"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; @Component({ selector: "app-password-history", diff --git a/apps/desktop/src/app/vault/share.component.ts b/apps/desktop/src/app/vault/share.component.ts index ebab6fc81c..efa81ddb98 100644 --- a/apps/desktop/src/app/vault/share.component.ts +++ b/apps/desktop/src/app/vault/share.component.ts @@ -1,12 +1,12 @@ import { Component } from "@angular/core"; -import { ShareComponent as BaseShareComponent } from "jslib-angular/components/share.component"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { ShareComponent as BaseShareComponent } from "@bitwarden/angular/components/share.component"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; @Component({ selector: "app-vault-share", diff --git a/apps/desktop/src/app/vault/vault.component.ts b/apps/desktop/src/app/vault/vault.component.ts index 7b9f60076b..70d19b2b6e 100644 --- a/apps/desktop/src/app/vault/vault.component.ts +++ b/apps/desktop/src/app/vault/vault.component.ts @@ -10,24 +10,24 @@ import { import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { ModalRef } from "jslib-angular/components/modal/modal.ref"; -import { VaultFilter } from "jslib-angular/modules/vault-filter/models/vault-filter.model"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { TotpService } from "jslib-common/abstractions/totp.service"; -import { CipherRepromptType } from "jslib-common/enums/cipherRepromptType"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { EventType } from "jslib-common/enums/eventType"; -import { CipherView } from "jslib-common/models/view/cipherView"; -import { FolderView } from "jslib-common/models/view/folderView"; -import { invokeMenu, RendererMenuItem } from "jslib-electron/utils"; +import { ModalRef } from "@bitwarden/angular/components/modal/modal.ref"; +import { VaultFilter } from "@bitwarden/angular/modules/vault-filter/models/vault-filter.model"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { TotpService } from "@bitwarden/common/abstractions/totp.service"; +import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { EventType } from "@bitwarden/common/enums/eventType"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { FolderView } from "@bitwarden/common/models/view/folderView"; +import { invokeMenu, RendererMenuItem } from "@bitwarden/electron/utils"; import { SearchBarService } from "../layout/search/search-bar.service"; import { VaultFilterComponent } from "../modules/vault-filter/vault-filter.component"; diff --git a/apps/desktop/src/app/vault/view-custom-fields.component.ts b/apps/desktop/src/app/vault/view-custom-fields.component.ts index 30046a3110..7d9b338f0f 100644 --- a/apps/desktop/src/app/vault/view-custom-fields.component.ts +++ b/apps/desktop/src/app/vault/view-custom-fields.component.ts @@ -1,7 +1,7 @@ import { Component } from "@angular/core"; -import { ViewCustomFieldsComponent as BaseViewCustomFieldsComponent } from "jslib-angular/components/view-custom-fields.component"; -import { EventService } from "jslib-common/abstractions/event.service"; +import { ViewCustomFieldsComponent as BaseViewCustomFieldsComponent } from "@bitwarden/angular/components/view-custom-fields.component"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; @Component({ selector: "app-vault-view-custom-fields", diff --git a/apps/desktop/src/app/vault/view.component.ts b/apps/desktop/src/app/vault/view.component.ts index 6c2dd85828..dd0986948e 100644 --- a/apps/desktop/src/app/vault/view.component.ts +++ b/apps/desktop/src/app/vault/view.component.ts @@ -7,22 +7,22 @@ import { Output, } from "@angular/core"; -import { ViewComponent as BaseViewComponent } from "jslib-angular/components/view.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AuditService } from "jslib-common/abstractions/audit.service"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { TokenService } from "jslib-common/abstractions/token.service"; -import { TotpService } from "jslib-common/abstractions/totp.service"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { ViewComponent as BaseViewComponent } from "@bitwarden/angular/components/view.component"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { AuditService } from "@bitwarden/common/abstractions/audit.service"; +import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.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 { CipherView } from "@bitwarden/common/models/view/cipherView"; const BroadcasterSubscriptionId = "ViewComponent"; diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts index 66cc06a118..681f104d65 100644 --- a/apps/desktop/src/main.ts +++ b/apps/desktop/src/main.ts @@ -2,15 +2,15 @@ import * as path from "path"; import { app } from "electron"; -import { StateFactory } from "jslib-common/factories/stateFactory"; -import { GlobalState } from "jslib-common/models/domain/globalState"; -import { StateService } from "jslib-common/services/state.service"; -import { ElectronLogService } from "jslib-electron/services/electronLog.service"; -import { ElectronMainMessagingService } from "jslib-electron/services/electronMainMessaging.service"; -import { ElectronStorageService } from "jslib-electron/services/electronStorage.service"; -import { TrayMain } from "jslib-electron/tray.main"; -import { UpdaterMain } from "jslib-electron/updater.main"; -import { WindowMain } from "jslib-electron/window.main"; +import { StateFactory } from "@bitwarden/common/factories/stateFactory"; +import { GlobalState } from "@bitwarden/common/models/domain/globalState"; +import { StateService } from "@bitwarden/common/services/state.service"; +import { ElectronLogService } from "@bitwarden/electron/services/electronLog.service"; +import { ElectronMainMessagingService } from "@bitwarden/electron/services/electronMainMessaging.service"; +import { ElectronStorageService } from "@bitwarden/electron/services/electronStorage.service"; +import { TrayMain } from "@bitwarden/electron/tray.main"; +import { UpdaterMain } from "@bitwarden/electron/updater.main"; +import { WindowMain } from "@bitwarden/electron/window.main"; import { BiometricMain } from "./main/biometric/biometric.main"; import { DesktopCredentialStorageListener } from "./main/desktopCredentialStorageListener"; diff --git a/apps/desktop/src/main/biometric/biometric.darwin.main.ts b/apps/desktop/src/main/biometric/biometric.darwin.main.ts index 03ee546033..7afcd1cddf 100644 --- a/apps/desktop/src/main/biometric/biometric.darwin.main.ts +++ b/apps/desktop/src/main/biometric/biometric.darwin.main.ts @@ -1,7 +1,7 @@ import { ipcMain, systemPreferences } from "electron"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { StateService } from "jslib-common/abstractions/state.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; import { BiometricMain } from "../biometric/biometric.main"; diff --git a/apps/desktop/src/main/biometric/biometric.windows.main.ts b/apps/desktop/src/main/biometric/biometric.windows.main.ts index aac4f4dc6d..eaea48cba1 100644 --- a/apps/desktop/src/main/biometric/biometric.windows.main.ts +++ b/apps/desktop/src/main/biometric/biometric.windows.main.ts @@ -1,10 +1,10 @@ import { ipcMain } from "electron"; import forceFocus from "forcefocus"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { WindowMain } from "jslib-electron/window.main"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { WindowMain } from "@bitwarden/electron/window.main"; import { BiometricMain } from "src/main/biometric/biometric.main"; diff --git a/apps/desktop/src/main/menu/menu.about.ts b/apps/desktop/src/main/menu/menu.about.ts index 10ce23d123..64f1adad0c 100644 --- a/apps/desktop/src/main/menu/menu.about.ts +++ b/apps/desktop/src/main/menu/menu.about.ts @@ -1,8 +1,8 @@ import { BrowserWindow, clipboard, dialog, MenuItemConstructorOptions } from "electron"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { UpdaterMain } from "jslib-electron/updater.main"; -import { isMacAppStore, isSnapStore, isWindowsStore } from "jslib-electron/utils"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { UpdaterMain } from "@bitwarden/electron/updater.main"; +import { isMacAppStore, isSnapStore, isWindowsStore } from "@bitwarden/electron/utils"; import { IMenubarMenu } from "./menubar"; diff --git a/apps/desktop/src/main/menu/menu.account.ts b/apps/desktop/src/main/menu/menu.account.ts index cce734beac..ef85f7462f 100644 --- a/apps/desktop/src/main/menu/menu.account.ts +++ b/apps/desktop/src/main/menu/menu.account.ts @@ -1,8 +1,8 @@ import { BrowserWindow, dialog, MenuItemConstructorOptions, shell } from "electron"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { isMacAppStore, isWindowsStore } from "jslib-electron/utils"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { isMacAppStore, isWindowsStore } from "@bitwarden/electron/utils"; import { IMenubarMenu } from "./menubar"; diff --git a/apps/desktop/src/main/menu/menu.bitwarden.ts b/apps/desktop/src/main/menu/menu.bitwarden.ts index 6ee3be9dbc..d25454d9a4 100644 --- a/apps/desktop/src/main/menu/menu.bitwarden.ts +++ b/apps/desktop/src/main/menu/menu.bitwarden.ts @@ -1,9 +1,9 @@ import { BrowserWindow, MenuItemConstructorOptions } from "electron"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { UpdaterMain } from "jslib-electron/updater.main"; -import { isMac } from "jslib-electron/utils"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { UpdaterMain } from "@bitwarden/electron/updater.main"; +import { isMac } from "@bitwarden/electron/utils"; import { FirstMenu } from "./menu.first"; import { MenuAccount } from "./menu.updater"; diff --git a/apps/desktop/src/main/menu/menu.edit.ts b/apps/desktop/src/main/menu/menu.edit.ts index a48afc745b..c5827015ba 100644 --- a/apps/desktop/src/main/menu/menu.edit.ts +++ b/apps/desktop/src/main/menu/menu.edit.ts @@ -1,7 +1,7 @@ import { MenuItemConstructorOptions } from "electron"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { IMenubarMenu } from "./menubar"; diff --git a/apps/desktop/src/main/menu/menu.file.ts b/apps/desktop/src/main/menu/menu.file.ts index 9ef4bc6da3..71b4a23692 100644 --- a/apps/desktop/src/main/menu/menu.file.ts +++ b/apps/desktop/src/main/menu/menu.file.ts @@ -1,9 +1,9 @@ import { BrowserWindow, MenuItemConstructorOptions } from "electron"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { UpdaterMain } from "jslib-electron/updater.main"; -import { isMac, isMacAppStore } from "jslib-electron/utils"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { UpdaterMain } from "@bitwarden/electron/updater.main"; +import { isMac, isMacAppStore } from "@bitwarden/electron/utils"; import { FirstMenu } from "./menu.first"; import { MenuAccount } from "./menu.updater"; diff --git a/apps/desktop/src/main/menu/menu.first.ts b/apps/desktop/src/main/menu/menu.first.ts index bccce323bf..5786b4e68c 100644 --- a/apps/desktop/src/main/menu/menu.first.ts +++ b/apps/desktop/src/main/menu/menu.first.ts @@ -1,9 +1,9 @@ import { BrowserWindow, dialog, MenuItem, MenuItemConstructorOptions } from "electron"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { UpdaterMain } from "jslib-electron/updater.main"; -import { isMacAppStore, isSnapStore, isWindowsStore } from "jslib-electron/utils"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { UpdaterMain } from "@bitwarden/electron/updater.main"; +import { isMacAppStore, isSnapStore, isWindowsStore } from "@bitwarden/electron/utils"; import { MenuAccount } from "./menu.updater"; diff --git a/apps/desktop/src/main/menu/menu.help.ts b/apps/desktop/src/main/menu/menu.help.ts index 4ac04c490b..28c3171fb4 100644 --- a/apps/desktop/src/main/menu/menu.help.ts +++ b/apps/desktop/src/main/menu/menu.help.ts @@ -1,7 +1,7 @@ import { shell, MenuItemConstructorOptions } from "electron"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { isMacAppStore, isWindowsStore } from "jslib-electron/utils"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { isMacAppStore, isWindowsStore } from "@bitwarden/electron/utils"; import { AboutMenu } from "./menu.about"; import { IMenubarMenu } from "./menubar"; diff --git a/apps/desktop/src/main/menu/menu.main.ts b/apps/desktop/src/main/menu/menu.main.ts index 2cc1935411..66670e196c 100644 --- a/apps/desktop/src/main/menu/menu.main.ts +++ b/apps/desktop/src/main/menu/menu.main.ts @@ -1,6 +1,6 @@ import { app, Menu } from "electron"; -import { BaseMenu } from "jslib-electron/baseMenu"; +import { BaseMenu } from "@bitwarden/electron/baseMenu"; import { Main } from "../../main"; diff --git a/apps/desktop/src/main/menu/menu.view.ts b/apps/desktop/src/main/menu/menu.view.ts index e3f53e35ba..2953ec8eaa 100644 --- a/apps/desktop/src/main/menu/menu.view.ts +++ b/apps/desktop/src/main/menu/menu.view.ts @@ -1,7 +1,7 @@ import { MenuItemConstructorOptions } from "electron"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { IMenubarMenu } from "./menubar"; diff --git a/apps/desktop/src/main/menu/menu.window.ts b/apps/desktop/src/main/menu/menu.window.ts index 9b63fa5d45..3746e22b72 100644 --- a/apps/desktop/src/main/menu/menu.window.ts +++ b/apps/desktop/src/main/menu/menu.window.ts @@ -1,9 +1,9 @@ import { MenuItemConstructorOptions } from "electron"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { isMac } from "jslib-electron/utils"; -import { WindowMain } from "jslib-electron/window.main"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { isMac } from "@bitwarden/electron/utils"; +import { WindowMain } from "@bitwarden/electron/window.main"; import { IMenubarMenu } from "./menubar"; diff --git a/apps/desktop/src/main/menu/menubar.ts b/apps/desktop/src/main/menu/menubar.ts index c9aa070687..441b9ac655 100644 --- a/apps/desktop/src/main/menu/menubar.ts +++ b/apps/desktop/src/main/menu/menubar.ts @@ -1,10 +1,10 @@ import { Menu, MenuItemConstructorOptions } from "electron"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { UpdaterMain } from "jslib-electron/updater.main"; -import { isMac } from "jslib-electron/utils"; -import { WindowMain } from "jslib-electron/window.main"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { UpdaterMain } from "@bitwarden/electron/updater.main"; +import { isMac } from "@bitwarden/electron/utils"; +import { WindowMain } from "@bitwarden/electron/window.main"; import { AboutMenu } from "./menu.about"; import { AccountMenu } from "./menu.account"; diff --git a/apps/desktop/src/main/messaging.main.ts b/apps/desktop/src/main/messaging.main.ts index 290109eec0..ee19a99e19 100644 --- a/apps/desktop/src/main/messaging.main.ts +++ b/apps/desktop/src/main/messaging.main.ts @@ -3,7 +3,7 @@ import * as path from "path"; import { app, ipcMain } from "electron"; -import { StateService } from "jslib-common/abstractions/state.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; import { Main } from "../main"; diff --git a/apps/desktop/src/main/nativeMessaging.main.ts b/apps/desktop/src/main/nativeMessaging.main.ts index 0e8554a1b3..90557cbb03 100644 --- a/apps/desktop/src/main/nativeMessaging.main.ts +++ b/apps/desktop/src/main/nativeMessaging.main.ts @@ -7,8 +7,8 @@ import * as util from "util"; import { ipcMain } from "electron"; import * as ipc from "node-ipc"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { WindowMain } from "jslib-electron/window.main"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { WindowMain } from "@bitwarden/electron/window.main"; export class NativeMessagingMain { private connected: Socket[] = []; diff --git a/apps/desktop/src/main/powerMonitor.main.ts b/apps/desktop/src/main/powerMonitor.main.ts index 4fa897c21b..438a0e6f9e 100644 --- a/apps/desktop/src/main/powerMonitor.main.ts +++ b/apps/desktop/src/main/powerMonitor.main.ts @@ -1,6 +1,6 @@ import { powerMonitor } from "electron"; -import { isSnapStore } from "jslib-electron/utils"; +import { isSnapStore } from "@bitwarden/electron/utils"; import { Main } from "../main"; diff --git a/apps/desktop/src/models/account.ts b/apps/desktop/src/models/account.ts index f92947fb0d..588d7b88b9 100644 --- a/apps/desktop/src/models/account.ts +++ b/apps/desktop/src/models/account.ts @@ -1,7 +1,7 @@ import { Account as BaseAccount, AccountSettings as BaseAccountSettings, -} from "jslib-common/models/domain/account"; +} from "@bitwarden/common/models/domain/account"; export class AccountSettings extends BaseAccountSettings { vaultTimeout = -1; // On Restart diff --git a/apps/desktop/src/package-lock.json b/apps/desktop/src/package-lock.json index a8c141bcf5..f5d6a69e12 100644 --- a/apps/desktop/src/package-lock.json +++ b/apps/desktop/src/package-lock.json @@ -1,12 +1,12 @@ { "name": "@bitwarden/desktop", - "version": "1.33.1", + "version": "2022.5.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@bitwarden/desktop", - "version": "1.33.1", + "version": "2022.5.2", "license": "GPL-3.0", "dependencies": { "@nodert-win10-rs4/windows.security.credentials.ui": "^0.4.4", @@ -26,7 +26,7 @@ "node_modules/ansi-regex": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", "engines": { "node": ">=0.10.0" } @@ -126,7 +126,7 @@ "node_modules/code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", + "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==", "engines": { "node": ">=0.10.0" } @@ -134,7 +134,7 @@ "node_modules/console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" + "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==" }, "node_modules/core-util-is": { "version": "1.0.3", @@ -163,12 +163,12 @@ "node_modules/delegates": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" + "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==" }, "node_modules/detect-libc": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", - "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", + "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==", "bin": { "detect-libc": "bin/detect-libc.js" }, @@ -218,7 +218,7 @@ "node_modules/gauge": { "version": "2.7.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "integrity": "sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==", "dependencies": { "aproba": "^1.0.3", "console-control-strings": "^1.0.0", @@ -233,12 +233,12 @@ "node_modules/github-from-package": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", - "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=" + "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==" }, "node_modules/has-unicode": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" + "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==" }, "node_modules/ieee754": { "version": "1.2.1", @@ -272,7 +272,7 @@ "node_modules/is-fullwidth-code-point": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==", "dependencies": { "number-is-nan": "^1.0.0" }, @@ -283,7 +283,7 @@ "node_modules/isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" }, "node_modules/keytar": { "version": "7.9.0", @@ -329,9 +329,9 @@ } }, "node_modules/keytar/node_modules/node-abi": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.15.0.tgz", - "integrity": "sha512-Ic6z/j6I9RLm4ov7npo1I48UQr2BEyFCqh6p7S1dhEx9jPO0GPGq/e2Rb7x7DroQrmiVMz/Bw1vJm9sPAl2nxA==", + "version": "3.22.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.22.0.tgz", + "integrity": "sha512-u4uAs/4Zzmp/jjsD9cyFYDXeISfUWaAVWshPmDZOFOv4Xl4SbzTXm53I04C2uRueYJ+0t5PEtLH/owbn2Npf/w==", "dependencies": { "semver": "^7.3.5" }, @@ -340,9 +340,9 @@ } }, "node_modules/keytar/node_modules/prebuild-install": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.0.tgz", - "integrity": "sha512-CNcMgI1xBypOyGqjp3wOc8AAo1nMhZS3Cwd3iHIxOdAUbb+YxdNuM4Z5iIrZ8RLvOsf3F3bl7b7xGq6DjQoNYA==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz", + "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==", "dependencies": { "detect-libc": "^2.0.0", "expand-template": "^2.0.3", @@ -351,7 +351,6 @@ "mkdirp-classic": "^0.5.3", "napi-build-utils": "^1.0.1", "node-abi": "^3.3.0", - "npmlog": "^4.0.1", "pump": "^3.0.0", "rc": "^1.2.7", "simple-get": "^4.0.0", @@ -436,9 +435,9 @@ "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" }, "node_modules/nan": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz", - "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==" + "version": "2.16.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz", + "integrity": "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==" }, "node_modules/napi-build-utils": { "version": "1.0.2", @@ -461,7 +460,7 @@ "node_modules/noop-logger": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz", - "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=" + "integrity": "sha512-6kM8CLXvuW5crTxsAtva2YLrRrDaiTIkIePWs9moLHqbFWT94WpNFjwS/5dfLfECg5i/lkmw3aoqVidxt23TEQ==" }, "node_modules/npmlog": { "version": "4.1.2", @@ -477,7 +476,7 @@ "node_modules/number-is-nan": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", + "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==", "engines": { "node": ">=0.10.0" } @@ -485,7 +484,7 @@ "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", "engines": { "node": ">=0.10.0" } @@ -493,7 +492,7 @@ "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "dependencies": { "wrappy": "1" } @@ -584,7 +583,7 @@ "node_modules/set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" }, "node_modules/signal-exit": { "version": "3.0.7", @@ -631,7 +630,7 @@ "node_modules/string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==", "dependencies": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -644,7 +643,7 @@ "node_modules/strip-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", "dependencies": { "ansi-regex": "^2.0.0" }, @@ -655,7 +654,7 @@ "node_modules/strip-json-comments": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", "engines": { "node": ">=0.10.0" } @@ -702,7 +701,7 @@ "node_modules/tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", "dependencies": { "safe-buffer": "^5.0.1" }, @@ -713,7 +712,7 @@ "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, "node_modules/which-pm-runs": { "version": "1.1.0", @@ -734,7 +733,7 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "node_modules/yallist": { "version": "4.0.0", @@ -754,7 +753,7 @@ "ansi-regex": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==" }, "aproba": { "version": "1.2.0", @@ -822,12 +821,12 @@ "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==" }, "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" + "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==" }, "core-util-is": { "version": "1.0.3", @@ -850,12 +849,12 @@ "delegates": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" + "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==" }, "detect-libc": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", - "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" + "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==" }, "end-of-stream": { "version": "1.4.4", @@ -892,7 +891,7 @@ "gauge": { "version": "2.7.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "integrity": "sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==", "requires": { "aproba": "^1.0.3", "console-control-strings": "^1.0.0", @@ -907,12 +906,12 @@ "github-from-package": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", - "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=" + "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==" }, "has-unicode": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" + "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==" }, "ieee754": { "version": "1.2.1", @@ -932,7 +931,7 @@ "is-fullwidth-code-point": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==", "requires": { "number-is-nan": "^1.0.0" } @@ -940,7 +939,7 @@ "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" }, "keytar": { "version": "7.9.0", @@ -970,17 +969,17 @@ "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==" }, "node-abi": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.15.0.tgz", - "integrity": "sha512-Ic6z/j6I9RLm4ov7npo1I48UQr2BEyFCqh6p7S1dhEx9jPO0GPGq/e2Rb7x7DroQrmiVMz/Bw1vJm9sPAl2nxA==", + "version": "3.22.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.22.0.tgz", + "integrity": "sha512-u4uAs/4Zzmp/jjsD9cyFYDXeISfUWaAVWshPmDZOFOv4Xl4SbzTXm53I04C2uRueYJ+0t5PEtLH/owbn2Npf/w==", "requires": { "semver": "^7.3.5" } }, "prebuild-install": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.0.tgz", - "integrity": "sha512-CNcMgI1xBypOyGqjp3wOc8AAo1nMhZS3Cwd3iHIxOdAUbb+YxdNuM4Z5iIrZ8RLvOsf3F3bl7b7xGq6DjQoNYA==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz", + "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==", "requires": { "detect-libc": "^2.0.0", "expand-template": "^2.0.3", @@ -989,7 +988,6 @@ "mkdirp-classic": "^0.5.3", "napi-build-utils": "^1.0.1", "node-abi": "^3.3.0", - "npmlog": "^4.0.1", "pump": "^3.0.0", "rc": "^1.2.7", "simple-get": "^4.0.0", @@ -1041,9 +1039,9 @@ "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" }, "nan": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz", - "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==" + "version": "2.16.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz", + "integrity": "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==" }, "napi-build-utils": { "version": "1.0.2", @@ -1066,7 +1064,7 @@ "noop-logger": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz", - "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=" + "integrity": "sha512-6kM8CLXvuW5crTxsAtva2YLrRrDaiTIkIePWs9moLHqbFWT94WpNFjwS/5dfLfECg5i/lkmw3aoqVidxt23TEQ==" }, "npmlog": { "version": "4.1.2", @@ -1082,17 +1080,17 @@ "number-is-nan": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==" }, "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "requires": { "wrappy": "1" } @@ -1171,7 +1169,7 @@ "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" }, "signal-exit": { "version": "3.0.7", @@ -1204,7 +1202,7 @@ "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==", "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -1214,7 +1212,7 @@ "strip-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", "requires": { "ansi-regex": "^2.0.0" } @@ -1222,7 +1220,7 @@ "strip-json-comments": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" + "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==" }, "tar-fs": { "version": "2.1.1", @@ -1262,7 +1260,7 @@ "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", "requires": { "safe-buffer": "^5.0.1" } @@ -1270,7 +1268,7 @@ "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, "which-pm-runs": { "version": "1.1.0", @@ -1288,7 +1286,7 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "yallist": { "version": "4.0.0", diff --git a/apps/desktop/src/scss/styles.scss b/apps/desktop/src/scss/styles.scss index e0a834c542..367303f236 100644 --- a/apps/desktop/src/scss/styles.scss +++ b/apps/desktop/src/scss/styles.scss @@ -1,6 +1,3 @@ -$icomoon-font-path: "../../../../libs/angular/src/scss/bwicons/fonts/"; -$card-icons-base: "../../../../libs/angular/src/images/cards/"; - @import "../../../../libs/angular/src/scss/webfonts.css"; @import "../../../../libs/angular/src/scss/bwicons/styles/style.scss"; @import "~@angular/cdk/overlay-prebuilt.css"; diff --git a/apps/desktop/src/services/i18n.service.ts b/apps/desktop/src/services/i18n.service.ts index 899147a075..7f130faee3 100644 --- a/apps/desktop/src/services/i18n.service.ts +++ b/apps/desktop/src/services/i18n.service.ts @@ -1,7 +1,7 @@ import * as fs from "fs"; import * as path from "path"; -import { I18nService as BaseI18nService } from "jslib-common/services/i18n.service"; +import { I18nService as BaseI18nService } from "@bitwarden/common/services/i18n.service"; export class I18nService extends BaseI18nService { constructor(systemLanguage: string, localesDirectory: string) { diff --git a/apps/desktop/src/services/nativeMessaging.service.ts b/apps/desktop/src/services/nativeMessaging.service.ts index a1ef710a62..695f3b3b3f 100644 --- a/apps/desktop/src/services/nativeMessaging.service.ts +++ b/apps/desktop/src/services/nativeMessaging.service.ts @@ -2,17 +2,17 @@ import { Injectable } from "@angular/core"; import { ipcRenderer } from "electron"; import Swal from "sweetalert2"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { KeySuffixOptions } from "jslib-common/enums/keySuffixOptions"; -import { Utils } from "jslib-common/misc/utils"; -import { EncString } from "jslib-common/models/domain/encString"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.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 { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { EncString } from "@bitwarden/common/models/domain/encString"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; const MessageValidTimeout = 10 * 1000; const EncryptionAlgorithm = "sha1"; diff --git a/apps/desktop/src/services/passwordReprompt.service.ts b/apps/desktop/src/services/passwordReprompt.service.ts index ad13a4d003..fc0ed81585 100644 --- a/apps/desktop/src/services/passwordReprompt.service.ts +++ b/apps/desktop/src/services/passwordReprompt.service.ts @@ -1,6 +1,6 @@ import { Injectable } from "@angular/core"; -import { PasswordRepromptService as BasePasswordRepromptService } from "jslib-angular/services/passwordReprompt.service"; +import { PasswordRepromptService as BasePasswordRepromptService } from "@bitwarden/angular/services/passwordReprompt.service"; import { PasswordRepromptComponent } from "../app/components/password-reprompt.component"; diff --git a/apps/desktop/src/services/state.service.ts b/apps/desktop/src/services/state.service.ts index 465b684d9e..521868a886 100644 --- a/apps/desktop/src/services/state.service.ts +++ b/apps/desktop/src/services/state.service.ts @@ -1,6 +1,6 @@ -import { StateService as StateServiceAbstraction } from "jslib-common/abstractions/state.service"; -import { GlobalState } from "jslib-common/models/domain/globalState"; -import { StateService as BaseStateService } from "jslib-common/services/state.service"; +import { StateService as StateServiceAbstraction } from "@bitwarden/common/abstractions/state.service"; +import { GlobalState } from "@bitwarden/common/models/domain/globalState"; +import { StateService as BaseStateService } from "@bitwarden/common/services/state.service"; import { Account } from "../models/account"; diff --git a/apps/desktop/tsconfig.json b/apps/desktop/tsconfig.json index e185cd59e1..f753858f69 100644 --- a/apps/desktop/tsconfig.json +++ b/apps/desktop/tsconfig.json @@ -11,9 +11,9 @@ "baseUrl": ".", "paths": { "tldjs": ["../../libs/common/src/misc/tldjs.noop"], - "jslib-common/*": ["../../libs/common/src/*"], - "jslib-angular/*": ["../../libs/angular/src/*"], - "jslib-electron/*": ["../../libs/electron/src/*"] + "@bitwarden/common/*": ["../../libs/common/src/*"], + "@bitwarden/angular/*": ["../../libs/angular/src/*"], + "@bitwarden/electron/*": ["../../libs/electron/src/*"] } }, "angularCompilerOptions": { diff --git a/apps/web/.eslintrc.json b/apps/web/.eslintrc.json index bfdcc55758..e5a34aec6a 100644 --- a/apps/web/.eslintrc.json +++ b/apps/web/.eslintrc.json @@ -1,5 +1,4 @@ { - "root": true, "env": { "browser": true } diff --git a/apps/web/src/abstractions/state.service.ts b/apps/web/src/abstractions/state.service.ts index f5faf5f7d6..c6b237a84d 100644 --- a/apps/web/src/abstractions/state.service.ts +++ b/apps/web/src/abstractions/state.service.ts @@ -1,5 +1,5 @@ -import { StateService as BaseStateService } from "jslib-common/abstractions/state.service"; -import { StorageOptions } from "jslib-common/models/domain/storageOptions"; +import { StateService as BaseStateService } from "@bitwarden/common/abstractions/state.service"; +import { StorageOptions } from "@bitwarden/common/models/domain/storageOptions"; import { Account } from "src/models/account"; diff --git a/apps/web/src/app/accounts/accept-emergency.component.ts b/apps/web/src/app/accounts/accept-emergency.component.ts index 2083ebcac4..a3a2f43fc0 100644 --- a/apps/web/src/app/accounts/accept-emergency.component.ts +++ b/apps/web/src/app/accounts/accept-emergency.component.ts @@ -1,11 +1,11 @@ import { Component } from "@angular/core"; import { ActivatedRoute, Params, Router } from "@angular/router"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { EmergencyAccessAcceptRequest } from "jslib-common/models/request/emergencyAccessAcceptRequest"; +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/emergencyAccessAcceptRequest"; import { BaseAcceptComponent } from "../common/base.accept.component"; diff --git a/apps/web/src/app/accounts/accept-organization.component.ts b/apps/web/src/app/accounts/accept-organization.component.ts index 541ca37461..58aeef7b9b 100644 --- a/apps/web/src/app/accounts/accept-organization.component.ts +++ b/apps/web/src/app/accounts/accept-organization.component.ts @@ -1,16 +1,16 @@ import { Component } from "@angular/core"; import { ActivatedRoute, Params, Router } from "@angular/router"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { Utils } from "jslib-common/misc/utils"; -import { Policy } from "jslib-common/models/domain/policy"; -import { OrganizationUserAcceptRequest } from "jslib-common/models/request/organizationUserAcceptRequest"; +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 { LogService } from "@bitwarden/common/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { Policy } from "@bitwarden/common/models/domain/policy"; +import { OrganizationUserAcceptRequest } from "@bitwarden/common/models/request/organizationUserAcceptRequest"; import { BaseAcceptComponent } from "../common/base.accept.component"; diff --git a/apps/web/src/app/accounts/hint.component.ts b/apps/web/src/app/accounts/hint.component.ts index d47b8b52d7..f6d3153b03 100644 --- a/apps/web/src/app/accounts/hint.component.ts +++ b/apps/web/src/app/accounts/hint.component.ts @@ -1,11 +1,11 @@ import { Component } from "@angular/core"; import { Router } from "@angular/router"; -import { HintComponent as BaseHintComponent } from "jslib-angular/components/hint.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { HintComponent as BaseHintComponent } from "@bitwarden/angular/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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; @Component({ selector: "app-hint", diff --git a/apps/web/src/app/accounts/lock.component.ts b/apps/web/src/app/accounts/lock.component.ts index 791481003c..90d2b1d387 100644 --- a/apps/web/src/app/accounts/lock.component.ts +++ b/apps/web/src/app/accounts/lock.component.ts @@ -1,17 +1,17 @@ import { Component, NgZone } from "@angular/core"; import { Router } from "@angular/router"; -import { LockComponent as BaseLockComponent } from "jslib-angular/components/lock.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.service"; +import { LockComponent as BaseLockComponent } from "@bitwarden/angular/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.service"; import { RouterService } from "../services/router.service"; diff --git a/apps/web/src/app/accounts/login.component.ts b/apps/web/src/app/accounts/login.component.ts index 524137a680..180d3d2739 100644 --- a/apps/web/src/app/accounts/login.component.ts +++ b/apps/web/src/app/accounts/login.component.ts @@ -2,22 +2,22 @@ import { Component, NgZone } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { LoginComponent as BaseLoginComponent } from "jslib-angular/components/login.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { PolicyData } from "jslib-common/models/data/policyData"; -import { MasterPasswordPolicyOptions } from "jslib-common/models/domain/masterPasswordPolicyOptions"; -import { Policy } from "jslib-common/models/domain/policy"; -import { ListResponse } from "jslib-common/models/response/listResponse"; -import { PolicyResponse } from "jslib-common/models/response/policyResponse"; +import { LoginComponent as BaseLoginComponent } from "@bitwarden/angular/components/login.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"; +import { LogService } from "@bitwarden/common/abstractions/log.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 { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { PolicyData } from "@bitwarden/common/models/data/policyData"; +import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions"; +import { Policy } from "@bitwarden/common/models/domain/policy"; +import { ListResponse } from "@bitwarden/common/models/response/listResponse"; +import { PolicyResponse } from "@bitwarden/common/models/response/policyResponse"; import { StateService } from "../../abstractions/state.service"; import { RouterService } from "../services/router.service"; diff --git a/apps/web/src/app/accounts/recover-delete.component.ts b/apps/web/src/app/accounts/recover-delete.component.ts index 00b69d1248..66f2fa0373 100644 --- a/apps/web/src/app/accounts/recover-delete.component.ts +++ b/apps/web/src/app/accounts/recover-delete.component.ts @@ -1,11 +1,11 @@ import { Component } from "@angular/core"; import { Router } from "@angular/router"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { DeleteRecoverRequest } from "jslib-common/models/request/deleteRecoverRequest"; +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 { DeleteRecoverRequest } from "@bitwarden/common/models/request/deleteRecoverRequest"; @Component({ selector: "app-recover-delete", diff --git a/apps/web/src/app/accounts/recover-two-factor.component.ts b/apps/web/src/app/accounts/recover-two-factor.component.ts index b7b219ffee..44245dfbce 100644 --- a/apps/web/src/app/accounts/recover-two-factor.component.ts +++ b/apps/web/src/app/accounts/recover-two-factor.component.ts @@ -1,13 +1,13 @@ import { Component } from "@angular/core"; import { Router } from "@angular/router"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { TwoFactorRecoveryRequest } from "jslib-common/models/request/twoFactorRecoveryRequest"; +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/twoFactorRecoveryRequest"; @Component({ selector: "app-recover-two-factor", diff --git a/apps/web/src/app/accounts/register.component.ts b/apps/web/src/app/accounts/register.component.ts index 542bb8e3cb..3ae38f960e 100644 --- a/apps/web/src/app/accounts/register.component.ts +++ b/apps/web/src/app/accounts/register.component.ts @@ -2,21 +2,21 @@ import { Component } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { RegisterComponent as BaseRegisterComponent } from "jslib-angular/components/register.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { PolicyData } from "jslib-common/models/data/policyData"; -import { MasterPasswordPolicyOptions } from "jslib-common/models/domain/masterPasswordPolicyOptions"; -import { Policy } from "jslib-common/models/domain/policy"; -import { ReferenceEventRequest } from "jslib-common/models/request/referenceEventRequest"; +import { RegisterComponent as BaseRegisterComponent } from "@bitwarden/angular/components/register.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 { LogService } from "@bitwarden/common/abstractions/log.service"; +import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { PolicyData } from "@bitwarden/common/models/data/policyData"; +import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions"; +import { Policy } from "@bitwarden/common/models/domain/policy"; +import { ReferenceEventRequest } from "@bitwarden/common/models/request/referenceEventRequest"; import { RouterService } from "../services/router.service"; diff --git a/apps/web/src/app/accounts/remove-password.component.ts b/apps/web/src/app/accounts/remove-password.component.ts index cdb75058ab..89ebd4a620 100644 --- a/apps/web/src/app/accounts/remove-password.component.ts +++ b/apps/web/src/app/accounts/remove-password.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { RemovePasswordComponent as BaseRemovePasswordComponent } from "jslib-angular/components/remove-password.component"; +import { RemovePasswordComponent as BaseRemovePasswordComponent } from "@bitwarden/angular/components/remove-password.component"; @Component({ selector: "app-remove-password", diff --git a/apps/web/src/app/accounts/set-password.component.ts b/apps/web/src/app/accounts/set-password.component.ts index 604df7d73d..c7841bc584 100644 --- a/apps/web/src/app/accounts/set-password.component.ts +++ b/apps/web/src/app/accounts/set-password.component.ts @@ -1,16 +1,16 @@ import { Component } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; -import { SetPasswordComponent as BaseSetPasswordComponent } from "jslib-angular/components/set-password.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; +import { SetPasswordComponent as BaseSetPasswordComponent } from "@bitwarden/angular/components/set-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 { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; @Component({ selector: "app-set-password", diff --git a/apps/web/src/app/accounts/sso.component.ts b/apps/web/src/app/accounts/sso.component.ts index 27ee8bcc73..35a9458cd4 100644 --- a/apps/web/src/app/accounts/sso.component.ts +++ b/apps/web/src/app/accounts/sso.component.ts @@ -2,16 +2,16 @@ import { Component } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { SsoComponent as BaseSsoComponent } from "jslib-angular/components/sso.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; +import { SsoComponent as BaseSsoComponent } from "@bitwarden/angular/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"; +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"; @Component({ selector: "app-sso", diff --git a/apps/web/src/app/accounts/two-factor-options.component.ts b/apps/web/src/app/accounts/two-factor-options.component.ts index 892c971bf9..89a089d8f1 100644 --- a/apps/web/src/app/accounts/two-factor-options.component.ts +++ b/apps/web/src/app/accounts/two-factor-options.component.ts @@ -1,10 +1,10 @@ import { Component } from "@angular/core"; import { Router } from "@angular/router"; -import { TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent } from "jslib-angular/components/two-factor-options.component"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service"; +import { TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent } from "@bitwarden/angular/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"; @Component({ selector: "app-two-factor-options", diff --git a/apps/web/src/app/accounts/two-factor.component.ts b/apps/web/src/app/accounts/two-factor.component.ts index 72aa8cf24c..57ec40a2a4 100644 --- a/apps/web/src/app/accounts/two-factor.component.ts +++ b/apps/web/src/app/accounts/two-factor.component.ts @@ -1,18 +1,18 @@ import { Component, ViewChild, ViewContainerRef } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; -import { TwoFactorComponent as BaseTwoFactorComponent } from "jslib-angular/components/two-factor.component"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AppIdService } from "jslib-common/abstractions/appId.service"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service"; -import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType"; +import { TwoFactorComponent as BaseTwoFactorComponent } from "@bitwarden/angular/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 { 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 { RouterService } from "../services/router.service"; diff --git a/apps/web/src/app/accounts/update-password.component.ts b/apps/web/src/app/accounts/update-password.component.ts index ec1aa3f515..2d9392f5e7 100644 --- a/apps/web/src/app/accounts/update-password.component.ts +++ b/apps/web/src/app/accounts/update-password.component.ts @@ -1,17 +1,17 @@ import { Component } from "@angular/core"; import { Router } from "@angular/router"; -import { UpdatePasswordComponent as BaseUpdatePasswordComponent } from "jslib-angular/components/update-password.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { UserVerificationService } from "jslib-common/abstractions/userVerification.service"; +import { UpdatePasswordComponent as BaseUpdatePasswordComponent } from "@bitwarden/angular/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"; +import { LogService } from "@bitwarden/common/abstractions/log.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 { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service"; @Component({ selector: "app-update-password", diff --git a/apps/web/src/app/accounts/update-temp-password.component.ts b/apps/web/src/app/accounts/update-temp-password.component.ts index 53cd46f3d4..8b02758677 100644 --- a/apps/web/src/app/accounts/update-temp-password.component.ts +++ b/apps/web/src/app/accounts/update-temp-password.component.ts @@ -1,16 +1,16 @@ import { Component } from "@angular/core"; -import { UpdateTempPasswordComponent as BaseUpdateTempPasswordComponent } from "jslib-angular/components/update-temp-password.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; +import { UpdateTempPasswordComponent as BaseUpdateTempPasswordComponent } from "@bitwarden/angular/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"; +import { LogService } from "@bitwarden/common/abstractions/log.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 { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; @Component({ selector: "app-update-temp-password", diff --git a/apps/web/src/app/accounts/verify-email-token.component.ts b/apps/web/src/app/accounts/verify-email-token.component.ts index 2517aad132..90983f7cf0 100644 --- a/apps/web/src/app/accounts/verify-email-token.component.ts +++ b/apps/web/src/app/accounts/verify-email-token.component.ts @@ -2,12 +2,12 @@ import { Component, OnInit } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { VerifyEmailRequest } from "jslib-common/models/request/verifyEmailRequest"; +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 { StateService } from "@bitwarden/common/abstractions/state.service"; +import { VerifyEmailRequest } from "@bitwarden/common/models/request/verifyEmailRequest"; @Component({ selector: "app-verify-email-token", diff --git a/apps/web/src/app/accounts/verify-recover-delete.component.ts b/apps/web/src/app/accounts/verify-recover-delete.component.ts index 6515569575..3deadbd4d4 100644 --- a/apps/web/src/app/accounts/verify-recover-delete.component.ts +++ b/apps/web/src/app/accounts/verify-recover-delete.component.ts @@ -2,11 +2,11 @@ import { Component, OnInit } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { VerifyDeleteRecoverRequest } from "jslib-common/models/request/verifyDeleteRecoverRequest"; +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 { VerifyDeleteRecoverRequest } from "@bitwarden/common/models/request/verifyDeleteRecoverRequest"; @Component({ selector: "app-verify-recover-delete", diff --git a/apps/web/src/app/app.component.ts b/apps/web/src/app/app.component.ts index 6c462a73ed..4d93482073 100644 --- a/apps/web/src/app/app.component.ts +++ b/apps/web/src/app/app.component.ts @@ -1,3 +1,4 @@ +import { DOCUMENT } from "@angular/common"; import { Component, Inject, NgZone, OnDestroy, OnInit, SecurityContext } from "@angular/core"; import { DomSanitizer } from "@angular/platform-browser"; import { NavigationEnd, Router } from "@angular/router"; @@ -5,25 +6,25 @@ import * as jq from "jquery"; import { IndividualConfig, ToastrService } from "ngx-toastr"; import Swal from "sweetalert2"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service"; -import { NotificationsService } from "jslib-common/abstractions/notifications.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { SearchService } from "jslib-common/abstractions/search.service"; -import { SettingsService } from "jslib-common/abstractions/settings.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { TokenService } from "jslib-common/abstractions/token.service"; -import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.service"; +import { AuthService } from "@bitwarden/common/abstractions/auth.service"; +import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { FolderService } from "@bitwarden/common/abstractions/folder.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"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +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 { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { TokenService } from "@bitwarden/common/abstractions/token.service"; +import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout.service"; import { DisableSendPolicy } from "./organizations/policies/disable-send.component"; import { MasterPasswordPolicy } from "./organizations/policies/master-password.component"; @@ -36,7 +37,6 @@ import { SingleOrgPolicy } from "./organizations/policies/single-org.component"; import { TwoFactorAuthenticationPolicy } from "./organizations/policies/two-factor-authentication.component"; import { PolicyListService } from "./services/policy-list.service"; import { RouterService } from "./services/router.service"; -import { DOCUMENT } from "@angular/common"; const BroadcasterSubscriptionId = "AppComponent"; const IdleTimeout = 60000 * 10; // 10 minutes diff --git a/apps/web/src/app/common/base.accept.component.ts b/apps/web/src/app/common/base.accept.component.ts index 7d6d753673..907d7410f8 100644 --- a/apps/web/src/app/common/base.accept.component.ts +++ b/apps/web/src/app/common/base.accept.component.ts @@ -2,9 +2,9 @@ import { Directive, OnInit } from "@angular/core"; import { ActivatedRoute, Params, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.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"; @Directive() export abstract class BaseAcceptComponent implements OnInit { diff --git a/apps/web/src/app/common/base.events.component.ts b/apps/web/src/app/common/base.events.component.ts index 11ad5c453f..6907a3db04 100644 --- a/apps/web/src/app/common/base.events.component.ts +++ b/apps/web/src/app/common/base.events.component.ts @@ -1,12 +1,12 @@ import { Directive } from "@angular/core"; -import { ExportService } from "jslib-common/abstractions/export.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { EventResponse } from "jslib-common/models/response/eventResponse"; -import { ListResponse } from "jslib-common/models/response/listResponse"; -import { EventView } from "jslib-common/models/view/eventView"; +import { ExportService } from "@bitwarden/common/abstractions/export.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 { EventResponse } from "@bitwarden/common/models/response/eventResponse"; +import { ListResponse } from "@bitwarden/common/models/response/listResponse"; +import { EventView } from "@bitwarden/common/models/view/eventView"; import { EventService } from "src/app/services/event.service"; diff --git a/apps/web/src/app/common/base.people.component.ts b/apps/web/src/app/common/base.people.component.ts index b93e9482b2..ac33e5509d 100644 --- a/apps/web/src/app/common/base.people.component.ts +++ b/apps/web/src/app/common/base.people.component.ts @@ -1,24 +1,24 @@ import { Directive, ViewChild, ViewContainerRef } from "@angular/core"; -import { SearchPipe } from "jslib-angular/pipes/search.pipe"; -import { UserNamePipe } from "jslib-angular/pipes/user-name.pipe"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { ValidationService } from "jslib-angular/services/validation.service"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { SearchService } from "jslib-common/abstractions/search.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { OrganizationUserStatusType } from "jslib-common/enums/organizationUserStatusType"; -import { OrganizationUserType } from "jslib-common/enums/organizationUserType"; -import { ProviderUserStatusType } from "jslib-common/enums/providerUserStatusType"; -import { ProviderUserType } from "jslib-common/enums/providerUserType"; -import { Utils } from "jslib-common/misc/utils"; -import { ListResponse } from "jslib-common/models/response/listResponse"; -import { OrganizationUserUserDetailsResponse } from "jslib-common/models/response/organizationUserResponse"; -import { ProviderUserUserDetailsResponse } from "jslib-common/models/response/provider/providerUserResponse"; +import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe"; +import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { ValidationService } from "@bitwarden/angular/services/validation.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 { LogService } from "@bitwarden/common/abstractions/log.service"; +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 { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; +import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType"; +import { ProviderUserStatusType } from "@bitwarden/common/enums/providerUserStatusType"; +import { ProviderUserType } from "@bitwarden/common/enums/providerUserType"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { ListResponse } from "@bitwarden/common/models/response/listResponse"; +import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/models/response/organizationUserResponse"; +import { ProviderUserUserDetailsResponse } from "@bitwarden/common/models/response/provider/providerUserResponse"; import { UserConfirmComponent } from "../organizations/manage/user-confirm.component"; diff --git a/apps/web/src/app/components/nested-checkbox.component.ts b/apps/web/src/app/components/nested-checkbox.component.ts index 32a999a038..eebd01e25d 100644 --- a/apps/web/src/app/components/nested-checkbox.component.ts +++ b/apps/web/src/app/components/nested-checkbox.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; -import { Utils } from "jslib-common/misc/utils"; +import { Utils } from "@bitwarden/common/misc/utils"; @Component({ selector: "app-nested-checkbox", diff --git a/apps/web/src/app/components/organization-switcher.component.ts b/apps/web/src/app/components/organization-switcher.component.ts index a71cf1760d..543aa7059b 100644 --- a/apps/web/src/app/components/organization-switcher.component.ts +++ b/apps/web/src/app/components/organization-switcher.component.ts @@ -1,9 +1,9 @@ import { Component, Input, OnInit } from "@angular/core"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { Utils } from "jslib-common/misc/utils"; -import { Organization } from "jslib-common/models/domain/organization"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { Organization } from "@bitwarden/common/models/domain/organization"; import { NavigationPermissionsService } from "../organizations/services/navigation-permissions.service"; diff --git a/apps/web/src/app/components/password-reprompt.component.ts b/apps/web/src/app/components/password-reprompt.component.ts index 442a0ab5ee..ef72c8a7a1 100644 --- a/apps/web/src/app/components/password-reprompt.component.ts +++ b/apps/web/src/app/components/password-reprompt.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { PasswordRepromptComponent as BasePasswordRepromptComponent } from "jslib-angular/components/password-reprompt.component"; +import { PasswordRepromptComponent as BasePasswordRepromptComponent } from "@bitwarden/angular/components/password-reprompt.component"; @Component({ templateUrl: "password-reprompt.component.html", diff --git a/apps/web/src/app/components/password-strength.component.ts b/apps/web/src/app/components/password-strength.component.ts index 53233b90f6..3063ba4689 100644 --- a/apps/web/src/app/components/password-strength.component.ts +++ b/apps/web/src/app/components/password-strength.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnChanges } from "@angular/core"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; @Component({ selector: "app-password-strength", diff --git a/apps/web/src/app/components/premium-badge.component.ts b/apps/web/src/app/components/premium-badge.component.ts index 0628621f17..3e6339bf6e 100644 --- a/apps/web/src/app/components/premium-badge.component.ts +++ b/apps/web/src/app/components/premium-badge.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; @Component({ selector: "app-premium-badge", diff --git a/apps/web/src/app/guards/home.guard.ts b/apps/web/src/app/guards/home.guard.ts index 5dfed1dba8..0a66ff33e9 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 "jslib-common/abstractions/auth.service"; -import { AuthenticationStatus } from "jslib-common/enums/authenticationStatus"; +import { AuthService } from "@bitwarden/common/abstractions/auth.service"; +import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; @Injectable() export class HomeGuard implements CanActivate { diff --git a/apps/web/src/app/layouts/footer.component.ts b/apps/web/src/app/layouts/footer.component.ts index 01e079655d..02bdacc6dd 100644 --- a/apps/web/src/app/layouts/footer.component.ts +++ b/apps/web/src/app/layouts/footer.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from "@angular/core"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; @Component({ selector: "app-footer", diff --git a/apps/web/src/app/layouts/frontend-layout.component.ts b/apps/web/src/app/layouts/frontend-layout.component.ts index 47580a496a..9b397afd29 100644 --- a/apps/web/src/app/layouts/frontend-layout.component.ts +++ b/apps/web/src/app/layouts/frontend-layout.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit } from "@angular/core"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; @Component({ selector: "app-frontend-layout", diff --git a/apps/web/src/app/layouts/navbar.component.ts b/apps/web/src/app/layouts/navbar.component.ts index d93ec65d27..d35929b6b4 100644 --- a/apps/web/src/app/layouts/navbar.component.ts +++ b/apps/web/src/app/layouts/navbar.component.ts @@ -1,16 +1,16 @@ import { Component, NgZone, OnInit } from "@angular/core"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { ProviderService } from "jslib-common/abstractions/provider.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { TokenService } from "jslib-common/abstractions/token.service"; -import { Utils } from "jslib-common/misc/utils"; -import { Organization } from "jslib-common/models/domain/organization"; -import { Provider } from "jslib-common/models/domain/provider"; +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 { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { TokenService } from "@bitwarden/common/abstractions/token.service"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { Provider } from "@bitwarden/common/models/domain/provider"; import { NavigationPermissionsService as OrgNavigationPermissionsService } from "../organizations/services/navigation-permissions.service"; diff --git a/apps/web/src/app/modules/loose-components.module.ts b/apps/web/src/app/modules/loose-components.module.ts index 8f01eb40bd..3fa418f6c5 100644 --- a/apps/web/src/app/modules/loose-components.module.ts +++ b/apps/web/src/app/modules/loose-components.module.ts @@ -1,6 +1,6 @@ import { NgModule } from "@angular/core"; -import { UserVerificationComponent } from "jslib-angular/components/user-verification.component"; +import { UserVerificationComponent } from "@bitwarden/angular/components/user-verification.component"; import { AcceptEmergencyComponent } from "../accounts/accept-emergency.component"; import { AcceptOrganizationComponent } from "../accounts/accept-organization.component"; diff --git a/apps/web/src/app/modules/organizations/manage/entity-users.component.ts b/apps/web/src/app/modules/organizations/manage/entity-users.component.ts index 5d81f65a64..bce2812078 100644 --- a/apps/web/src/app/modules/organizations/manage/entity-users.component.ts +++ b/apps/web/src/app/modules/organizations/manage/entity-users.component.ts @@ -1,15 +1,15 @@ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { SearchPipe } from "jslib-angular/pipes/search.pipe"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { OrganizationUserStatusType } from "jslib-common/enums/organizationUserStatusType"; -import { OrganizationUserType } from "jslib-common/enums/organizationUserType"; -import { Utils } from "jslib-common/misc/utils"; -import { SelectionReadOnlyRequest } from "jslib-common/models/request/selectionReadOnlyRequest"; -import { OrganizationUserUserDetailsResponse } from "jslib-common/models/response/organizationUserResponse"; +import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe"; +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 { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; +import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selectionReadOnlyRequest"; +import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/models/response/organizationUserResponse"; @Component({ selector: "app-entity-users", diff --git a/apps/web/src/app/modules/organizations/users/enroll-master-password-reset.component.ts b/apps/web/src/app/modules/organizations/users/enroll-master-password-reset.component.ts index 29cf529039..9252c92feb 100644 --- a/apps/web/src/app/modules/organizations/users/enroll-master-password-reset.component.ts +++ b/apps/web/src/app/modules/organizations/users/enroll-master-password-reset.component.ts @@ -1,18 +1,18 @@ import { Component } from "@angular/core"; -import { ModalRef } from "jslib-angular/components/modal/modal.ref"; -import { ModalConfig } from "jslib-angular/services/modal.service"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { UserVerificationService } from "jslib-common/abstractions/userVerification.service"; -import { Utils } from "jslib-common/misc/utils"; -import { Organization } from "jslib-common/models/domain/organization"; -import { OrganizationUserResetPasswordEnrollmentRequest } from "jslib-common/models/request/organizationUserResetPasswordEnrollmentRequest"; -import { Verification } from "jslib-common/types/verification"; +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 { 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 { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/models/request/organizationUserResetPasswordEnrollmentRequest"; +import { Verification } from "@bitwarden/common/types/verification"; @Component({ selector: "app-enroll-master-password-reset", diff --git a/apps/web/src/app/modules/pipes/get-organization-name.pipe.ts b/apps/web/src/app/modules/pipes/get-organization-name.pipe.ts index 5745933c3a..1e597346a9 100644 --- a/apps/web/src/app/modules/pipes/get-organization-name.pipe.ts +++ b/apps/web/src/app/modules/pipes/get-organization-name.pipe.ts @@ -1,6 +1,6 @@ import { Pipe, PipeTransform } from "@angular/core"; -import { Organization } from "jslib-common/models/domain/organization"; +import { Organization } from "@bitwarden/common/models/domain/organization"; @Pipe({ name: "orgNameFromId", diff --git a/apps/web/src/app/modules/shared.module.ts b/apps/web/src/app/modules/shared.module.ts index 2455bd03fc..c8eaf0925f 100644 --- a/apps/web/src/app/modules/shared.module.ts +++ b/apps/web/src/app/modules/shared.module.ts @@ -53,11 +53,11 @@ import localeZhTw from "@angular/common/locales/zh-Hant"; import { NgModule } from "@angular/core"; import { FormsModule, ReactiveFormsModule } from "@angular/forms"; import { RouterModule } from "@angular/router"; -import { BadgeModule, ButtonModule, CalloutModule, MenuModule } from "@bitwarden/components"; import { InfiniteScrollModule } from "ngx-infinite-scroll"; import { ToastrModule } from "ngx-toastr"; -import { JslibModule } from "jslib-angular/jslib.module"; +import { JslibModule } from "@bitwarden/angular/jslib.module"; +import { BadgeModule, ButtonModule, CalloutModule, MenuModule } from "@bitwarden/components"; registerLocaleData(localeAf, "af"); registerLocaleData(localeAz, "az"); diff --git a/apps/web/src/app/modules/vault-filter/components/collection-filter.component.ts b/apps/web/src/app/modules/vault-filter/components/collection-filter.component.ts index e08c724a5a..9f18186ae8 100644 --- a/apps/web/src/app/modules/vault-filter/components/collection-filter.component.ts +++ b/apps/web/src/app/modules/vault-filter/components/collection-filter.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { CollectionFilterComponent as BaseCollectionFilterComponent } from "jslib-angular/modules/vault-filter/components/collection-filter.component"; +import { CollectionFilterComponent as BaseCollectionFilterComponent } from "@bitwarden/angular/modules/vault-filter/components/collection-filter.component"; @Component({ selector: "app-collection-filter", diff --git a/apps/web/src/app/modules/vault-filter/components/folder-filter.component.ts b/apps/web/src/app/modules/vault-filter/components/folder-filter.component.ts index 6205239f77..20b1372359 100644 --- a/apps/web/src/app/modules/vault-filter/components/folder-filter.component.ts +++ b/apps/web/src/app/modules/vault-filter/components/folder-filter.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { FolderFilterComponent as BaseFolderFilterComponent } from "jslib-angular/modules/vault-filter/components/folder-filter.component"; +import { FolderFilterComponent as BaseFolderFilterComponent } from "@bitwarden/angular/modules/vault-filter/components/folder-filter.component"; @Component({ selector: "app-folder-filter", diff --git a/apps/web/src/app/modules/vault-filter/components/link-sso.component.ts b/apps/web/src/app/modules/vault-filter/components/link-sso.component.ts index e86eeb7377..bc898a3d5c 100644 --- a/apps/web/src/app/modules/vault-filter/components/link-sso.component.ts +++ b/apps/web/src/app/modules/vault-filter/components/link-sso.component.ts @@ -1,17 +1,17 @@ import { AfterContentInit, Component, Input } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; -import { SsoComponent } from "jslib-angular/components/sso.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { Organization } from "jslib-common/models/domain/organization"; +import { SsoComponent } from "@bitwarden/angular/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"; +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 { Organization } from "@bitwarden/common/models/domain/organization"; @Component({ selector: "app-link-sso", diff --git a/apps/web/src/app/modules/vault-filter/components/organization-filter.component.ts b/apps/web/src/app/modules/vault-filter/components/organization-filter.component.ts index 30241acd95..2fa9da79a8 100644 --- a/apps/web/src/app/modules/vault-filter/components/organization-filter.component.ts +++ b/apps/web/src/app/modules/vault-filter/components/organization-filter.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { OrganizationFilterComponent as BaseOrganizationFilterComponent } from "jslib-angular/modules/vault-filter/components/organization-filter.component"; +import { OrganizationFilterComponent as BaseOrganizationFilterComponent } from "@bitwarden/angular/modules/vault-filter/components/organization-filter.component"; @Component({ selector: "app-organization-filter", diff --git a/apps/web/src/app/modules/vault-filter/components/organization-options.component.ts b/apps/web/src/app/modules/vault-filter/components/organization-options.component.ts index cef11d0c38..919e39f2ac 100644 --- a/apps/web/src/app/modules/vault-filter/components/organization-options.component.ts +++ b/apps/web/src/app/modules/vault-filter/components/organization-options.component.ts @@ -1,16 +1,16 @@ import { Component, Input } from "@angular/core"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { PolicyType } from "jslib-common/enums/policyType"; -import { Organization } from "jslib-common/models/domain/organization"; -import { Policy } from "jslib-common/models/domain/policy"; -import { OrganizationUserResetPasswordEnrollmentRequest } from "jslib-common/models/request/organizationUserResetPasswordEnrollmentRequest"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +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 { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { Policy } from "@bitwarden/common/models/domain/policy"; +import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/models/request/organizationUserResetPasswordEnrollmentRequest"; import { EnrollMasterPasswordReset } from "../../organizations/users/enroll-master-password-reset.component"; diff --git a/apps/web/src/app/modules/vault-filter/components/status-filter.component.ts b/apps/web/src/app/modules/vault-filter/components/status-filter.component.ts index c7c38aa6aa..6ab853488c 100644 --- a/apps/web/src/app/modules/vault-filter/components/status-filter.component.ts +++ b/apps/web/src/app/modules/vault-filter/components/status-filter.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { StatusFilterComponent as BaseStatusFilterComponent } from "jslib-angular/modules/vault-filter/components/status-filter.component"; +import { StatusFilterComponent as BaseStatusFilterComponent } from "@bitwarden/angular/modules/vault-filter/components/status-filter.component"; @Component({ selector: "app-status-filter", diff --git a/apps/web/src/app/modules/vault-filter/components/type-filter.component.ts b/apps/web/src/app/modules/vault-filter/components/type-filter.component.ts index 794fc49787..94e554d79f 100644 --- a/apps/web/src/app/modules/vault-filter/components/type-filter.component.ts +++ b/apps/web/src/app/modules/vault-filter/components/type-filter.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { TypeFilterComponent as BaseTypeFilterComponent } from "jslib-angular/modules/vault-filter/components/type-filter.component"; +import { TypeFilterComponent as BaseTypeFilterComponent } from "@bitwarden/angular/modules/vault-filter/components/type-filter.component"; @Component({ selector: "app-type-filter", diff --git a/apps/web/src/app/modules/vault-filter/organization-vault-filter.component.ts b/apps/web/src/app/modules/vault-filter/organization-vault-filter.component.ts index bda2f2ca78..840747ba84 100644 --- a/apps/web/src/app/modules/vault-filter/organization-vault-filter.component.ts +++ b/apps/web/src/app/modules/vault-filter/organization-vault-filter.component.ts @@ -1,6 +1,6 @@ -import { Component, Input } from "@angular/core"; +import { Component } from "@angular/core"; -import { Organization } from "jslib-common/models/domain/organization"; +import { Organization } from "@bitwarden/common/models/domain/organization"; import { VaultFilterComponent } from "./vault-filter.component"; diff --git a/apps/web/src/app/modules/vault-filter/vault-filter.component.ts b/apps/web/src/app/modules/vault-filter/vault-filter.component.ts index 0d6225714a..9ce6147e74 100644 --- a/apps/web/src/app/modules/vault-filter/vault-filter.component.ts +++ b/apps/web/src/app/modules/vault-filter/vault-filter.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Output } from "@angular/core"; -import { VaultFilterComponent as BaseVaultFilterComponent } from "jslib-angular/modules/vault-filter/vault-filter.component"; +import { VaultFilterComponent as BaseVaultFilterComponent } from "@bitwarden/angular/modules/vault-filter/vault-filter.component"; import { VaultFilterService } from "./vault-filter.service"; diff --git a/apps/web/src/app/modules/vault-filter/vault-filter.service.ts b/apps/web/src/app/modules/vault-filter/vault-filter.service.ts index 335ad9b274..6e5b13a846 100644 --- a/apps/web/src/app/modules/vault-filter/vault-filter.service.ts +++ b/apps/web/src/app/modules/vault-filter/vault-filter.service.ts @@ -1,20 +1,19 @@ +import { Injectable } from "@angular/core"; import { BehaviorSubject, Observable } from "rxjs"; -import { Injectable } from "@angular/core"; - -import { DynamicTreeNode } from "jslib-angular/modules/vault-filter/models/dynamic-tree-node.model"; -import { VaultFilterService as BaseVaultFilterService } from "jslib-angular/modules/vault-filter/vault-filter.service"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { CollectionData } from "jslib-common/models/data/collectionData"; -import { Collection } from "jslib-common/models/domain/collection"; -import { CollectionDetailsResponse } from "jslib-common/models/response/collectionResponse"; -import { CollectionView } from "jslib-common/models/view/collectionView"; +import { DynamicTreeNode } from "@bitwarden/angular/modules/vault-filter/models/dynamic-tree-node.model"; +import { VaultFilterService as BaseVaultFilterService } from "@bitwarden/angular/modules/vault-filter/vault-filter.service"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; +import { FolderService } from "@bitwarden/common/abstractions/folder.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CollectionData } from "@bitwarden/common/models/data/collectionData"; +import { Collection } from "@bitwarden/common/models/domain/collection"; +import { CollectionDetailsResponse } from "@bitwarden/common/models/response/collectionResponse"; +import { CollectionView } from "@bitwarden/common/models/view/collectionView"; @Injectable() export class VaultFilterService extends BaseVaultFilterService { diff --git a/apps/web/src/app/modules/vault/modules/individual-vault/individual-vault.component.ts b/apps/web/src/app/modules/vault/modules/individual-vault/individual-vault.component.ts index 47a0f433cf..3e1b379636 100644 --- a/apps/web/src/app/modules/vault/modules/individual-vault/individual-vault.component.ts +++ b/apps/web/src/app/modules/vault/modules/individual-vault/individual-vault.component.ts @@ -10,20 +10,20 @@ import { import { ActivatedRoute, Params, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { VaultFilter } from "jslib-angular/modules/vault-filter/models/vault-filter.model"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { TokenService } from "jslib-common/abstractions/token.service"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { VaultFilter } from "@bitwarden/angular/modules/vault-filter/models/vault-filter.model"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { TokenService } from "@bitwarden/common/abstractions/token.service"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; import { UpdateKeyComponent } from "../../../../settings/update-key.component"; import { AddEditComponent } from "../../../../vault/add-edit.component"; diff --git a/apps/web/src/app/modules/vault/modules/organization-badge/organization-name-badge.component.ts b/apps/web/src/app/modules/vault/modules/organization-badge/organization-name-badge.component.ts index 1d4f90d1fc..e34c2a8611 100644 --- a/apps/web/src/app/modules/vault/modules/organization-badge/organization-name-badge.component.ts +++ b/apps/web/src/app/modules/vault/modules/organization-badge/organization-name-badge.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; @Component({ selector: "app-org-badge", diff --git a/apps/web/src/app/modules/vault/modules/organization-vault/organization-vault.component.ts b/apps/web/src/app/modules/vault/modules/organization-vault/organization-vault.component.ts index 451e9ca504..295100fd9d 100644 --- a/apps/web/src/app/modules/vault/modules/organization-vault/organization-vault.component.ts +++ b/apps/web/src/app/modules/vault/modules/organization-vault/organization-vault.component.ts @@ -10,19 +10,19 @@ import { import { ActivatedRoute, Params, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { VaultFilter } from "jslib-angular/modules/vault-filter/models/vault-filter.model"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { Organization } from "jslib-common/models/domain/organization"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { VaultFilter } from "@bitwarden/angular/modules/vault-filter/models/vault-filter.model"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; import { EntityEventsComponent } from "../../../../organizations/manage/entity-events.component"; import { AddEditComponent } from "../../../../organizations/vault/add-edit.component"; diff --git a/apps/web/src/app/modules/vault/vault.service.ts b/apps/web/src/app/modules/vault/vault.service.ts index 3f8cc17c63..4488173b4b 100644 --- a/apps/web/src/app/modules/vault/vault.service.ts +++ b/apps/web/src/app/modules/vault/vault.service.ts @@ -1,4 +1,4 @@ -import { VaultFilter } from "jslib-angular/modules/vault-filter/models/vault-filter.model"; +import { VaultFilter } from "@bitwarden/angular/modules/vault-filter/models/vault-filter.model"; export class VaultService { calculateSearchBarLocalizationString(vaultFilter: VaultFilter): string { diff --git a/apps/web/src/app/organizations/guards/permissions.guard.ts b/apps/web/src/app/organizations/guards/permissions.guard.ts index 0d9ab6be17..b017aeac45 100644 --- a/apps/web/src/app/organizations/guards/permissions.guard.ts +++ b/apps/web/src/app/organizations/guards/permissions.guard.ts @@ -1,11 +1,11 @@ import { Injectable } from "@angular/core"; import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from "@angular/router"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { Permissions } from "jslib-common/enums/permissions"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { Permissions } from "@bitwarden/common/enums/permissions"; @Injectable() export class PermissionsGuard implements CanActivate { diff --git a/apps/web/src/app/organizations/layouts/organization-layout.component.ts b/apps/web/src/app/organizations/layouts/organization-layout.component.ts index 050e12f492..7e0d33f12a 100644 --- a/apps/web/src/app/organizations/layouts/organization-layout.component.ts +++ b/apps/web/src/app/organizations/layouts/organization-layout.component.ts @@ -1,9 +1,9 @@ import { Component, NgZone, OnDestroy, OnInit } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { Organization } from "jslib-common/models/domain/organization"; +import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { Organization } from "@bitwarden/common/models/domain/organization"; import { NavigationPermissionsService } from "../services/navigation-permissions.service"; diff --git a/apps/web/src/app/organizations/manage/bulk/bulk-confirm.component.ts b/apps/web/src/app/organizations/manage/bulk/bulk-confirm.component.ts index e14aa68f82..6c5f6e9a34 100644 --- a/apps/web/src/app/organizations/manage/bulk/bulk-confirm.component.ts +++ b/apps/web/src/app/organizations/manage/bulk/bulk-confirm.component.ts @@ -1,12 +1,12 @@ import { Component, Input, OnInit } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { OrganizationUserStatusType } from "jslib-common/enums/organizationUserStatusType"; -import { Utils } from "jslib-common/misc/utils"; -import { OrganizationUserBulkConfirmRequest } from "jslib-common/models/request/organizationUserBulkConfirmRequest"; -import { OrganizationUserBulkRequest } from "jslib-common/models/request/organizationUserBulkRequest"; +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 { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { OrganizationUserBulkConfirmRequest } from "@bitwarden/common/models/request/organizationUserBulkConfirmRequest"; +import { OrganizationUserBulkRequest } from "@bitwarden/common/models/request/organizationUserBulkRequest"; import { BulkUserDetails } from "./bulk-status.component"; diff --git a/apps/web/src/app/organizations/manage/bulk/bulk-remove.component.ts b/apps/web/src/app/organizations/manage/bulk/bulk-remove.component.ts index 97097cba13..e6abeb0322 100644 --- a/apps/web/src/app/organizations/manage/bulk/bulk-remove.component.ts +++ b/apps/web/src/app/organizations/manage/bulk/bulk-remove.component.ts @@ -1,8 +1,8 @@ import { Component, Input } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { OrganizationUserBulkRequest } from "jslib-common/models/request/organizationUserBulkRequest"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { OrganizationUserBulkRequest } from "@bitwarden/common/models/request/organizationUserBulkRequest"; import { BulkUserDetails } from "./bulk-status.component"; diff --git a/apps/web/src/app/organizations/manage/bulk/bulk-status.component.ts b/apps/web/src/app/organizations/manage/bulk/bulk-status.component.ts index 59f24e1aa9..d6020d00e4 100644 --- a/apps/web/src/app/organizations/manage/bulk/bulk-status.component.ts +++ b/apps/web/src/app/organizations/manage/bulk/bulk-status.component.ts @@ -1,7 +1,7 @@ import { Component } from "@angular/core"; -import { OrganizationUserStatusType } from "jslib-common/enums/organizationUserStatusType"; -import { ProviderUserStatusType } from "jslib-common/enums/providerUserStatusType"; +import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; +import { ProviderUserStatusType } from "@bitwarden/common/enums/providerUserStatusType"; export interface BulkUserDetails { id: string; diff --git a/apps/web/src/app/organizations/manage/collection-add-edit.component.ts b/apps/web/src/app/organizations/manage/collection-add-edit.component.ts index 9ab69152a2..2c77a726b7 100644 --- a/apps/web/src/app/organizations/manage/collection-add-edit.component.ts +++ b/apps/web/src/app/organizations/manage/collection-add-edit.component.ts @@ -1,17 +1,17 @@ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { Utils } from "jslib-common/misc/utils"; -import { EncString } from "jslib-common/models/domain/encString"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; -import { CollectionRequest } from "jslib-common/models/request/collectionRequest"; -import { SelectionReadOnlyRequest } from "jslib-common/models/request/selectionReadOnlyRequest"; -import { GroupResponse } from "jslib-common/models/response/groupResponse"; +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 { LogService } from "@bitwarden/common/abstractions/log.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { EncString } from "@bitwarden/common/models/domain/encString"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { CollectionRequest } from "@bitwarden/common/models/request/collectionRequest"; +import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selectionReadOnlyRequest"; +import { GroupResponse } from "@bitwarden/common/models/response/groupResponse"; @Component({ selector: "app-collection-add-edit", diff --git a/apps/web/src/app/organizations/manage/collections.component.ts b/apps/web/src/app/organizations/manage/collections.component.ts index f20a4cf5c6..411e0e7861 100644 --- a/apps/web/src/app/organizations/manage/collections.component.ts +++ b/apps/web/src/app/organizations/manage/collections.component.ts @@ -2,23 +2,23 @@ import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { first } from "rxjs/operators"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { SearchService } from "jslib-common/abstractions/search.service"; -import { CollectionData } from "jslib-common/models/data/collectionData"; -import { Collection } from "jslib-common/models/domain/collection"; -import { Organization } from "jslib-common/models/domain/organization"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { SearchService } from "@bitwarden/common/abstractions/search.service"; +import { CollectionData } from "@bitwarden/common/models/data/collectionData"; +import { Collection } from "@bitwarden/common/models/domain/collection"; +import { Organization } from "@bitwarden/common/models/domain/organization"; import { CollectionDetailsResponse, CollectionResponse, -} from "jslib-common/models/response/collectionResponse"; -import { ListResponse } from "jslib-common/models/response/listResponse"; -import { CollectionView } from "jslib-common/models/view/collectionView"; +} from "@bitwarden/common/models/response/collectionResponse"; +import { ListResponse } from "@bitwarden/common/models/response/listResponse"; +import { CollectionView } from "@bitwarden/common/models/view/collectionView"; import { EntityUsersComponent } from "../../modules/organizations/manage/entity-users.component"; diff --git a/apps/web/src/app/organizations/manage/entity-events.component.ts b/apps/web/src/app/organizations/manage/entity-events.component.ts index 62a9ee69a8..d3cb75e213 100644 --- a/apps/web/src/app/organizations/manage/entity-events.component.ts +++ b/apps/web/src/app/organizations/manage/entity-events.component.ts @@ -1,12 +1,12 @@ import { Component, Input, OnInit } from "@angular/core"; -import { UserNamePipe } from "jslib-angular/pipes/user-name.pipe"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { EventResponse } from "jslib-common/models/response/eventResponse"; -import { ListResponse } from "jslib-common/models/response/listResponse"; +import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe"; +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 { EventResponse } from "@bitwarden/common/models/response/eventResponse"; +import { ListResponse } from "@bitwarden/common/models/response/listResponse"; import { EventService } from "../../services/event.service"; diff --git a/apps/web/src/app/organizations/manage/events.component.ts b/apps/web/src/app/organizations/manage/events.component.ts index d1eb48c084..5d347cb729 100644 --- a/apps/web/src/app/organizations/manage/events.component.ts +++ b/apps/web/src/app/organizations/manage/events.component.ts @@ -1,16 +1,16 @@ import { Component, OnInit } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; -import { UserNamePipe } from "jslib-angular/pipes/user-name.pipe"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { ExportService } from "jslib-common/abstractions/export.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { ProviderService } from "jslib-common/abstractions/provider.service"; -import { Organization } from "jslib-common/models/domain/organization"; -import { EventResponse } from "jslib-common/models/response/eventResponse"; +import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { ExportService } from "@bitwarden/common/abstractions/export.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { EventResponse } from "@bitwarden/common/models/response/eventResponse"; import { BaseEventsComponent } from "../../common/base.events.component"; import { EventService } from "../../services/event.service"; diff --git a/apps/web/src/app/organizations/manage/group-add-edit.component.ts b/apps/web/src/app/organizations/manage/group-add-edit.component.ts index 5b19508359..0d5f654a50 100644 --- a/apps/web/src/app/organizations/manage/group-add-edit.component.ts +++ b/apps/web/src/app/organizations/manage/group-add-edit.component.ts @@ -1,16 +1,16 @@ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { CollectionData } from "jslib-common/models/data/collectionData"; -import { Collection } from "jslib-common/models/domain/collection"; -import { GroupRequest } from "jslib-common/models/request/groupRequest"; -import { SelectionReadOnlyRequest } from "jslib-common/models/request/selectionReadOnlyRequest"; -import { CollectionDetailsResponse } from "jslib-common/models/response/collectionResponse"; -import { CollectionView } from "jslib-common/models/view/collectionView"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.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 { CollectionData } from "@bitwarden/common/models/data/collectionData"; +import { Collection } from "@bitwarden/common/models/domain/collection"; +import { GroupRequest } from "@bitwarden/common/models/request/groupRequest"; +import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selectionReadOnlyRequest"; +import { CollectionDetailsResponse } from "@bitwarden/common/models/response/collectionResponse"; +import { CollectionView } from "@bitwarden/common/models/view/collectionView"; @Component({ selector: "app-group-add-edit", diff --git a/apps/web/src/app/organizations/manage/groups.component.ts b/apps/web/src/app/organizations/manage/groups.component.ts index bc8bbd3c09..2df4c79b18 100644 --- a/apps/web/src/app/organizations/manage/groups.component.ts +++ b/apps/web/src/app/organizations/manage/groups.component.ts @@ -2,15 +2,15 @@ import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { SearchService } from "jslib-common/abstractions/search.service"; -import { Utils } from "jslib-common/misc/utils"; -import { GroupResponse } from "jslib-common/models/response/groupResponse"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +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 { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { SearchService } from "@bitwarden/common/abstractions/search.service"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { GroupResponse } from "@bitwarden/common/models/response/groupResponse"; import { EntityUsersComponent } from "../../modules/organizations/manage/entity-users.component"; diff --git a/apps/web/src/app/organizations/manage/manage.component.ts b/apps/web/src/app/organizations/manage/manage.component.ts index ee04d5621f..aad670c5e1 100644 --- a/apps/web/src/app/organizations/manage/manage.component.ts +++ b/apps/web/src/app/organizations/manage/manage.component.ts @@ -1,8 +1,8 @@ import { Component, OnInit } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { Organization } from "jslib-common/models/domain/organization"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { Organization } from "@bitwarden/common/models/domain/organization"; @Component({ selector: "app-org-manage", diff --git a/apps/web/src/app/organizations/manage/people.component.ts b/apps/web/src/app/organizations/manage/people.component.ts index f26be7f5ad..5a579a453a 100644 --- a/apps/web/src/app/organizations/manage/people.component.ts +++ b/apps/web/src/app/organizations/manage/people.component.ts @@ -2,29 +2,29 @@ import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { SearchPipe } from "jslib-angular/pipes/search.pipe"; -import { UserNamePipe } from "jslib-angular/pipes/user-name.pipe"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { ValidationService } from "jslib-angular/services/validation.service"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { SearchService } from "jslib-common/abstractions/search.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { OrganizationUserStatusType } from "jslib-common/enums/organizationUserStatusType"; -import { OrganizationUserType } from "jslib-common/enums/organizationUserType"; -import { PolicyType } from "jslib-common/enums/policyType"; -import { OrganizationKeysRequest } from "jslib-common/models/request/organizationKeysRequest"; -import { OrganizationUserBulkRequest } from "jslib-common/models/request/organizationUserBulkRequest"; -import { OrganizationUserConfirmRequest } from "jslib-common/models/request/organizationUserConfirmRequest"; -import { ListResponse } from "jslib-common/models/response/listResponse"; -import { OrganizationUserBulkResponse } from "jslib-common/models/response/organizationUserBulkResponse"; -import { OrganizationUserUserDetailsResponse } from "jslib-common/models/response/organizationUserResponse"; +import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe"; +import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { ValidationService } from "@bitwarden/angular/services/validation.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 { LogService } from "@bitwarden/common/abstractions/log.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { SearchService } from "@bitwarden/common/abstractions/search.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; +import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { OrganizationKeysRequest } from "@bitwarden/common/models/request/organizationKeysRequest"; +import { OrganizationUserBulkRequest } from "@bitwarden/common/models/request/organizationUserBulkRequest"; +import { OrganizationUserConfirmRequest } from "@bitwarden/common/models/request/organizationUserConfirmRequest"; +import { ListResponse } from "@bitwarden/common/models/response/listResponse"; +import { OrganizationUserBulkResponse } from "@bitwarden/common/models/response/organizationUserBulkResponse"; +import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/models/response/organizationUserResponse"; import { BasePeopleComponent } from "../../common/base.people.component"; diff --git a/apps/web/src/app/organizations/manage/policies.component.ts b/apps/web/src/app/organizations/manage/policies.component.ts index f62c8bf2e3..ac479ae548 100644 --- a/apps/web/src/app/organizations/manage/policies.component.ts +++ b/apps/web/src/app/organizations/manage/policies.component.ts @@ -2,12 +2,12 @@ import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PolicyType } from "jslib-common/enums/policyType"; -import { Organization } from "jslib-common/models/domain/organization"; -import { PolicyResponse } from "jslib-common/models/response/policyResponse"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { PolicyResponse } from "@bitwarden/common/models/response/policyResponse"; import { PolicyListService } from "../../services/policy-list.service"; import { BasePolicy } from "../policies/base-policy.component"; diff --git a/apps/web/src/app/organizations/manage/policy-edit.component.ts b/apps/web/src/app/organizations/manage/policy-edit.component.ts index 93f3de37ff..fea0ee804e 100644 --- a/apps/web/src/app/organizations/manage/policy-edit.component.ts +++ b/apps/web/src/app/organizations/manage/policy-edit.component.ts @@ -9,13 +9,13 @@ import { ViewContainerRef, } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyType } from "jslib-common/enums/policyType"; -import { PolicyRequest } from "jslib-common/models/request/policyRequest"; -import { PolicyResponse } from "jslib-common/models/response/policyResponse"; +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 { PolicyType } from "@bitwarden/common/enums/policyType"; +import { PolicyRequest } from "@bitwarden/common/models/request/policyRequest"; +import { PolicyResponse } from "@bitwarden/common/models/response/policyResponse"; import { BasePolicy, BasePolicyComponent } from "../policies/base-policy.component"; diff --git a/apps/web/src/app/organizations/manage/reset-password.component.ts b/apps/web/src/app/organizations/manage/reset-password.component.ts index 3c3aab7ad8..2ca3aff2cb 100644 --- a/apps/web/src/app/organizations/manage/reset-password.component.ts +++ b/apps/web/src/app/organizations/manage/reset-password.component.ts @@ -1,16 +1,16 @@ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { EncString } from "jslib-common/models/domain/encString"; -import { MasterPasswordPolicyOptions } from "jslib-common/models/domain/masterPasswordPolicyOptions"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; -import { OrganizationUserResetPasswordRequest } from "jslib-common/models/request/organizationUserResetPasswordRequest"; +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 { LogService } from "@bitwarden/common/abstractions/log.service"; +import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { EncString } from "@bitwarden/common/models/domain/encString"; +import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { OrganizationUserResetPasswordRequest } from "@bitwarden/common/models/request/organizationUserResetPasswordRequest"; @Component({ selector: "app-reset-password", diff --git a/apps/web/src/app/organizations/manage/user-add-edit.component.ts b/apps/web/src/app/organizations/manage/user-add-edit.component.ts index cebf022657..1f888a2dfe 100644 --- a/apps/web/src/app/organizations/manage/user-add-edit.component.ts +++ b/apps/web/src/app/organizations/manage/user-add-edit.component.ts @@ -1,19 +1,19 @@ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { OrganizationUserType } from "jslib-common/enums/organizationUserType"; -import { PermissionsApi } from "jslib-common/models/api/permissionsApi"; -import { CollectionData } from "jslib-common/models/data/collectionData"; -import { Collection } from "jslib-common/models/domain/collection"; -import { OrganizationUserInviteRequest } from "jslib-common/models/request/organizationUserInviteRequest"; -import { OrganizationUserUpdateRequest } from "jslib-common/models/request/organizationUserUpdateRequest"; -import { SelectionReadOnlyRequest } from "jslib-common/models/request/selectionReadOnlyRequest"; -import { CollectionDetailsResponse } from "jslib-common/models/response/collectionResponse"; -import { CollectionView } from "jslib-common/models/view/collectionView"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.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 { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType"; +import { PermissionsApi } from "@bitwarden/common/models/api/permissionsApi"; +import { CollectionData } from "@bitwarden/common/models/data/collectionData"; +import { Collection } from "@bitwarden/common/models/domain/collection"; +import { OrganizationUserInviteRequest } from "@bitwarden/common/models/request/organizationUserInviteRequest"; +import { OrganizationUserUpdateRequest } from "@bitwarden/common/models/request/organizationUserUpdateRequest"; +import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selectionReadOnlyRequest"; +import { CollectionDetailsResponse } from "@bitwarden/common/models/response/collectionResponse"; +import { CollectionView } from "@bitwarden/common/models/view/collectionView"; @Component({ selector: "app-user-add-edit", diff --git a/apps/web/src/app/organizations/manage/user-confirm.component.ts b/apps/web/src/app/organizations/manage/user-confirm.component.ts index ec10d51386..0ae5bdf804 100644 --- a/apps/web/src/app/organizations/manage/user-confirm.component.ts +++ b/apps/web/src/app/organizations/manage/user-confirm.component.ts @@ -1,8 +1,8 @@ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { StateService } from "jslib-common/abstractions/state.service"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; @Component({ selector: "app-user-confirm", diff --git a/apps/web/src/app/organizations/manage/user-groups.component.ts b/apps/web/src/app/organizations/manage/user-groups.component.ts index b572c11681..baacade757 100644 --- a/apps/web/src/app/organizations/manage/user-groups.component.ts +++ b/apps/web/src/app/organizations/manage/user-groups.component.ts @@ -1,12 +1,12 @@ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { Utils } from "jslib-common/misc/utils"; -import { OrganizationUserUpdateGroupsRequest } from "jslib-common/models/request/organizationUserUpdateGroupsRequest"; -import { GroupResponse } from "jslib-common/models/response/groupResponse"; +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 { Utils } from "@bitwarden/common/misc/utils"; +import { OrganizationUserUpdateGroupsRequest } from "@bitwarden/common/models/request/organizationUserUpdateGroupsRequest"; +import { GroupResponse } from "@bitwarden/common/models/response/groupResponse"; @Component({ selector: "app-user-groups", diff --git a/apps/web/src/app/organizations/organization-routing.module.ts b/apps/web/src/app/organizations/organization-routing.module.ts index cae00bec56..76ba537990 100644 --- a/apps/web/src/app/organizations/organization-routing.module.ts +++ b/apps/web/src/app/organizations/organization-routing.module.ts @@ -1,8 +1,8 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; -import { AuthGuard } from "jslib-angular/guards/auth.guard"; -import { Permissions } from "jslib-common/enums/permissions"; +import { AuthGuard } from "@bitwarden/angular/guards/auth.guard"; +import { Permissions } from "@bitwarden/common/enums/permissions"; import { PermissionsGuard } from "./guards/permissions.guard"; import { OrganizationLayoutComponent } from "./layouts/organization-layout.component"; diff --git a/apps/web/src/app/organizations/policies/base-policy.component.ts b/apps/web/src/app/organizations/policies/base-policy.component.ts index d93337c7c0..c43e713aa7 100644 --- a/apps/web/src/app/organizations/policies/base-policy.component.ts +++ b/apps/web/src/app/organizations/policies/base-policy.component.ts @@ -1,10 +1,10 @@ import { Directive, Input, OnInit } from "@angular/core"; import { FormControl, FormGroup } from "@angular/forms"; -import { PolicyType } from "jslib-common/enums/policyType"; -import { Organization } from "jslib-common/models/domain/organization"; -import { PolicyRequest } from "jslib-common/models/request/policyRequest"; -import { PolicyResponse } from "jslib-common/models/response/policyResponse"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { PolicyRequest } from "@bitwarden/common/models/request/policyRequest"; +import { PolicyResponse } from "@bitwarden/common/models/response/policyResponse"; export abstract class BasePolicy { abstract name: string; diff --git a/apps/web/src/app/organizations/policies/disable-send.component.ts b/apps/web/src/app/organizations/policies/disable-send.component.ts index 326a5e098f..346627e703 100644 --- a/apps/web/src/app/organizations/policies/disable-send.component.ts +++ b/apps/web/src/app/organizations/policies/disable-send.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { PolicyType } from "jslib-common/enums/policyType"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; import { BasePolicy, BasePolicyComponent } from "./base-policy.component"; diff --git a/apps/web/src/app/organizations/policies/master-password.component.ts b/apps/web/src/app/organizations/policies/master-password.component.ts index de33c84531..663e3ee7dd 100644 --- a/apps/web/src/app/organizations/policies/master-password.component.ts +++ b/apps/web/src/app/organizations/policies/master-password.component.ts @@ -1,9 +1,9 @@ import { Component } from "@angular/core"; import { FormBuilder } from "@angular/forms"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PolicyType } from "jslib-common/enums/policyType"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; import { BasePolicy, BasePolicyComponent } from "./base-policy.component"; diff --git a/apps/web/src/app/organizations/policies/password-generator.component.ts b/apps/web/src/app/organizations/policies/password-generator.component.ts index fd474b1f0d..fe9235c7b7 100644 --- a/apps/web/src/app/organizations/policies/password-generator.component.ts +++ b/apps/web/src/app/organizations/policies/password-generator.component.ts @@ -1,8 +1,8 @@ import { Component } from "@angular/core"; import { FormBuilder } from "@angular/forms"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PolicyType } from "jslib-common/enums/policyType"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; import { BasePolicy, BasePolicyComponent } from "./base-policy.component"; diff --git a/apps/web/src/app/organizations/policies/personal-ownership.component.ts b/apps/web/src/app/organizations/policies/personal-ownership.component.ts index eb737102e9..2caeaf168d 100644 --- a/apps/web/src/app/organizations/policies/personal-ownership.component.ts +++ b/apps/web/src/app/organizations/policies/personal-ownership.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { PolicyType } from "jslib-common/enums/policyType"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; import { BasePolicy, BasePolicyComponent } from "./base-policy.component"; diff --git a/apps/web/src/app/organizations/policies/require-sso.component.ts b/apps/web/src/app/organizations/policies/require-sso.component.ts index 06f30d0ddf..53fbc584cf 100644 --- a/apps/web/src/app/organizations/policies/require-sso.component.ts +++ b/apps/web/src/app/organizations/policies/require-sso.component.ts @@ -1,9 +1,9 @@ import { Component } from "@angular/core"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PolicyType } from "jslib-common/enums/policyType"; -import { Organization } from "jslib-common/models/domain/organization"; -import { PolicyRequest } from "jslib-common/models/request/policyRequest"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { PolicyRequest } from "@bitwarden/common/models/request/policyRequest"; import { BasePolicy, BasePolicyComponent } from "./base-policy.component"; diff --git a/apps/web/src/app/organizations/policies/reset-password.component.ts b/apps/web/src/app/organizations/policies/reset-password.component.ts index c4db4a6d0b..e13c453e36 100644 --- a/apps/web/src/app/organizations/policies/reset-password.component.ts +++ b/apps/web/src/app/organizations/policies/reset-password.component.ts @@ -1,9 +1,9 @@ import { Component } from "@angular/core"; import { FormBuilder } from "@angular/forms"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PolicyType } from "jslib-common/enums/policyType"; -import { Organization } from "jslib-common/models/domain/organization"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { Organization } from "@bitwarden/common/models/domain/organization"; import { BasePolicy, BasePolicyComponent } from "./base-policy.component"; diff --git a/apps/web/src/app/organizations/policies/send-options.component.ts b/apps/web/src/app/organizations/policies/send-options.component.ts index f789fb5ba1..0bd021e2cf 100644 --- a/apps/web/src/app/organizations/policies/send-options.component.ts +++ b/apps/web/src/app/organizations/policies/send-options.component.ts @@ -1,7 +1,7 @@ import { Component } from "@angular/core"; import { FormBuilder } from "@angular/forms"; -import { PolicyType } from "jslib-common/enums/policyType"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; import { BasePolicy, BasePolicyComponent } from "./base-policy.component"; diff --git a/apps/web/src/app/organizations/policies/single-org.component.ts b/apps/web/src/app/organizations/policies/single-org.component.ts index 0308c28268..a36da283de 100644 --- a/apps/web/src/app/organizations/policies/single-org.component.ts +++ b/apps/web/src/app/organizations/policies/single-org.component.ts @@ -1,8 +1,8 @@ import { Component } from "@angular/core"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PolicyType } from "jslib-common/enums/policyType"; -import { PolicyRequest } from "jslib-common/models/request/policyRequest"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { PolicyRequest } from "@bitwarden/common/models/request/policyRequest"; import { BasePolicy, BasePolicyComponent } from "./base-policy.component"; diff --git a/apps/web/src/app/organizations/policies/two-factor-authentication.component.ts b/apps/web/src/app/organizations/policies/two-factor-authentication.component.ts index 140c099f21..d01d9b0a5a 100644 --- a/apps/web/src/app/organizations/policies/two-factor-authentication.component.ts +++ b/apps/web/src/app/organizations/policies/two-factor-authentication.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { PolicyType } from "jslib-common/enums/policyType"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; import { BasePolicy, BasePolicyComponent } from "./base-policy.component"; diff --git a/apps/web/src/app/organizations/services/navigation-permissions.service.ts b/apps/web/src/app/organizations/services/navigation-permissions.service.ts index dd47d2c52e..0361354976 100644 --- a/apps/web/src/app/organizations/services/navigation-permissions.service.ts +++ b/apps/web/src/app/organizations/services/navigation-permissions.service.ts @@ -1,5 +1,5 @@ -import { Permissions } from "jslib-common/enums/permissions"; -import { Organization } from "jslib-common/models/domain/organization"; +import { Permissions } from "@bitwarden/common/enums/permissions"; +import { Organization } from "@bitwarden/common/models/domain/organization"; const permissions = { manage: [ diff --git a/apps/web/src/app/organizations/settings/account.component.ts b/apps/web/src/app/organizations/settings/account.component.ts index 291c8f9e49..e53f3dd172 100644 --- a/apps/web/src/app/organizations/settings/account.component.ts +++ b/apps/web/src/app/organizations/settings/account.component.ts @@ -1,17 +1,17 @@ import { Component, ViewChild, ViewContainerRef } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { OrganizationKeysRequest } from "jslib-common/models/request/organizationKeysRequest"; -import { OrganizationUpdateRequest } from "jslib-common/models/request/organizationUpdateRequest"; -import { OrganizationResponse } from "jslib-common/models/response/organizationResponse"; +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 { LogService } from "@bitwarden/common/abstractions/log.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { OrganizationKeysRequest } from "@bitwarden/common/models/request/organizationKeysRequest"; +import { OrganizationUpdateRequest } from "@bitwarden/common/models/request/organizationUpdateRequest"; +import { OrganizationResponse } from "@bitwarden/common/models/response/organizationResponse"; import { ApiKeyComponent } from "../../settings/api-key.component"; import { PurgeVaultComponent } from "../../settings/purge-vault.component"; diff --git a/apps/web/src/app/organizations/settings/adjust-subscription.component.ts b/apps/web/src/app/organizations/settings/adjust-subscription.component.ts index bbbeff7906..006c735aef 100644 --- a/apps/web/src/app/organizations/settings/adjust-subscription.component.ts +++ b/apps/web/src/app/organizations/settings/adjust-subscription.component.ts @@ -1,10 +1,10 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { OrganizationSubscriptionUpdateRequest } from "jslib-common/models/request/organizationSubscriptionUpdateRequest"; +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 { OrganizationSubscriptionUpdateRequest } from "@bitwarden/common/models/request/organizationSubscriptionUpdateRequest"; @Component({ selector: "app-adjust-subscription", diff --git a/apps/web/src/app/organizations/settings/billing-sync-api-key.component.ts b/apps/web/src/app/organizations/settings/billing-sync-api-key.component.ts index 47e70c7563..dfe87ebbf7 100644 --- a/apps/web/src/app/organizations/settings/billing-sync-api-key.component.ts +++ b/apps/web/src/app/organizations/settings/billing-sync-api-key.component.ts @@ -1,13 +1,13 @@ import { Component } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { UserVerificationService } from "jslib-common/abstractions/userVerification.service"; -import { OrganizationApiKeyType } from "jslib-common/enums/organizationApiKeyType"; -import { OrganizationApiKeyRequest } from "jslib-common/models/request/organizationApiKeyRequest"; -import { ApiKeyResponse } from "jslib-common/models/response/apiKeyResponse"; -import { Verification } from "jslib-common/types/verification"; +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 { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service"; +import { OrganizationApiKeyType } from "@bitwarden/common/enums/organizationApiKeyType"; +import { OrganizationApiKeyRequest } from "@bitwarden/common/models/request/organizationApiKeyRequest"; +import { ApiKeyResponse } from "@bitwarden/common/models/response/apiKeyResponse"; +import { Verification } from "@bitwarden/common/types/verification"; @Component({ selector: "app-billing-sync-api-key", diff --git a/apps/web/src/app/organizations/settings/change-plan.component.ts b/apps/web/src/app/organizations/settings/change-plan.component.ts index 1ed62739b2..fcdc56d444 100644 --- a/apps/web/src/app/organizations/settings/change-plan.component.ts +++ b/apps/web/src/app/organizations/settings/change-plan.component.ts @@ -1,8 +1,8 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlanType } from "jslib-common/enums/planType"; -import { ProductType } from "jslib-common/enums/productType"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { PlanType } from "@bitwarden/common/enums/planType"; +import { ProductType } from "@bitwarden/common/enums/productType"; @Component({ selector: "app-change-plan", diff --git a/apps/web/src/app/organizations/settings/delete-organization.component.ts b/apps/web/src/app/organizations/settings/delete-organization.component.ts index 799d916a8b..a008dab06a 100644 --- a/apps/web/src/app/organizations/settings/delete-organization.component.ts +++ b/apps/web/src/app/organizations/settings/delete-organization.component.ts @@ -1,16 +1,16 @@ import { Component, EventEmitter, OnInit, Output } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { UserVerificationService } from "jslib-common/abstractions/userVerification.service"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { Utils } from "jslib-common/misc/utils"; -import { CipherView } from "jslib-common/models/view/cipherView"; -import { Verification } from "jslib-common/types/verification"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { Verification } from "@bitwarden/common/types/verification"; class CountBasedLocalizationKey { singular: string; diff --git a/apps/web/src/app/organizations/settings/download-license.component.ts b/apps/web/src/app/organizations/settings/download-license.component.ts index fdc79a648f..8d2383c18b 100644 --- a/apps/web/src/app/organizations/settings/download-license.component.ts +++ b/apps/web/src/app/organizations/settings/download-license.component.ts @@ -1,8 +1,8 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; @Component({ selector: "app-download-license", diff --git a/apps/web/src/app/organizations/settings/organization-billing.component.ts b/apps/web/src/app/organizations/settings/organization-billing.component.ts index 49ed6a0e69..33c36c978f 100644 --- a/apps/web/src/app/organizations/settings/organization-billing.component.ts +++ b/apps/web/src/app/organizations/settings/organization-billing.component.ts @@ -1,14 +1,14 @@ import { Component, OnInit } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PaymentMethodType } from "jslib-common/enums/paymentMethodType"; -import { TransactionType } from "jslib-common/enums/transactionType"; -import { VerifyBankRequest } from "jslib-common/models/request/verifyBankRequest"; -import { BillingResponse } from "jslib-common/models/response/billingResponse"; +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 { PaymentMethodType } from "@bitwarden/common/enums/paymentMethodType"; +import { TransactionType } from "@bitwarden/common/enums/transactionType"; +import { VerifyBankRequest } from "@bitwarden/common/models/request/verifyBankRequest"; +import { BillingResponse } from "@bitwarden/common/models/response/billingResponse"; @Component({ selector: "app-org-billing", diff --git a/apps/web/src/app/organizations/settings/organization-subscription.component.ts b/apps/web/src/app/organizations/settings/organization-subscription.component.ts index e829e82081..a2208c2c59 100644 --- a/apps/web/src/app/organizations/settings/organization-subscription.component.ts +++ b/apps/web/src/app/organizations/settings/organization-subscription.component.ts @@ -1,21 +1,21 @@ import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { ModalRef } from "jslib-angular/components/modal/modal.ref"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { OrganizationApiKeyType } from "jslib-common/enums/organizationApiKeyType"; -import { OrganizationConnectionType } from "jslib-common/enums/organizationConnectionType"; -import { PlanType } from "jslib-common/enums/planType"; -import { BillingSyncConfigApi } from "jslib-common/models/api/billingSyncConfigApi"; -import { Organization } from "jslib-common/models/domain/organization"; -import { OrganizationConnectionResponse } from "jslib-common/models/response/organizationConnectionResponse"; -import { OrganizationSubscriptionResponse } from "jslib-common/models/response/organizationSubscriptionResponse"; +import { ModalRef } from "@bitwarden/angular/components/modal/modal.ref"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +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 { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { OrganizationApiKeyType } from "@bitwarden/common/enums/organizationApiKeyType"; +import { OrganizationConnectionType } from "@bitwarden/common/enums/organizationConnectionType"; +import { PlanType } from "@bitwarden/common/enums/planType"; +import { BillingSyncConfigApi } from "@bitwarden/common/models/api/billingSyncConfigApi"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { OrganizationConnectionResponse } from "@bitwarden/common/models/response/organizationConnectionResponse"; +import { OrganizationSubscriptionResponse } from "@bitwarden/common/models/response/organizationSubscriptionResponse"; import { BillingSyncKeyComponent } from "src/app/settings/billing-sync-key.component"; diff --git a/apps/web/src/app/organizations/settings/settings.component.ts b/apps/web/src/app/organizations/settings/settings.component.ts index d75790944d..2a4f798c7f 100644 --- a/apps/web/src/app/organizations/settings/settings.component.ts +++ b/apps/web/src/app/organizations/settings/settings.component.ts @@ -1,8 +1,8 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; @Component({ selector: "app-org-settings", 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 a8566e12db..d082d9ecae 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 @@ -1,15 +1,15 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +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 { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; import { TwoFactorDuoComponent } from "../../settings/two-factor-duo.component"; import { TwoFactorSetupComponent as BaseTwoFactorSetupComponent } from "../../settings/two-factor-setup.component"; diff --git a/apps/web/src/app/organizations/sponsorships/families-for-enterprise-setup.component.ts b/apps/web/src/app/organizations/sponsorships/families-for-enterprise-setup.component.ts index ee99d19eed..2e4b505e6c 100644 --- a/apps/web/src/app/organizations/sponsorships/families-for-enterprise-setup.component.ts +++ b/apps/web/src/app/organizations/sponsorships/families-for-enterprise-setup.component.ts @@ -2,18 +2,18 @@ import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { ValidationService } from "jslib-angular/services/validation.service"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { PlanSponsorshipType } from "jslib-common/enums/planSponsorshipType"; -import { PlanType } from "jslib-common/enums/planType"; -import { ProductType } from "jslib-common/enums/productType"; -import { Organization } from "jslib-common/models/domain/organization"; -import { OrganizationSponsorshipRedeemRequest } from "jslib-common/models/request/organization/organizationSponsorshipRedeemRequest"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { ValidationService } from "@bitwarden/angular/services/validation.service"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { PlanSponsorshipType } from "@bitwarden/common/enums/planSponsorshipType"; +import { PlanType } from "@bitwarden/common/enums/planType"; +import { ProductType } from "@bitwarden/common/enums/productType"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { OrganizationSponsorshipRedeemRequest } from "@bitwarden/common/models/request/organization/organizationSponsorshipRedeemRequest"; import { DeleteOrganizationComponent } from "src/app/organizations/settings/delete-organization.component"; import { OrganizationPlansComponent } from "src/app/settings/organization-plans.component"; diff --git a/apps/web/src/app/organizations/tools/export.component.ts b/apps/web/src/app/organizations/tools/export.component.ts index 0601d6b370..8c482f58b7 100644 --- a/apps/web/src/app/organizations/tools/export.component.ts +++ b/apps/web/src/app/organizations/tools/export.component.ts @@ -2,14 +2,14 @@ import { Component } from "@angular/core"; import { FormBuilder } from "@angular/forms"; import { ActivatedRoute } from "@angular/router"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { ExportService } from "jslib-common/abstractions/export.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { UserVerificationService } from "jslib-common/abstractions/userVerification.service"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { ExportService } from "@bitwarden/common/abstractions/export.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 { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service"; import { ExportComponent as BaseExportComponent } from "../../tools/export.component"; diff --git a/apps/web/src/app/organizations/tools/exposed-passwords-report.component.ts b/apps/web/src/app/organizations/tools/exposed-passwords-report.component.ts index e3b8f5521e..e059267100 100644 --- a/apps/web/src/app/organizations/tools/exposed-passwords-report.component.ts +++ b/apps/web/src/app/organizations/tools/exposed-passwords-report.component.ts @@ -1,15 +1,15 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { AuditService } from "jslib-common/abstractions/audit.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { Cipher } from "jslib-common/models/domain/cipher"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { AuditService } from "@bitwarden/common/abstractions/audit.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { Cipher } from "@bitwarden/common/models/domain/cipher"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; import { ExposedPasswordsReportComponent as BaseExposedPasswordsReportComponent } from "../../reports/exposed-passwords-report.component"; diff --git a/apps/web/src/app/organizations/tools/import.component.ts b/apps/web/src/app/organizations/tools/import.component.ts index 6dce498808..08aea5b1ac 100644 --- a/apps/web/src/app/organizations/tools/import.component.ts +++ b/apps/web/src/app/organizations/tools/import.component.ts @@ -1,12 +1,12 @@ import { Component } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { ImportService } from "jslib-common/abstractions/import.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { ImportService } from "@bitwarden/common/abstractions/import.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; import { ImportComponent as BaseImportComponent } from "../../tools/import.component"; diff --git a/apps/web/src/app/organizations/tools/inactive-two-factor-report.component.ts b/apps/web/src/app/organizations/tools/inactive-two-factor-report.component.ts index 5aec67d5f2..f0ec4614f6 100644 --- a/apps/web/src/app/organizations/tools/inactive-two-factor-report.component.ts +++ b/apps/web/src/app/organizations/tools/inactive-two-factor-report.component.ts @@ -1,14 +1,14 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; import { InactiveTwoFactorReportComponent as BaseInactiveTwoFactorReportComponent } from "../../reports/inactive-two-factor-report.component"; diff --git a/apps/web/src/app/organizations/tools/reused-passwords-report.component.ts b/apps/web/src/app/organizations/tools/reused-passwords-report.component.ts index 4aa8ab706a..e85a5fd4b4 100644 --- a/apps/web/src/app/organizations/tools/reused-passwords-report.component.ts +++ b/apps/web/src/app/organizations/tools/reused-passwords-report.component.ts @@ -1,14 +1,14 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { Cipher } from "jslib-common/models/domain/cipher"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { Cipher } from "@bitwarden/common/models/domain/cipher"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; import { ReusedPasswordsReportComponent as BaseReusedPasswordsReportComponent } from "../../reports/reused-passwords-report.component"; diff --git a/apps/web/src/app/organizations/tools/tools.component.ts b/apps/web/src/app/organizations/tools/tools.component.ts index da23f2e9d7..cfff58a682 100644 --- a/apps/web/src/app/organizations/tools/tools.component.ts +++ b/apps/web/src/app/organizations/tools/tools.component.ts @@ -1,9 +1,9 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { Organization } from "jslib-common/models/domain/organization"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { Organization } from "@bitwarden/common/models/domain/organization"; @Component({ selector: "app-org-tools", diff --git a/apps/web/src/app/organizations/tools/unsecured-websites-report.component.ts b/apps/web/src/app/organizations/tools/unsecured-websites-report.component.ts index 9091146234..62b18ea8f7 100644 --- a/apps/web/src/app/organizations/tools/unsecured-websites-report.component.ts +++ b/apps/web/src/app/organizations/tools/unsecured-websites-report.component.ts @@ -1,13 +1,13 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; import { UnsecuredWebsitesReportComponent as BaseUnsecuredWebsitesReportComponent } from "../../reports/unsecured-websites-report.component"; diff --git a/apps/web/src/app/organizations/tools/weak-passwords-report.component.ts b/apps/web/src/app/organizations/tools/weak-passwords-report.component.ts index b79b73b021..2b65fa4292 100644 --- a/apps/web/src/app/organizations/tools/weak-passwords-report.component.ts +++ b/apps/web/src/app/organizations/tools/weak-passwords-report.component.ts @@ -1,15 +1,15 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { Cipher } from "jslib-common/models/domain/cipher"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { Cipher } from "@bitwarden/common/models/domain/cipher"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; import { WeakPasswordsReportComponent as BaseWeakPasswordsReportComponent } from "../../reports/weak-passwords-report.component"; diff --git a/apps/web/src/app/organizations/vault/add-edit.component.ts b/apps/web/src/app/organizations/vault/add-edit.component.ts index 2f86ce4ece..d271a56804 100644 --- a/apps/web/src/app/organizations/vault/add-edit.component.ts +++ b/apps/web/src/app/organizations/vault/add-edit.component.ts @@ -1,26 +1,26 @@ import { Component } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AuditService } from "jslib-common/abstractions/audit.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { TotpService } from "jslib-common/abstractions/totp.service"; -import { CipherData } from "jslib-common/models/data/cipherData"; -import { Cipher } from "jslib-common/models/domain/cipher"; -import { Organization } from "jslib-common/models/domain/organization"; -import { CipherCreateRequest } from "jslib-common/models/request/cipherCreateRequest"; -import { CipherRequest } from "jslib-common/models/request/cipherRequest"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { AuditService } from "@bitwarden/common/abstractions/audit.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { FolderService } from "@bitwarden/common/abstractions/folder.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { TotpService } from "@bitwarden/common/abstractions/totp.service"; +import { CipherData } from "@bitwarden/common/models/data/cipherData"; +import { Cipher } from "@bitwarden/common/models/domain/cipher"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { CipherCreateRequest } from "@bitwarden/common/models/request/cipherCreateRequest"; +import { CipherRequest } from "@bitwarden/common/models/request/cipherRequest"; import { AddEditComponent as BaseAddEditComponent } from "../../vault/add-edit.component"; diff --git a/apps/web/src/app/organizations/vault/attachments.component.ts b/apps/web/src/app/organizations/vault/attachments.component.ts index fb4b46c7fa..463cc7e03a 100644 --- a/apps/web/src/app/organizations/vault/attachments.component.ts +++ b/apps/web/src/app/organizations/vault/attachments.component.ts @@ -1,16 +1,16 @@ import { Component } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { CipherData } from "jslib-common/models/data/cipherData"; -import { Cipher } from "jslib-common/models/domain/cipher"; -import { Organization } from "jslib-common/models/domain/organization"; -import { AttachmentView } from "jslib-common/models/view/attachmentView"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.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 { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CipherData } from "@bitwarden/common/models/data/cipherData"; +import { Cipher } from "@bitwarden/common/models/domain/cipher"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { AttachmentView } from "@bitwarden/common/models/view/attachmentView"; import { AttachmentsComponent as BaseAttachmentsComponent } from "../../vault/attachments.component"; diff --git a/apps/web/src/app/organizations/vault/ciphers.component.ts b/apps/web/src/app/organizations/vault/ciphers.component.ts index 2960b9ae99..4b8d23137d 100644 --- a/apps/web/src/app/organizations/vault/ciphers.component.ts +++ b/apps/web/src/app/organizations/vault/ciphers.component.ts @@ -1,19 +1,19 @@ import { Component, EventEmitter, Output } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { SearchService } from "jslib-common/abstractions/search.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { TokenService } from "jslib-common/abstractions/token.service"; -import { TotpService } from "jslib-common/abstractions/totp.service"; -import { Organization } from "jslib-common/models/domain/organization"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; +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 { Organization } from "@bitwarden/common/models/domain/organization"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; import { CiphersComponent as BaseCiphersComponent } from "../../vault/ciphers.component"; diff --git a/apps/web/src/app/organizations/vault/collections.component.ts b/apps/web/src/app/organizations/vault/collections.component.ts index deeaa7c7e6..d724828e3b 100644 --- a/apps/web/src/app/organizations/vault/collections.component.ts +++ b/apps/web/src/app/organizations/vault/collections.component.ts @@ -1,15 +1,15 @@ import { Component } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { CipherData } from "jslib-common/models/data/cipherData"; -import { Cipher } from "jslib-common/models/domain/cipher"; -import { Organization } from "jslib-common/models/domain/organization"; -import { CipherCollectionsRequest } from "jslib-common/models/request/cipherCollectionsRequest"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.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 { CipherData } from "@bitwarden/common/models/data/cipherData"; +import { Cipher } from "@bitwarden/common/models/domain/cipher"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { CipherCollectionsRequest } from "@bitwarden/common/models/request/cipherCollectionsRequest"; import { CollectionsComponent as BaseCollectionsComponent } from "../../vault/collections.component"; diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts index 77547813f8..f5896cccf6 100644 --- a/apps/web/src/app/oss-routing.module.ts +++ b/apps/web/src/app/oss-routing.module.ts @@ -1,9 +1,9 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; -import { AuthGuard } from "jslib-angular/guards/auth.guard"; -import { LockGuard } from "jslib-angular/guards/lock.guard"; -import { UnauthGuard } from "jslib-angular/guards/unauth.guard"; +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 { AcceptEmergencyComponent } from "./accounts/accept-emergency.component"; import { AcceptOrganizationComponent } from "./accounts/accept-organization.component"; diff --git a/apps/web/src/app/providers/providers.component.ts b/apps/web/src/app/providers/providers.component.ts index ca80ef46ff..25fd211cb9 100644 --- a/apps/web/src/app/providers/providers.component.ts +++ b/apps/web/src/app/providers/providers.component.ts @@ -1,9 +1,9 @@ import { Component, OnInit } from "@angular/core"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { ProviderService } from "jslib-common/abstractions/provider.service"; -import { Utils } from "jslib-common/misc/utils"; -import { Provider } from "jslib-common/models/domain/provider"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { Provider } from "@bitwarden/common/models/domain/provider"; @Component({ selector: "app-providers", diff --git a/apps/web/src/app/reports/breach-report.component.ts b/apps/web/src/app/reports/breach-report.component.ts index 0c7da7af51..154624c211 100644 --- a/apps/web/src/app/reports/breach-report.component.ts +++ b/apps/web/src/app/reports/breach-report.component.ts @@ -1,8 +1,8 @@ import { Component, OnInit } from "@angular/core"; -import { AuditService } from "jslib-common/abstractions/audit.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { BreachAccountResponse } from "jslib-common/models/response/breachAccountResponse"; +import { AuditService } from "@bitwarden/common/abstractions/audit.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { BreachAccountResponse } from "@bitwarden/common/models/response/breachAccountResponse"; @Component({ selector: "app-breach-report", diff --git a/apps/web/src/app/reports/cipher-report.component.ts b/apps/web/src/app/reports/cipher-report.component.ts index ebc7121eb9..b1c5df36b6 100644 --- a/apps/web/src/app/reports/cipher-report.component.ts +++ b/apps/web/src/app/reports/cipher-report.component.ts @@ -1,12 +1,12 @@ import { Directive, ViewChild, ViewContainerRef } from "@angular/core"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { CipherRepromptType } from "jslib-common/enums/cipherRepromptType"; -import { Organization } from "jslib-common/models/domain/organization"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; import { AddEditComponent as OrgAddEditComponent } from "../organizations/vault/add-edit.component"; import { AddEditComponent } from "../vault/add-edit.component"; diff --git a/apps/web/src/app/reports/exposed-passwords-report.component.ts b/apps/web/src/app/reports/exposed-passwords-report.component.ts index 4a08964bc7..443f03453c 100644 --- a/apps/web/src/app/reports/exposed-passwords-report.component.ts +++ b/apps/web/src/app/reports/exposed-passwords-report.component.ts @@ -1,13 +1,13 @@ import { Component, OnInit } from "@angular/core"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { AuditService } from "jslib-common/abstractions/audit.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { AuditService } from "@bitwarden/common/abstractions/audit.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; import { CipherReportComponent } from "./cipher-report.component"; diff --git a/apps/web/src/app/reports/inactive-two-factor-report.component.ts b/apps/web/src/app/reports/inactive-two-factor-report.component.ts index 9dd438e307..03047f36cd 100644 --- a/apps/web/src/app/reports/inactive-two-factor-report.component.ts +++ b/apps/web/src/app/reports/inactive-two-factor-report.component.ts @@ -1,14 +1,14 @@ import { Component, OnInit } from "@angular/core"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { Utils } from "jslib-common/misc/utils"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; import { CipherReportComponent } from "./cipher-report.component"; diff --git a/apps/web/src/app/reports/report-card.component.ts b/apps/web/src/app/reports/report-card.component.ts index d6a9470c66..a67550d52e 100644 --- a/apps/web/src/app/reports/report-card.component.ts +++ b/apps/web/src/app/reports/report-card.component.ts @@ -1,8 +1,8 @@ import { Component, Input, OnInit } from "@angular/core"; import { DomSanitizer } from "@angular/platform-browser"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { StateService } from "jslib-common/abstractions/state.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; export enum ReportTypes { "exposedPasswords" = "exposedPasswords", diff --git a/apps/web/src/app/reports/reports-routing.module.ts b/apps/web/src/app/reports/reports-routing.module.ts index d97d20550b..f2029e16df 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 "jslib-angular/guards/auth.guard"; +import { AuthGuard } from "@bitwarden/angular/guards/auth.guard"; import { BreachReportComponent } from "./breach-report.component"; import { ExposedPasswordsReportComponent } from "./exposed-passwords-report.component"; diff --git a/apps/web/src/app/reports/reused-passwords-report.component.ts b/apps/web/src/app/reports/reused-passwords-report.component.ts index 68ce3c8527..d2330bfcff 100644 --- a/apps/web/src/app/reports/reused-passwords-report.component.ts +++ b/apps/web/src/app/reports/reused-passwords-report.component.ts @@ -1,12 +1,12 @@ import { Component, OnInit } from "@angular/core"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; import { CipherReportComponent } from "./cipher-report.component"; diff --git a/apps/web/src/app/reports/unsecured-websites-report.component.ts b/apps/web/src/app/reports/unsecured-websites-report.component.ts index e029002bf0..ed8eb68df2 100644 --- a/apps/web/src/app/reports/unsecured-websites-report.component.ts +++ b/apps/web/src/app/reports/unsecured-websites-report.component.ts @@ -1,12 +1,12 @@ import { Component, OnInit } from "@angular/core"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; import { CipherReportComponent } from "./cipher-report.component"; diff --git a/apps/web/src/app/reports/weak-passwords-report.component.ts b/apps/web/src/app/reports/weak-passwords-report.component.ts index e84ffa1f03..f18cff53bb 100644 --- a/apps/web/src/app/reports/weak-passwords-report.component.ts +++ b/apps/web/src/app/reports/weak-passwords-report.component.ts @@ -1,13 +1,13 @@ import { Component, OnInit } from "@angular/core"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; import { CipherReportComponent } from "./cipher-report.component"; diff --git a/apps/web/src/app/send/access.component.ts b/apps/web/src/app/send/access.component.ts index 2665f28bf9..a0a3a081ce 100644 --- a/apps/web/src/app/send/access.component.ts +++ b/apps/web/src/app/send/access.component.ts @@ -1,20 +1,20 @@ import { Component, OnInit } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { SEND_KDF_ITERATIONS } from "jslib-common/enums/kdfType"; -import { SendType } from "jslib-common/enums/sendType"; -import { Utils } from "jslib-common/misc/utils"; -import { SendAccess } from "jslib-common/models/domain/sendAccess"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; -import { SendAccessRequest } from "jslib-common/models/request/sendAccessRequest"; -import { ErrorResponse } from "jslib-common/models/response/errorResponse"; -import { SendAccessResponse } from "jslib-common/models/response/sendAccessResponse"; -import { SendAccessView } from "jslib-common/models/view/sendAccessView"; +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 { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { SEND_KDF_ITERATIONS } from "@bitwarden/common/enums/kdfType"; +import { SendType } from "@bitwarden/common/enums/sendType"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { SendAccess } from "@bitwarden/common/models/domain/sendAccess"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { SendAccessRequest } from "@bitwarden/common/models/request/sendAccessRequest"; +import { ErrorResponse } from "@bitwarden/common/models/response/errorResponse"; +import { SendAccessResponse } from "@bitwarden/common/models/response/sendAccessResponse"; +import { SendAccessView } from "@bitwarden/common/models/view/sendAccessView"; @Component({ selector: "app-send-access", diff --git a/apps/web/src/app/send/add-edit.component.ts b/apps/web/src/app/send/add-edit.component.ts index 6a2aacead1..038de04fa5 100644 --- a/apps/web/src/app/send/add-edit.component.ts +++ b/apps/web/src/app/send/add-edit.component.ts @@ -1,15 +1,15 @@ import { DatePipe } from "@angular/common"; import { Component } from "@angular/core"; -import { AddEditComponent as BaseAddEditComponent } from "jslib-angular/components/send/add-edit.component"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { SendService } from "jslib-common/abstractions/send.service"; -import { StateService } from "jslib-common/abstractions/state.service"; +import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/components/send/add-edit.component"; +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 { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { SendService } from "@bitwarden/common/abstractions/send.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; @Component({ selector: "app-send-add-edit", diff --git a/apps/web/src/app/send/efflux-dates.component.ts b/apps/web/src/app/send/efflux-dates.component.ts index 27bb1fb110..b89fd0c33a 100644 --- a/apps/web/src/app/send/efflux-dates.component.ts +++ b/apps/web/src/app/send/efflux-dates.component.ts @@ -2,9 +2,9 @@ import { DatePipe } from "@angular/common"; import { Component } from "@angular/core"; import { ControlContainer, NgForm } from "@angular/forms"; -import { EffluxDatesComponent as BaseEffluxDatesComponent } from "jslib-angular/components/send/efflux-dates.component"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { EffluxDatesComponent as BaseEffluxDatesComponent } from "@bitwarden/angular/components/send/efflux-dates.component"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; @Component({ selector: "app-send-efflux-dates", diff --git a/apps/web/src/app/send/send.component.ts b/apps/web/src/app/send/send.component.ts index fc8bbb623a..b7466cfeb5 100644 --- a/apps/web/src/app/send/send.component.ts +++ b/apps/web/src/app/send/send.component.ts @@ -1,16 +1,16 @@ import { Component, NgZone, ViewChild, ViewContainerRef } from "@angular/core"; -import { SendComponent as BaseSendComponent } from "jslib-angular/components/send/send.component"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { SearchService } from "jslib-common/abstractions/search.service"; -import { SendService } from "jslib-common/abstractions/send.service"; -import { SendView } from "jslib-common/models/view/sendView"; +import { SendComponent as BaseSendComponent } from "@bitwarden/angular/components/send/send.component"; +import { ModalService } from "@bitwarden/angular/services/modal.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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { SearchService } from "@bitwarden/common/abstractions/search.service"; +import { SendService } from "@bitwarden/common/abstractions/send.service"; +import { SendView } from "@bitwarden/common/models/view/sendView"; import { AddEditComponent } from "./add-edit.component"; diff --git a/apps/web/src/app/services/event.service.ts b/apps/web/src/app/services/event.service.ts index 02f50cf7b3..302fe2b9ce 100644 --- a/apps/web/src/app/services/event.service.ts +++ b/apps/web/src/app/services/event.service.ts @@ -1,11 +1,11 @@ import { Injectable } from "@angular/core"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { DeviceType } from "jslib-common/enums/deviceType"; -import { EventType } from "jslib-common/enums/eventType"; -import { PolicyType } from "jslib-common/enums/policyType"; -import { EventResponse } from "jslib-common/models/response/eventResponse"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { DeviceType } from "@bitwarden/common/enums/deviceType"; +import { EventType } from "@bitwarden/common/enums/eventType"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { EventResponse } from "@bitwarden/common/models/response/eventResponse"; @Injectable() export class EventService { diff --git a/apps/web/src/app/services/init.service.ts b/apps/web/src/app/services/init.service.ts index eacfea9773..1a9178b28e 100644 --- a/apps/web/src/app/services/init.service.ts +++ b/apps/web/src/app/services/init.service.ts @@ -1,22 +1,22 @@ import { Inject, Injectable } from "@angular/core"; -import { WINDOW } from "jslib-angular/services/jslib-services.module"; -import { CryptoService as CryptoServiceAbstraction } from "jslib-common/abstractions/crypto.service"; +import { WINDOW } from "@bitwarden/angular/services/jslib-services.module"; +import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/abstractions/crypto.service"; import { EnvironmentService as EnvironmentServiceAbstraction, Urls, -} from "jslib-common/abstractions/environment.service"; -import { EventService as EventLoggingServiceAbstraction } from "jslib-common/abstractions/event.service"; -import { I18nService as I18nServiceAbstraction } from "jslib-common/abstractions/i18n.service"; -import { NotificationsService as NotificationsServiceAbstraction } from "jslib-common/abstractions/notifications.service"; -import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "jslib-common/abstractions/platformUtils.service"; -import { StateService as StateServiceAbstraction } from "jslib-common/abstractions/state.service"; -import { TwoFactorService as TwoFactorServiceAbstraction } from "jslib-common/abstractions/twoFactor.service"; -import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "jslib-common/abstractions/vaultTimeout.service"; -import { ThemeType } from "jslib-common/enums/themeType"; -import { ContainerService } from "jslib-common/services/container.service"; -import { EventService as EventLoggingService } from "jslib-common/services/event.service"; -import { VaultTimeoutService as VaultTimeoutService } from "jslib-common/services/vaultTimeout.service"; +} from "@bitwarden/common/abstractions/environment.service"; +import { EventService as EventLoggingServiceAbstraction } from "@bitwarden/common/abstractions/event.service"; +import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service"; +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.service"; +import { ThemeType } from "@bitwarden/common/enums/themeType"; +import { ContainerService } from "@bitwarden/common/services/container.service"; +import { EventService as EventLoggingService } from "@bitwarden/common/services/event.service"; +import { VaultTimeoutService as VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout.service"; import { I18nService as I18nService } from "../../services/i18n.service"; diff --git a/apps/web/src/app/services/modal.service.ts b/apps/web/src/app/services/modal.service.ts index 760796fe17..19c54a23bc 100644 --- a/apps/web/src/app/services/modal.service.ts +++ b/apps/web/src/app/services/modal.service.ts @@ -2,10 +2,10 @@ import { ApplicationRef, ComponentFactoryResolver, Injectable, Injector } from " import * as jq from "jquery"; import { first } from "rxjs/operators"; -import { ModalRef } from "jslib-angular/components/modal/modal.ref"; -import { ModalService as BaseModalService } from "jslib-angular/services/modal.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { Utils } from "jslib-common/misc/utils"; +import { ModalRef } from "@bitwarden/angular/components/modal/modal.ref"; +import { ModalService as BaseModalService } from "@bitwarden/angular/services/modal.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { Utils } from "@bitwarden/common/misc/utils"; @Injectable() export class ModalService extends BaseModalService { diff --git a/apps/web/src/app/services/router.service.ts b/apps/web/src/app/services/router.service.ts index 7493e2cb5a..aa9041875a 100644 --- a/apps/web/src/app/services/router.service.ts +++ b/apps/web/src/app/services/router.service.ts @@ -3,7 +3,7 @@ import { Title } from "@angular/platform-browser"; import { ActivatedRoute, NavigationEnd, Router } from "@angular/router"; import { filter } from "rxjs"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; @Injectable() export class RouterService { diff --git a/apps/web/src/app/services/services.module.ts b/apps/web/src/app/services/services.module.ts index b99eda72d2..cf4b290e62 100644 --- a/apps/web/src/app/services/services.module.ts +++ b/apps/web/src/app/services/services.module.ts @@ -8,24 +8,24 @@ import { STATE_SERVICE_USE_CACHE, LOCALES_DIRECTORY, SYSTEM_LANGUAGE, -} from "jslib-angular/services/jslib-services.module"; -import { ModalService as ModalServiceAbstraction } from "jslib-angular/services/modal.service"; -import { ApiService as ApiServiceAbstraction } from "jslib-common/abstractions/api.service"; -import { CipherService as CipherServiceAbstraction } from "jslib-common/abstractions/cipher.service"; -import { CollectionService as CollectionServiceAbstraction } from "jslib-common/abstractions/collection.service"; -import { CryptoService as CryptoServiceAbstraction } from "jslib-common/abstractions/crypto.service"; -import { FolderService as FolderServiceAbstraction } from "jslib-common/abstractions/folder.service"; -import { I18nService as I18nServiceAbstraction } from "jslib-common/abstractions/i18n.service"; -import { ImportService as ImportServiceAbstraction } from "jslib-common/abstractions/import.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService as MessagingServiceAbstraction } from "jslib-common/abstractions/messaging.service"; -import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "jslib-common/abstractions/passwordReprompt.service"; -import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "jslib-common/abstractions/platformUtils.service"; -import { StateService as BaseStateServiceAbstraction } from "jslib-common/abstractions/state.service"; -import { StateMigrationService as StateMigrationServiceAbstraction } from "jslib-common/abstractions/stateMigration.service"; -import { StorageService as StorageServiceAbstraction } from "jslib-common/abstractions/storage.service"; -import { StateFactory } from "jslib-common/factories/stateFactory"; -import { ImportService } from "jslib-common/services/import.service"; +} from "@bitwarden/angular/services/jslib-services.module"; +import { ModalService as ModalServiceAbstraction } from "@bitwarden/angular/services/modal.service"; +import { ApiService as ApiServiceAbstraction } from "@bitwarden/common/abstractions/api.service"; +import { CipherService as CipherServiceAbstraction } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService as CollectionServiceAbstraction } from "@bitwarden/common/abstractions/collection.service"; +import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/abstractions/crypto.service"; +import { FolderService as FolderServiceAbstraction } from "@bitwarden/common/abstractions/folder.service"; +import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service"; +import { ImportService as ImportServiceAbstraction } from "@bitwarden/common/abstractions/import.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/abstractions/messaging.service"; +import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/abstractions/passwordReprompt.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 { StorageService as StorageServiceAbstraction } from "@bitwarden/common/abstractions/storage.service"; +import { StateFactory } from "@bitwarden/common/factories/stateFactory"; +import { ImportService } from "@bitwarden/common/services/import.service"; import { StateService as StateServiceAbstraction } from "../../abstractions/state.service"; import { Account } from "../../models/account"; diff --git a/apps/web/src/app/settings/account.component.ts b/apps/web/src/app/settings/account.component.ts index aa13eb4544..48153fa5b7 100644 --- a/apps/web/src/app/settings/account.component.ts +++ b/apps/web/src/app/settings/account.component.ts @@ -1,9 +1,9 @@ import { Component, ViewChild, ViewContainerRef } from "@angular/core"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service"; -import { StateService } from "jslib-common/abstractions/state.service"; +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 { DeauthorizeSessionsComponent } from "./deauthorize-sessions.component"; import { DeleteAccountComponent } from "./delete-account.component"; diff --git a/apps/web/src/app/settings/add-credit.component.ts b/apps/web/src/app/settings/add-credit.component.ts index 4d646990ac..eeb22e876d 100644 --- a/apps/web/src/app/settings/add-credit.component.ts +++ b/apps/web/src/app/settings/add-credit.component.ts @@ -8,14 +8,14 @@ import { ViewChild, } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { PayPalConfig } from "jslib-common/abstractions/environment.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { PaymentMethodType } from "jslib-common/enums/paymentMethodType"; -import { BitPayInvoiceRequest } from "jslib-common/models/request/bitPayInvoiceRequest"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { PayPalConfig } from "@bitwarden/common/abstractions/environment.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { PaymentMethodType } from "@bitwarden/common/enums/paymentMethodType"; +import { BitPayInvoiceRequest } from "@bitwarden/common/models/request/bitPayInvoiceRequest"; @Component({ selector: "app-add-credit", diff --git a/apps/web/src/app/settings/adjust-payment.component.ts b/apps/web/src/app/settings/adjust-payment.component.ts index bfa89fef4b..e88329fd7b 100644 --- a/apps/web/src/app/settings/adjust-payment.component.ts +++ b/apps/web/src/app/settings/adjust-payment.component.ts @@ -1,11 +1,11 @@ import { Component, EventEmitter, Input, Output, ViewChild } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PaymentMethodType } from "jslib-common/enums/paymentMethodType"; -import { PaymentRequest } from "jslib-common/models/request/paymentRequest"; +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 { PaymentMethodType } from "@bitwarden/common/enums/paymentMethodType"; +import { PaymentRequest } from "@bitwarden/common/models/request/paymentRequest"; import { PaymentComponent } from "./payment.component"; import { TaxInfoComponent } from "./tax-info.component"; diff --git a/apps/web/src/app/settings/adjust-storage.component.ts b/apps/web/src/app/settings/adjust-storage.component.ts index d3cf0669ca..eea26c2a2d 100644 --- a/apps/web/src/app/settings/adjust-storage.component.ts +++ b/apps/web/src/app/settings/adjust-storage.component.ts @@ -1,12 +1,12 @@ import { Component, EventEmitter, Input, Output, ViewChild } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StorageRequest } from "jslib-common/models/request/storageRequest"; -import { PaymentResponse } from "jslib-common/models/response/paymentResponse"; +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 { StorageRequest } from "@bitwarden/common/models/request/storageRequest"; +import { PaymentResponse } from "@bitwarden/common/models/response/paymentResponse"; import { PaymentComponent } from "./payment.component"; diff --git a/apps/web/src/app/settings/api-key.component.ts b/apps/web/src/app/settings/api-key.component.ts index fd1eec7e45..25238c2989 100644 --- a/apps/web/src/app/settings/api-key.component.ts +++ b/apps/web/src/app/settings/api-key.component.ts @@ -1,10 +1,10 @@ import { Component } from "@angular/core"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { UserVerificationService } from "jslib-common/abstractions/userVerification.service"; -import { SecretVerificationRequest } from "jslib-common/models/request/secretVerificationRequest"; -import { ApiKeyResponse } from "jslib-common/models/response/apiKeyResponse"; -import { Verification } from "jslib-common/types/verification"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service"; +import { SecretVerificationRequest } from "@bitwarden/common/models/request/secretVerificationRequest"; +import { ApiKeyResponse } from "@bitwarden/common/models/response/apiKeyResponse"; +import { Verification } from "@bitwarden/common/types/verification"; @Component({ selector: "app-api-key", diff --git a/apps/web/src/app/settings/billing-sync-key.component.ts b/apps/web/src/app/settings/billing-sync-key.component.ts index 9b80037c2d..fb992abd66 100644 --- a/apps/web/src/app/settings/billing-sync-key.component.ts +++ b/apps/web/src/app/settings/billing-sync-key.component.ts @@ -1,13 +1,12 @@ import { Component } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { OrganizationConnectionType } from "jslib-common/enums/organizationConnectionType"; -import { Utils } from "jslib-common/misc/utils"; -import { BillingSyncConfigApi } from "jslib-common/models/api/billingSyncConfigApi"; -import { BillingSyncConfigRequest } from "jslib-common/models/request/billingSyncConfigRequest"; -import { OrganizationConnectionRequest } from "jslib-common/models/request/organizationConnectionRequest"; -import { OrganizationConnectionResponse } from "jslib-common/models/response/organizationConnectionResponse"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { OrganizationConnectionType } from "@bitwarden/common/enums/organizationConnectionType"; +import { BillingSyncConfigApi } from "@bitwarden/common/models/api/billingSyncConfigApi"; +import { BillingSyncConfigRequest } from "@bitwarden/common/models/request/billingSyncConfigRequest"; +import { OrganizationConnectionRequest } from "@bitwarden/common/models/request/organizationConnectionRequest"; +import { OrganizationConnectionResponse } from "@bitwarden/common/models/response/organizationConnectionResponse"; @Component({ selector: "app-billing-sync-key", diff --git a/apps/web/src/app/settings/change-email.component.ts b/apps/web/src/app/settings/change-email.component.ts index b53ffb454c..5dd0528ac9 100644 --- a/apps/web/src/app/settings/change-email.component.ts +++ b/apps/web/src/app/settings/change-email.component.ts @@ -1,15 +1,15 @@ import { Component, OnInit } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType"; -import { EmailRequest } from "jslib-common/models/request/emailRequest"; -import { EmailTokenRequest } from "jslib-common/models/request/emailTokenRequest"; +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 { 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 { EmailRequest } from "@bitwarden/common/models/request/emailRequest"; +import { EmailTokenRequest } from "@bitwarden/common/models/request/emailTokenRequest"; @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 dcc268ac7c..60820b594b 100644 --- a/apps/web/src/app/settings/change-kdf.component.ts +++ b/apps/web/src/app/settings/change-kdf.component.ts @@ -1,14 +1,14 @@ import { Component, OnInit } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { DEFAULT_KDF_ITERATIONS, KdfType } from "jslib-common/enums/kdfType"; -import { KdfRequest } from "jslib-common/models/request/kdfRequest"; +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 { 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 { DEFAULT_KDF_ITERATIONS, KdfType } from "@bitwarden/common/enums/kdfType"; +import { KdfRequest } from "@bitwarden/common/models/request/kdfRequest"; @Component({ selector: "app-change-kdf", diff --git a/apps/web/src/app/settings/change-password.component.ts b/apps/web/src/app/settings/change-password.component.ts index 37246a840e..9b7e541c6a 100644 --- a/apps/web/src/app/settings/change-password.component.ts +++ b/apps/web/src/app/settings/change-password.component.ts @@ -1,32 +1,32 @@ import { Component } from "@angular/core"; import { Router } from "@angular/router"; -import { ChangePasswordComponent as BaseChangePasswordComponent } from "jslib-angular/components/change-password.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { SendService } from "jslib-common/abstractions/send.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { EmergencyAccessStatusType } from "jslib-common/enums/emergencyAccessStatusType"; -import { Utils } from "jslib-common/misc/utils"; -import { EncString } from "jslib-common/models/domain/encString"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; -import { CipherWithIdRequest } from "jslib-common/models/request/cipherWithIdRequest"; -import { EmergencyAccessUpdateRequest } from "jslib-common/models/request/emergencyAccessUpdateRequest"; -import { FolderWithIdRequest } from "jslib-common/models/request/folderWithIdRequest"; -import { OrganizationUserResetPasswordEnrollmentRequest } from "jslib-common/models/request/organizationUserResetPasswordEnrollmentRequest"; -import { PasswordRequest } from "jslib-common/models/request/passwordRequest"; -import { SendWithIdRequest } from "jslib-common/models/request/sendWithIdRequest"; -import { UpdateKeyRequest } from "jslib-common/models/request/updateKeyRequest"; +import { ChangePasswordComponent as BaseChangePasswordComponent } from "@bitwarden/angular/components/change-password.component"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { FolderService } from "@bitwarden/common/abstractions/folder.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 { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { SendService } from "@bitwarden/common/abstractions/send.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { EmergencyAccessStatusType } from "@bitwarden/common/enums/emergencyAccessStatusType"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { EncString } from "@bitwarden/common/models/domain/encString"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { CipherWithIdRequest } from "@bitwarden/common/models/request/cipherWithIdRequest"; +import { EmergencyAccessUpdateRequest } from "@bitwarden/common/models/request/emergencyAccessUpdateRequest"; +import { FolderWithIdRequest } from "@bitwarden/common/models/request/folderWithIdRequest"; +import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/models/request/organizationUserResetPasswordEnrollmentRequest"; +import { PasswordRequest } from "@bitwarden/common/models/request/passwordRequest"; +import { SendWithIdRequest } from "@bitwarden/common/models/request/sendWithIdRequest"; +import { UpdateKeyRequest } from "@bitwarden/common/models/request/updateKeyRequest"; @Component({ selector: "app-change-password", diff --git a/apps/web/src/app/settings/create-organization.component.ts b/apps/web/src/app/settings/create-organization.component.ts index db0dc964e8..fc6caf815a 100644 --- a/apps/web/src/app/settings/create-organization.component.ts +++ b/apps/web/src/app/settings/create-organization.component.ts @@ -2,8 +2,8 @@ import { Component, OnInit, ViewChild } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { first } from "rxjs/operators"; -import { PlanType } from "jslib-common/enums/planType"; -import { ProductType } from "jslib-common/enums/productType"; +import { PlanType } from "@bitwarden/common/enums/planType"; +import { ProductType } from "@bitwarden/common/enums/productType"; import { OrganizationPlansComponent } from "./organization-plans.component"; diff --git a/apps/web/src/app/settings/deauthorize-sessions.component.ts b/apps/web/src/app/settings/deauthorize-sessions.component.ts index f46872f5e8..c617b4750b 100644 --- a/apps/web/src/app/settings/deauthorize-sessions.component.ts +++ b/apps/web/src/app/settings/deauthorize-sessions.component.ts @@ -1,12 +1,12 @@ import { Component } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { UserVerificationService } from "jslib-common/abstractions/userVerification.service"; -import { Verification } from "jslib-common/types/verification"; +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 { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service"; +import { Verification } from "@bitwarden/common/types/verification"; @Component({ selector: "app-deauthorize-sessions", diff --git a/apps/web/src/app/settings/delete-account.component.ts b/apps/web/src/app/settings/delete-account.component.ts index 4a4e1131b1..8e953a9605 100644 --- a/apps/web/src/app/settings/delete-account.component.ts +++ b/apps/web/src/app/settings/delete-account.component.ts @@ -1,12 +1,12 @@ import { Component } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { UserVerificationService } from "jslib-common/abstractions/userVerification.service"; -import { Verification } from "jslib-common/types/verification"; +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 { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service"; +import { Verification } from "@bitwarden/common/types/verification"; @Component({ selector: "app-delete-account", diff --git a/apps/web/src/app/settings/domain-rules.component.ts b/apps/web/src/app/settings/domain-rules.component.ts index 54fea56202..2224f32955 100644 --- a/apps/web/src/app/settings/domain-rules.component.ts +++ b/apps/web/src/app/settings/domain-rules.component.ts @@ -1,10 +1,10 @@ import { Component, OnInit } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { UpdateDomainsRequest } from "jslib-common/models/request/updateDomainsRequest"; +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 { UpdateDomainsRequest } from "@bitwarden/common/models/request/updateDomainsRequest"; @Component({ selector: "app-domain-rules", diff --git a/apps/web/src/app/settings/emergency-access-add-edit.component.ts b/apps/web/src/app/settings/emergency-access-add-edit.component.ts index a89136da4d..522feeb303 100644 --- a/apps/web/src/app/settings/emergency-access-add-edit.component.ts +++ b/apps/web/src/app/settings/emergency-access-add-edit.component.ts @@ -1,12 +1,12 @@ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { EmergencyAccessType } from "jslib-common/enums/emergencyAccessType"; -import { EmergencyAccessInviteRequest } from "jslib-common/models/request/emergencyAccessInviteRequest"; -import { EmergencyAccessUpdateRequest } from "jslib-common/models/request/emergencyAccessUpdateRequest"; +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/emergencyAccessInviteRequest"; +import { EmergencyAccessUpdateRequest } from "@bitwarden/common/models/request/emergencyAccessUpdateRequest"; @Component({ selector: "emergency-access-add-edit", diff --git a/apps/web/src/app/settings/emergency-access-attachments.component.ts b/apps/web/src/app/settings/emergency-access-attachments.component.ts index a388c64dc8..dbf19cb5b9 100644 --- a/apps/web/src/app/settings/emergency-access-attachments.component.ts +++ b/apps/web/src/app/settings/emergency-access-attachments.component.ts @@ -1,14 +1,14 @@ import { Component } from "@angular/core"; -import { AttachmentsComponent as BaseAttachmentsComponent } from "jslib-angular/components/attachments.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { AttachmentView } from "jslib-common/models/view/attachmentView"; +import { AttachmentsComponent as BaseAttachmentsComponent } from "@bitwarden/angular/components/attachments.component"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.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 { StateService } from "@bitwarden/common/abstractions/state.service"; +import { AttachmentView } from "@bitwarden/common/models/view/attachmentView"; @Component({ selector: "emergency-access-attachments", diff --git a/apps/web/src/app/settings/emergency-access-confirm.component.ts b/apps/web/src/app/settings/emergency-access-confirm.component.ts index 1e19a3808c..6c767b851b 100644 --- a/apps/web/src/app/settings/emergency-access-confirm.component.ts +++ b/apps/web/src/app/settings/emergency-access-confirm.component.ts @@ -1,10 +1,10 @@ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { Utils } from "jslib-common/misc/utils"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { Utils } from "@bitwarden/common/misc/utils"; @Component({ selector: "emergency-access-confirm", diff --git a/apps/web/src/app/settings/emergency-access-takeover.component.ts b/apps/web/src/app/settings/emergency-access-takeover.component.ts index 4cb0a461ff..dea4d3862a 100644 --- a/apps/web/src/app/settings/emergency-access-takeover.component.ts +++ b/apps/web/src/app/settings/emergency-access-takeover.component.ts @@ -1,21 +1,21 @@ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { ChangePasswordComponent } from "jslib-angular/components/change-password.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { KdfType } from "jslib-common/enums/kdfType"; -import { PolicyData } from "jslib-common/models/data/policyData"; -import { Policy } from "jslib-common/models/domain/policy"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; -import { EmergencyAccessPasswordRequest } from "jslib-common/models/request/emergencyAccessPasswordRequest"; -import { PolicyResponse } from "jslib-common/models/response/policyResponse"; +import { ChangePasswordComponent } from "@bitwarden/angular/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 { LogService } from "@bitwarden/common/abstractions/log.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 { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { KdfType } from "@bitwarden/common/enums/kdfType"; +import { PolicyData } from "@bitwarden/common/models/data/policyData"; +import { Policy } from "@bitwarden/common/models/domain/policy"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { EmergencyAccessPasswordRequest } from "@bitwarden/common/models/request/emergencyAccessPasswordRequest"; +import { PolicyResponse } from "@bitwarden/common/models/response/policyResponse"; @Component({ selector: "emergency-access-takeover", diff --git a/apps/web/src/app/settings/emergency-access-view.component.ts b/apps/web/src/app/settings/emergency-access-view.component.ts index 7abb95e7c7..acdf6e43e2 100644 --- a/apps/web/src/app/settings/emergency-access-view.component.ts +++ b/apps/web/src/app/settings/emergency-access-view.component.ts @@ -1,15 +1,15 @@ import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { CipherData } from "jslib-common/models/data/cipherData"; -import { Cipher } from "jslib-common/models/domain/cipher"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; -import { EmergencyAccessViewResponse } from "jslib-common/models/response/emergencyAccessResponse"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { CipherData } from "@bitwarden/common/models/data/cipherData"; +import { Cipher } from "@bitwarden/common/models/domain/cipher"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { EmergencyAccessViewResponse } from "@bitwarden/common/models/response/emergencyAccessResponse"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; import { EmergencyAccessAttachmentsComponent } from "./emergency-access-attachments.component"; import { EmergencyAddEditComponent } from "./emergency-add-edit.component"; diff --git a/apps/web/src/app/settings/emergency-access.component.ts b/apps/web/src/app/settings/emergency-access.component.ts index 69b0fb9584..fec4ea59df 100644 --- a/apps/web/src/app/settings/emergency-access.component.ts +++ b/apps/web/src/app/settings/emergency-access.component.ts @@ -1,23 +1,23 @@ import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core"; -import { UserNamePipe } from "jslib-angular/pipes/user-name.pipe"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { EmergencyAccessStatusType } from "jslib-common/enums/emergencyAccessStatusType"; -import { EmergencyAccessType } from "jslib-common/enums/emergencyAccessType"; -import { Utils } from "jslib-common/misc/utils"; -import { EmergencyAccessConfirmRequest } from "jslib-common/models/request/emergencyAccessConfirmRequest"; +import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe"; +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 { LogService } from "@bitwarden/common/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +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/emergencyAccessConfirmRequest"; import { EmergencyAccessGranteeDetailsResponse, EmergencyAccessGrantorDetailsResponse, -} from "jslib-common/models/response/emergencyAccessResponse"; +} from "@bitwarden/common/models/response/emergencyAccessResponse"; 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/app/settings/emergency-add-edit.component.ts index b50ca9d2c7..c0aabd8da3 100644 --- a/apps/web/src/app/settings/emergency-add-edit.component.ts +++ b/apps/web/src/app/settings/emergency-add-edit.component.ts @@ -1,21 +1,21 @@ import { Component } from "@angular/core"; -import { AuditService } from "jslib-common/abstractions/audit.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { TotpService } from "jslib-common/abstractions/totp.service"; -import { Cipher } from "jslib-common/models/domain/cipher"; +import { AuditService } from "@bitwarden/common/abstractions/audit.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { FolderService } from "@bitwarden/common/abstractions/folder.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { TotpService } from "@bitwarden/common/abstractions/totp.service"; +import { Cipher } from "@bitwarden/common/models/domain/cipher"; import { AddEditComponent as BaseAddEditComponent } from "../vault/add-edit.component"; diff --git a/apps/web/src/app/settings/organization-plans.component.ts b/apps/web/src/app/settings/organization-plans.component.ts index 73da459ebf..65e39d9212 100644 --- a/apps/web/src/app/settings/organization-plans.component.ts +++ b/apps/web/src/app/settings/organization-plans.component.ts @@ -1,26 +1,26 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from "@angular/core"; import { Router } from "@angular/router"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { PaymentMethodType } from "jslib-common/enums/paymentMethodType"; -import { PlanType } from "jslib-common/enums/planType"; -import { PolicyType } from "jslib-common/enums/policyType"; -import { ProductType } from "jslib-common/enums/productType"; -import { EncString } from "jslib-common/models/domain/encString"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; -import { OrganizationCreateRequest } from "jslib-common/models/request/organizationCreateRequest"; -import { OrganizationKeysRequest } from "jslib-common/models/request/organizationKeysRequest"; -import { OrganizationUpgradeRequest } from "jslib-common/models/request/organizationUpgradeRequest"; -import { ProviderOrganizationCreateRequest } from "jslib-common/models/request/provider/providerOrganizationCreateRequest"; -import { PlanResponse } from "jslib-common/models/response/planResponse"; +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 { LogService } from "@bitwarden/common/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { PaymentMethodType } from "@bitwarden/common/enums/paymentMethodType"; +import { PlanType } from "@bitwarden/common/enums/planType"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { ProductType } from "@bitwarden/common/enums/productType"; +import { EncString } from "@bitwarden/common/models/domain/encString"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { OrganizationCreateRequest } from "@bitwarden/common/models/request/organizationCreateRequest"; +import { OrganizationKeysRequest } from "@bitwarden/common/models/request/organizationKeysRequest"; +import { OrganizationUpgradeRequest } from "@bitwarden/common/models/request/organizationUpgradeRequest"; +import { ProviderOrganizationCreateRequest } from "@bitwarden/common/models/request/provider/providerOrganizationCreateRequest"; +import { PlanResponse } from "@bitwarden/common/models/response/planResponse"; import { PaymentComponent } from "./payment.component"; import { TaxInfoComponent } from "./tax-info.component"; diff --git a/apps/web/src/app/settings/payment-method.component.ts b/apps/web/src/app/settings/payment-method.component.ts index 505d22a4eb..2cf9a17911 100644 --- a/apps/web/src/app/settings/payment-method.component.ts +++ b/apps/web/src/app/settings/payment-method.component.ts @@ -1,11 +1,11 @@ import { Component, OnInit } from "@angular/core"; import { Router } from "@angular/router"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PaymentMethodType } from "jslib-common/enums/paymentMethodType"; -import { BillingPaymentResponse } from "jslib-common/models/response/billingPaymentResponse"; +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 { PaymentMethodType } from "@bitwarden/common/enums/paymentMethodType"; +import { BillingPaymentResponse } from "@bitwarden/common/models/response/billingPaymentResponse"; @Component({ selector: "app-payment-method", diff --git a/apps/web/src/app/settings/payment.component.ts b/apps/web/src/app/settings/payment.component.ts index eb5fd4e0e2..075463357a 100644 --- a/apps/web/src/app/settings/payment.component.ts +++ b/apps/web/src/app/settings/payment.component.ts @@ -1,10 +1,10 @@ import { Component, Input, OnInit } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PaymentMethodType } from "jslib-common/enums/paymentMethodType"; -import { ThemeType } from "jslib-common/enums/themeType"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PaymentMethodType } from "@bitwarden/common/enums/paymentMethodType"; +import { ThemeType } from "@bitwarden/common/enums/themeType"; import ThemeVariables from "src/scss/export.module.scss"; diff --git a/apps/web/src/app/settings/preferences.component.ts b/apps/web/src/app/settings/preferences.component.ts index ea7f74ee83..5431ba4530 100644 --- a/apps/web/src/app/settings/preferences.component.ts +++ b/apps/web/src/app/settings/preferences.component.ts @@ -1,13 +1,13 @@ import { Component, OnInit } from "@angular/core"; import { FormControl } from "@angular/forms"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.service"; -import { ThemeType } from "jslib-common/enums/themeType"; -import { Utils } from "jslib-common/misc/utils"; +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 { StateService } from "@bitwarden/common/abstractions/state.service"; +import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { ThemeType } from "@bitwarden/common/enums/themeType"; +import { Utils } from "@bitwarden/common/misc/utils"; @Component({ selector: "app-preferences", diff --git a/apps/web/src/app/settings/premium.component.ts b/apps/web/src/app/settings/premium.component.ts index a345f7ddf0..80ded51a21 100644 --- a/apps/web/src/app/settings/premium.component.ts +++ b/apps/web/src/app/settings/premium.component.ts @@ -1,14 +1,14 @@ import { Component, OnInit, ViewChild } from "@angular/core"; import { Router } from "@angular/router"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { TokenService } from "jslib-common/abstractions/token.service"; +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 { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { TokenService } from "@bitwarden/common/abstractions/token.service"; import { PaymentComponent } from "./payment.component"; import { TaxInfoComponent } from "./tax-info.component"; diff --git a/apps/web/src/app/settings/profile.component.ts b/apps/web/src/app/settings/profile.component.ts index e9a4914a5a..f93cc340ad 100644 --- a/apps/web/src/app/settings/profile.component.ts +++ b/apps/web/src/app/settings/profile.component.ts @@ -1,14 +1,14 @@ import { Component, OnInit } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { UpdateProfileRequest } from "jslib-common/models/request/updateProfileRequest"; -import { ProfileResponse } from "jslib-common/models/response/profileResponse"; +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/updateProfileRequest"; +import { ProfileResponse } from "@bitwarden/common/models/response/profileResponse"; @Component({ selector: "app-profile", diff --git a/apps/web/src/app/settings/purge-vault.component.ts b/apps/web/src/app/settings/purge-vault.component.ts index d40e21b32f..b2ee3ee8c3 100644 --- a/apps/web/src/app/settings/purge-vault.component.ts +++ b/apps/web/src/app/settings/purge-vault.component.ts @@ -1,12 +1,12 @@ import { Component, Input } from "@angular/core"; import { Router } from "@angular/router"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { UserVerificationService } from "jslib-common/abstractions/userVerification.service"; -import { Verification } from "jslib-common/types/verification"; +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 { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service"; +import { Verification } from "@bitwarden/common/types/verification"; @Component({ selector: "app-purge-vault", diff --git a/apps/web/src/app/settings/security-keys.component.ts b/apps/web/src/app/settings/security-keys.component.ts index 650f5c4851..a44789bc77 100644 --- a/apps/web/src/app/settings/security-keys.component.ts +++ b/apps/web/src/app/settings/security-keys.component.ts @@ -1,9 +1,9 @@ import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service"; -import { StateService } from "jslib-common/abstractions/state.service"; +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 { ApiKeyComponent } from "./api-key.component"; diff --git a/apps/web/src/app/settings/security.component.ts b/apps/web/src/app/settings/security.component.ts index 7312392ee7..a0c0ae98c0 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 "jslib-common/abstractions/keyConnector.service"; +import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.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 f0559b8dce..0fae6a7dc0 100644 --- a/apps/web/src/app/settings/settings.component.ts +++ b/apps/web/src/app/settings/settings.component.ts @@ -1,10 +1,10 @@ import { Component, NgZone, OnDestroy, OnInit } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { TokenService } from "jslib-common/abstractions/token.service"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { TokenService } from "@bitwarden/common/abstractions/token.service"; import { StateService } from "../../abstractions/state.service"; diff --git a/apps/web/src/app/settings/sponsored-families.component.ts b/apps/web/src/app/settings/sponsored-families.component.ts index c168d00d82..e6b03042d6 100644 --- a/apps/web/src/app/settings/sponsored-families.component.ts +++ b/apps/web/src/app/settings/sponsored-families.component.ts @@ -1,15 +1,15 @@ import { Component, OnInit } from "@angular/core"; import { FormBuilder, FormGroup, Validators } from "@angular/forms"; -import { notAllowedValueAsync } from "jslib-angular/validators/notAllowedValueAsync.validator"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { PlanSponsorshipType } from "jslib-common/enums/planSponsorshipType"; -import { Organization } from "jslib-common/models/domain/organization"; +import { notAllowedValueAsync } from "@bitwarden/angular/validators/notAllowedValueAsync.validator"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { PlanSponsorshipType } from "@bitwarden/common/enums/planSponsorshipType"; +import { Organization } from "@bitwarden/common/models/domain/organization"; @Component({ selector: "app-sponsored-families", diff --git a/apps/web/src/app/settings/sponsoring-org-row.component.ts b/apps/web/src/app/settings/sponsoring-org-row.component.ts index 59723f0c8b..4dabff04b6 100644 --- a/apps/web/src/app/settings/sponsoring-org-row.component.ts +++ b/apps/web/src/app/settings/sponsoring-org-row.component.ts @@ -1,11 +1,11 @@ import { formatDate } from "@angular/common"; import { Component, EventEmitter, Input, Output, OnInit } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { Organization } from "jslib-common/models/domain/organization"; +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 { Organization } from "@bitwarden/common/models/domain/organization"; @Component({ selector: "[sponsoring-org-row]", diff --git a/apps/web/src/app/settings/subscription.component.ts b/apps/web/src/app/settings/subscription.component.ts index 62322eb03b..b84ffa8893 100644 --- a/apps/web/src/app/settings/subscription.component.ts +++ b/apps/web/src/app/settings/subscription.component.ts @@ -1,7 +1,7 @@ import { Component } from "@angular/core"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; @Component({ selector: "app-subscription", diff --git a/apps/web/src/app/settings/tax-info.component.ts b/apps/web/src/app/settings/tax-info.component.ts index f36feadde2..ea4a4b7716 100644 --- a/apps/web/src/app/settings/tax-info.component.ts +++ b/apps/web/src/app/settings/tax-info.component.ts @@ -1,11 +1,11 @@ import { Component, EventEmitter, Output } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { OrganizationTaxInfoUpdateRequest } from "jslib-common/models/request/organizationTaxInfoUpdateRequest"; -import { TaxInfoUpdateRequest } from "jslib-common/models/request/taxInfoUpdateRequest"; -import { TaxRateResponse } from "jslib-common/models/response/taxRateResponse"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { OrganizationTaxInfoUpdateRequest } from "@bitwarden/common/models/request/organizationTaxInfoUpdateRequest"; +import { TaxInfoUpdateRequest } from "@bitwarden/common/models/request/taxInfoUpdateRequest"; +import { TaxRateResponse } from "@bitwarden/common/models/response/taxRateResponse"; @Component({ selector: "app-tax-info", diff --git a/apps/web/src/app/settings/two-factor-authenticator.component.ts b/apps/web/src/app/settings/two-factor-authenticator.component.ts index c8f7b8c1fa..9a1269d5f8 100644 --- a/apps/web/src/app/settings/two-factor-authenticator.component.ts +++ b/apps/web/src/app/settings/two-factor-authenticator.component.ts @@ -1,14 +1,14 @@ import { Component, OnDestroy, OnInit } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { UserVerificationService } from "jslib-common/abstractions/userVerification.service"; -import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType"; -import { UpdateTwoFactorAuthenticatorRequest } from "jslib-common/models/request/updateTwoFactorAuthenticatorRequest"; -import { TwoFactorAuthenticatorResponse } from "jslib-common/models/response/twoFactorAuthenticatorResponse"; +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 { StateService } from "@bitwarden/common/abstractions/state.service"; +import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service"; +import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; +import { UpdateTwoFactorAuthenticatorRequest } from "@bitwarden/common/models/request/updateTwoFactorAuthenticatorRequest"; +import { TwoFactorAuthenticatorResponse } from "@bitwarden/common/models/response/twoFactorAuthenticatorResponse"; import { TwoFactorBaseComponent } from "./two-factor-base.component"; diff --git a/apps/web/src/app/settings/two-factor-base.component.ts b/apps/web/src/app/settings/two-factor-base.component.ts index b07c9d4138..d38a59ed49 100644 --- a/apps/web/src/app/settings/two-factor-base.component.ts +++ b/apps/web/src/app/settings/two-factor-base.component.ts @@ -1,14 +1,14 @@ import { Directive, EventEmitter, Output } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { UserVerificationService } from "jslib-common/abstractions/userVerification.service"; -import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType"; -import { VerificationType } from "jslib-common/enums/verificationType"; -import { SecretVerificationRequest } from "jslib-common/models/request/secretVerificationRequest"; -import { TwoFactorProviderRequest } from "jslib-common/models/request/twoFactorProviderRequest"; +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 { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service"; +import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; +import { VerificationType } from "@bitwarden/common/enums/verificationType"; +import { SecretVerificationRequest } from "@bitwarden/common/models/request/secretVerificationRequest"; +import { TwoFactorProviderRequest } from "@bitwarden/common/models/request/twoFactorProviderRequest"; @Directive() export abstract class TwoFactorBaseComponent { diff --git a/apps/web/src/app/settings/two-factor-duo.component.ts b/apps/web/src/app/settings/two-factor-duo.component.ts index e17f04ea24..e2cb8f62d6 100644 --- a/apps/web/src/app/settings/two-factor-duo.component.ts +++ b/apps/web/src/app/settings/two-factor-duo.component.ts @@ -1,13 +1,13 @@ import { Component } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { UserVerificationService } from "jslib-common/abstractions/userVerification.service"; -import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType"; -import { UpdateTwoFactorDuoRequest } from "jslib-common/models/request/updateTwoFactorDuoRequest"; -import { TwoFactorDuoResponse } from "jslib-common/models/response/twoFactorDuoResponse"; +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 { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service"; +import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; +import { UpdateTwoFactorDuoRequest } from "@bitwarden/common/models/request/updateTwoFactorDuoRequest"; +import { TwoFactorDuoResponse } from "@bitwarden/common/models/response/twoFactorDuoResponse"; import { TwoFactorBaseComponent } from "./two-factor-base.component"; diff --git a/apps/web/src/app/settings/two-factor-email.component.ts b/apps/web/src/app/settings/two-factor-email.component.ts index e45bb87743..4bf376ef6a 100644 --- a/apps/web/src/app/settings/two-factor-email.component.ts +++ b/apps/web/src/app/settings/two-factor-email.component.ts @@ -1,15 +1,15 @@ import { Component } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { UserVerificationService } from "jslib-common/abstractions/userVerification.service"; -import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType"; -import { TwoFactorEmailRequest } from "jslib-common/models/request/twoFactorEmailRequest"; -import { UpdateTwoFactorEmailRequest } from "jslib-common/models/request/updateTwoFactorEmailRequest"; -import { TwoFactorEmailResponse } from "jslib-common/models/response/twoFactorEmailResponse"; +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 { StateService } from "@bitwarden/common/abstractions/state.service"; +import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service"; +import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; +import { TwoFactorEmailRequest } from "@bitwarden/common/models/request/twoFactorEmailRequest"; +import { UpdateTwoFactorEmailRequest } from "@bitwarden/common/models/request/updateTwoFactorEmailRequest"; +import { TwoFactorEmailResponse } from "@bitwarden/common/models/response/twoFactorEmailResponse"; import { TwoFactorBaseComponent } from "./two-factor-base.component"; diff --git a/apps/web/src/app/settings/two-factor-recovery.component.ts b/apps/web/src/app/settings/two-factor-recovery.component.ts index 576f91566c..c5cd76b329 100644 --- a/apps/web/src/app/settings/two-factor-recovery.component.ts +++ b/apps/web/src/app/settings/two-factor-recovery.component.ts @@ -1,8 +1,8 @@ import { Component } from "@angular/core"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType"; -import { TwoFactorRecoverResponse } from "jslib-common/models/response/twoFactorRescoverResponse"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; +import { TwoFactorRecoverResponse } from "@bitwarden/common/models/response/twoFactorRescoverResponse"; @Component({ selector: "app-two-factor-recovery", diff --git a/apps/web/src/app/settings/two-factor-setup.component.ts b/apps/web/src/app/settings/two-factor-setup.component.ts index d83177e13c..efcc5a3747 100644 --- a/apps/web/src/app/settings/two-factor-setup.component.ts +++ b/apps/web/src/app/settings/two-factor-setup.component.ts @@ -1,18 +1,18 @@ import { Component, OnInit, Type, ViewChild, ViewContainerRef } from "@angular/core"; -import { ModalRef } from "jslib-angular/components/modal/modal.ref"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { PolicyType } from "jslib-common/enums/policyType"; -import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType"; -import { DeviceVerificationRequest } from "jslib-common/models/request/deviceVerificationRequest"; -import { TwoFactorProviders } from "jslib-common/services/twoFactor.service"; +import { ModalRef } from "@bitwarden/angular/components/modal/modal.ref"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +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 { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; +import { DeviceVerificationRequest } from "@bitwarden/common/models/request/deviceVerificationRequest"; +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.ts b/apps/web/src/app/settings/two-factor-verify.component.ts index ff1fe7ed46..f9492edc6d 100644 --- a/apps/web/src/app/settings/two-factor-verify.component.ts +++ b/apps/web/src/app/settings/two-factor-verify.component.ts @@ -1,18 +1,18 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { UserVerificationService } from "jslib-common/abstractions/userVerification.service"; -import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType"; -import { VerificationType } from "jslib-common/enums/verificationType"; -import { SecretVerificationRequest } from "jslib-common/models/request/secretVerificationRequest"; -import { TwoFactorAuthenticatorResponse } from "jslib-common/models/response/twoFactorAuthenticatorResponse"; -import { TwoFactorDuoResponse } from "jslib-common/models/response/twoFactorDuoResponse"; -import { TwoFactorEmailResponse } from "jslib-common/models/response/twoFactorEmailResponse"; -import { TwoFactorRecoverResponse } from "jslib-common/models/response/twoFactorRescoverResponse"; -import { TwoFactorWebAuthnResponse } from "jslib-common/models/response/twoFactorWebAuthnResponse"; -import { TwoFactorYubiKeyResponse } from "jslib-common/models/response/twoFactorYubiKeyResponse"; -import { Verification } from "jslib-common/types/verification"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service"; +import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; +import { VerificationType } from "@bitwarden/common/enums/verificationType"; +import { SecretVerificationRequest } from "@bitwarden/common/models/request/secretVerificationRequest"; +import { TwoFactorAuthenticatorResponse } from "@bitwarden/common/models/response/twoFactorAuthenticatorResponse"; +import { TwoFactorDuoResponse } from "@bitwarden/common/models/response/twoFactorDuoResponse"; +import { TwoFactorEmailResponse } from "@bitwarden/common/models/response/twoFactorEmailResponse"; +import { TwoFactorRecoverResponse } from "@bitwarden/common/models/response/twoFactorRescoverResponse"; +import { TwoFactorWebAuthnResponse } from "@bitwarden/common/models/response/twoFactorWebAuthnResponse"; +import { TwoFactorYubiKeyResponse } from "@bitwarden/common/models/response/twoFactorYubiKeyResponse"; +import { Verification } from "@bitwarden/common/types/verification"; type TwoFactorResponse = | TwoFactorRecoverResponse diff --git a/apps/web/src/app/settings/two-factor-webauthn.component.ts b/apps/web/src/app/settings/two-factor-webauthn.component.ts index 41e12f90c6..f3c946c0ce 100644 --- a/apps/web/src/app/settings/two-factor-webauthn.component.ts +++ b/apps/web/src/app/settings/two-factor-webauthn.component.ts @@ -1,18 +1,18 @@ import { Component, NgZone } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { UserVerificationService } from "jslib-common/abstractions/userVerification.service"; -import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType"; -import { SecretVerificationRequest } from "jslib-common/models/request/secretVerificationRequest"; -import { UpdateTwoFactorWebAuthnDeleteRequest } from "jslib-common/models/request/updateTwoFactorWebAuthnDeleteRequest"; -import { UpdateTwoFactorWebAuthnRequest } from "jslib-common/models/request/updateTwoFactorWebAuthnRequest"; +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 { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service"; +import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; +import { SecretVerificationRequest } from "@bitwarden/common/models/request/secretVerificationRequest"; +import { UpdateTwoFactorWebAuthnDeleteRequest } from "@bitwarden/common/models/request/updateTwoFactorWebAuthnDeleteRequest"; +import { UpdateTwoFactorWebAuthnRequest } from "@bitwarden/common/models/request/updateTwoFactorWebAuthnRequest"; import { ChallengeResponse, TwoFactorWebAuthnResponse, -} from "jslib-common/models/response/twoFactorWebAuthnResponse"; +} from "@bitwarden/common/models/response/twoFactorWebAuthnResponse"; import { TwoFactorBaseComponent } from "./two-factor-base.component"; diff --git a/apps/web/src/app/settings/two-factor-yubikey.component.ts b/apps/web/src/app/settings/two-factor-yubikey.component.ts index ee653df7ea..23dba61e5e 100644 --- a/apps/web/src/app/settings/two-factor-yubikey.component.ts +++ b/apps/web/src/app/settings/two-factor-yubikey.component.ts @@ -1,13 +1,13 @@ import { Component } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { UserVerificationService } from "jslib-common/abstractions/userVerification.service"; -import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType"; -import { UpdateTwoFactorYubioOtpRequest } from "jslib-common/models/request/updateTwoFactorYubioOtpRequest"; -import { TwoFactorYubiKeyResponse } from "jslib-common/models/response/twoFactorYubiKeyResponse"; +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 { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service"; +import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; +import { UpdateTwoFactorYubioOtpRequest } from "@bitwarden/common/models/request/updateTwoFactorYubioOtpRequest"; +import { TwoFactorYubiKeyResponse } from "@bitwarden/common/models/response/twoFactorYubiKeyResponse"; import { TwoFactorBaseComponent } from "./two-factor-base.component"; diff --git a/apps/web/src/app/settings/update-key.component.ts b/apps/web/src/app/settings/update-key.component.ts index 54d7cd5946..77aaab86ab 100644 --- a/apps/web/src/app/settings/update-key.component.ts +++ b/apps/web/src/app/settings/update-key.component.ts @@ -1,18 +1,18 @@ import { Component } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { EncString } from "jslib-common/models/domain/encString"; -import { CipherWithIdRequest } from "jslib-common/models/request/cipherWithIdRequest"; -import { FolderWithIdRequest } from "jslib-common/models/request/folderWithIdRequest"; -import { UpdateKeyRequest } from "jslib-common/models/request/updateKeyRequest"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { FolderService } from "@bitwarden/common/abstractions/folder.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.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 { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { EncString } from "@bitwarden/common/models/domain/encString"; +import { CipherWithIdRequest } from "@bitwarden/common/models/request/cipherWithIdRequest"; +import { FolderWithIdRequest } from "@bitwarden/common/models/request/folderWithIdRequest"; +import { UpdateKeyRequest } from "@bitwarden/common/models/request/updateKeyRequest"; @Component({ selector: "app-update-key", diff --git a/apps/web/src/app/settings/update-license.component.ts b/apps/web/src/app/settings/update-license.component.ts index a163123564..e843a5d600 100644 --- a/apps/web/src/app/settings/update-license.component.ts +++ b/apps/web/src/app/settings/update-license.component.ts @@ -1,9 +1,9 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +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"; @Component({ selector: "app-update-license", diff --git a/apps/web/src/app/settings/user-billing-history.component.ts b/apps/web/src/app/settings/user-billing-history.component.ts index ae26862d07..dfc3216d2f 100644 --- a/apps/web/src/app/settings/user-billing-history.component.ts +++ b/apps/web/src/app/settings/user-billing-history.component.ts @@ -1,12 +1,12 @@ import { Component, OnInit } from "@angular/core"; import { Router } from "@angular/router"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PaymentMethodType } from "jslib-common/enums/paymentMethodType"; -import { TransactionType } from "jslib-common/enums/transactionType"; -import { BillingHistoryResponse } from "jslib-common/models/response/billingHistoryResponse"; +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 { PaymentMethodType } from "@bitwarden/common/enums/paymentMethodType"; +import { TransactionType } from "@bitwarden/common/enums/transactionType"; +import { BillingHistoryResponse } from "@bitwarden/common/models/response/billingHistoryResponse"; @Component({ selector: "app-user-billing", diff --git a/apps/web/src/app/settings/user-subscription.component.ts b/apps/web/src/app/settings/user-subscription.component.ts index a91099d9a4..64ca0589ec 100644 --- a/apps/web/src/app/settings/user-subscription.component.ts +++ b/apps/web/src/app/settings/user-subscription.component.ts @@ -1,12 +1,12 @@ import { Component, OnInit } from "@angular/core"; import { Router } from "@angular/router"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SubscriptionResponse } from "jslib-common/models/response/subscriptionResponse"; +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 { StateService } from "@bitwarden/common/abstractions/state.service"; +import { SubscriptionResponse } from "@bitwarden/common/models/response/subscriptionResponse"; @Component({ selector: "app-user-subscription", diff --git a/apps/web/src/app/settings/vault-timeout-input.component.ts b/apps/web/src/app/settings/vault-timeout-input.component.ts index 8eb308b4c0..75c3c9e9e0 100644 --- a/apps/web/src/app/settings/vault-timeout-input.component.ts +++ b/apps/web/src/app/settings/vault-timeout-input.component.ts @@ -1,7 +1,7 @@ import { Component } from "@angular/core"; import { NG_VALIDATORS, NG_VALUE_ACCESSOR } from "@angular/forms"; -import { VaultTimeoutInputComponent as VaultTimeoutInputComponentBase } from "jslib-angular/components/settings/vault-timeout-input.component"; +import { VaultTimeoutInputComponent as VaultTimeoutInputComponentBase } from "@bitwarden/angular/components/settings/vault-timeout-input.component"; @Component({ selector: "app-vault-timeout-input", diff --git a/apps/web/src/app/settings/verify-email.component.ts b/apps/web/src/app/settings/verify-email.component.ts index 0927c8216a..bd59441689 100644 --- a/apps/web/src/app/settings/verify-email.component.ts +++ b/apps/web/src/app/settings/verify-email.component.ts @@ -1,9 +1,9 @@ import { Component } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +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"; @Component({ selector: "app-verify-email", diff --git a/apps/web/src/app/tools/export.component.ts b/apps/web/src/app/tools/export.component.ts index a35a022249..d5e6aadccb 100644 --- a/apps/web/src/app/tools/export.component.ts +++ b/apps/web/src/app/tools/export.component.ts @@ -1,15 +1,15 @@ import { Component } from "@angular/core"; import { FormBuilder } from "@angular/forms"; -import { ExportComponent as BaseExportComponent } from "jslib-angular/components/export.component"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { ExportService } from "jslib-common/abstractions/export.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { UserVerificationService } from "jslib-common/abstractions/userVerification.service"; +import { ExportComponent as BaseExportComponent } from "@bitwarden/angular/components/export.component"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { ExportService } from "@bitwarden/common/abstractions/export.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 { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service"; @Component({ selector: "app-export", diff --git a/apps/web/src/app/tools/generator.component.ts b/apps/web/src/app/tools/generator.component.ts index ad825ba599..48aaeb4d5f 100644 --- a/apps/web/src/app/tools/generator.component.ts +++ b/apps/web/src/app/tools/generator.component.ts @@ -1,14 +1,14 @@ import { Component, ViewChild, ViewContainerRef } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { GeneratorComponent as BaseGeneratorComponent } from "jslib-angular/components/generator.component"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { UsernameGenerationService } from "jslib-common/abstractions/usernameGeneration.service"; +import { GeneratorComponent as BaseGeneratorComponent } from "@bitwarden/angular/components/generator.component"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +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 { UsernameGenerationService } from "@bitwarden/common/abstractions/usernameGeneration.service"; import { PasswordGeneratorHistoryComponent } from "./password-generator-history.component"; diff --git a/apps/web/src/app/tools/import.component.ts b/apps/web/src/app/tools/import.component.ts index c274c29b23..540872daf9 100644 --- a/apps/web/src/app/tools/import.component.ts +++ b/apps/web/src/app/tools/import.component.ts @@ -3,13 +3,13 @@ import { Router } from "@angular/router"; import * as JSZip from "jszip"; import Swal, { SweetAlertIcon } from "sweetalert2"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { ImportService } from "jslib-common/abstractions/import.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { ImportOption, ImportType } from "jslib-common/enums/importOptions"; -import { PolicyType } from "jslib-common/enums/policyType"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { ImportService } from "@bitwarden/common/abstractions/import.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { ImportOption, ImportType } from "@bitwarden/common/enums/importOptions"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; @Component({ selector: "app-import", diff --git a/apps/web/src/app/tools/password-generator-history.component.ts b/apps/web/src/app/tools/password-generator-history.component.ts index d7f344365f..71c57932aa 100644 --- a/apps/web/src/app/tools/password-generator-history.component.ts +++ b/apps/web/src/app/tools/password-generator-history.component.ts @@ -1,9 +1,9 @@ import { Component } from "@angular/core"; -import { PasswordGeneratorHistoryComponent as BasePasswordGeneratorHistoryComponent } from "jslib-angular/components/password-generator-history.component"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { PasswordGeneratorHistoryComponent as BasePasswordGeneratorHistoryComponent } from "@bitwarden/angular/components/password-generator-history.component"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; @Component({ selector: "app-password-generator-history", diff --git a/apps/web/src/app/tools/tools.component.ts b/apps/web/src/app/tools/tools.component.ts index 7e2c776ec6..e77b935507 100644 --- a/apps/web/src/app/tools/tools.component.ts +++ b/apps/web/src/app/tools/tools.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from "@angular/core"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { StateService } from "jslib-common/abstractions/state.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; @Component({ selector: "app-tools", diff --git a/apps/web/src/app/vault/add-edit-custom-fields.component.ts b/apps/web/src/app/vault/add-edit-custom-fields.component.ts index 644e23f413..796e42592d 100644 --- a/apps/web/src/app/vault/add-edit-custom-fields.component.ts +++ b/apps/web/src/app/vault/add-edit-custom-fields.component.ts @@ -1,8 +1,8 @@ import { Component, Input } from "@angular/core"; -import { AddEditCustomFieldsComponent as BaseAddEditCustomFieldsComponent } from "jslib-angular/components/add-edit-custom-fields.component"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; +import { AddEditCustomFieldsComponent as BaseAddEditCustomFieldsComponent } from "@bitwarden/angular/components/add-edit-custom-fields.component"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; @Component({ selector: "app-vault-add-edit-custom-fields", diff --git a/apps/web/src/app/vault/add-edit.component.ts b/apps/web/src/app/vault/add-edit.component.ts index 6cd8182aa1..c5da24f891 100644 --- a/apps/web/src/app/vault/add-edit.component.ts +++ b/apps/web/src/app/vault/add-edit.component.ts @@ -1,24 +1,24 @@ import { Component } from "@angular/core"; -import { AddEditComponent as BaseAddEditComponent } from "jslib-angular/components/add-edit.component"; -import { AuditService } from "jslib-common/abstractions/audit.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { TotpService } from "jslib-common/abstractions/totp.service"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { EventType } from "jslib-common/enums/eventType"; -import { LoginUriView } from "jslib-common/models/view/loginUriView"; +import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/components/add-edit.component"; +import { AuditService } from "@bitwarden/common/abstractions/audit.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { FolderService } from "@bitwarden/common/abstractions/folder.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { TotpService } from "@bitwarden/common/abstractions/totp.service"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { EventType } from "@bitwarden/common/enums/eventType"; +import { LoginUriView } from "@bitwarden/common/models/view/loginUriView"; @Component({ selector: "app-vault-add-edit", diff --git a/apps/web/src/app/vault/attachments.component.ts b/apps/web/src/app/vault/attachments.component.ts index fef3875fee..fdf2d9f70e 100644 --- a/apps/web/src/app/vault/attachments.component.ts +++ b/apps/web/src/app/vault/attachments.component.ts @@ -1,14 +1,14 @@ import { Component } from "@angular/core"; -import { AttachmentsComponent as BaseAttachmentsComponent } from "jslib-angular/components/attachments.component"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { AttachmentView } from "jslib-common/models/view/attachmentView"; +import { AttachmentsComponent as BaseAttachmentsComponent } from "@bitwarden/angular/components/attachments.component"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.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 { StateService } from "@bitwarden/common/abstractions/state.service"; +import { AttachmentView } from "@bitwarden/common/models/view/attachmentView"; @Component({ selector: "app-vault-attachments", diff --git a/apps/web/src/app/vault/bulk-actions.component.ts b/apps/web/src/app/vault/bulk-actions.component.ts index 29bf474087..3b1fff1c3d 100644 --- a/apps/web/src/app/vault/bulk-actions.component.ts +++ b/apps/web/src/app/vault/bulk-actions.component.ts @@ -1,11 +1,11 @@ import { Component, Input, ViewChild, ViewContainerRef } from "@angular/core"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { CipherRepromptType } from "jslib-common/enums/cipherRepromptType"; -import { Organization } from "jslib-common/models/domain/organization"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; +import { Organization } from "@bitwarden/common/models/domain/organization"; import { BulkDeleteComponent } from "./bulk-delete.component"; import { BulkMoveComponent } from "./bulk-move.component"; diff --git a/apps/web/src/app/vault/bulk-delete.component.ts b/apps/web/src/app/vault/bulk-delete.component.ts index 04e86c5ce6..d7ba762c42 100644 --- a/apps/web/src/app/vault/bulk-delete.component.ts +++ b/apps/web/src/app/vault/bulk-delete.component.ts @@ -1,11 +1,11 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { Organization } from "jslib-common/models/domain/organization"; -import { CipherBulkDeleteRequest } from "jslib-common/models/request/cipherBulkDeleteRequest"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { CipherBulkDeleteRequest } from "@bitwarden/common/models/request/cipherBulkDeleteRequest"; @Component({ selector: "app-vault-bulk-delete", diff --git a/apps/web/src/app/vault/bulk-move.component.ts b/apps/web/src/app/vault/bulk-move.component.ts index d7da60a4dd..3dd906e583 100644 --- a/apps/web/src/app/vault/bulk-move.component.ts +++ b/apps/web/src/app/vault/bulk-move.component.ts @@ -1,10 +1,10 @@ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { FolderView } from "jslib-common/models/view/folderView"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { FolderService } from "@bitwarden/common/abstractions/folder.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { FolderView } from "@bitwarden/common/models/view/folderView"; @Component({ selector: "app-vault-bulk-move", diff --git a/apps/web/src/app/vault/bulk-restore.component.ts b/apps/web/src/app/vault/bulk-restore.component.ts index 61bc0e165e..b48fb019c9 100644 --- a/apps/web/src/app/vault/bulk-restore.component.ts +++ b/apps/web/src/app/vault/bulk-restore.component.ts @@ -1,8 +1,8 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; @Component({ selector: "app-vault-bulk-restore", diff --git a/apps/web/src/app/vault/bulk-share.component.ts b/apps/web/src/app/vault/bulk-share.component.ts index e2cf361f12..eccdf027b2 100644 --- a/apps/web/src/app/vault/bulk-share.component.ts +++ b/apps/web/src/app/vault/bulk-share.component.ts @@ -1,14 +1,14 @@ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { Organization } from "jslib-common/models/domain/organization"; -import { CipherView } from "jslib-common/models/view/cipherView"; -import { CollectionView } from "jslib-common/models/view/collectionView"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CollectionView } from "@bitwarden/common/models/view/collectionView"; @Component({ selector: "app-vault-bulk-share", diff --git a/apps/web/src/app/vault/ciphers.component.ts b/apps/web/src/app/vault/ciphers.component.ts index 3f1dc3e059..0ccb487ac7 100644 --- a/apps/web/src/app/vault/ciphers.component.ts +++ b/apps/web/src/app/vault/ciphers.component.ts @@ -1,22 +1,22 @@ import { Component, EventEmitter, Input, OnDestroy, Output } from "@angular/core"; -import { CiphersComponent as BaseCiphersComponent } from "jslib-angular/components/ciphers.component"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { SearchService } from "jslib-common/abstractions/search.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { TokenService } from "jslib-common/abstractions/token.service"; -import { TotpService } from "jslib-common/abstractions/totp.service"; -import { CipherRepromptType } from "jslib-common/enums/cipherRepromptType"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { EventType } from "jslib-common/enums/eventType"; -import { Organization } from "jslib-common/models/domain/organization"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { CiphersComponent as BaseCiphersComponent } from "@bitwarden/angular/components/ciphers.component"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; +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 { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { EventType } from "@bitwarden/common/enums/eventType"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; const MaxCheckedCount = 500; diff --git a/apps/web/src/app/vault/collections.component.ts b/apps/web/src/app/vault/collections.component.ts index 17dc207d33..3dc712c09e 100644 --- a/apps/web/src/app/vault/collections.component.ts +++ b/apps/web/src/app/vault/collections.component.ts @@ -1,12 +1,12 @@ import { Component, OnDestroy } from "@angular/core"; -import { CollectionsComponent as BaseCollectionsComponent } from "jslib-angular/components/collections.component"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { CollectionView } from "jslib-common/models/view/collectionView"; +import { CollectionsComponent as BaseCollectionsComponent } from "@bitwarden/angular/components/collections.component"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.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 { CollectionView } from "@bitwarden/common/models/view/collectionView"; @Component({ selector: "app-vault-collections", diff --git a/apps/web/src/app/vault/folder-add-edit.component.ts b/apps/web/src/app/vault/folder-add-edit.component.ts index a65f3f0226..9c7369ac87 100644 --- a/apps/web/src/app/vault/folder-add-edit.component.ts +++ b/apps/web/src/app/vault/folder-add-edit.component.ts @@ -1,10 +1,10 @@ import { Component } from "@angular/core"; -import { FolderAddEditComponent as BaseFolderAddEditComponent } from "jslib-angular/components/folder-add-edit.component"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { FolderAddEditComponent as BaseFolderAddEditComponent } from "@bitwarden/angular/components/folder-add-edit.component"; +import { FolderService } from "@bitwarden/common/abstractions/folder.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"; @Component({ selector: "app-folder-add-edit", diff --git a/apps/web/src/app/vault/share.component.ts b/apps/web/src/app/vault/share.component.ts index 719f0ac075..018e4a6f56 100644 --- a/apps/web/src/app/vault/share.component.ts +++ b/apps/web/src/app/vault/share.component.ts @@ -1,13 +1,13 @@ import { Component, OnDestroy } from "@angular/core"; -import { ShareComponent as BaseShareComponent } from "jslib-angular/components/share.component"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { CollectionView } from "jslib-common/models/view/collectionView"; +import { ShareComponent as BaseShareComponent } from "@bitwarden/angular/components/share.component"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { CollectionView } from "@bitwarden/common/models/view/collectionView"; @Component({ selector: "app-vault-share", diff --git a/apps/web/src/models/account.ts b/apps/web/src/models/account.ts index b45c40b1ad..8403e91547 100644 --- a/apps/web/src/models/account.ts +++ b/apps/web/src/models/account.ts @@ -1,7 +1,7 @@ import { Account as BaseAccount, AccountSettings as BaseAccountSettings, -} from "jslib-common/models/domain/account"; +} from "@bitwarden/common/models/domain/account"; export class AccountSettings extends BaseAccountSettings { vaultTimeout: number = process.env.NODE_ENV === "development" ? null : 15; diff --git a/apps/web/src/models/globalState.ts b/apps/web/src/models/globalState.ts index 3937690209..15fc03876f 100644 --- a/apps/web/src/models/globalState.ts +++ b/apps/web/src/models/globalState.ts @@ -1,5 +1,5 @@ -import { ThemeType } from "jslib-common/enums/themeType"; -import { GlobalState as BaseGlobalState } from "jslib-common/models/domain/globalState"; +import { ThemeType } from "@bitwarden/common/enums/themeType"; +import { GlobalState as BaseGlobalState } from "@bitwarden/common/models/domain/globalState"; export class GlobalState extends BaseGlobalState { theme?: ThemeType = ThemeType.Light; diff --git a/apps/web/src/scss/styles.scss b/apps/web/src/scss/styles.scss index 9b5c9e9060..d218ee1d76 100644 --- a/apps/web/src/scss/styles.scss +++ b/apps/web/src/scss/styles.scss @@ -1,6 +1,3 @@ -$icomoon-font-path: "../../../../libs/angular/src/scss/bwicons/fonts/"; -$card-icons-base: "../../../../libs/angular/src/images/cards/"; - @import "../../../../libs/angular/src/scss/webfonts.css"; @import "./variables"; @import "../../../../libs/angular/src/scss/bwicons/styles/style.scss"; diff --git a/apps/web/src/services/broadcasterMessaging.service.ts b/apps/web/src/services/broadcasterMessaging.service.ts index 8ba3e7f1ba..47745a9e44 100644 --- a/apps/web/src/services/broadcasterMessaging.service.ts +++ b/apps/web/src/services/broadcasterMessaging.service.ts @@ -1,7 +1,7 @@ import { Injectable } from "@angular/core"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; +import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; @Injectable() export class BroadcasterMessagingService implements MessagingService { diff --git a/apps/web/src/services/htmlStorage.service.ts b/apps/web/src/services/htmlStorage.service.ts index b706d5277d..2b3614d210 100644 --- a/apps/web/src/services/htmlStorage.service.ts +++ b/apps/web/src/services/htmlStorage.service.ts @@ -1,8 +1,8 @@ import { Injectable } from "@angular/core"; -import { StorageService } from "jslib-common/abstractions/storage.service"; -import { HtmlStorageLocation } from "jslib-common/enums/htmlStorageLocation"; -import { StorageOptions } from "jslib-common/models/domain/storageOptions"; +import { StorageService } from "@bitwarden/common/abstractions/storage.service"; +import { HtmlStorageLocation } from "@bitwarden/common/enums/htmlStorageLocation"; +import { StorageOptions } from "@bitwarden/common/models/domain/storageOptions"; @Injectable() export class HtmlStorageService implements StorageService { diff --git a/apps/web/src/services/i18n.service.ts b/apps/web/src/services/i18n.service.ts index 0b0b526a7d..5d6d40191b 100644 --- a/apps/web/src/services/i18n.service.ts +++ b/apps/web/src/services/i18n.service.ts @@ -1,4 +1,4 @@ -import { I18nService as BaseI18nService } from "jslib-common/services/i18n.service"; +import { I18nService as BaseI18nService } from "@bitwarden/common/services/i18n.service"; export class I18nService extends BaseI18nService { constructor(systemLanguage: string, localesDirectory: string) { diff --git a/apps/web/src/services/memoryStorage.service.ts b/apps/web/src/services/memoryStorage.service.ts index 5560f883de..764d40a613 100644 --- a/apps/web/src/services/memoryStorage.service.ts +++ b/apps/web/src/services/memoryStorage.service.ts @@ -1,4 +1,4 @@ -import { StorageService } from "jslib-common/abstractions/storage.service"; +import { StorageService } from "@bitwarden/common/abstractions/storage.service"; export class MemoryStorageService implements StorageService { private store = new Map(); diff --git a/apps/web/src/services/passwordReprompt.service.ts b/apps/web/src/services/passwordReprompt.service.ts index ad13a4d003..fc0ed81585 100644 --- a/apps/web/src/services/passwordReprompt.service.ts +++ b/apps/web/src/services/passwordReprompt.service.ts @@ -1,6 +1,6 @@ import { Injectable } from "@angular/core"; -import { PasswordRepromptService as BasePasswordRepromptService } from "jslib-angular/services/passwordReprompt.service"; +import { PasswordRepromptService as BasePasswordRepromptService } from "@bitwarden/angular/services/passwordReprompt.service"; import { PasswordRepromptComponent } from "../app/components/password-reprompt.component"; diff --git a/apps/web/src/services/state.service.ts b/apps/web/src/services/state.service.ts index 9328a4fd8b..ef2a29a46a 100644 --- a/apps/web/src/services/state.service.ts +++ b/apps/web/src/services/state.service.ts @@ -1,9 +1,9 @@ -import { CipherData } from "jslib-common/models/data/cipherData"; -import { CollectionData } from "jslib-common/models/data/collectionData"; -import { FolderData } from "jslib-common/models/data/folderData"; -import { SendData } from "jslib-common/models/data/sendData"; -import { StorageOptions } from "jslib-common/models/domain/storageOptions"; -import { StateService as BaseStateService } from "jslib-common/services/state.service"; +import { CipherData } from "@bitwarden/common/models/data/cipherData"; +import { CollectionData } from "@bitwarden/common/models/data/collectionData"; +import { FolderData } from "@bitwarden/common/models/data/folderData"; +import { SendData } from "@bitwarden/common/models/data/sendData"; +import { StorageOptions } from "@bitwarden/common/models/domain/storageOptions"; +import { StateService as BaseStateService } from "@bitwarden/common/services/state.service"; import { StateService as StateServiceAbstraction } from "../abstractions/state.service"; import { Account } from "../models/account"; diff --git a/apps/web/src/services/stateMigration.service.ts b/apps/web/src/services/stateMigration.service.ts index 86b2169307..3b9a322a88 100644 --- a/apps/web/src/services/stateMigration.service.ts +++ b/apps/web/src/services/stateMigration.service.ts @@ -1,4 +1,4 @@ -import { StateMigrationService as BaseStateMigrationService } from "jslib-common/services/stateMigration.service"; +import { StateMigrationService as BaseStateMigrationService } from "@bitwarden/common/services/stateMigration.service"; import { Account } from "../models/account"; import { GlobalState } from "../models/globalState"; diff --git a/apps/web/src/services/webPlatformUtils.service.ts b/apps/web/src/services/webPlatformUtils.service.ts index 755600a15a..07f424b676 100644 --- a/apps/web/src/services/webPlatformUtils.service.ts +++ b/apps/web/src/services/webPlatformUtils.service.ts @@ -1,14 +1,14 @@ import { Injectable } from "@angular/core"; import Swal, { SweetAlertIcon } from "sweetalert2"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { ClientType } from "jslib-common/enums/clientType"; -import { DeviceType } from "jslib-common/enums/deviceType"; -import { ThemeType } from "jslib-common/enums/themeType"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.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 { ClientType } from "@bitwarden/common/enums/clientType"; +import { DeviceType } from "@bitwarden/common/enums/deviceType"; +import { ThemeType } from "@bitwarden/common/enums/themeType"; @Injectable() export class WebPlatformUtilsService implements PlatformUtilsService { diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json index de14b95f30..3fdb5bcf0d 100644 --- a/apps/web/tsconfig.json +++ b/apps/web/tsconfig.json @@ -4,10 +4,10 @@ "baseUrl": ".", "paths": { "tldjs": ["../../libs/common/src/misc/tldjs.noop"], - "jslib-common/*": ["../../libs/common/src/*"], - "jslib-angular/*": ["../../libs/angular/src/*"], - "@bitwarden/components": ["../../libs/components/src"], - "src/*": ["src/*"] + "src/*": ["src/*"], + "@bitwarden/common/*": ["../../libs/common/src/*"], + "@bitwarden/angular/*": ["../../libs/angular/src/*"], + "@bitwarden/components": ["../../libs/components/src"] } }, "angularCompilerOptions": { diff --git a/bitwarden_license/bit-web/src/app/app.module.ts b/bitwarden_license/bit-web/src/app/app.module.ts index b137491b7d..1d15a71cef 100644 --- a/bitwarden_license/bit-web/src/app/app.module.ts +++ b/bitwarden_license/bit-web/src/app/app.module.ts @@ -6,7 +6,7 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { RouterModule } from "@angular/router"; import { InfiniteScrollModule } from "ngx-infinite-scroll"; -import { JslibModule } from "jslib-angular/jslib.module"; +import { JslibModule } from "@bitwarden/angular/jslib.module"; import { OssRoutingModule } from "src/app/oss-routing.module"; import { OssModule } from "src/app/oss.module"; diff --git a/bitwarden_license/bit-web/src/app/organizations/components/base-cva.component.ts b/bitwarden_license/bit-web/src/app/organizations/components/base-cva.component.ts index 409090ddc4..c4120528cc 100644 --- a/bitwarden_license/bit-web/src/app/organizations/components/base-cva.component.ts +++ b/bitwarden_license/bit-web/src/app/organizations/components/base-cva.component.ts @@ -1,7 +1,7 @@ import { Directive, Input, OnInit, Self } from "@angular/core"; import { ControlValueAccessor, FormControl, NgControl, Validators } from "@angular/forms"; -import { dirtyRequired } from "jslib-angular/validators/dirty.validator"; +import { dirtyRequired } from "@bitwarden/angular/validators/dirty.validator"; /** For use in the SSO Config Form only - will be deprecated by the Component Library */ @Directive() diff --git a/bitwarden_license/bit-web/src/app/organizations/components/input-text-readonly.component.ts b/bitwarden_license/bit-web/src/app/organizations/components/input-text-readonly.component.ts index a7618ac8e2..4b9a675b08 100644 --- a/bitwarden_license/bit-web/src/app/organizations/components/input-text-readonly.component.ts +++ b/bitwarden_license/bit-web/src/app/organizations/components/input-text-readonly.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from "@angular/core"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; /** For use in the SSO Config Form only - will be deprecated by the Component Library */ @Component({ diff --git a/bitwarden_license/bit-web/src/app/organizations/components/select.component.ts b/bitwarden_license/bit-web/src/app/organizations/components/select.component.ts index 0045032865..5c2ab30867 100644 --- a/bitwarden_license/bit-web/src/app/organizations/components/select.component.ts +++ b/bitwarden_license/bit-web/src/app/organizations/components/select.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from "@angular/core"; -import { SelectOptions } from "jslib-angular/interfaces/selectOptions"; +import { SelectOptions } from "@bitwarden/angular/interfaces/selectOptions"; import { BaseCvaComponent } from "./base-cva.component"; diff --git a/bitwarden_license/bit-web/src/app/organizations/manage/sso.component.ts b/bitwarden_license/bit-web/src/app/organizations/manage/sso.component.ts index 8dc074a701..63d1c7d015 100644 --- a/bitwarden_license/bit-web/src/app/organizations/manage/sso.component.ts +++ b/bitwarden_license/bit-web/src/app/organizations/manage/sso.component.ts @@ -2,25 +2,25 @@ import { Component, OnInit } from "@angular/core"; import { AbstractControl, FormBuilder, FormGroup } from "@angular/forms"; import { ActivatedRoute } from "@angular/router"; -import { SelectOptions } from "jslib-angular/interfaces/selectOptions"; -import { dirtyRequired } from "jslib-angular/validators/dirty.validator"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { SelectOptions } from "@bitwarden/angular/interfaces/selectOptions"; +import { dirtyRequired } from "@bitwarden/angular/validators/dirty.validator"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { OpenIdConnectRedirectBehavior, Saml2BindingType, Saml2NameIdFormat, Saml2SigningBehavior, SsoType, -} from "jslib-common/enums/ssoEnums"; -import { Utils } from "jslib-common/misc/utils"; -import { SsoConfigApi } from "jslib-common/models/api/ssoConfigApi"; -import { Organization } from "jslib-common/models/domain/organization"; -import { OrganizationSsoRequest } from "jslib-common/models/request/organization/organizationSsoRequest"; -import { OrganizationSsoResponse } from "jslib-common/models/response/organization/organizationSsoResponse"; -import { SsoConfigView } from "jslib-common/models/view/ssoConfigView"; +} from "@bitwarden/common/enums/ssoEnums"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { SsoConfigApi } from "@bitwarden/common/models/api/ssoConfigApi"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { OrganizationSsoRequest } from "@bitwarden/common/models/request/organization/organizationSsoRequest"; +import { OrganizationSsoResponse } from "@bitwarden/common/models/response/organization/organizationSsoResponse"; +import { SsoConfigView } from "@bitwarden/common/models/view/ssoConfigView"; const defaultSigningAlgorithm = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"; 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 691feda30c..0052f0d67b 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,8 +1,8 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; -import { AuthGuard } from "jslib-angular/guards/auth.guard"; -import { Permissions } from "jslib-common/enums/permissions"; +import { AuthGuard } from "@bitwarden/angular/guards/auth.guard"; +import { Permissions } from "@bitwarden/common/enums/permissions"; import { PermissionsGuard } from "src/app/organizations/guards/permissions.guard"; import { OrganizationLayoutComponent } from "src/app/organizations/layouts/organization-layout.component"; 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 f67a9b7ef5..0833e2ef9d 100644 --- a/bitwarden_license/bit-web/src/app/organizations/organizations.module.ts +++ b/bitwarden_license/bit-web/src/app/organizations/organizations.module.ts @@ -2,7 +2,7 @@ import { CommonModule } from "@angular/common"; import { NgModule } from "@angular/core"; import { FormsModule, ReactiveFormsModule } from "@angular/forms"; -import { JslibModule } from "jslib-angular/jslib.module"; +import { JslibModule } from "@bitwarden/angular/jslib.module"; import { InputCheckboxComponent } from "./components/input-checkbox.component"; import { InputTextReadOnlyComponent } from "./components/input-text-readonly.component"; diff --git a/bitwarden_license/bit-web/src/app/policies/disable-personal-vault-export.component.ts b/bitwarden_license/bit-web/src/app/policies/disable-personal-vault-export.component.ts index 617499c84b..1633655743 100644 --- a/bitwarden_license/bit-web/src/app/policies/disable-personal-vault-export.component.ts +++ b/bitwarden_license/bit-web/src/app/policies/disable-personal-vault-export.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { PolicyType } from "jslib-common/enums/policyType"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; import { BasePolicy, diff --git a/bitwarden_license/bit-web/src/app/policies/maximum-vault-timeout.component.ts b/bitwarden_license/bit-web/src/app/policies/maximum-vault-timeout.component.ts index e31097dcd3..56e467a0d7 100644 --- a/bitwarden_license/bit-web/src/app/policies/maximum-vault-timeout.component.ts +++ b/bitwarden_license/bit-web/src/app/policies/maximum-vault-timeout.component.ts @@ -1,9 +1,9 @@ import { Component } from "@angular/core"; import { FormBuilder } from "@angular/forms"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PolicyType } from "jslib-common/enums/policyType"; -import { PolicyRequest } from "jslib-common/models/request/policyRequest"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { PolicyRequest } from "@bitwarden/common/models/request/policyRequest"; import { BasePolicy, diff --git a/bitwarden_license/bit-web/src/app/providers/clients/add-organization.component.ts b/bitwarden_license/bit-web/src/app/providers/clients/add-organization.component.ts index ef678a838e..8544acc405 100644 --- a/bitwarden_license/bit-web/src/app/providers/clients/add-organization.component.ts +++ b/bitwarden_license/bit-web/src/app/providers/clients/add-organization.component.ts @@ -1,11 +1,11 @@ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { ValidationService } from "jslib-angular/services/validation.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { ProviderService } from "jslib-common/abstractions/provider.service"; -import { Organization } from "jslib-common/models/domain/organization"; -import { Provider } from "jslib-common/models/domain/provider"; +import { ValidationService } from "@bitwarden/angular/services/validation.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { Provider } from "@bitwarden/common/models/domain/provider"; import { WebProviderService } from "../services/webProvider.service"; diff --git a/bitwarden_license/bit-web/src/app/providers/clients/clients.component.ts b/bitwarden_license/bit-web/src/app/providers/clients/clients.component.ts index c78bac24e4..68f6f6bcc7 100644 --- a/bitwarden_license/bit-web/src/app/providers/clients/clients.component.ts +++ b/bitwarden_license/bit-web/src/app/providers/clients/clients.component.ts @@ -2,19 +2,19 @@ import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { first } from "rxjs/operators"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { ValidationService } from "jslib-angular/services/validation.service"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { ProviderService } from "jslib-common/abstractions/provider.service"; -import { SearchService } from "jslib-common/abstractions/search.service"; -import { PlanType } from "jslib-common/enums/planType"; -import { ProviderUserType } from "jslib-common/enums/providerUserType"; -import { Organization } from "jslib-common/models/domain/organization"; -import { ProviderOrganizationOrganizationDetailsResponse } from "jslib-common/models/response/provider/providerOrganizationResponse"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { ValidationService } from "@bitwarden/angular/services/validation.service"; +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 { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; +import { SearchService } from "@bitwarden/common/abstractions/search.service"; +import { PlanType } from "@bitwarden/common/enums/planType"; +import { ProviderUserType } from "@bitwarden/common/enums/providerUserType"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { ProviderOrganizationOrganizationDetailsResponse } from "@bitwarden/common/models/response/provider/providerOrganizationResponse"; import { WebProviderService } from "../services/webProvider.service"; diff --git a/bitwarden_license/bit-web/src/app/providers/guards/provider-type.guard.ts b/bitwarden_license/bit-web/src/app/providers/guards/provider-type.guard.ts index 107fd04494..730573b946 100644 --- a/bitwarden_license/bit-web/src/app/providers/guards/provider-type.guard.ts +++ b/bitwarden_license/bit-web/src/app/providers/guards/provider-type.guard.ts @@ -1,8 +1,8 @@ import { Injectable } from "@angular/core"; import { ActivatedRouteSnapshot, CanActivate, Router } from "@angular/router"; -import { ProviderService } from "jslib-common/abstractions/provider.service"; -import { Permissions } from "jslib-common/enums/permissions"; +import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; +import { Permissions } from "@bitwarden/common/enums/permissions"; @Injectable() export class PermissionsGuard implements CanActivate { diff --git a/bitwarden_license/bit-web/src/app/providers/guards/provider.guard.ts b/bitwarden_license/bit-web/src/app/providers/guards/provider.guard.ts index 444d65fda6..ece28a9cb0 100644 --- a/bitwarden_license/bit-web/src/app/providers/guards/provider.guard.ts +++ b/bitwarden_license/bit-web/src/app/providers/guards/provider.guard.ts @@ -1,9 +1,9 @@ import { Injectable } from "@angular/core"; import { ActivatedRouteSnapshot, CanActivate, Router } from "@angular/router"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { ProviderService } from "jslib-common/abstractions/provider.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; @Injectable() export class ProviderGuard implements CanActivate { diff --git a/bitwarden_license/bit-web/src/app/providers/manage/accept-provider.component.ts b/bitwarden_license/bit-web/src/app/providers/manage/accept-provider.component.ts index 4266f93c8a..148995134c 100644 --- a/bitwarden_license/bit-web/src/app/providers/manage/accept-provider.component.ts +++ b/bitwarden_license/bit-web/src/app/providers/manage/accept-provider.component.ts @@ -1,11 +1,11 @@ import { Component } from "@angular/core"; import { ActivatedRoute, Params, Router } from "@angular/router"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { ProviderUserAcceptRequest } from "jslib-common/models/request/provider/providerUserAcceptRequest"; +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 { ProviderUserAcceptRequest } from "@bitwarden/common/models/request/provider/providerUserAcceptRequest"; import { BaseAcceptComponent } from "src/app/common/base.accept.component"; diff --git a/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-confirm.component.ts b/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-confirm.component.ts index 656793f22d..f2ab04b9cd 100644 --- a/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-confirm.component.ts +++ b/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-confirm.component.ts @@ -1,8 +1,8 @@ import { Component, Input } from "@angular/core"; -import { ProviderUserStatusType } from "jslib-common/enums/providerUserStatusType"; -import { ProviderUserBulkConfirmRequest } from "jslib-common/models/request/provider/providerUserBulkConfirmRequest"; -import { ProviderUserBulkRequest } from "jslib-common/models/request/provider/providerUserBulkRequest"; +import { ProviderUserStatusType } from "@bitwarden/common/enums/providerUserStatusType"; +import { ProviderUserBulkConfirmRequest } from "@bitwarden/common/models/request/provider/providerUserBulkConfirmRequest"; +import { ProviderUserBulkRequest } from "@bitwarden/common/models/request/provider/providerUserBulkRequest"; import { BulkConfirmComponent as OrganizationBulkConfirmComponent } from "src/app/organizations/manage/bulk/bulk-confirm.component"; import { BulkUserDetails } from "src/app/organizations/manage/bulk/bulk-status.component"; diff --git a/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-remove.component.ts b/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-remove.component.ts index b910f8f76c..bf2bb61118 100644 --- a/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-remove.component.ts +++ b/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-remove.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from "@angular/core"; -import { ProviderUserBulkRequest } from "jslib-common/models/request/provider/providerUserBulkRequest"; +import { ProviderUserBulkRequest } from "@bitwarden/common/models/request/provider/providerUserBulkRequest"; import { BulkRemoveComponent as OrganizationBulkRemoveComponent } from "src/app/organizations/manage/bulk/bulk-remove.component"; diff --git a/bitwarden_license/bit-web/src/app/providers/manage/events.component.ts b/bitwarden_license/bit-web/src/app/providers/manage/events.component.ts index 791cdd1e68..b2a281f228 100644 --- a/bitwarden_license/bit-web/src/app/providers/manage/events.component.ts +++ b/bitwarden_license/bit-web/src/app/providers/manage/events.component.ts @@ -1,14 +1,14 @@ import { Component, OnInit } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; -import { UserNamePipe } from "jslib-angular/pipes/user-name.pipe"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { ExportService } from "jslib-common/abstractions/export.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { ProviderService } from "jslib-common/abstractions/provider.service"; -import { EventResponse } from "jslib-common/models/response/eventResponse"; +import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { ExportService } from "@bitwarden/common/abstractions/export.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 { ProviderService } from "@bitwarden/common/abstractions/provider.service"; +import { EventResponse } from "@bitwarden/common/models/response/eventResponse"; import { BaseEventsComponent } from "src/app/common/base.events.component"; import { EventService } from "src/app/services/event.service"; diff --git a/bitwarden_license/bit-web/src/app/providers/manage/manage.component.ts b/bitwarden_license/bit-web/src/app/providers/manage/manage.component.ts index 2ddc19c3b7..84173e6386 100644 --- a/bitwarden_license/bit-web/src/app/providers/manage/manage.component.ts +++ b/bitwarden_license/bit-web/src/app/providers/manage/manage.component.ts @@ -1,8 +1,8 @@ import { Component, OnInit } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { ProviderService } from "jslib-common/abstractions/provider.service"; -import { Provider } from "jslib-common/models/domain/provider"; +import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; +import { Provider } from "@bitwarden/common/models/domain/provider"; @Component({ selector: "provider-manage", diff --git a/bitwarden_license/bit-web/src/app/providers/manage/people.component.ts b/bitwarden_license/bit-web/src/app/providers/manage/people.component.ts index 9cc615b87e..be9dd6b515 100644 --- a/bitwarden_license/bit-web/src/app/providers/manage/people.component.ts +++ b/bitwarden_license/bit-web/src/app/providers/manage/people.component.ts @@ -2,25 +2,25 @@ import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { SearchPipe } from "jslib-angular/pipes/search.pipe"; -import { UserNamePipe } from "jslib-angular/pipes/user-name.pipe"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { ValidationService } from "jslib-angular/services/validation.service"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { ProviderService } from "jslib-common/abstractions/provider.service"; -import { SearchService } from "jslib-common/abstractions/search.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { ProviderUserStatusType } from "jslib-common/enums/providerUserStatusType"; -import { ProviderUserType } from "jslib-common/enums/providerUserType"; -import { ProviderUserBulkRequest } from "jslib-common/models/request/provider/providerUserBulkRequest"; -import { ProviderUserConfirmRequest } from "jslib-common/models/request/provider/providerUserConfirmRequest"; -import { ListResponse } from "jslib-common/models/response/listResponse"; -import { ProviderUserBulkResponse } from "jslib-common/models/response/provider/providerUserBulkResponse"; -import { ProviderUserUserDetailsResponse } from "jslib-common/models/response/provider/providerUserResponse"; +import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe"; +import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { ValidationService } from "@bitwarden/angular/services/validation.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 { LogService } from "@bitwarden/common/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; +import { SearchService } from "@bitwarden/common/abstractions/search.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { ProviderUserStatusType } from "@bitwarden/common/enums/providerUserStatusType"; +import { ProviderUserType } from "@bitwarden/common/enums/providerUserType"; +import { ProviderUserBulkRequest } from "@bitwarden/common/models/request/provider/providerUserBulkRequest"; +import { ProviderUserConfirmRequest } from "@bitwarden/common/models/request/provider/providerUserConfirmRequest"; +import { ListResponse } from "@bitwarden/common/models/response/listResponse"; +import { ProviderUserBulkResponse } from "@bitwarden/common/models/response/provider/providerUserBulkResponse"; +import { ProviderUserUserDetailsResponse } from "@bitwarden/common/models/response/provider/providerUserResponse"; import { BasePeopleComponent } from "src/app/common/base.people.component"; import { BulkStatusComponent } from "src/app/organizations/manage/bulk/bulk-status.component"; diff --git a/bitwarden_license/bit-web/src/app/providers/manage/user-add-edit.component.ts b/bitwarden_license/bit-web/src/app/providers/manage/user-add-edit.component.ts index 48038472d8..c48d674237 100644 --- a/bitwarden_license/bit-web/src/app/providers/manage/user-add-edit.component.ts +++ b/bitwarden_license/bit-web/src/app/providers/manage/user-add-edit.component.ts @@ -1,13 +1,13 @@ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { ProviderUserType } from "jslib-common/enums/providerUserType"; -import { PermissionsApi } from "jslib-common/models/api/permissionsApi"; -import { ProviderUserInviteRequest } from "jslib-common/models/request/provider/providerUserInviteRequest"; -import { ProviderUserUpdateRequest } from "jslib-common/models/request/provider/providerUserUpdateRequest"; +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 { ProviderUserType } from "@bitwarden/common/enums/providerUserType"; +import { PermissionsApi } from "@bitwarden/common/models/api/permissionsApi"; +import { ProviderUserInviteRequest } from "@bitwarden/common/models/request/provider/providerUserInviteRequest"; +import { ProviderUserUpdateRequest } from "@bitwarden/common/models/request/provider/providerUserUpdateRequest"; @Component({ selector: "provider-user-add-edit", diff --git a/bitwarden_license/bit-web/src/app/providers/providers-layout.component.ts b/bitwarden_license/bit-web/src/app/providers/providers-layout.component.ts index e00a30b65b..09472e851e 100644 --- a/bitwarden_license/bit-web/src/app/providers/providers-layout.component.ts +++ b/bitwarden_license/bit-web/src/app/providers/providers-layout.component.ts @@ -1,8 +1,8 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { ProviderService } from "jslib-common/abstractions/provider.service"; -import { Provider } from "jslib-common/models/domain/provider"; +import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; +import { Provider } from "@bitwarden/common/models/domain/provider"; @Component({ selector: "providers-layout", 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 14cd7c4707..c521d9b537 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,8 +1,8 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; -import { AuthGuard } from "jslib-angular/guards/auth.guard"; -import { Permissions } from "jslib-common/enums/permissions"; +import { AuthGuard } from "@bitwarden/angular/guards/auth.guard"; +import { Permissions } from "@bitwarden/common/enums/permissions"; import { FrontendLayoutComponent } from "src/app/layouts/frontend-layout.component"; import { ProvidersComponent } from "src/app/providers/providers.component"; diff --git a/bitwarden_license/bit-web/src/app/providers/providers.module.ts b/bitwarden_license/bit-web/src/app/providers/providers.module.ts index 7880d78c9b..d7dc71300e 100644 --- a/bitwarden_license/bit-web/src/app/providers/providers.module.ts +++ b/bitwarden_license/bit-web/src/app/providers/providers.module.ts @@ -2,8 +2,8 @@ import { CommonModule } from "@angular/common"; import { ComponentFactoryResolver, NgModule } from "@angular/core"; import { FormsModule } from "@angular/forms"; -import { JslibModule } from "jslib-angular/jslib.module"; -import { ModalService } from "jslib-angular/services/modal.service"; +import { JslibModule } from "@bitwarden/angular/jslib.module"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; import { OssModule } from "src/app/oss.module"; diff --git a/bitwarden_license/bit-web/src/app/providers/services/webProvider.service.ts b/bitwarden_license/bit-web/src/app/providers/services/webProvider.service.ts index 2910229495..b6a7c07d28 100644 --- a/bitwarden_license/bit-web/src/app/providers/services/webProvider.service.ts +++ b/bitwarden_license/bit-web/src/app/providers/services/webProvider.service.ts @@ -1,9 +1,9 @@ import { Injectable } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { ProviderAddOrganizationRequest } from "jslib-common/models/request/provider/providerAddOrganizationRequest"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { ProviderAddOrganizationRequest } from "@bitwarden/common/models/request/provider/providerAddOrganizationRequest"; @Injectable() export class WebProviderService { diff --git a/bitwarden_license/bit-web/src/app/providers/settings/account.component.ts b/bitwarden_license/bit-web/src/app/providers/settings/account.component.ts index fc834d4b65..44214afb41 100644 --- a/bitwarden_license/bit-web/src/app/providers/settings/account.component.ts +++ b/bitwarden_license/bit-web/src/app/providers/settings/account.component.ts @@ -1,13 +1,13 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { ProviderUpdateRequest } from "jslib-common/models/request/provider/providerUpdateRequest"; -import { ProviderResponse } from "jslib-common/models/response/provider/providerResponse"; +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 { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { ProviderUpdateRequest } from "@bitwarden/common/models/request/provider/providerUpdateRequest"; +import { ProviderResponse } from "@bitwarden/common/models/response/provider/providerResponse"; @Component({ selector: "provider-account", diff --git a/bitwarden_license/bit-web/src/app/providers/settings/settings.component.ts b/bitwarden_license/bit-web/src/app/providers/settings/settings.component.ts index 860f02cf3a..ad416bd9c4 100644 --- a/bitwarden_license/bit-web/src/app/providers/settings/settings.component.ts +++ b/bitwarden_license/bit-web/src/app/providers/settings/settings.component.ts @@ -1,7 +1,7 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { ProviderService } from "jslib-common/abstractions/provider.service"; +import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; @Component({ selector: "provider-settings", diff --git a/bitwarden_license/bit-web/src/app/providers/setup/setup.component.ts b/bitwarden_license/bit-web/src/app/providers/setup/setup.component.ts index 14435be217..7bb71c7e02 100644 --- a/bitwarden_license/bit-web/src/app/providers/setup/setup.component.ts +++ b/bitwarden_license/bit-web/src/app/providers/setup/setup.component.ts @@ -2,13 +2,13 @@ import { Component, OnInit } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { ValidationService } from "jslib-angular/services/validation.service"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { ProviderSetupRequest } from "jslib-common/models/request/provider/providerSetupRequest"; +import { ValidationService } from "@bitwarden/angular/services/validation.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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { ProviderSetupRequest } from "@bitwarden/common/models/request/provider/providerSetupRequest"; @Component({ selector: "provider-setup", diff --git a/libs/jest.config.js b/jest.config.js similarity index 57% rename from libs/jest.config.js rename to jest.config.js index 75028ad26f..493e624271 100644 --- a/libs/jest.config.js +++ b/jest.config.js @@ -10,9 +10,12 @@ module.exports = { prefix: "/", }), projects: [ - "/angular/jest.config.js", - "/common/jest.config.js", - "/electron/jest.config.js", - "/node/jest.config.js", + "/apps/browser/jest.config.js", + "/apps/cli/jest.config.js", + + "/libs/angular/jest.config.js", + "/libs/common/jest.config.js", + "/libs/electron/jest.config.js", + "/libs/node/jest.config.js", ], }; diff --git a/libs/.gitignore b/libs/.gitignore deleted file mode 100644 index 20b786361b..0000000000 --- a/libs/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -.vs -.idea -node_modules -npm-debug.log -vwd.webinfo -*.crx -*.pem -dist -coverage diff --git a/libs/README.md b/libs/README.md deleted file mode 100644 index 0614a6cfbc..0000000000 --- a/libs/README.md +++ /dev/null @@ -1,42 +0,0 @@ -[![Github Workflow build on master](https://github.com/bitwarden/jslib/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/bitwarden/jslib/actions/workflows/build.yml?query=branch:master) - -# Bitwarden JavaScript Library - -Common code referenced across Bitwarden JavaScript projects. - -## Requirements - -- [Node.js](https://nodejs.org) v16.13.1 or greater -- NPM v8 -- Git -- node-gyp - -### Windows - -- _Microsoft Build Tools 2015_ in Visual Studio Installer -- [Windows 10 SDK 17134](https://developer.microsoft.com/en-us/windows/downloads/sdk-archive/) - either by downloading it seperately or through the Visual Studio Installer. - -## We're Hiring! - -Interested in contributing in a big way? Consider joining our team! We're hiring for many positions. Please take a look at our [Careers page](https://bitwarden.com/careers/) to see what opportunities are currently open as well as what it's like to work at Bitwarden. - -## Prettier - -We recently migrated to using Prettier as code formatter. All previous branches will need to updated to avoid large merge conflicts using the following steps: - -1. Check out your local Branch -2. Run `git merge 8b2dfc6cdcb8ff5b604364c2ea6d343473aee7cd` -3. Resolve any merge conflicts, commit. -4. Run `npm run prettier` -5. Commit -6. Run `git merge -Xours 193434461dbd9c48fe5dcbad95693470aec422ac` -7. Push - -### Git blame - -We also recommend that you configure git to ignore the prettier revision using: - -```bash -git config blame.ignoreRevsFile .git-blame-ignore-revs -``` diff --git a/libs/angular/jest.config.js b/libs/angular/jest.config.js index 0268a45054..8972604212 100644 --- a/libs/angular/jest.config.js +++ b/libs/angular/jest.config.js @@ -1,6 +1,6 @@ const { pathsToModuleNameMapper } = require("ts-jest"); -const { compilerOptions } = require("./tsconfig"); +const { compilerOptions } = require("../shared/tsconfig.libs"); module.exports = { name: "angular", diff --git a/libs/angular/package.json b/libs/angular/package.json index b0eefd7bcd..603826cb69 100644 --- a/libs/angular/package.json +++ b/libs/angular/package.json @@ -1,5 +1,5 @@ { - "name": "@bitwarden/jslib-angular", + "name": "@bitwarden/angular", "version": "0.0.0", "description": "Common code used across Bitwarden JavaScript projects.", "keywords": [ @@ -16,8 +16,5 @@ "clean": "rimraf dist/**/*", "build": "npm run clean && tsc", "build:watch": "npm run clean && tsc -watch" - }, - "dependencies": { - "@bitwarden/jslib-common": "file:../common" } } diff --git a/libs/angular/src/components/add-edit-custom-fields.component.ts b/libs/angular/src/components/add-edit-custom-fields.component.ts index e6dad6cde9..23615ed342 100644 --- a/libs/angular/src/components/add-edit-custom-fields.component.ts +++ b/libs/angular/src/components/add-edit-custom-fields.component.ts @@ -1,14 +1,14 @@ import { CdkDragDrop, moveItemInArray } from "@angular/cdk/drag-drop"; import { Directive, Input, OnChanges, SimpleChanges } from "@angular/core"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { EventType } from "jslib-common/enums/eventType"; -import { FieldType } from "jslib-common/enums/fieldType"; -import { Utils } from "jslib-common/misc/utils"; -import { CipherView } from "jslib-common/models/view/cipherView"; -import { FieldView } from "jslib-common/models/view/fieldView"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { EventType } from "@bitwarden/common/enums/eventType"; +import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { FieldView } from "@bitwarden/common/models/view/fieldView"; @Directive() export class AddEditCustomFieldsComponent implements OnChanges { diff --git a/libs/angular/src/components/add-edit.component.ts b/libs/angular/src/components/add-edit.component.ts index af57e70345..aa6ec4aee1 100644 --- a/libs/angular/src/components/add-edit.component.ts +++ b/libs/angular/src/components/add-edit.component.ts @@ -1,35 +1,35 @@ import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { AuditService } from "jslib-common/abstractions/audit.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { CipherRepromptType } from "jslib-common/enums/cipherRepromptType"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { EventType } from "jslib-common/enums/eventType"; -import { OrganizationUserStatusType } from "jslib-common/enums/organizationUserStatusType"; -import { PolicyType } from "jslib-common/enums/policyType"; -import { SecureNoteType } from "jslib-common/enums/secureNoteType"; -import { UriMatchType } from "jslib-common/enums/uriMatchType"; -import { Utils } from "jslib-common/misc/utils"; -import { Cipher } from "jslib-common/models/domain/cipher"; -import { CardView } from "jslib-common/models/view/cardView"; -import { CipherView } from "jslib-common/models/view/cipherView"; -import { CollectionView } from "jslib-common/models/view/collectionView"; -import { FolderView } from "jslib-common/models/view/folderView"; -import { IdentityView } from "jslib-common/models/view/identityView"; -import { LoginUriView } from "jslib-common/models/view/loginUriView"; -import { LoginView } from "jslib-common/models/view/loginView"; -import { SecureNoteView } from "jslib-common/models/view/secureNoteView"; +import { AuditService } from "@bitwarden/common/abstractions/audit.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { FolderService } from "@bitwarden/common/abstractions/folder.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { EventType } from "@bitwarden/common/enums/eventType"; +import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { UriMatchType } from "@bitwarden/common/enums/uriMatchType"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { Cipher } from "@bitwarden/common/models/domain/cipher"; +import { CardView } from "@bitwarden/common/models/view/cardView"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CollectionView } from "@bitwarden/common/models/view/collectionView"; +import { FolderView } from "@bitwarden/common/models/view/folderView"; +import { IdentityView } from "@bitwarden/common/models/view/identityView"; +import { LoginUriView } from "@bitwarden/common/models/view/loginUriView"; +import { LoginView } from "@bitwarden/common/models/view/loginView"; +import { SecureNoteView } from "@bitwarden/common/models/view/secureNoteView"; @Directive() export class AddEditComponent implements OnInit { diff --git a/libs/angular/src/components/attachments.component.ts b/libs/angular/src/components/attachments.component.ts index ff76f6abd4..9f684b66ac 100644 --- a/libs/angular/src/components/attachments.component.ts +++ b/libs/angular/src/components/attachments.component.ts @@ -1,16 +1,16 @@ import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { Cipher } from "jslib-common/models/domain/cipher"; -import { ErrorResponse } from "jslib-common/models/response/errorResponse"; -import { AttachmentView } from "jslib-common/models/view/attachmentView"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.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 { StateService } from "@bitwarden/common/abstractions/state.service"; +import { Cipher } from "@bitwarden/common/models/domain/cipher"; +import { ErrorResponse } from "@bitwarden/common/models/response/errorResponse"; +import { AttachmentView } from "@bitwarden/common/models/view/attachmentView"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; @Directive() export class AttachmentsComponent implements OnInit { diff --git a/libs/angular/src/components/avatar.component.ts b/libs/angular/src/components/avatar.component.ts index bc029ea461..740a66a5e2 100644 --- a/libs/angular/src/components/avatar.component.ts +++ b/libs/angular/src/components/avatar.component.ts @@ -1,9 +1,9 @@ import { Component, Input, OnChanges, OnInit } from "@angular/core"; import { DomSanitizer } from "@angular/platform-browser"; -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { Utils } from "jslib-common/misc/utils"; +import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { Utils } from "@bitwarden/common/misc/utils"; @Component({ selector: "app-avatar", diff --git a/libs/angular/src/components/callout.component.ts b/libs/angular/src/components/callout.component.ts index a1785fe515..3f32828ed8 100644 --- a/libs/angular/src/components/callout.component.ts +++ b/libs/angular/src/components/callout.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from "@angular/core"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { MasterPasswordPolicyOptions } from "jslib-common/models/domain/masterPasswordPolicyOptions"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions"; @Component({ selector: "app-callout", diff --git a/libs/angular/src/components/captchaProtected.component.ts b/libs/angular/src/components/captchaProtected.component.ts index 998970e4fc..13cb729918 100644 --- a/libs/angular/src/components/captchaProtected.component.ts +++ b/libs/angular/src/components/captchaProtected.component.ts @@ -1,10 +1,10 @@ import { Directive, Input } from "@angular/core"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { CaptchaIFrame } from "jslib-common/misc/captcha_iframe"; -import { Utils } from "jslib-common/misc/utils"; +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 { Utils } from "@bitwarden/common/misc/utils"; @Directive() export abstract class CaptchaProtectedComponent { diff --git a/libs/angular/src/components/change-password.component.ts b/libs/angular/src/components/change-password.component.ts index 4b2ea6196d..cd3c0a5e24 100644 --- a/libs/angular/src/components/change-password.component.ts +++ b/libs/angular/src/components/change-password.component.ts @@ -1,16 +1,16 @@ import { Directive, OnInit } from "@angular/core"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { KdfType } from "jslib-common/enums/kdfType"; -import { EncString } from "jslib-common/models/domain/encString"; -import { MasterPasswordPolicyOptions } from "jslib-common/models/domain/masterPasswordPolicyOptions"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.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 { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { KdfType } from "@bitwarden/common/enums/kdfType"; +import { EncString } from "@bitwarden/common/models/domain/encString"; +import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; @Directive() export class ChangePasswordComponent implements OnInit { diff --git a/libs/angular/src/components/ciphers.component.ts b/libs/angular/src/components/ciphers.component.ts index 62fe65a73b..7391caacde 100644 --- a/libs/angular/src/components/ciphers.component.ts +++ b/libs/angular/src/components/ciphers.component.ts @@ -1,7 +1,7 @@ import { Directive, EventEmitter, Input, Output } from "@angular/core"; -import { SearchService } from "jslib-common/abstractions/search.service"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { SearchService } from "@bitwarden/common/abstractions/search.service"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; @Directive() export class CiphersComponent { diff --git a/libs/angular/src/components/collections.component.ts b/libs/angular/src/components/collections.component.ts index 284b97db86..3ad6714815 100644 --- a/libs/angular/src/components/collections.component.ts +++ b/libs/angular/src/components/collections.component.ts @@ -1,13 +1,13 @@ import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { Cipher } from "jslib-common/models/domain/cipher"; -import { CipherView } from "jslib-common/models/view/cipherView"; -import { CollectionView } from "jslib-common/models/view/collectionView"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.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 { Cipher } from "@bitwarden/common/models/domain/cipher"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CollectionView } from "@bitwarden/common/models/view/collectionView"; @Directive() export class CollectionsComponent implements OnInit { diff --git a/libs/angular/src/components/environment.component.ts b/libs/angular/src/components/environment.component.ts index 8b7689de36..347b5686e7 100644 --- a/libs/angular/src/components/environment.component.ts +++ b/libs/angular/src/components/environment.component.ts @@ -1,8 +1,8 @@ import { Directive, EventEmitter, Output } from "@angular/core"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; @Directive() export class EnvironmentComponent { diff --git a/libs/angular/src/components/export-scope-callout.component.ts b/libs/angular/src/components/export-scope-callout.component.ts index a20118465e..c77be2e77d 100644 --- a/libs/angular/src/components/export-scope-callout.component.ts +++ b/libs/angular/src/components/export-scope-callout.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from "@angular/core"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { StateService } from "jslib-common/abstractions/state.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; @Component({ selector: "app-export-scope-callout", diff --git a/libs/angular/src/components/export.component.ts b/libs/angular/src/components/export.component.ts index 8f892045ca..353a58dc72 100644 --- a/libs/angular/src/components/export.component.ts +++ b/libs/angular/src/components/export.component.ts @@ -1,16 +1,16 @@ import { Directive, EventEmitter, OnInit, Output } from "@angular/core"; import { FormBuilder } from "@angular/forms"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { ExportService } from "jslib-common/abstractions/export.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { UserVerificationService } from "jslib-common/abstractions/userVerification.service"; -import { EventType } from "jslib-common/enums/eventType"; -import { PolicyType } from "jslib-common/enums/policyType"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { ExportService } from "@bitwarden/common/abstractions/export.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 { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service"; +import { EventType } from "@bitwarden/common/enums/eventType"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; @Directive() export class ExportComponent implements OnInit { diff --git a/libs/angular/src/components/folder-add-edit.component.ts b/libs/angular/src/components/folder-add-edit.component.ts index ef1fa11158..9668f372ec 100644 --- a/libs/angular/src/components/folder-add-edit.component.ts +++ b/libs/angular/src/components/folder-add-edit.component.ts @@ -1,10 +1,10 @@ import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { FolderView } from "jslib-common/models/view/folderView"; +import { FolderService } from "@bitwarden/common/abstractions/folder.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 { FolderView } from "@bitwarden/common/models/view/folderView"; @Directive() export class FolderAddEditComponent implements OnInit { diff --git a/libs/angular/src/components/generator.component.ts b/libs/angular/src/components/generator.component.ts index 9ef891099e..be4040799b 100644 --- a/libs/angular/src/components/generator.component.ts +++ b/libs/angular/src/components/generator.component.ts @@ -2,13 +2,13 @@ import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { first } from "rxjs/operators"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { UsernameGenerationService } from "jslib-common/abstractions/usernameGeneration.service"; -import { PasswordGeneratorPolicyOptions } from "jslib-common/models/domain/passwordGeneratorPolicyOptions"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +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 { UsernameGenerationService } from "@bitwarden/common/abstractions/usernameGeneration.service"; +import { PasswordGeneratorPolicyOptions } from "@bitwarden/common/models/domain/passwordGeneratorPolicyOptions"; @Directive() export class GeneratorComponent implements OnInit { diff --git a/libs/angular/src/components/hint.component.ts b/libs/angular/src/components/hint.component.ts index 6ee007e7df..12e11f58b2 100644 --- a/libs/angular/src/components/hint.component.ts +++ b/libs/angular/src/components/hint.component.ts @@ -1,10 +1,10 @@ import { Router } from "@angular/router"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PasswordHintRequest } from "jslib-common/models/request/passwordHintRequest"; +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 { PasswordHintRequest } from "@bitwarden/common/models/request/passwordHintRequest"; export class HintComponent { email = ""; diff --git a/libs/angular/src/components/icon.component.ts b/libs/angular/src/components/icon.component.ts index c6a6c8a0b5..e715c57ec8 100644 --- a/libs/angular/src/components/icon.component.ts +++ b/libs/angular/src/components/icon.component.ts @@ -1,10 +1,10 @@ import { Component, Input, OnChanges } from "@angular/core"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { Utils } from "jslib-common/misc/utils"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; /** * Provides a mapping from supported card brands to diff --git a/libs/angular/src/components/lock.component.ts b/libs/angular/src/components/lock.component.ts index 2411f5884b..5ecbb9f8b6 100644 --- a/libs/angular/src/components/lock.component.ts +++ b/libs/angular/src/components/lock.component.ts @@ -2,22 +2,22 @@ import { Directive, NgZone, OnInit } from "@angular/core"; import { Router } from "@angular/router"; import { take } from "rxjs/operators"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.service"; -import { HashPurpose } from "jslib-common/enums/hashPurpose"; -import { KeySuffixOptions } from "jslib-common/enums/keySuffixOptions"; -import { Utils } from "jslib-common/misc/utils"; -import { EncString } from "jslib-common/models/domain/encString"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; -import { SecretVerificationRequest } from "jslib-common/models/request/secretVerificationRequest"; +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.service"; +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/encString"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { SecretVerificationRequest } from "@bitwarden/common/models/request/secretVerificationRequest"; @Directive() export class LockComponent implements OnInit { diff --git a/libs/angular/src/components/login.component.ts b/libs/angular/src/components/login.component.ts index 5d3f7cfff8..c784a0aa06 100644 --- a/libs/angular/src/components/login.component.ts +++ b/libs/angular/src/components/login.component.ts @@ -2,17 +2,17 @@ import { Directive, Input, NgZone, OnInit } from "@angular/core"; import { Router } from "@angular/router"; import { take } from "rxjs/operators"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { Utils } from "jslib-common/misc/utils"; -import { AuthResult } from "jslib-common/models/domain/authResult"; -import { PasswordLogInCredentials } from "jslib-common/models/domain/logInCredentials"; +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"; +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 { Utils } from "@bitwarden/common/misc/utils"; +import { AuthResult } from "@bitwarden/common/models/domain/authResult"; +import { PasswordLogInCredentials } from "@bitwarden/common/models/domain/logInCredentials"; import { CaptchaProtectedComponent } from "./captchaProtected.component"; diff --git a/libs/angular/src/components/password-generator-history.component.ts b/libs/angular/src/components/password-generator-history.component.ts index 15e6c7e435..fa2cfd09d2 100644 --- a/libs/angular/src/components/password-generator-history.component.ts +++ b/libs/angular/src/components/password-generator-history.component.ts @@ -1,9 +1,9 @@ import { Directive, OnInit } from "@angular/core"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { GeneratedPasswordHistory } from "jslib-common/models/domain/generatedPasswordHistory"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { GeneratedPasswordHistory } from "@bitwarden/common/models/domain/generatedPasswordHistory"; @Directive() export class PasswordGeneratorHistoryComponent implements OnInit { diff --git a/libs/angular/src/components/password-history.component.ts b/libs/angular/src/components/password-history.component.ts index 94eb2f7cc3..8b1bf1cc14 100644 --- a/libs/angular/src/components/password-history.component.ts +++ b/libs/angular/src/components/password-history.component.ts @@ -1,9 +1,9 @@ import { Directive, OnInit } from "@angular/core"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PasswordHistoryView } from "jslib-common/models/view/passwordHistoryView"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PasswordHistoryView } from "@bitwarden/common/models/view/passwordHistoryView"; @Directive() export class PasswordHistoryComponent implements OnInit { diff --git a/libs/angular/src/components/password-reprompt.component.ts b/libs/angular/src/components/password-reprompt.component.ts index 03b4080277..188abee754 100644 --- a/libs/angular/src/components/password-reprompt.component.ts +++ b/libs/angular/src/components/password-reprompt.component.ts @@ -1,8 +1,8 @@ import { Directive } from "@angular/core"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { ModalRef } from "./modal/modal.ref"; diff --git a/libs/angular/src/components/premium.component.ts b/libs/angular/src/components/premium.component.ts index efad4986b8..17bb4bb1b1 100644 --- a/libs/angular/src/components/premium.component.ts +++ b/libs/angular/src/components/premium.component.ts @@ -1,10 +1,10 @@ import { Directive, OnInit } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; +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 { StateService } from "@bitwarden/common/abstractions/state.service"; @Directive() export class PremiumComponent implements OnInit { diff --git a/libs/angular/src/components/register.component.ts b/libs/angular/src/components/register.component.ts index d4b99e17a2..3f5339c916 100644 --- a/libs/angular/src/components/register.component.ts +++ b/libs/angular/src/components/register.component.ts @@ -1,19 +1,19 @@ import { Directive, OnInit } from "@angular/core"; import { Router } from "@angular/router"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { DEFAULT_KDF_ITERATIONS, DEFAULT_KDF_TYPE } from "jslib-common/enums/kdfType"; -import { KeysRequest } from "jslib-common/models/request/keysRequest"; -import { ReferenceEventRequest } from "jslib-common/models/request/referenceEventRequest"; -import { RegisterRequest } from "jslib-common/models/request/registerRequest"; +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 { 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 { DEFAULT_KDF_ITERATIONS, DEFAULT_KDF_TYPE } from "@bitwarden/common/enums/kdfType"; +import { KeysRequest } from "@bitwarden/common/models/request/keysRequest"; +import { ReferenceEventRequest } from "@bitwarden/common/models/request/referenceEventRequest"; +import { RegisterRequest } from "@bitwarden/common/models/request/registerRequest"; import { CaptchaProtectedComponent } from "./captchaProtected.component"; diff --git a/libs/angular/src/components/remove-password.component.ts b/libs/angular/src/components/remove-password.component.ts index bce481e50c..000112854c 100644 --- a/libs/angular/src/components/remove-password.component.ts +++ b/libs/angular/src/components/remove-password.component.ts @@ -1,13 +1,13 @@ import { Directive, OnInit } from "@angular/core"; import { Router } from "@angular/router"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { Organization } from "jslib-common/models/domain/organization"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { Organization } from "@bitwarden/common/models/domain/organization"; @Directive() export class RemovePasswordComponent implements OnInit { diff --git a/libs/angular/src/components/send/add-edit.component.ts b/libs/angular/src/components/send/add-edit.component.ts index 382adf354d..3fb1246575 100644 --- a/libs/angular/src/components/send/add-edit.component.ts +++ b/libs/angular/src/components/send/add-edit.component.ts @@ -1,21 +1,21 @@ import { DatePipe } from "@angular/common"; import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { SendService } from "jslib-common/abstractions/send.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { PolicyType } from "jslib-common/enums/policyType"; -import { SendType } from "jslib-common/enums/sendType"; -import { EncArrayBuffer } from "jslib-common/models/domain/encArrayBuffer"; -import { Send } from "jslib-common/models/domain/send"; -import { SendFileView } from "jslib-common/models/view/sendFileView"; -import { SendTextView } from "jslib-common/models/view/sendTextView"; -import { SendView } from "jslib-common/models/view/sendView"; +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 { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { SendService } from "@bitwarden/common/abstractions/send.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { SendType } from "@bitwarden/common/enums/sendType"; +import { EncArrayBuffer } from "@bitwarden/common/models/domain/encArrayBuffer"; +import { Send } from "@bitwarden/common/models/domain/send"; +import { SendFileView } from "@bitwarden/common/models/view/sendFileView"; +import { SendTextView } from "@bitwarden/common/models/view/sendTextView"; +import { SendView } from "@bitwarden/common/models/view/sendView"; @Directive() export class AddEditComponent implements OnInit { diff --git a/libs/angular/src/components/send/efflux-dates.component.ts b/libs/angular/src/components/send/efflux-dates.component.ts index 15aec8a0a9..4fd285f127 100644 --- a/libs/angular/src/components/send/efflux-dates.component.ts +++ b/libs/angular/src/components/send/efflux-dates.component.ts @@ -2,8 +2,8 @@ import { DatePipe } from "@angular/common"; import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core"; import { FormControl, FormGroup } from "@angular/forms"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; // Different BrowserPath = different controls. enum BrowserPath { diff --git a/libs/angular/src/components/send/send.component.ts b/libs/angular/src/components/send/send.component.ts index 63831dcbd6..b7d2891777 100644 --- a/libs/angular/src/components/send/send.component.ts +++ b/libs/angular/src/components/send/send.component.ts @@ -1,15 +1,15 @@ import { Directive, NgZone, OnInit } from "@angular/core"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { SearchService } from "jslib-common/abstractions/search.service"; -import { SendService } from "jslib-common/abstractions/send.service"; -import { PolicyType } from "jslib-common/enums/policyType"; -import { SendType } from "jslib-common/enums/sendType"; -import { SendView } from "jslib-common/models/view/sendView"; +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 { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { SearchService } from "@bitwarden/common/abstractions/search.service"; +import { SendService } from "@bitwarden/common/abstractions/send.service"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { SendType } from "@bitwarden/common/enums/sendType"; +import { SendView } from "@bitwarden/common/models/view/sendView"; @Directive() export class SendComponent implements OnInit { diff --git a/libs/angular/src/components/set-password.component.ts b/libs/angular/src/components/set-password.component.ts index 4b996b5667..9ae12b9ebb 100644 --- a/libs/angular/src/components/set-password.component.ts +++ b/libs/angular/src/components/set-password.component.ts @@ -2,23 +2,23 @@ import { Directive } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { HashPurpose } from "jslib-common/enums/hashPurpose"; -import { DEFAULT_KDF_ITERATIONS, DEFAULT_KDF_TYPE } from "jslib-common/enums/kdfType"; -import { Utils } from "jslib-common/misc/utils"; -import { EncString } from "jslib-common/models/domain/encString"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; -import { KeysRequest } from "jslib-common/models/request/keysRequest"; -import { OrganizationUserResetPasswordEnrollmentRequest } from "jslib-common/models/request/organizationUserResetPasswordEnrollmentRequest"; -import { SetPasswordRequest } from "jslib-common/models/request/setPasswordRequest"; +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 { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { HashPurpose } from "@bitwarden/common/enums/hashPurpose"; +import { DEFAULT_KDF_ITERATIONS, DEFAULT_KDF_TYPE } from "@bitwarden/common/enums/kdfType"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { EncString } from "@bitwarden/common/models/domain/encString"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { KeysRequest } from "@bitwarden/common/models/request/keysRequest"; +import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/models/request/organizationUserResetPasswordEnrollmentRequest"; +import { SetPasswordRequest } from "@bitwarden/common/models/request/setPasswordRequest"; import { ChangePasswordComponent as BaseChangePasswordComponent } from "./change-password.component"; diff --git a/libs/angular/src/components/set-pin.component.ts b/libs/angular/src/components/set-pin.component.ts index dd10e99d24..c6db38a85d 100644 --- a/libs/angular/src/components/set-pin.component.ts +++ b/libs/angular/src/components/set-pin.component.ts @@ -1,9 +1,9 @@ import { Directive, OnInit } from "@angular/core"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { Utils } from "jslib-common/misc/utils"; +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 { Utils } from "@bitwarden/common/misc/utils"; import { ModalRef } from "./modal/modal.ref"; diff --git a/libs/angular/src/components/settings/vault-timeout-input.component.ts b/libs/angular/src/components/settings/vault-timeout-input.component.ts index eb6057f275..dce4f662e3 100644 --- a/libs/angular/src/components/settings/vault-timeout-input.component.ts +++ b/libs/angular/src/components/settings/vault-timeout-input.component.ts @@ -7,10 +7,10 @@ import { Validator, } from "@angular/forms"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { PolicyType } from "jslib-common/enums/policyType"; -import { Policy } from "jslib-common/models/domain/policy"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { Policy } from "@bitwarden/common/models/domain/policy"; @Directive() export class VaultTimeoutInputComponent implements ControlValueAccessor, Validator, OnInit { diff --git a/libs/angular/src/components/share.component.ts b/libs/angular/src/components/share.component.ts index 0b1b3577df..55e3835270 100644 --- a/libs/angular/src/components/share.component.ts +++ b/libs/angular/src/components/share.component.ts @@ -1,16 +1,16 @@ import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { OrganizationUserStatusType } from "jslib-common/enums/organizationUserStatusType"; -import { Utils } from "jslib-common/misc/utils"; -import { Organization } from "jslib-common/models/domain/organization"; -import { CipherView } from "jslib-common/models/view/cipherView"; -import { CollectionView } from "jslib-common/models/view/collectionView"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CollectionView } from "@bitwarden/common/models/view/collectionView"; @Directive() export class ShareComponent implements OnInit { diff --git a/libs/angular/src/components/sso.component.ts b/libs/angular/src/components/sso.component.ts index 9732ce967e..2a1a3b9c52 100644 --- a/libs/angular/src/components/sso.component.ts +++ b/libs/angular/src/components/sso.component.ts @@ -2,19 +2,19 @@ import { Directive } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { Utils } from "jslib-common/misc/utils"; -import { AuthResult } from "jslib-common/models/domain/authResult"; -import { SsoLogInCredentials } from "jslib-common/models/domain/logInCredentials"; -import { SsoPreValidateResponse } from "jslib-common/models/response/ssoPreValidateResponse"; +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"; +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 { Utils } from "@bitwarden/common/misc/utils"; +import { AuthResult } from "@bitwarden/common/models/domain/authResult"; +import { SsoLogInCredentials } from "@bitwarden/common/models/domain/logInCredentials"; +import { SsoPreValidateResponse } from "@bitwarden/common/models/response/ssoPreValidateResponse"; @Directive() export class SsoComponent { diff --git a/libs/angular/src/components/two-factor-options.component.ts b/libs/angular/src/components/two-factor-options.component.ts index a2aabc71ab..4d3eeb99a8 100644 --- a/libs/angular/src/components/two-factor-options.component.ts +++ b/libs/angular/src/components/two-factor-options.component.ts @@ -1,10 +1,10 @@ import { Directive, EventEmitter, OnInit, Output } from "@angular/core"; import { Router } from "@angular/router"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service"; -import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType"; +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"; @Directive() export class TwoFactorOptionsComponent implements OnInit { diff --git a/libs/angular/src/components/two-factor.component.ts b/libs/angular/src/components/two-factor.component.ts index 2054c4dc40..068826ccc0 100644 --- a/libs/angular/src/components/two-factor.component.ts +++ b/libs/angular/src/components/two-factor.component.ts @@ -3,21 +3,21 @@ import { ActivatedRoute, Router } from "@angular/router"; import * as DuoWebSDK from "duo_web_sdk"; import { first } from "rxjs/operators"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AppIdService } from "jslib-common/abstractions/appId.service"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service"; -import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType"; -import { WebAuthnIFrame } from "jslib-common/misc/webauthn_iframe"; -import { AuthResult } from "jslib-common/models/domain/authResult"; -import { TokenRequestTwoFactor } from "jslib-common/models/request/identityToken/tokenRequestTwoFactor"; -import { TwoFactorEmailRequest } from "jslib-common/models/request/twoFactorEmailRequest"; -import { TwoFactorProviders } from "jslib-common/services/twoFactor.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 { 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/authResult"; +import { TokenRequestTwoFactor } from "@bitwarden/common/models/request/identityToken/tokenRequestTwoFactor"; +import { TwoFactorEmailRequest } from "@bitwarden/common/models/request/twoFactorEmailRequest"; +import { TwoFactorProviders } from "@bitwarden/common/services/twoFactor.service"; import { CaptchaProtectedComponent } from "./captchaProtected.component"; diff --git a/libs/angular/src/components/update-password.component.ts b/libs/angular/src/components/update-password.component.ts index fb2697b4fc..92bd476e72 100644 --- a/libs/angular/src/components/update-password.component.ts +++ b/libs/angular/src/components/update-password.component.ts @@ -1,22 +1,22 @@ import { Directive } from "@angular/core"; import { Router } from "@angular/router"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { UserVerificationService } from "jslib-common/abstractions/userVerification.service"; -import { VerificationType } from "jslib-common/enums/verificationType"; -import { EncString } from "jslib-common/models/domain/encString"; -import { MasterPasswordPolicyOptions } from "jslib-common/models/domain/masterPasswordPolicyOptions"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; -import { PasswordRequest } from "jslib-common/models/request/passwordRequest"; -import { Verification } from "jslib-common/types/verification"; +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 { LogService } from "@bitwarden/common/abstractions/log.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 { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service"; +import { VerificationType } from "@bitwarden/common/enums/verificationType"; +import { EncString } from "@bitwarden/common/models/domain/encString"; +import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { PasswordRequest } from "@bitwarden/common/models/request/passwordRequest"; +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/components/update-temp-password.component.ts index 70f75cb8f4..11af9f2270 100644 --- a/libs/angular/src/components/update-temp-password.component.ts +++ b/libs/angular/src/components/update-temp-password.component.ts @@ -1,19 +1,19 @@ import { Directive } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { SyncService } from "jslib-common/abstractions/sync.service"; -import { EncString } from "jslib-common/models/domain/encString"; -import { MasterPasswordPolicyOptions } from "jslib-common/models/domain/masterPasswordPolicyOptions"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; -import { UpdateTempPasswordRequest } from "jslib-common/models/request/updateTempPasswordRequest"; +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 { LogService } from "@bitwarden/common/abstractions/log.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 { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { SyncService } from "@bitwarden/common/abstractions/sync.service"; +import { EncString } from "@bitwarden/common/models/domain/encString"; +import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { UpdateTempPasswordRequest } from "@bitwarden/common/models/request/updateTempPasswordRequest"; import { ChangePasswordComponent as BaseChangePasswordComponent } from "./change-password.component"; diff --git a/libs/angular/src/components/user-verification.component.ts b/libs/angular/src/components/user-verification.component.ts index 5504796e4b..3ce25cb74f 100644 --- a/libs/angular/src/components/user-verification.component.ts +++ b/libs/angular/src/components/user-verification.component.ts @@ -2,10 +2,10 @@ import { animate, style, transition, trigger } from "@angular/animations"; import { Component, OnInit } from "@angular/core"; import { ControlValueAccessor, FormControl, NG_VALUE_ACCESSOR } from "@angular/forms"; -import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service"; -import { UserVerificationService } from "jslib-common/abstractions/userVerification.service"; -import { VerificationType } from "jslib-common/enums/verificationType"; -import { Verification } from "jslib-common/types/verification"; +import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service"; +import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service"; +import { VerificationType } from "@bitwarden/common/enums/verificationType"; +import { Verification } from "@bitwarden/common/types/verification"; /** * Used for general-purpose user verification throughout the app. diff --git a/libs/angular/src/components/view-custom-fields.component.ts b/libs/angular/src/components/view-custom-fields.component.ts index 8439ed67b7..d1ca8934fa 100644 --- a/libs/angular/src/components/view-custom-fields.component.ts +++ b/libs/angular/src/components/view-custom-fields.component.ts @@ -1,10 +1,10 @@ import { Directive, Input } from "@angular/core"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { EventType } from "jslib-common/enums/eventType"; -import { FieldType } from "jslib-common/enums/fieldType"; -import { CipherView } from "jslib-common/models/view/cipherView"; -import { FieldView } from "jslib-common/models/view/fieldView"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { EventType } from "@bitwarden/common/enums/eventType"; +import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { FieldView } from "@bitwarden/common/models/view/fieldView"; @Directive() export class ViewCustomFieldsComponent { diff --git a/libs/angular/src/components/view.component.ts b/libs/angular/src/components/view.component.ts index d1e949677b..8fe50f23d1 100644 --- a/libs/angular/src/components/view.component.ts +++ b/libs/angular/src/components/view.component.ts @@ -9,27 +9,27 @@ import { Output, } from "@angular/core"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AuditService } from "jslib-common/abstractions/audit.service"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { EventService } from "jslib-common/abstractions/event.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { TokenService } from "jslib-common/abstractions/token.service"; -import { TotpService } from "jslib-common/abstractions/totp.service"; -import { CipherRepromptType } from "jslib-common/enums/cipherRepromptType"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { EventType } from "jslib-common/enums/eventType"; -import { FieldType } from "jslib-common/enums/fieldType"; -import { ErrorResponse } from "jslib-common/models/response/errorResponse"; -import { AttachmentView } from "jslib-common/models/view/attachmentView"; -import { CipherView } from "jslib-common/models/view/cipherView"; -import { LoginUriView } from "jslib-common/models/view/loginUriView"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { AuditService } from "@bitwarden/common/abstractions/audit.service"; +import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { EventService } from "@bitwarden/common/abstractions/event.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.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 { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { EventType } from "@bitwarden/common/enums/eventType"; +import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { ErrorResponse } from "@bitwarden/common/models/response/errorResponse"; +import { AttachmentView } from "@bitwarden/common/models/view/attachmentView"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { LoginUriView } from "@bitwarden/common/models/view/loginUriView"; const BroadcasterSubscriptionId = "ViewComponent"; diff --git a/libs/angular/src/directives/api-action.directive.ts b/libs/angular/src/directives/api-action.directive.ts index 3d12172603..4a4e06201f 100644 --- a/libs/angular/src/directives/api-action.directive.ts +++ b/libs/angular/src/directives/api-action.directive.ts @@ -1,7 +1,7 @@ import { Directive, ElementRef, Input, OnChanges } from "@angular/core"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { ErrorResponse } from "jslib-common/models/response/errorResponse"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { ErrorResponse } from "@bitwarden/common/models/response/errorResponse"; import { ValidationService } from "../services/validation.service"; diff --git a/libs/angular/src/directives/autofocus.directive.ts b/libs/angular/src/directives/autofocus.directive.ts index 5c5997fa1b..168cd1cc21 100644 --- a/libs/angular/src/directives/autofocus.directive.ts +++ b/libs/angular/src/directives/autofocus.directive.ts @@ -1,7 +1,7 @@ import { Directive, ElementRef, Input, NgZone } from "@angular/core"; import { take } from "rxjs/operators"; -import { Utils } from "jslib-common/misc/utils"; +import { Utils } from "@bitwarden/common/misc/utils"; @Directive({ selector: "[appAutofocus]", diff --git a/libs/angular/src/directives/not-premium.directive.ts b/libs/angular/src/directives/not-premium.directive.ts index 15a01f7146..b25615a8ed 100644 --- a/libs/angular/src/directives/not-premium.directive.ts +++ b/libs/angular/src/directives/not-premium.directive.ts @@ -1,6 +1,6 @@ import { Directive, OnInit, TemplateRef, ViewContainerRef } from "@angular/core"; -import { StateService } from "jslib-common/abstractions/state.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; /** * Hides the element if the user has premium. diff --git a/libs/angular/src/directives/premium.directive.ts b/libs/angular/src/directives/premium.directive.ts index c403f5b9b6..8729fea245 100644 --- a/libs/angular/src/directives/premium.directive.ts +++ b/libs/angular/src/directives/premium.directive.ts @@ -1,6 +1,6 @@ import { Directive, OnInit, TemplateRef, ViewContainerRef } from "@angular/core"; -import { StateService } from "jslib-common/abstractions/state.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; /** * Only shows the element if the user has premium. diff --git a/libs/angular/src/directives/select-copy.directive.ts b/libs/angular/src/directives/select-copy.directive.ts index 81d4928b4b..8d894b14d5 100644 --- a/libs/angular/src/directives/select-copy.directive.ts +++ b/libs/angular/src/directives/select-copy.directive.ts @@ -1,6 +1,6 @@ import { Directive, ElementRef, HostListener } from "@angular/core"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; @Directive({ selector: "[appSelectCopy]", diff --git a/libs/angular/src/guards/auth.guard.ts b/libs/angular/src/guards/auth.guard.ts index 355f797bf3..9961d26a77 100644 --- a/libs/angular/src/guards/auth.guard.ts +++ b/libs/angular/src/guards/auth.guard.ts @@ -1,10 +1,10 @@ import { Injectable } from "@angular/core"; import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from "@angular/router"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { AuthenticationStatus } from "jslib-common/enums/authenticationStatus"; +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"; @Injectable() export class AuthGuard implements CanActivate { diff --git a/libs/angular/src/guards/lock.guard.ts b/libs/angular/src/guards/lock.guard.ts index 262158528e..1c6853e9f8 100644 --- a/libs/angular/src/guards/lock.guard.ts +++ b/libs/angular/src/guards/lock.guard.ts @@ -1,8 +1,8 @@ import { Injectable } from "@angular/core"; import { CanActivate, Router } from "@angular/router"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { AuthenticationStatus } from "jslib-common/enums/authenticationStatus"; +import { AuthService } from "@bitwarden/common/abstractions/auth.service"; +import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; @Injectable() export class LockGuard implements CanActivate { diff --git a/libs/angular/src/guards/unauth.guard.ts b/libs/angular/src/guards/unauth.guard.ts index 3335d636d4..d869ca5ad8 100644 --- a/libs/angular/src/guards/unauth.guard.ts +++ b/libs/angular/src/guards/unauth.guard.ts @@ -1,8 +1,8 @@ import { Injectable } from "@angular/core"; import { CanActivate, Router } from "@angular/router"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { AuthenticationStatus } from "jslib-common/enums/authenticationStatus"; +import { AuthService } from "@bitwarden/common/abstractions/auth.service"; +import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; @Injectable() export class UnauthGuard implements CanActivate { diff --git a/libs/angular/src/modules/vault-filter/components/collection-filter.component.ts b/libs/angular/src/modules/vault-filter/components/collection-filter.component.ts index 67a21200a5..ed35390dae 100644 --- a/libs/angular/src/modules/vault-filter/components/collection-filter.component.ts +++ b/libs/angular/src/modules/vault-filter/components/collection-filter.component.ts @@ -1,7 +1,7 @@ import { Directive, EventEmitter, Input, Output } from "@angular/core"; -import { ITreeNodeObject } from "jslib-common/models/domain/treeNode"; -import { CollectionView } from "jslib-common/models/view/collectionView"; +import { ITreeNodeObject } from "@bitwarden/common/models/domain/treeNode"; +import { CollectionView } from "@bitwarden/common/models/view/collectionView"; import { DynamicTreeNode } from "../models/dynamic-tree-node.model"; import { TopLevelTreeNode } from "../models/top-level-tree-node.model"; diff --git a/libs/angular/src/modules/vault-filter/components/folder-filter.component.ts b/libs/angular/src/modules/vault-filter/components/folder-filter.component.ts index fe9537a705..9fd39a6cf0 100644 --- a/libs/angular/src/modules/vault-filter/components/folder-filter.component.ts +++ b/libs/angular/src/modules/vault-filter/components/folder-filter.component.ts @@ -1,7 +1,7 @@ import { Directive, EventEmitter, Input, Output } from "@angular/core"; -import { ITreeNodeObject } from "jslib-common/models/domain/treeNode"; -import { FolderView } from "jslib-common/models/view/folderView"; +import { ITreeNodeObject } from "@bitwarden/common/models/domain/treeNode"; +import { FolderView } from "@bitwarden/common/models/view/folderView"; import { DynamicTreeNode } from "../models/dynamic-tree-node.model"; import { TopLevelTreeNode } from "../models/top-level-tree-node.model"; diff --git a/libs/angular/src/modules/vault-filter/components/organization-filter.component.ts b/libs/angular/src/modules/vault-filter/components/organization-filter.component.ts index 79c2c95516..9e2a493d7a 100644 --- a/libs/angular/src/modules/vault-filter/components/organization-filter.component.ts +++ b/libs/angular/src/modules/vault-filter/components/organization-filter.component.ts @@ -1,7 +1,7 @@ import { Directive, EventEmitter, Input, Output } from "@angular/core"; -import { Organization } from "jslib-common/models/domain/organization"; -import { ITreeNodeObject } from "jslib-common/models/domain/treeNode"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { ITreeNodeObject } from "@bitwarden/common/models/domain/treeNode"; import { DisplayMode } from "../models/display-mode"; import { TopLevelTreeNode } from "../models/top-level-tree-node.model"; diff --git a/libs/angular/src/modules/vault-filter/components/type-filter.component.ts b/libs/angular/src/modules/vault-filter/components/type-filter.component.ts index 49aeaa81ff..89336aebf8 100644 --- a/libs/angular/src/modules/vault-filter/components/type-filter.component.ts +++ b/libs/angular/src/modules/vault-filter/components/type-filter.component.ts @@ -1,7 +1,7 @@ import { Directive, EventEmitter, Input, Output } from "@angular/core"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { ITreeNodeObject } from "jslib-common/models/domain/treeNode"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { ITreeNodeObject } from "@bitwarden/common/models/domain/treeNode"; import { TopLevelTreeNode } from "../models/top-level-tree-node.model"; import { VaultFilter } from "../models/vault-filter.model"; diff --git a/libs/angular/src/modules/vault-filter/models/dynamic-tree-node.model.ts b/libs/angular/src/modules/vault-filter/models/dynamic-tree-node.model.ts index d63a518f7c..31ba21e481 100644 --- a/libs/angular/src/modules/vault-filter/models/dynamic-tree-node.model.ts +++ b/libs/angular/src/modules/vault-filter/models/dynamic-tree-node.model.ts @@ -1,6 +1,6 @@ -import { TreeNode } from "jslib-common/models/domain/treeNode"; -import { CollectionView } from "jslib-common/models/view/collectionView"; -import { FolderView } from "jslib-common/models/view/folderView"; +import { TreeNode } from "@bitwarden/common/models/domain/treeNode"; +import { CollectionView } from "@bitwarden/common/models/view/collectionView"; +import { FolderView } from "@bitwarden/common/models/view/folderView"; export class DynamicTreeNode { fullList: T[]; diff --git a/libs/angular/src/modules/vault-filter/models/top-level-tree-node.model.ts b/libs/angular/src/modules/vault-filter/models/top-level-tree-node.model.ts index 3e9870de2d..9af3c7b50c 100644 --- a/libs/angular/src/modules/vault-filter/models/top-level-tree-node.model.ts +++ b/libs/angular/src/modules/vault-filter/models/top-level-tree-node.model.ts @@ -1,4 +1,4 @@ -import { ITreeNodeObject } from "jslib-common/models/domain/treeNode"; +import { ITreeNodeObject } from "@bitwarden/common/models/domain/treeNode"; export type TopLevelTreeNodeId = "vaults" | "types" | "collections" | "folders"; export class TopLevelTreeNode implements ITreeNodeObject { diff --git a/libs/angular/src/modules/vault-filter/models/vault-filter.model.ts b/libs/angular/src/modules/vault-filter/models/vault-filter.model.ts index b65729c583..f28cd20336 100644 --- a/libs/angular/src/modules/vault-filter/models/vault-filter.model.ts +++ b/libs/angular/src/modules/vault-filter/models/vault-filter.model.ts @@ -1,4 +1,4 @@ -import { CipherType } from "jslib-common/enums/cipherType"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; import { CipherStatus } from "./cipher-status.model"; diff --git a/libs/angular/src/modules/vault-filter/vault-filter.component.ts b/libs/angular/src/modules/vault-filter/vault-filter.component.ts index e717f5c975..b620ed82e2 100644 --- a/libs/angular/src/modules/vault-filter/vault-filter.component.ts +++ b/libs/angular/src/modules/vault-filter/vault-filter.component.ts @@ -1,9 +1,9 @@ import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { Organization } from "jslib-common/models/domain/organization"; -import { ITreeNodeObject } from "jslib-common/models/domain/treeNode"; -import { CollectionView } from "jslib-common/models/view/collectionView"; -import { FolderView } from "jslib-common/models/view/folderView"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { ITreeNodeObject } from "@bitwarden/common/models/domain/treeNode"; +import { CollectionView } from "@bitwarden/common/models/view/collectionView"; +import { FolderView } from "@bitwarden/common/models/view/folderView"; import { DynamicTreeNode } from "./models/dynamic-tree-node.model"; import { VaultFilter } from "./models/vault-filter.model"; diff --git a/libs/angular/src/modules/vault-filter/vault-filter.service.ts b/libs/angular/src/modules/vault-filter/vault-filter.service.ts index b05cce1742..ea5f52ee90 100644 --- a/libs/angular/src/modules/vault-filter/vault-filter.service.ts +++ b/libs/angular/src/modules/vault-filter/vault-filter.service.ts @@ -1,15 +1,15 @@ import { Injectable } from "@angular/core"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { OrganizationService } from "jslib-common/abstractions/organization.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { PolicyType } from "jslib-common/enums/policyType"; -import { Organization } from "jslib-common/models/domain/organization"; -import { CollectionView } from "jslib-common/models/view/collectionView"; -import { FolderView } from "jslib-common/models/view/folderView"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; +import { FolderService } from "@bitwarden/common/abstractions/folder.service"; +import { OrganizationService } from "@bitwarden/common/abstractions/organization.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { PolicyType } from "@bitwarden/common/enums/policyType"; +import { Organization } from "@bitwarden/common/models/domain/organization"; +import { CollectionView } from "@bitwarden/common/models/view/collectionView"; +import { FolderView } from "@bitwarden/common/models/view/folderView"; import { DynamicTreeNode } from "./models/dynamic-tree-node.model"; diff --git a/libs/angular/src/pipes/color-password.pipe.ts b/libs/angular/src/pipes/color-password.pipe.ts index 1b3d607203..e8e0ad9629 100644 --- a/libs/angular/src/pipes/color-password.pipe.ts +++ b/libs/angular/src/pipes/color-password.pipe.ts @@ -1,6 +1,6 @@ import { Pipe, PipeTransform } from "@angular/core"; -import { Utils } from "jslib-common/misc/utils"; +import { Utils } from "@bitwarden/common/misc/utils"; /* An updated pipe that sanitizes HTML, highlights numbers and special characters (in different colors each) diff --git a/libs/angular/src/pipes/i18n.pipe.ts b/libs/angular/src/pipes/i18n.pipe.ts index 8fc09434c4..730f439b46 100644 --- a/libs/angular/src/pipes/i18n.pipe.ts +++ b/libs/angular/src/pipes/i18n.pipe.ts @@ -1,6 +1,6 @@ import { Pipe, PipeTransform } from "@angular/core"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; @Pipe({ name: "i18n", diff --git a/libs/angular/src/pipes/search-ciphers.pipe.ts b/libs/angular/src/pipes/search-ciphers.pipe.ts index e8bdd13e68..a2c667804e 100644 --- a/libs/angular/src/pipes/search-ciphers.pipe.ts +++ b/libs/angular/src/pipes/search-ciphers.pipe.ts @@ -1,6 +1,6 @@ import { Pipe, PipeTransform } from "@angular/core"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; @Pipe({ name: "searchCiphers", diff --git a/libs/angular/src/scss/bwicons/styles/style.scss b/libs/angular/src/scss/bwicons/styles/style.scss index 86c99f5911..4b18243fb4 100644 --- a/libs/angular/src/scss/bwicons/styles/style.scss +++ b/libs/angular/src/scss/bwicons/styles/style.scss @@ -1,5 +1,5 @@ $icomoon-font-family: "bwi-font" !default; -$icomoon-font-path: "~@bitwarden/jslib-angular/src/scss/bwicons/fonts/" !default; +$icomoon-font-path: "~@bitwarden/angular/src/scss/bwicons/fonts/" !default; // New font sheet? Update the font-face information below @font-face { diff --git a/libs/angular/src/scss/icons.scss b/libs/angular/src/scss/icons.scss index 88e9c5af54..58c860ff7e 100644 --- a/libs/angular/src/scss/icons.scss +++ b/libs/angular/src/scss/icons.scss @@ -1,4 +1,4 @@ -$card-icons-base: "~@bitwarden/jslib-angular/src/images/cards/" !default; +$card-icons-base: "~@bitwarden/angular/src/images/cards/" !default; $card-icons: ( "visa": $card-icons-base + "visa-light.png", "amex": $card-icons-base + "amex-light.png", diff --git a/libs/angular/src/services/broadcaster.service.ts b/libs/angular/src/services/broadcaster.service.ts index 362184059d..9f62ecbd10 100644 --- a/libs/angular/src/services/broadcaster.service.ts +++ b/libs/angular/src/services/broadcaster.service.ts @@ -1,6 +1,6 @@ import { Injectable } from "@angular/core"; -import { BroadcasterService as BaseBroadcasterService } from "jslib-common/services/broadcaster.service"; +import { BroadcasterService as BaseBroadcasterService } from "@bitwarden/common/services/broadcaster.service"; @Injectable() export class BroadcasterService extends BaseBroadcasterService {} diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts index ab4ca41eb2..9062d86c04 100644 --- a/libs/angular/src/services/jslib-services.module.ts +++ b/libs/angular/src/services/jslib-services.module.ts @@ -1,78 +1,78 @@ import { InjectionToken, Injector, LOCALE_ID, NgModule } from "@angular/core"; -import { ApiService as ApiServiceAbstraction } from "jslib-common/abstractions/api.service"; -import { AppIdService as AppIdServiceAbstraction } from "jslib-common/abstractions/appId.service"; -import { AuditService as AuditServiceAbstraction } from "jslib-common/abstractions/audit.service"; -import { AuthService as AuthServiceAbstraction } from "jslib-common/abstractions/auth.service"; -import { BroadcasterService as BroadcasterServiceAbstraction } from "jslib-common/abstractions/broadcaster.service"; -import { CipherService as CipherServiceAbstraction } from "jslib-common/abstractions/cipher.service"; -import { CollectionService as CollectionServiceAbstraction } from "jslib-common/abstractions/collection.service"; -import { CryptoService as CryptoServiceAbstraction } from "jslib-common/abstractions/crypto.service"; -import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "jslib-common/abstractions/cryptoFunction.service"; -import { EnvironmentService as EnvironmentServiceAbstraction } from "jslib-common/abstractions/environment.service"; -import { EventService as EventServiceAbstraction } from "jslib-common/abstractions/event.service"; -import { ExportService as ExportServiceAbstraction } from "jslib-common/abstractions/export.service"; -import { FileUploadService as FileUploadServiceAbstraction } from "jslib-common/abstractions/fileUpload.service"; -import { FolderService as FolderServiceAbstraction } from "jslib-common/abstractions/folder.service"; -import { I18nService as I18nServiceAbstraction } from "jslib-common/abstractions/i18n.service"; -import { KeyConnectorService as KeyConnectorServiceAbstraction } from "jslib-common/abstractions/keyConnector.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService as MessagingServiceAbstraction } from "jslib-common/abstractions/messaging.service"; -import { NotificationsService as NotificationsServiceAbstraction } from "jslib-common/abstractions/notifications.service"; -import { OrganizationService as OrganizationServiceAbstraction } from "jslib-common/abstractions/organization.service"; -import { PasswordGenerationService as PasswordGenerationServiceAbstraction } from "jslib-common/abstractions/passwordGeneration.service"; -import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "jslib-common/abstractions/passwordReprompt.service"; -import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService as PolicyServiceAbstraction } from "jslib-common/abstractions/policy.service"; -import { ProviderService as ProviderServiceAbstraction } from "jslib-common/abstractions/provider.service"; -import { SearchService as SearchServiceAbstraction } from "jslib-common/abstractions/search.service"; -import { SendService as SendServiceAbstraction } from "jslib-common/abstractions/send.service"; -import { SettingsService as SettingsServiceAbstraction } from "jslib-common/abstractions/settings.service"; -import { StateService as StateServiceAbstraction } from "jslib-common/abstractions/state.service"; -import { StateMigrationService as StateMigrationServiceAbstraction } from "jslib-common/abstractions/stateMigration.service"; -import { StorageService as StorageServiceAbstraction } from "jslib-common/abstractions/storage.service"; -import { SyncService as SyncServiceAbstraction } from "jslib-common/abstractions/sync.service"; -import { TokenService as TokenServiceAbstraction } from "jslib-common/abstractions/token.service"; -import { TotpService as TotpServiceAbstraction } from "jslib-common/abstractions/totp.service"; -import { TwoFactorService as TwoFactorServiceAbstraction } from "jslib-common/abstractions/twoFactor.service"; -import { UserVerificationService as UserVerificationServiceAbstraction } from "jslib-common/abstractions/userVerification.service"; -import { UsernameGenerationService as UsernameGenerationServiceAbstraction } from "jslib-common/abstractions/usernameGeneration.service"; -import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "jslib-common/abstractions/vaultTimeout.service"; -import { StateFactory } from "jslib-common/factories/stateFactory"; -import { Account } from "jslib-common/models/domain/account"; -import { GlobalState } from "jslib-common/models/domain/globalState"; -import { ApiService } from "jslib-common/services/api.service"; -import { AppIdService } from "jslib-common/services/appId.service"; -import { AuditService } from "jslib-common/services/audit.service"; -import { AuthService } from "jslib-common/services/auth.service"; -import { CipherService } from "jslib-common/services/cipher.service"; -import { CollectionService } from "jslib-common/services/collection.service"; -import { ConsoleLogService } from "jslib-common/services/consoleLog.service"; -import { CryptoService } from "jslib-common/services/crypto.service"; -import { EnvironmentService } from "jslib-common/services/environment.service"; -import { EventService } from "jslib-common/services/event.service"; -import { ExportService } from "jslib-common/services/export.service"; -import { FileUploadService } from "jslib-common/services/fileUpload.service"; -import { FolderService } from "jslib-common/services/folder.service"; -import { KeyConnectorService } from "jslib-common/services/keyConnector.service"; -import { NotificationsService } from "jslib-common/services/notifications.service"; -import { OrganizationService } from "jslib-common/services/organization.service"; -import { PasswordGenerationService } from "jslib-common/services/passwordGeneration.service"; -import { PolicyService } from "jslib-common/services/policy.service"; -import { ProviderService } from "jslib-common/services/provider.service"; -import { SearchService } from "jslib-common/services/search.service"; -import { SendService } from "jslib-common/services/send.service"; -import { SettingsService } from "jslib-common/services/settings.service"; -import { StateService } from "jslib-common/services/state.service"; -import { StateMigrationService } from "jslib-common/services/stateMigration.service"; -import { SyncService } from "jslib-common/services/sync.service"; -import { TokenService } from "jslib-common/services/token.service"; -import { TotpService } from "jslib-common/services/totp.service"; -import { TwoFactorService } from "jslib-common/services/twoFactor.service"; -import { UserVerificationService } from "jslib-common/services/userVerification.service"; -import { UsernameGenerationService } from "jslib-common/services/usernameGeneration.service"; -import { VaultTimeoutService } from "jslib-common/services/vaultTimeout.service"; -import { WebCryptoFunctionService } from "jslib-common/services/webCryptoFunction.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 { CipherService as CipherServiceAbstraction } from "@bitwarden/common/abstractions/cipher.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"; +import { EnvironmentService as EnvironmentServiceAbstraction } from "@bitwarden/common/abstractions/environment.service"; +import { EventService as EventServiceAbstraction } from "@bitwarden/common/abstractions/event.service"; +import { ExportService as ExportServiceAbstraction } from "@bitwarden/common/abstractions/export.service"; +import { FileUploadService as FileUploadServiceAbstraction } from "@bitwarden/common/abstractions/fileUpload.service"; +import { FolderService as FolderServiceAbstraction } from "@bitwarden/common/abstractions/folder.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 { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/abstractions/messaging.service"; +import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service"; +import { OrganizationService as OrganizationServiceAbstraction } from "@bitwarden/common/abstractions/organization.service"; +import { PasswordGenerationService as PasswordGenerationServiceAbstraction } from "@bitwarden/common/abstractions/passwordGeneration.service"; +import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/abstractions/passwordReprompt.service"; +import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService as PolicyServiceAbstraction } from "@bitwarden/common/abstractions/policy.service"; +import { ProviderService as ProviderServiceAbstraction } from "@bitwarden/common/abstractions/provider.service"; +import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service"; +import { SendService as SendServiceAbstraction } from "@bitwarden/common/abstractions/send.service"; +import { SettingsService as SettingsServiceAbstraction } from "@bitwarden/common/abstractions/settings.service"; +import { StateService as StateServiceAbstraction } from "@bitwarden/common/abstractions/state.service"; +import { StateMigrationService as StateMigrationServiceAbstraction } from "@bitwarden/common/abstractions/stateMigration.service"; +import { StorageService as StorageServiceAbstraction } from "@bitwarden/common/abstractions/storage.service"; +import { SyncService as SyncServiceAbstraction } from "@bitwarden/common/abstractions/sync.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 { UserVerificationService as UserVerificationServiceAbstraction } from "@bitwarden/common/abstractions/userVerification.service"; +import { UsernameGenerationService as UsernameGenerationServiceAbstraction } from "@bitwarden/common/abstractions/usernameGeneration.service"; +import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { StateFactory } from "@bitwarden/common/factories/stateFactory"; +import { Account } from "@bitwarden/common/models/domain/account"; +import { GlobalState } from "@bitwarden/common/models/domain/globalState"; +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 { CipherService } from "@bitwarden/common/services/cipher.service"; +import { CollectionService } from "@bitwarden/common/services/collection.service"; +import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; +import { CryptoService } from "@bitwarden/common/services/crypto.service"; +import { EnvironmentService } from "@bitwarden/common/services/environment.service"; +import { EventService } from "@bitwarden/common/services/event.service"; +import { ExportService } from "@bitwarden/common/services/export.service"; +import { FileUploadService } from "@bitwarden/common/services/fileUpload.service"; +import { FolderService } from "@bitwarden/common/services/folder.service"; +import { KeyConnectorService } from "@bitwarden/common/services/keyConnector.service"; +import { NotificationsService } from "@bitwarden/common/services/notifications.service"; +import { OrganizationService } from "@bitwarden/common/services/organization.service"; +import { PasswordGenerationService } from "@bitwarden/common/services/passwordGeneration.service"; +import { PolicyService } from "@bitwarden/common/services/policy.service"; +import { ProviderService } from "@bitwarden/common/services/provider.service"; +import { SearchService } from "@bitwarden/common/services/search.service"; +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 { SyncService } from "@bitwarden/common/services/sync.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 { UserVerificationService } from "@bitwarden/common/services/userVerification.service"; +import { UsernameGenerationService } from "@bitwarden/common/services/usernameGeneration.service"; +import { VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout.service"; +import { WebCryptoFunctionService } from "@bitwarden/common/services/webCryptoFunction.service"; import { AuthGuard } from "../guards/auth.guard"; import { LockGuard } from "../guards/lock.guard"; diff --git a/libs/angular/src/services/passwordReprompt.service.ts b/libs/angular/src/services/passwordReprompt.service.ts index 723c41f78b..e1fc916cd7 100644 --- a/libs/angular/src/services/passwordReprompt.service.ts +++ b/libs/angular/src/services/passwordReprompt.service.ts @@ -1,7 +1,7 @@ import { Injectable } from "@angular/core"; -import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service"; -import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "jslib-common/abstractions/passwordReprompt.service"; +import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service"; +import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/abstractions/passwordReprompt.service"; import { PasswordRepromptComponent } from "../components/password-reprompt.component"; diff --git a/libs/angular/src/services/validation.service.ts b/libs/angular/src/services/validation.service.ts index 865f6458a0..a9d4dbbf33 100644 --- a/libs/angular/src/services/validation.service.ts +++ b/libs/angular/src/services/validation.service.ts @@ -1,8 +1,8 @@ import { Injectable } from "@angular/core"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { ErrorResponse } from "jslib-common/models/response/errorResponse"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { ErrorResponse } from "@bitwarden/common/models/response/errorResponse"; @Injectable() export class ValidationService { diff --git a/libs/angular/tsconfig.json b/libs/angular/tsconfig.json index c2fd662cfe..6004a56fb5 100644 --- a/libs/angular/tsconfig.json +++ b/libs/angular/tsconfig.json @@ -1,11 +1,5 @@ { - "extends": "../shared/tsconfig", - "compilerOptions": { - "paths": { - "jslib-common/*": ["../common/src/*"], - "jslib-angular/*": ["./src/"] - } - }, + "extends": "../shared/tsconfig.libs", "include": ["src", "spec"], "exclude": ["node_modules", "dist"] } diff --git a/libs/common/jest.config.js b/libs/common/jest.config.js index 9e8c9211c0..734598be3e 100644 --- a/libs/common/jest.config.js +++ b/libs/common/jest.config.js @@ -1,6 +1,6 @@ const { pathsToModuleNameMapper } = require("ts-jest"); -const { compilerOptions } = require("./tsconfig"); +const { compilerOptions } = require("../shared/tsconfig.libs"); module.exports = { name: "common", diff --git a/libs/common/package.json b/libs/common/package.json index 1c03329a7b..37e3821df1 100644 --- a/libs/common/package.json +++ b/libs/common/package.json @@ -1,5 +1,5 @@ { - "name": "@bitwarden/jslib-common", + "name": "@bitwarden/common", "version": "0.0.0", "description": "Common code used across Bitwarden JavaScript projects.", "keywords": [ diff --git a/libs/common/spec/domain/attachment.spec.ts b/libs/common/spec/domain/attachment.spec.ts index f625adbfff..72db84ce63 100644 --- a/libs/common/spec/domain/attachment.spec.ts +++ b/libs/common/spec/domain/attachment.spec.ts @@ -1,10 +1,10 @@ import Substitute, { Arg } from "@fluffy-spoon/substitute"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { AttachmentData } from "jslib-common/models/data/attachmentData"; -import { Attachment } from "jslib-common/models/domain/attachment"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; -import { ContainerService } from "jslib-common/services/container.service"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { AttachmentData } from "@bitwarden/common/models/data/attachmentData"; +import { Attachment } from "@bitwarden/common/models/domain/attachment"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { ContainerService } from "@bitwarden/common/services/container.service"; import { makeStaticByteArray, mockEnc } from "../utils"; diff --git a/libs/common/spec/domain/card.spec.ts b/libs/common/spec/domain/card.spec.ts index f4709bccf9..0565f1da43 100644 --- a/libs/common/spec/domain/card.spec.ts +++ b/libs/common/spec/domain/card.spec.ts @@ -1,5 +1,5 @@ -import { CardData } from "jslib-common/models/data/cardData"; -import { Card } from "jslib-common/models/domain/card"; +import { CardData } from "@bitwarden/common/models/data/cardData"; +import { Card } from "@bitwarden/common/models/domain/card"; import { mockEnc } from "../utils"; diff --git a/libs/common/spec/domain/cipher.spec.ts b/libs/common/spec/domain/cipher.spec.ts index 0eff1b85d8..6bc3b933ce 100644 --- a/libs/common/spec/domain/cipher.spec.ts +++ b/libs/common/spec/domain/cipher.spec.ts @@ -1,19 +1,19 @@ import Substitute, { Arg } from "@fluffy-spoon/substitute"; -import { CipherRepromptType } from "jslib-common/enums/cipherRepromptType"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { FieldType } from "jslib-common/enums/fieldType"; -import { SecureNoteType } from "jslib-common/enums/secureNoteType"; -import { UriMatchType } from "jslib-common/enums/uriMatchType"; -import { CipherData } from "jslib-common/models/data/cipherData"; -import { Card } from "jslib-common/models/domain/card"; -import { Cipher } from "jslib-common/models/domain/cipher"; -import { Identity } from "jslib-common/models/domain/identity"; -import { Login } from "jslib-common/models/domain/login"; -import { SecureNote } from "jslib-common/models/domain/secureNote"; -import { CardView } from "jslib-common/models/view/cardView"; -import { IdentityView } from "jslib-common/models/view/identityView"; -import { LoginView } from "jslib-common/models/view/loginView"; +import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { UriMatchType } from "@bitwarden/common/enums/uriMatchType"; +import { CipherData } from "@bitwarden/common/models/data/cipherData"; +import { Card } from "@bitwarden/common/models/domain/card"; +import { Cipher } from "@bitwarden/common/models/domain/cipher"; +import { Identity } from "@bitwarden/common/models/domain/identity"; +import { Login } from "@bitwarden/common/models/domain/login"; +import { SecureNote } from "@bitwarden/common/models/domain/secureNote"; +import { CardView } from "@bitwarden/common/models/view/cardView"; +import { IdentityView } from "@bitwarden/common/models/view/identityView"; +import { LoginView } from "@bitwarden/common/models/view/loginView"; import { mockEnc } from "../utils"; diff --git a/libs/common/spec/domain/collection.spec.ts b/libs/common/spec/domain/collection.spec.ts index 713bf2eba2..1c2d8ed86a 100644 --- a/libs/common/spec/domain/collection.spec.ts +++ b/libs/common/spec/domain/collection.spec.ts @@ -1,5 +1,5 @@ -import { CollectionData } from "jslib-common/models/data/collectionData"; -import { Collection } from "jslib-common/models/domain/collection"; +import { CollectionData } from "@bitwarden/common/models/data/collectionData"; +import { Collection } from "@bitwarden/common/models/domain/collection"; import { mockEnc } from "../utils"; diff --git a/libs/common/spec/domain/encString.spec.ts b/libs/common/spec/domain/encString.spec.ts index e2477447d6..1b0c3d9eb0 100644 --- a/libs/common/spec/domain/encString.spec.ts +++ b/libs/common/spec/domain/encString.spec.ts @@ -1,10 +1,10 @@ import Substitute, { Arg } from "@fluffy-spoon/substitute"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { EncryptionType } from "jslib-common/enums/encryptionType"; -import { EncString } from "jslib-common/models/domain/encString"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; -import { ContainerService } from "jslib-common/services/container.service"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { EncryptionType } from "@bitwarden/common/enums/encryptionType"; +import { EncString } from "@bitwarden/common/models/domain/encString"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { ContainerService } from "@bitwarden/common/services/container.service"; describe("EncString", () => { afterEach(() => { diff --git a/libs/common/spec/domain/field.spec.ts b/libs/common/spec/domain/field.spec.ts index 40ceb710a4..8ca74f0e28 100644 --- a/libs/common/spec/domain/field.spec.ts +++ b/libs/common/spec/domain/field.spec.ts @@ -1,6 +1,6 @@ -import { FieldType } from "jslib-common/enums/fieldType"; -import { FieldData } from "jslib-common/models/data/fieldData"; -import { Field } from "jslib-common/models/domain/field"; +import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { FieldData } from "@bitwarden/common/models/data/fieldData"; +import { Field } from "@bitwarden/common/models/domain/field"; import { mockEnc } from "../utils"; diff --git a/libs/common/spec/domain/folder.spec.ts b/libs/common/spec/domain/folder.spec.ts index 20ca6b9523..8ce5477ea7 100644 --- a/libs/common/spec/domain/folder.spec.ts +++ b/libs/common/spec/domain/folder.spec.ts @@ -1,5 +1,5 @@ -import { FolderData } from "jslib-common/models/data/folderData"; -import { Folder } from "jslib-common/models/domain/folder"; +import { FolderData } from "@bitwarden/common/models/data/folderData"; +import { Folder } from "@bitwarden/common/models/domain/folder"; import { mockEnc } from "../utils"; diff --git a/libs/common/spec/domain/identity.spec.ts b/libs/common/spec/domain/identity.spec.ts index ffaf504925..84fd1e5c39 100644 --- a/libs/common/spec/domain/identity.spec.ts +++ b/libs/common/spec/domain/identity.spec.ts @@ -1,5 +1,5 @@ -import { IdentityData } from "jslib-common/models/data/identityData"; -import { Identity } from "jslib-common/models/domain/identity"; +import { IdentityData } from "@bitwarden/common/models/data/identityData"; +import { Identity } from "@bitwarden/common/models/domain/identity"; import { mockEnc } from "../utils"; diff --git a/libs/common/spec/domain/login.spec.ts b/libs/common/spec/domain/login.spec.ts index 88c31a5f7a..74479ecb3a 100644 --- a/libs/common/spec/domain/login.spec.ts +++ b/libs/common/spec/domain/login.spec.ts @@ -1,10 +1,10 @@ import Substitute, { Arg } from "@fluffy-spoon/substitute"; -import { UriMatchType } from "jslib-common/enums/uriMatchType"; -import { LoginData } from "jslib-common/models/data/loginData"; -import { Login } from "jslib-common/models/domain/login"; -import { LoginUri } from "jslib-common/models/domain/loginUri"; -import { LoginUriView } from "jslib-common/models/view/loginUriView"; +import { UriMatchType } from "@bitwarden/common/enums/uriMatchType"; +import { LoginData } from "@bitwarden/common/models/data/loginData"; +import { Login } from "@bitwarden/common/models/domain/login"; +import { LoginUri } from "@bitwarden/common/models/domain/loginUri"; +import { LoginUriView } from "@bitwarden/common/models/view/loginUriView"; import { mockEnc } from "../utils"; diff --git a/libs/common/spec/domain/loginUri.spec.ts b/libs/common/spec/domain/loginUri.spec.ts index 2ea5ab59ad..b57721bd0c 100644 --- a/libs/common/spec/domain/loginUri.spec.ts +++ b/libs/common/spec/domain/loginUri.spec.ts @@ -1,6 +1,6 @@ -import { UriMatchType } from "jslib-common/enums/uriMatchType"; -import { LoginUriData } from "jslib-common/models/data/loginUriData"; -import { LoginUri } from "jslib-common/models/domain/loginUri"; +import { UriMatchType } from "@bitwarden/common/enums/uriMatchType"; +import { LoginUriData } from "@bitwarden/common/models/data/loginUriData"; +import { LoginUri } from "@bitwarden/common/models/domain/loginUri"; import { mockEnc } from "../utils"; diff --git a/libs/common/spec/domain/password.spec.ts b/libs/common/spec/domain/password.spec.ts index 4054c9510a..24377d6238 100644 --- a/libs/common/spec/domain/password.spec.ts +++ b/libs/common/spec/domain/password.spec.ts @@ -1,5 +1,5 @@ -import { PasswordHistoryData } from "jslib-common/models/data/passwordHistoryData"; -import { Password } from "jslib-common/models/domain/password"; +import { PasswordHistoryData } from "@bitwarden/common/models/data/passwordHistoryData"; +import { Password } from "@bitwarden/common/models/domain/password"; import { mockEnc } from "../utils"; diff --git a/libs/common/spec/domain/secureNote.spec.ts b/libs/common/spec/domain/secureNote.spec.ts index 50ca67ed26..592c991d80 100644 --- a/libs/common/spec/domain/secureNote.spec.ts +++ b/libs/common/spec/domain/secureNote.spec.ts @@ -1,6 +1,6 @@ -import { SecureNoteType } from "jslib-common/enums/secureNoteType"; -import { SecureNoteData } from "jslib-common/models/data/secureNoteData"; -import { SecureNote } from "jslib-common/models/domain/secureNote"; +import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { SecureNoteData } from "@bitwarden/common/models/data/secureNoteData"; +import { SecureNote } from "@bitwarden/common/models/domain/secureNote"; describe("SecureNote", () => { let data: SecureNoteData; diff --git a/libs/common/spec/domain/send.spec.ts b/libs/common/spec/domain/send.spec.ts index c97f1be64e..23f570b9b9 100644 --- a/libs/common/spec/domain/send.spec.ts +++ b/libs/common/spec/domain/send.spec.ts @@ -1,12 +1,12 @@ import Substitute, { Arg, SubstituteOf } from "@fluffy-spoon/substitute"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { SendType } from "jslib-common/enums/sendType"; -import { SendData } from "jslib-common/models/data/sendData"; -import { EncString } from "jslib-common/models/domain/encString"; -import { Send } from "jslib-common/models/domain/send"; -import { SendText } from "jslib-common/models/domain/sendText"; -import { ContainerService } from "jslib-common/services/container.service"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { SendType } from "@bitwarden/common/enums/sendType"; +import { SendData } from "@bitwarden/common/models/data/sendData"; +import { EncString } from "@bitwarden/common/models/domain/encString"; +import { Send } from "@bitwarden/common/models/domain/send"; +import { SendText } from "@bitwarden/common/models/domain/sendText"; +import { ContainerService } from "@bitwarden/common/services/container.service"; import { makeStaticByteArray, mockEnc } from "../utils"; diff --git a/libs/common/spec/domain/sendAccess.spec.ts b/libs/common/spec/domain/sendAccess.spec.ts index fc3001a5b9..49c635c8d3 100644 --- a/libs/common/spec/domain/sendAccess.spec.ts +++ b/libs/common/spec/domain/sendAccess.spec.ts @@ -1,9 +1,9 @@ import Substitute, { Arg } from "@fluffy-spoon/substitute"; -import { SendType } from "jslib-common/enums/sendType"; -import { SendAccess } from "jslib-common/models/domain/sendAccess"; -import { SendText } from "jslib-common/models/domain/sendText"; -import { SendAccessResponse } from "jslib-common/models/response/sendAccessResponse"; +import { SendType } from "@bitwarden/common/enums/sendType"; +import { SendAccess } from "@bitwarden/common/models/domain/sendAccess"; +import { SendText } from "@bitwarden/common/models/domain/sendText"; +import { SendAccessResponse } from "@bitwarden/common/models/response/sendAccessResponse"; import { mockEnc } from "../utils"; diff --git a/libs/common/spec/domain/sendFile.spec.ts b/libs/common/spec/domain/sendFile.spec.ts index 9fde0b76df..a6c57349e1 100644 --- a/libs/common/spec/domain/sendFile.spec.ts +++ b/libs/common/spec/domain/sendFile.spec.ts @@ -1,5 +1,5 @@ -import { SendFileData } from "jslib-common/models/data/sendFileData"; -import { SendFile } from "jslib-common/models/domain/sendFile"; +import { SendFileData } from "@bitwarden/common/models/data/sendFileData"; +import { SendFile } from "@bitwarden/common/models/domain/sendFile"; import { mockEnc } from "../utils"; diff --git a/libs/common/spec/domain/sendText.spec.ts b/libs/common/spec/domain/sendText.spec.ts index 776a4c5705..683331ba9c 100644 --- a/libs/common/spec/domain/sendText.spec.ts +++ b/libs/common/spec/domain/sendText.spec.ts @@ -1,5 +1,5 @@ -import { SendTextData } from "jslib-common/models/data/sendTextData"; -import { SendText } from "jslib-common/models/domain/sendText"; +import { SendTextData } from "@bitwarden/common/models/data/sendTextData"; +import { SendText } from "@bitwarden/common/models/domain/sendText"; import { mockEnc } from "../utils"; diff --git a/libs/common/spec/domain/symmetricCryptoKey.spec.ts b/libs/common/spec/domain/symmetricCryptoKey.spec.ts index 62f096c1ec..31410f254b 100644 --- a/libs/common/spec/domain/symmetricCryptoKey.spec.ts +++ b/libs/common/spec/domain/symmetricCryptoKey.spec.ts @@ -1,5 +1,5 @@ -import { EncryptionType } from "jslib-common/enums/encryptionType"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; +import { EncryptionType } from "@bitwarden/common/enums/encryptionType"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; import { makeStaticByteArray } from "../utils"; diff --git a/libs/common/spec/importers/bitwardenJsonImporter.spec.ts b/libs/common/spec/importers/bitwardenJsonImporter.spec.ts index 94b035286b..46cf44207a 100644 --- a/libs/common/spec/importers/bitwardenJsonImporter.spec.ts +++ b/libs/common/spec/importers/bitwardenJsonImporter.spec.ts @@ -1,8 +1,8 @@ import { Substitute, SubstituteOf } from "@fluffy-spoon/substitute"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { BitwardenJsonImporter } from "jslib-common/importers/bitwardenJsonImporter"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { BitwardenJsonImporter } from "@bitwarden/common/importers/bitwardenJsonImporter"; import { data as passwordProtectedData } from "./testData/bitwardenJson/passwordProtected.json"; diff --git a/libs/common/spec/importers/bitwardenPasswordProtectedImporter.spec.ts b/libs/common/spec/importers/bitwardenPasswordProtectedImporter.spec.ts index ed2434ee53..820f8db38c 100644 --- a/libs/common/spec/importers/bitwardenPasswordProtectedImporter.spec.ts +++ b/libs/common/spec/importers/bitwardenPasswordProtectedImporter.spec.ts @@ -1,11 +1,11 @@ import Substitute, { Arg, SubstituteOf } from "@fluffy-spoon/substitute"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { KdfType } from "jslib-common/enums/kdfType"; -import { BitwardenPasswordProtectedImporter } from "jslib-common/importers/bitwardenPasswordProtectedImporter"; -import { Utils } from "jslib-common/misc/utils"; -import { ImportResult } from "jslib-common/models/domain/importResult"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { KdfType } from "@bitwarden/common/enums/kdfType"; +import { BitwardenPasswordProtectedImporter } from "@bitwarden/common/importers/bitwardenPasswordProtectedImporter"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { ImportResult } from "@bitwarden/common/models/domain/importResult"; import { data as emptyDecryptedData } from "./testData/bitwardenJson/empty.json"; diff --git a/libs/common/spec/importers/dashlaneCsvImporter.spec.ts b/libs/common/spec/importers/dashlaneCsvImporter.spec.ts index 666e32323b..5fdd9a95a6 100644 --- a/libs/common/spec/importers/dashlaneCsvImporter.spec.ts +++ b/libs/common/spec/importers/dashlaneCsvImporter.spec.ts @@ -1,5 +1,5 @@ -import { CipherType } from "jslib-common/enums/cipherType"; -import { DashlaneCsvImporter as Importer } from "jslib-common/importers/dashlaneImporters/dashlaneCsvImporter"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { DashlaneCsvImporter as Importer } from "@bitwarden/common/importers/dashlaneImporters/dashlaneCsvImporter"; import { credentialsData } from "./testData/dashlaneCsv/credentials.csv"; import { identityData } from "./testData/dashlaneCsv/id.csv"; diff --git a/libs/common/spec/importers/firefoxCsvImporter.spec.ts b/libs/common/spec/importers/firefoxCsvImporter.spec.ts index e15b86e9ff..06f5246d0c 100644 --- a/libs/common/spec/importers/firefoxCsvImporter.spec.ts +++ b/libs/common/spec/importers/firefoxCsvImporter.spec.ts @@ -1,7 +1,7 @@ -import { FirefoxCsvImporter as Importer } from "jslib-common/importers/firefoxCsvImporter"; -import { CipherView } from "jslib-common/models/view/cipherView"; -import { LoginUriView } from "jslib-common/models/view/loginUriView"; -import { LoginView } from "jslib-common/models/view/loginView"; +import { FirefoxCsvImporter as Importer } from "@bitwarden/common/importers/firefoxCsvImporter"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { LoginUriView } from "@bitwarden/common/models/view/loginUriView"; +import { LoginView } from "@bitwarden/common/models/view/loginView"; import { data as firefoxAccountsData } from "./testData/firefoxCsv/firefoxAccountsData.csv"; import { data as simplePasswordData } from "./testData/firefoxCsv/simplePasswordData.csv"; diff --git a/libs/common/spec/importers/fsecureFskImporter.spec.ts b/libs/common/spec/importers/fsecureFskImporter.spec.ts index 63d082df34..f0aa03bb1c 100644 --- a/libs/common/spec/importers/fsecureFskImporter.spec.ts +++ b/libs/common/spec/importers/fsecureFskImporter.spec.ts @@ -1,4 +1,4 @@ -import { FSecureFskImporter as Importer } from "jslib-common/importers/fsecureFskImporter"; +import { FSecureFskImporter as Importer } from "@bitwarden/common/importers/fsecureFskImporter"; const TestDataWithStyleSetToWebsite: string = JSON.stringify({ data: { diff --git a/libs/common/spec/importers/keepass2XmlImporter.spec.ts b/libs/common/spec/importers/keepass2XmlImporter.spec.ts index 6b53946884..6364acca4e 100644 --- a/libs/common/spec/importers/keepass2XmlImporter.spec.ts +++ b/libs/common/spec/importers/keepass2XmlImporter.spec.ts @@ -1,4 +1,4 @@ -import { KeePass2XmlImporter as Importer } from "jslib-common/importers/keepass2XmlImporter"; +import { KeePass2XmlImporter as Importer } from "@bitwarden/common/importers/keepass2XmlImporter"; const TestData = ` diff --git a/libs/common/spec/importers/keeperJsonImporter.spec.ts b/libs/common/spec/importers/keeperJsonImporter.spec.ts index 3da6ac4860..ef92839645 100644 --- a/libs/common/spec/importers/keeperJsonImporter.spec.ts +++ b/libs/common/spec/importers/keeperJsonImporter.spec.ts @@ -1,5 +1,5 @@ -import { KeeperJsonImporter as Importer } from "jslib-common/importers/keeperImporters/keeperJsonImporter"; -import { Utils } from "jslib-common/misc/utils"; +import { KeeperJsonImporter as Importer } from "@bitwarden/common/importers/keeperImporters/keeperJsonImporter"; +import { Utils } from "@bitwarden/common/misc/utils"; import { testData as TestData } from "./testData/keeperJson/testData"; diff --git a/libs/common/spec/importers/lastpassCsvImporter.spec.ts b/libs/common/spec/importers/lastpassCsvImporter.spec.ts index 9cca6c4fbb..21761ee311 100644 --- a/libs/common/spec/importers/lastpassCsvImporter.spec.ts +++ b/libs/common/spec/importers/lastpassCsvImporter.spec.ts @@ -1,9 +1,9 @@ -import { CipherType } from "jslib-common/enums/cipherType"; -import { FieldType } from "jslib-common/enums/fieldType"; -import { LastPassCsvImporter as Importer } from "jslib-common/importers/lastpassCsvImporter"; -import { ImportResult } from "jslib-common/models/domain/importResult"; -import { CipherView } from "jslib-common/models/view/cipherView"; -import { FieldView } from "jslib-common/models/view/fieldView"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { LastPassCsvImporter as Importer } from "@bitwarden/common/importers/lastpassCsvImporter"; +import { ImportResult } from "@bitwarden/common/models/domain/importResult"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { FieldView } from "@bitwarden/common/models/view/fieldView"; function baseExcept(result: ImportResult) { expect(result).not.toBeNull(); diff --git a/libs/common/spec/importers/mykiCsvImporter.spec.ts b/libs/common/spec/importers/mykiCsvImporter.spec.ts index d9538ee765..d7f9a91e27 100644 --- a/libs/common/spec/importers/mykiCsvImporter.spec.ts +++ b/libs/common/spec/importers/mykiCsvImporter.spec.ts @@ -1,6 +1,6 @@ -import { CipherType } from "jslib-common/enums/cipherType"; -import { MykiCsvImporter as Importer } from "jslib-common/importers/mykiCsvImporter"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { MykiCsvImporter as Importer } from "@bitwarden/common/importers/mykiCsvImporter"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; import { userAccountData } from "./testData/mykiCsv/UserAccount.csv"; import { userCreditCardData } from "./testData/mykiCsv/UserCreditCard.csv"; diff --git a/libs/common/spec/importers/nordpassCsvImporter.spec.ts b/libs/common/spec/importers/nordpassCsvImporter.spec.ts index 4022b7e35d..20fa57c6b7 100644 --- a/libs/common/spec/importers/nordpassCsvImporter.spec.ts +++ b/libs/common/spec/importers/nordpassCsvImporter.spec.ts @@ -1,8 +1,8 @@ -import { CipherType } from "jslib-common/enums/cipherType"; -import { SecureNoteType } from "jslib-common/enums/secureNoteType"; -import { NordPassCsvImporter as Importer } from "jslib-common/importers/nordpassCsvImporter"; -import { CipherView } from "jslib-common/models/view/cipherView"; -import { IdentityView } from "jslib-common/models/view/identityView"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { NordPassCsvImporter as Importer } from "@bitwarden/common/importers/nordpassCsvImporter"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { IdentityView } from "@bitwarden/common/models/view/identityView"; import { data as creditCardData } from "./testData/nordpassCsv/nordpass.card.csv"; import { data as identityData } from "./testData/nordpassCsv/nordpass.identity.csv"; diff --git a/libs/common/spec/importers/onepassword1PifImporter.spec.ts b/libs/common/spec/importers/onepassword1PifImporter.spec.ts index ffa2417a10..85080377de 100644 --- a/libs/common/spec/importers/onepassword1PifImporter.spec.ts +++ b/libs/common/spec/importers/onepassword1PifImporter.spec.ts @@ -1,5 +1,5 @@ -import { FieldType } from "jslib-common/enums/fieldType"; -import { OnePassword1PifImporter as Importer } from "jslib-common/importers/onepasswordImporters/onepassword1PifImporter"; +import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { OnePassword1PifImporter as Importer } from "@bitwarden/common/importers/onepasswordImporters/onepassword1PifImporter"; const TestData: string = "***aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee***\n" + diff --git a/libs/common/spec/importers/onepassword1PuxImporter.spec.ts b/libs/common/spec/importers/onepassword1PuxImporter.spec.ts index a56e080a96..47dce8f0e7 100644 --- a/libs/common/spec/importers/onepassword1PuxImporter.spec.ts +++ b/libs/common/spec/importers/onepassword1PuxImporter.spec.ts @@ -1,9 +1,9 @@ -import { CipherType } from "jslib-common/enums/cipherType"; -import { FieldType } from "jslib-common/enums/fieldType"; -import { SecureNoteType } from "jslib-common/enums/secureNoteType"; -import { OnePassword1PuxImporter as Importer } from "jslib-common/importers/onepasswordImporters/onepassword1PuxImporter"; -import { Utils } from "jslib-common/misc/utils"; -import { FieldView } from "jslib-common/models/view/fieldView"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; +import { OnePassword1PuxImporter as Importer } from "@bitwarden/common/importers/onepasswordImporters/onepassword1PuxImporter"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { FieldView } from "@bitwarden/common/models/view/fieldView"; import { APICredentialsData } from "./testData/onePassword1Pux/APICredentials"; import { BankAccountData } from "./testData/onePassword1Pux/BankAccount"; diff --git a/libs/common/spec/importers/onepasswordMacCsvImporter.spec.ts b/libs/common/spec/importers/onepasswordMacCsvImporter.spec.ts index 73569fc6ea..ea2bf1c84f 100644 --- a/libs/common/spec/importers/onepasswordMacCsvImporter.spec.ts +++ b/libs/common/spec/importers/onepasswordMacCsvImporter.spec.ts @@ -1,6 +1,6 @@ -import { CipherType } from "jslib-common/enums/cipherType"; -import { OnePasswordMacCsvImporter as Importer } from "jslib-common/importers/onepasswordImporters/onepasswordMacCsvImporter"; -import { CipherView } from "jslib-common/models/view/cipherView"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { OnePasswordMacCsvImporter as Importer } from "@bitwarden/common/importers/onepasswordImporters/onepasswordMacCsvImporter"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; import { data as creditCardData } from "./testData/onePasswordCsv/creditCard.mac.csv"; import { data as identityData } from "./testData/onePasswordCsv/identity.mac.csv"; diff --git a/libs/common/spec/importers/onepasswordWinCsvImporter.spec.ts b/libs/common/spec/importers/onepasswordWinCsvImporter.spec.ts index bfc1044a16..e7186ee292 100644 --- a/libs/common/spec/importers/onepasswordWinCsvImporter.spec.ts +++ b/libs/common/spec/importers/onepasswordWinCsvImporter.spec.ts @@ -1,8 +1,8 @@ -import { CipherType } from "jslib-common/enums/cipherType"; -import { FieldType } from "jslib-common/enums/fieldType"; -import { OnePasswordWinCsvImporter as Importer } from "jslib-common/importers/onepasswordImporters/onepasswordWinCsvImporter"; -import { CipherView } from "jslib-common/models/view/cipherView"; -import { FieldView } from "jslib-common/models/view/fieldView"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { FieldType } from "@bitwarden/common/enums/fieldType"; +import { OnePasswordWinCsvImporter as Importer } from "@bitwarden/common/importers/onepasswordImporters/onepasswordWinCsvImporter"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { FieldView } from "@bitwarden/common/models/view/fieldView"; import { data as creditCardData } from "./testData/onePasswordCsv/creditCard.windows.csv"; import { data as identityData } from "./testData/onePasswordCsv/identity.windows.csv"; diff --git a/libs/common/spec/importers/safariCsvImporter.spec.ts b/libs/common/spec/importers/safariCsvImporter.spec.ts index f1e1186fe8..c24e39b502 100644 --- a/libs/common/spec/importers/safariCsvImporter.spec.ts +++ b/libs/common/spec/importers/safariCsvImporter.spec.ts @@ -1,7 +1,7 @@ -import { SafariCsvImporter as Importer } from "jslib-common/importers/safariCsvImporter"; -import { CipherView } from "jslib-common/models/view/cipherView"; -import { LoginUriView } from "jslib-common/models/view/loginUriView"; -import { LoginView } from "jslib-common/models/view/loginView"; +import { SafariCsvImporter as Importer } from "@bitwarden/common/importers/safariCsvImporter"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { LoginUriView } from "@bitwarden/common/models/view/loginUriView"; +import { LoginView } from "@bitwarden/common/models/view/loginView"; import { data as oldSimplePasswordData } from "./testData/safariCsv/oldSimplePasswordData.csv"; import { data as simplePasswordData } from "./testData/safariCsv/simplePasswordData.csv"; diff --git a/libs/common/spec/importers/testData/keeperJson/testData.ts b/libs/common/spec/importers/testData/keeperJson/testData.ts index fee8f54c45..c7868658a4 100644 --- a/libs/common/spec/importers/testData/keeperJson/testData.ts +++ b/libs/common/spec/importers/testData/keeperJson/testData.ts @@ -1,4 +1,4 @@ -import { KeeperJsonExport } from "jslib-common/importers/keeperImporters/types/keeperJsonTypes"; +import { KeeperJsonExport } from "@bitwarden/common/importers/keeperImporters/types/keeperJsonTypes"; export const testData: KeeperJsonExport = { shared_folders: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/APICredentials.ts b/libs/common/spec/importers/testData/onePassword1Pux/APICredentials.ts index 41b7533103..d9f91cc6e9 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/APICredentials.ts +++ b/libs/common/spec/importers/testData/onePassword1Pux/APICredentials.ts @@ -1,4 +1,4 @@ -import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; export const APICredentialsData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/BankAccount.ts b/libs/common/spec/importers/testData/onePassword1Pux/BankAccount.ts index 1ada271464..e5718988f2 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/BankAccount.ts +++ b/libs/common/spec/importers/testData/onePassword1Pux/BankAccount.ts @@ -1,4 +1,4 @@ -import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; export const BankAccountData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/CreditCard.ts b/libs/common/spec/importers/testData/onePassword1Pux/CreditCard.ts index ccdd4aa993..c05052c1f2 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/CreditCard.ts +++ b/libs/common/spec/importers/testData/onePassword1Pux/CreditCard.ts @@ -1,4 +1,4 @@ -import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; export const CreditCardData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/Database.ts b/libs/common/spec/importers/testData/onePassword1Pux/Database.ts index 594f53847c..2bbd6c2e23 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/Database.ts +++ b/libs/common/spec/importers/testData/onePassword1Pux/Database.ts @@ -1,4 +1,4 @@ -import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; export const DatabaseData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/DriversLicense.ts b/libs/common/spec/importers/testData/onePassword1Pux/DriversLicense.ts index 468069aeb6..e6e81bf83a 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/DriversLicense.ts +++ b/libs/common/spec/importers/testData/onePassword1Pux/DriversLicense.ts @@ -1,4 +1,4 @@ -import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; export const DriversLicenseData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/EmailAccount.ts b/libs/common/spec/importers/testData/onePassword1Pux/EmailAccount.ts index 1f83a6d89e..5f8950173c 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/EmailAccount.ts +++ b/libs/common/spec/importers/testData/onePassword1Pux/EmailAccount.ts @@ -1,4 +1,4 @@ -import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; export const EmailAccountData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/Emailfield.ts b/libs/common/spec/importers/testData/onePassword1Pux/Emailfield.ts index ae2723f397..ca282a1716 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/Emailfield.ts +++ b/libs/common/spec/importers/testData/onePassword1Pux/Emailfield.ts @@ -1,4 +1,4 @@ -import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; export const EmailFieldData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/EmailfieldOnIdentity.ts b/libs/common/spec/importers/testData/onePassword1Pux/EmailfieldOnIdentity.ts index e33404e384..ebd8abd4e0 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/EmailfieldOnIdentity.ts +++ b/libs/common/spec/importers/testData/onePassword1Pux/EmailfieldOnIdentity.ts @@ -1,4 +1,4 @@ -import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; export const EmailFieldOnIdentityData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/EmailfieldOnIdentity_Prefilled.ts b/libs/common/spec/importers/testData/onePassword1Pux/EmailfieldOnIdentity_Prefilled.ts index c383ebc825..afa7e16d6c 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/EmailfieldOnIdentity_Prefilled.ts +++ b/libs/common/spec/importers/testData/onePassword1Pux/EmailfieldOnIdentity_Prefilled.ts @@ -1,4 +1,4 @@ -import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; export const EmailFieldOnIdentityPrefilledData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/IdentityData.ts b/libs/common/spec/importers/testData/onePassword1Pux/IdentityData.ts index 9a37f94676..41291bac60 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/IdentityData.ts +++ b/libs/common/spec/importers/testData/onePassword1Pux/IdentityData.ts @@ -1,4 +1,4 @@ -import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; export const IdentityData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/LoginData.ts b/libs/common/spec/importers/testData/onePassword1Pux/LoginData.ts index b7c283534e..34a32baf1f 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/LoginData.ts +++ b/libs/common/spec/importers/testData/onePassword1Pux/LoginData.ts @@ -1,4 +1,4 @@ -import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; export const LoginData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/MedicalRecord.ts b/libs/common/spec/importers/testData/onePassword1Pux/MedicalRecord.ts index 0358b2a38b..5c47761b58 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/MedicalRecord.ts +++ b/libs/common/spec/importers/testData/onePassword1Pux/MedicalRecord.ts @@ -1,4 +1,4 @@ -import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; export const MedicalRecordData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/Membership.ts b/libs/common/spec/importers/testData/onePassword1Pux/Membership.ts index 62b5e10192..24488352fe 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/Membership.ts +++ b/libs/common/spec/importers/testData/onePassword1Pux/Membership.ts @@ -1,4 +1,4 @@ -import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; export const MembershipData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/Onepux_example.ts b/libs/common/spec/importers/testData/onePassword1Pux/Onepux_example.ts index e73705cbed..3278362e01 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/Onepux_example.ts +++ b/libs/common/spec/importers/testData/onePassword1Pux/Onepux_example.ts @@ -1,4 +1,4 @@ -import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; export const OnePuxExampleFile: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/OutdoorLicense.ts b/libs/common/spec/importers/testData/onePassword1Pux/OutdoorLicense.ts index ea59e4f529..3f6f31643d 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/OutdoorLicense.ts +++ b/libs/common/spec/importers/testData/onePassword1Pux/OutdoorLicense.ts @@ -1,4 +1,4 @@ -import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; export const OutdoorLicenseData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/Passport.ts b/libs/common/spec/importers/testData/onePassword1Pux/Passport.ts index 635b7eaeb3..86551d4a51 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/Passport.ts +++ b/libs/common/spec/importers/testData/onePassword1Pux/Passport.ts @@ -1,4 +1,4 @@ -import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; export const PassportData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/Password.ts b/libs/common/spec/importers/testData/onePassword1Pux/Password.ts index fc6c662dfb..d71d856a6d 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/Password.ts +++ b/libs/common/spec/importers/testData/onePassword1Pux/Password.ts @@ -1,4 +1,4 @@ -import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; export const PasswordData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/RewardsProgram.ts b/libs/common/spec/importers/testData/onePassword1Pux/RewardsProgram.ts index a0f0712e4a..fa4e173150 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/RewardsProgram.ts +++ b/libs/common/spec/importers/testData/onePassword1Pux/RewardsProgram.ts @@ -1,4 +1,4 @@ -import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; export const RewardsProgramData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/SSN.ts b/libs/common/spec/importers/testData/onePassword1Pux/SSN.ts index 058e5bdb55..721409a896 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/SSN.ts +++ b/libs/common/spec/importers/testData/onePassword1Pux/SSN.ts @@ -1,4 +1,4 @@ -import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; export const SSNData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/SanitizedExport.ts b/libs/common/spec/importers/testData/onePassword1Pux/SanitizedExport.ts index 657b26b557..d98500202e 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/SanitizedExport.ts +++ b/libs/common/spec/importers/testData/onePassword1Pux/SanitizedExport.ts @@ -1,4 +1,4 @@ -import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; export const SanitizedExport: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/SecureNote.ts b/libs/common/spec/importers/testData/onePassword1Pux/SecureNote.ts index 238cb667d2..fd690a8dd7 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/SecureNote.ts +++ b/libs/common/spec/importers/testData/onePassword1Pux/SecureNote.ts @@ -1,4 +1,4 @@ -import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; export const SecureNoteData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/Server.ts b/libs/common/spec/importers/testData/onePassword1Pux/Server.ts index c614d03ff8..dbbd2031c6 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/Server.ts +++ b/libs/common/spec/importers/testData/onePassword1Pux/Server.ts @@ -1,4 +1,4 @@ -import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; export const ServerData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/SoftwareLicense.ts b/libs/common/spec/importers/testData/onePassword1Pux/SoftwareLicense.ts index 769aa088f4..2b901977f0 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/SoftwareLicense.ts +++ b/libs/common/spec/importers/testData/onePassword1Pux/SoftwareLicense.ts @@ -1,4 +1,4 @@ -import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; export const SoftwareLicenseData: ExportData = { accounts: [ diff --git a/libs/common/spec/importers/testData/onePassword1Pux/WirelessRouter.ts b/libs/common/spec/importers/testData/onePassword1Pux/WirelessRouter.ts index 1fe6350ec5..8c3bb25424 100644 --- a/libs/common/spec/importers/testData/onePassword1Pux/WirelessRouter.ts +++ b/libs/common/spec/importers/testData/onePassword1Pux/WirelessRouter.ts @@ -1,4 +1,4 @@ -import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; +import { ExportData } from "@bitwarden/common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes"; export const WirelessRouterData: ExportData = { accounts: [ diff --git a/libs/common/spec/misc/logInStrategies/apiLogIn.strategy.spec.ts b/libs/common/spec/misc/logInStrategies/apiLogIn.strategy.spec.ts index 2f4fe6c31d..81672fe39e 100644 --- a/libs/common/spec/misc/logInStrategies/apiLogIn.strategy.spec.ts +++ b/libs/common/spec/misc/logInStrategies/apiLogIn.strategy.spec.ts @@ -1,19 +1,19 @@ import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AppIdService } from "jslib-common/abstractions/appId.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { TokenService } from "jslib-common/abstractions/token.service"; -import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service"; -import { ApiLogInStrategy } from "jslib-common/misc/logInStrategies/apiLogin.strategy"; -import { Utils } from "jslib-common/misc/utils"; -import { ApiLogInCredentials } from "jslib-common/models/domain/logInCredentials"; +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 { ApiLogInStrategy } from "@bitwarden/common/misc/logInStrategies/apiLogin.strategy"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { ApiLogInCredentials } from "@bitwarden/common/models/domain/logInCredentials"; import { identityTokenResponseFactory } from "./logIn.strategy.spec"; diff --git a/libs/common/spec/misc/logInStrategies/logIn.strategy.spec.ts b/libs/common/spec/misc/logInStrategies/logIn.strategy.spec.ts index 5f68881bad..1b26721bec 100644 --- a/libs/common/spec/misc/logInStrategies/logIn.strategy.spec.ts +++ b/libs/common/spec/misc/logInStrategies/logIn.strategy.spec.ts @@ -1,27 +1,27 @@ import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AppIdService } from "jslib-common/abstractions/appId.service"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { TokenService } from "jslib-common/abstractions/token.service"; -import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service"; -import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType"; -import { PasswordLogInStrategy } from "jslib-common/misc/logInStrategies/passwordLogin.strategy"; -import { Utils } from "jslib-common/misc/utils"; -import { Account, AccountProfile, AccountTokens } from "jslib-common/models/domain/account"; -import { AuthResult } from "jslib-common/models/domain/authResult"; -import { EncString } from "jslib-common/models/domain/encString"; -import { PasswordLogInCredentials } from "jslib-common/models/domain/logInCredentials"; -import { PasswordTokenRequest } from "jslib-common/models/request/identityToken/passwordTokenRequest"; -import { TokenRequestTwoFactor } from "jslib-common/models/request/identityToken/tokenRequestTwoFactor"; -import { IdentityCaptchaResponse } from "jslib-common/models/response/identityCaptchaResponse"; -import { IdentityTokenResponse } from "jslib-common/models/response/identityTokenResponse"; -import { IdentityTwoFactorResponse } from "jslib-common/models/response/identityTwoFactorResponse"; +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/authResult"; +import { EncString } from "@bitwarden/common/models/domain/encString"; +import { PasswordLogInCredentials } from "@bitwarden/common/models/domain/logInCredentials"; +import { PasswordTokenRequest } from "@bitwarden/common/models/request/identityToken/passwordTokenRequest"; +import { TokenRequestTwoFactor } from "@bitwarden/common/models/request/identityToken/tokenRequestTwoFactor"; +import { IdentityCaptchaResponse } from "@bitwarden/common/models/response/identityCaptchaResponse"; +import { IdentityTokenResponse } from "@bitwarden/common/models/response/identityTokenResponse"; +import { IdentityTwoFactorResponse } from "@bitwarden/common/models/response/identityTwoFactorResponse"; const email = "hello@world.com"; const masterPassword = "password"; diff --git a/libs/common/spec/misc/logInStrategies/passwordLogIn.strategy.spec.ts b/libs/common/spec/misc/logInStrategies/passwordLogIn.strategy.spec.ts index 65bf536712..f244f5f5bd 100644 --- a/libs/common/spec/misc/logInStrategies/passwordLogIn.strategy.spec.ts +++ b/libs/common/spec/misc/logInStrategies/passwordLogIn.strategy.spec.ts @@ -1,20 +1,20 @@ import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AppIdService } from "jslib-common/abstractions/appId.service"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { TokenService } from "jslib-common/abstractions/token.service"; -import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service"; -import { HashPurpose } from "jslib-common/enums/hashPurpose"; -import { PasswordLogInStrategy } from "jslib-common/misc/logInStrategies/passwordLogin.strategy"; -import { Utils } from "jslib-common/misc/utils"; -import { PasswordLogInCredentials } from "jslib-common/models/domain/logInCredentials"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; +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/logInCredentials"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; import { identityTokenResponseFactory } from "./logIn.strategy.spec"; diff --git a/libs/common/spec/misc/logInStrategies/ssoLogIn.strategy.spec.ts b/libs/common/spec/misc/logInStrategies/ssoLogIn.strategy.spec.ts index 826a16a508..1526fca548 100644 --- a/libs/common/spec/misc/logInStrategies/ssoLogIn.strategy.spec.ts +++ b/libs/common/spec/misc/logInStrategies/ssoLogIn.strategy.spec.ts @@ -1,18 +1,18 @@ import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AppIdService } from "jslib-common/abstractions/appId.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { TokenService } from "jslib-common/abstractions/token.service"; -import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service"; -import { SsoLogInStrategy } from "jslib-common/misc/logInStrategies/ssoLogin.strategy"; -import { Utils } from "jslib-common/misc/utils"; -import { SsoLogInCredentials } from "jslib-common/models/domain/logInCredentials"; +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/logInCredentials"; import { identityTokenResponseFactory } from "./logIn.strategy.spec"; diff --git a/libs/common/spec/misc/sequentialize.spec.ts b/libs/common/spec/misc/sequentialize.spec.ts index 4165eca2c1..77f10afb9a 100644 --- a/libs/common/spec/misc/sequentialize.spec.ts +++ b/libs/common/spec/misc/sequentialize.spec.ts @@ -1,4 +1,4 @@ -import { sequentialize } from "jslib-common/misc/sequentialize"; +import { sequentialize } from "@bitwarden/common/misc/sequentialize"; describe("sequentialize decorator", () => { it("should call the function once", async () => { diff --git a/libs/common/spec/misc/throttle.spec.ts b/libs/common/spec/misc/throttle.spec.ts index 5a8cd27ed3..27572c6e04 100644 --- a/libs/common/spec/misc/throttle.spec.ts +++ b/libs/common/spec/misc/throttle.spec.ts @@ -1,5 +1,5 @@ -import { sequentialize } from "jslib-common/misc/sequentialize"; -import { throttle } from "jslib-common/misc/throttle"; +import { sequentialize } from "@bitwarden/common/misc/sequentialize"; +import { throttle } from "@bitwarden/common/misc/throttle"; describe("throttle decorator", () => { it("should call the function once at a time", async () => { diff --git a/libs/common/spec/misc/utils.spec.ts b/libs/common/spec/misc/utils.spec.ts index eec41e4bb4..d4dbac958a 100644 --- a/libs/common/spec/misc/utils.spec.ts +++ b/libs/common/spec/misc/utils.spec.ts @@ -1,4 +1,4 @@ -import { Utils } from "jslib-common/misc/utils"; +import { Utils } from "@bitwarden/common/misc/utils"; describe("Utils Service", () => { describe("getDomain", () => { diff --git a/libs/common/spec/services/cipher.service.spec.ts b/libs/common/spec/services/cipher.service.spec.ts index 79b75787f6..0242626e69 100644 --- a/libs/common/spec/services/cipher.service.spec.ts +++ b/libs/common/spec/services/cipher.service.spec.ts @@ -1,19 +1,19 @@ import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { FileUploadService } from "jslib-common/abstractions/fileUpload.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { SearchService } from "jslib-common/abstractions/search.service"; -import { SettingsService } from "jslib-common/abstractions/settings.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { Utils } from "jslib-common/misc/utils"; -import { Cipher } from "jslib-common/models/domain/cipher"; -import { EncArrayBuffer } from "jslib-common/models/domain/encArrayBuffer"; -import { EncString } from "jslib-common/models/domain/encString"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; -import { CipherService } from "jslib-common/services/cipher.service"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { FileUploadService } from "@bitwarden/common/abstractions/fileUpload.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +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 { Utils } from "@bitwarden/common/misc/utils"; +import { Cipher } from "@bitwarden/common/models/domain/cipher"; +import { EncArrayBuffer } from "@bitwarden/common/models/domain/encArrayBuffer"; +import { EncString } from "@bitwarden/common/models/domain/encString"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { CipherService } from "@bitwarden/common/services/cipher.service"; const ENCRYPTED_TEXT = "This data has been encrypted"; const ENCRYPTED_BYTES = new EncArrayBuffer(Utils.fromUtf8ToArray(ENCRYPTED_TEXT).buffer); diff --git a/libs/common/spec/services/consoleLog.service.spec.ts b/libs/common/spec/services/consoleLog.service.spec.ts index 3f3059f753..fc487ce704 100644 --- a/libs/common/spec/services/consoleLog.service.spec.ts +++ b/libs/common/spec/services/consoleLog.service.spec.ts @@ -1,4 +1,4 @@ -import { ConsoleLogService } from "jslib-common/services/consoleLog.service"; +import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; const originalConsole = console; let caughtMessage: any; diff --git a/libs/common/spec/services/export.service.spec.ts b/libs/common/spec/services/export.service.spec.ts index fcbbff11f7..7c0a20c450 100644 --- a/libs/common/spec/services/export.service.spec.ts +++ b/libs/common/spec/services/export.service.spec.ts @@ -1,20 +1,20 @@ import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { KdfType } from "jslib-common/enums/kdfType"; -import { Utils } from "jslib-common/misc/utils"; -import { Cipher } from "jslib-common/models/domain/cipher"; -import { EncString } from "jslib-common/models/domain/encString"; -import { Login } from "jslib-common/models/domain/login"; -import { CipherWithIdExport as CipherExport } from "jslib-common/models/export/cipherWithIdsExport"; -import { CipherView } from "jslib-common/models/view/cipherView"; -import { LoginView } from "jslib-common/models/view/loginView"; -import { ExportService } from "jslib-common/services/export.service"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; +import { FolderService } from "@bitwarden/common/abstractions/folder.service"; +import { CipherType } from "@bitwarden/common/enums/cipherType"; +import { KdfType } from "@bitwarden/common/enums/kdfType"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { Cipher } from "@bitwarden/common/models/domain/cipher"; +import { EncString } from "@bitwarden/common/models/domain/encString"; +import { Login } from "@bitwarden/common/models/domain/login"; +import { CipherWithIdExport as CipherExport } from "@bitwarden/common/models/export/cipherWithIdsExport"; +import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { LoginView } from "@bitwarden/common/models/view/loginView"; +import { ExportService } from "@bitwarden/common/services/export.service"; import { BuildTestObject, GetUniqueString } from "../utils"; diff --git a/libs/common/spec/services/import.service.spec.ts b/libs/common/spec/services/import.service.spec.ts index dbf31cb298..5f0789943b 100644 --- a/libs/common/spec/services/import.service.spec.ts +++ b/libs/common/spec/services/import.service.spec.ts @@ -1,16 +1,16 @@ import Substitute, { SubstituteOf } from "@fluffy-spoon/substitute"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { BitwardenPasswordProtectedImporter } from "jslib-common/importers/bitwardenPasswordProtectedImporter"; -import { Importer } from "jslib-common/importers/importer"; -import { Utils } from "jslib-common/misc/utils"; -import { ImportService } from "jslib-common/services/import.service"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; +import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; +import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { FolderService } from "@bitwarden/common/abstractions/folder.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { BitwardenPasswordProtectedImporter } from "@bitwarden/common/importers/bitwardenPasswordProtectedImporter"; +import { Importer } from "@bitwarden/common/importers/importer"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { ImportService } from "@bitwarden/common/services/import.service"; describe("ImportService", () => { let importService: ImportService; diff --git a/libs/common/spec/services/stateMigration.service.ts b/libs/common/spec/services/stateMigration.service.ts index d325585a7c..400c3aaa24 100644 --- a/libs/common/spec/services/stateMigration.service.ts +++ b/libs/common/spec/services/stateMigration.service.ts @@ -1,11 +1,11 @@ import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute"; -import { StorageService } from "jslib-common/abstractions/storage.service"; -import { StateVersion } from "jslib-common/enums/stateVersion"; -import { StateFactory } from "jslib-common/factories/stateFactory"; -import { Account } from "jslib-common/models/domain/account"; -import { GlobalState } from "jslib-common/models/domain/globalState"; -import { StateMigrationService } from "jslib-common/services/stateMigration.service"; +import { StorageService } from "@bitwarden/common/abstractions/storage.service"; +import { StateVersion } from "@bitwarden/common/enums/stateVersion"; +import { StateFactory } from "@bitwarden/common/factories/stateFactory"; +import { Account } from "@bitwarden/common/models/domain/account"; +import { GlobalState } from "@bitwarden/common/models/domain/globalState"; +import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service"; const userId = "USER_ID"; diff --git a/libs/common/spec/utils.ts b/libs/common/spec/utils.ts index 58963d0f83..b01f8c1493 100644 --- a/libs/common/spec/utils.ts +++ b/libs/common/spec/utils.ts @@ -1,6 +1,6 @@ import Substitute, { Arg } from "@fluffy-spoon/substitute"; -import { EncString } from "jslib-common/models/domain/encString"; +import { EncString } from "@bitwarden/common/models/domain/encString"; function newGuid() { return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => { diff --git a/libs/common/spec/web/services/webCryptoFunction.service.spec.ts b/libs/common/spec/web/services/webCryptoFunction.service.spec.ts index 3e437c6a97..964364a1fa 100644 --- a/libs/common/spec/web/services/webCryptoFunction.service.spec.ts +++ b/libs/common/spec/web/services/webCryptoFunction.service.spec.ts @@ -1,9 +1,9 @@ import Substitute from "@fluffy-spoon/substitute"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { Utils } from "jslib-common/misc/utils"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; -import { WebCryptoFunctionService } from "jslib-common/services/webCryptoFunction.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { WebCryptoFunctionService } from "@bitwarden/common/services/webCryptoFunction.service"; const RsaPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl0Vawl/toXzkEvB82FEtqHP" + diff --git a/libs/common/src/abstractions/api.service.ts b/libs/common/src/abstractions/api.service.ts index bda6e2d0a5..d411561ccd 100644 --- a/libs/common/src/abstractions/api.service.ts +++ b/libs/common/src/abstractions/api.service.ts @@ -1,15 +1,4 @@ -import { OrganizationConnectionType } from "jslib-common/enums/organizationConnectionType"; -import { DeviceVerificationRequest } from "jslib-common/models/request/deviceVerificationRequest"; -import { OrganizationConnectionRequest } from "jslib-common/models/request/organizationConnectionRequest"; -import { BillingHistoryResponse } from "jslib-common/models/response/billingHistoryResponse"; -import { BillingPaymentResponse } from "jslib-common/models/response/billingPaymentResponse"; -import { DeviceVerificationResponse } from "jslib-common/models/response/deviceVerificationResponse"; -import { - OrganizationConnectionConfigApis, - OrganizationConnectionResponse, -} from "jslib-common/models/response/organizationConnectionResponse"; -import { SsoPreValidateResponse } from "jslib-common/models/response/ssoPreValidateResponse"; - +import { OrganizationConnectionType } from "../enums/organizationConnectionType"; import { PolicyType } from "../enums/policyType"; import { SetKeyConnectorKeyRequest } from "../models/request/account/setKeyConnectorKeyRequest"; import { VerifyOTPRequest } from "../models/request/account/verifyOTPRequest"; @@ -25,6 +14,7 @@ import { CipherRequest } from "../models/request/cipherRequest"; import { CipherShareRequest } from "../models/request/cipherShareRequest"; import { CollectionRequest } from "../models/request/collectionRequest"; import { DeleteRecoverRequest } from "../models/request/deleteRecoverRequest"; +import { DeviceVerificationRequest } from "../models/request/deviceVerificationRequest"; import { EmailRequest } from "../models/request/emailRequest"; import { EmailTokenRequest } from "../models/request/emailTokenRequest"; import { EmergencyAccessAcceptRequest } from "../models/request/emergencyAccessAcceptRequest"; @@ -49,6 +39,7 @@ import { OrganizationSponsorshipCreateRequest } from "../models/request/organiza import { OrganizationSponsorshipRedeemRequest } from "../models/request/organization/organizationSponsorshipRedeemRequest"; import { OrganizationSsoRequest } from "../models/request/organization/organizationSsoRequest"; import { OrganizationApiKeyRequest } from "../models/request/organizationApiKeyRequest"; +import { OrganizationConnectionRequest } from "../models/request/organizationConnectionRequest"; import { OrganizationCreateRequest } from "../models/request/organizationCreateRequest"; import { OrganizationImportRequest } from "../models/request/organizationImportRequest"; import { OrganizationKeysRequest } from "../models/request/organizationKeysRequest"; @@ -108,6 +99,8 @@ import { VerifyEmailRequest } from "../models/request/verifyEmailRequest"; import { ApiKeyResponse } from "../models/response/apiKeyResponse"; import { AttachmentResponse } from "../models/response/attachmentResponse"; import { AttachmentUploadDataResponse } from "../models/response/attachmentUploadDataResponse"; +import { BillingHistoryResponse } from "../models/response/billingHistoryResponse"; +import { BillingPaymentResponse } from "../models/response/billingPaymentResponse"; import { BillingResponse } from "../models/response/billingResponse"; import { BreachAccountResponse } from "../models/response/breachAccountResponse"; import { CipherResponse } from "../models/response/cipherResponse"; @@ -115,6 +108,7 @@ import { CollectionGroupDetailsResponse, CollectionResponse, } from "../models/response/collectionResponse"; +import { DeviceVerificationResponse } from "../models/response/deviceVerificationResponse"; import { DomainsResponse } from "../models/response/domainsResponse"; import { EmergencyAccessGranteeDetailsResponse, @@ -133,6 +127,10 @@ import { ListResponse } from "../models/response/listResponse"; import { OrganizationSsoResponse } from "../models/response/organization/organizationSsoResponse"; import { OrganizationApiKeyInformationResponse } from "../models/response/organizationApiKeyInformationResponse"; import { OrganizationAutoEnrollStatusResponse } from "../models/response/organizationAutoEnrollStatusResponse"; +import { + OrganizationConnectionConfigApis, + OrganizationConnectionResponse, +} from "../models/response/organizationConnectionResponse"; import { OrganizationKeysResponse } from "../models/response/organizationKeysResponse"; import { OrganizationResponse } from "../models/response/organizationResponse"; import { OrganizationSponsorshipSyncStatusResponse } from "../models/response/organizationSponsorshipSyncStatusResponse"; @@ -165,6 +163,7 @@ import { SendAccessResponse } from "../models/response/sendAccessResponse"; import { SendFileDownloadDataResponse } from "../models/response/sendFileDownloadDataResponse"; import { SendFileUploadDataResponse } from "../models/response/sendFileUploadDataResponse"; import { SendResponse } from "../models/response/sendResponse"; +import { SsoPreValidateResponse } from "../models/response/ssoPreValidateResponse"; import { SubscriptionResponse } from "../models/response/subscriptionResponse"; import { SyncResponse } from "../models/response/syncResponse"; import { TaxInfoResponse } from "../models/response/taxInfoResponse"; diff --git a/libs/common/src/models/request/identityToken/tokenRequestTwoFactor.ts b/libs/common/src/models/request/identityToken/tokenRequestTwoFactor.ts index 567e8c66e6..9d196ac684 100644 --- a/libs/common/src/models/request/identityToken/tokenRequestTwoFactor.ts +++ b/libs/common/src/models/request/identityToken/tokenRequestTwoFactor.ts @@ -1,4 +1,4 @@ -import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType"; +import { TwoFactorProviderType } from "../../../enums/twoFactorProviderType"; export class TokenRequestTwoFactor { constructor( diff --git a/libs/common/src/models/request/organizationConnectionRequest.ts b/libs/common/src/models/request/organizationConnectionRequest.ts index 89cd25fe65..69964cb09e 100644 --- a/libs/common/src/models/request/organizationConnectionRequest.ts +++ b/libs/common/src/models/request/organizationConnectionRequest.ts @@ -1,4 +1,4 @@ -import { OrganizationConnectionType } from "jslib-common/enums/organizationConnectionType"; +import { OrganizationConnectionType } from "../../enums/organizationConnectionType"; import { BillingSyncConfigRequest } from "./billingSyncConfigRequest"; diff --git a/libs/common/src/models/response/organizationConnectionResponse.ts b/libs/common/src/models/response/organizationConnectionResponse.ts index 954afaed3a..a1e9a3de67 100644 --- a/libs/common/src/models/response/organizationConnectionResponse.ts +++ b/libs/common/src/models/response/organizationConnectionResponse.ts @@ -1,5 +1,4 @@ -import { OrganizationConnectionType } from "jslib-common/enums/organizationConnectionType"; - +import { OrganizationConnectionType } from "../../enums/organizationConnectionType"; import { BillingSyncConfigApi } from "../api/billingSyncConfigApi"; import { BaseResponse } from "./baseResponse"; diff --git a/libs/common/src/services/api.service.ts b/libs/common/src/services/api.service.ts index abb4bf485e..0c9ff83bc3 100644 --- a/libs/common/src/services/api.service.ts +++ b/libs/common/src/services/api.service.ts @@ -1,21 +1,10 @@ -import { AppIdService } from "jslib-common/abstractions/appId.service"; -import { OrganizationConnectionType } from "jslib-common/enums/organizationConnectionType"; -import { DeviceRequest } from "jslib-common/models/request/deviceRequest"; -import { TokenRequestTwoFactor } from "jslib-common/models/request/identityToken/tokenRequestTwoFactor"; -import { OrganizationConnectionRequest } from "jslib-common/models/request/organizationConnectionRequest"; -import { BillingHistoryResponse } from "jslib-common/models/response/billingHistoryResponse"; -import { BillingPaymentResponse } from "jslib-common/models/response/billingPaymentResponse"; -import { - OrganizationConnectionConfigApis, - OrganizationConnectionResponse, -} from "jslib-common/models/response/organizationConnectionResponse"; -import { SsoPreValidateResponse } from "jslib-common/models/response/ssoPreValidateResponse"; - 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 { DeviceType } from "../enums/deviceType"; +import { OrganizationConnectionType } from "../enums/organizationConnectionType"; import { PolicyType } from "../enums/policyType"; import { Utils } from "../misc/utils"; import { SetKeyConnectorKeyRequest } from "../models/request/account/setKeyConnectorKeyRequest"; @@ -31,6 +20,7 @@ import { CipherRequest } from "../models/request/cipherRequest"; import { CipherShareRequest } from "../models/request/cipherShareRequest"; import { CollectionRequest } from "../models/request/collectionRequest"; import { DeleteRecoverRequest } from "../models/request/deleteRecoverRequest"; +import { DeviceRequest } from "../models/request/deviceRequest"; import { DeviceVerificationRequest } from "../models/request/deviceVerificationRequest"; import { EmailRequest } from "../models/request/emailRequest"; import { EmailTokenRequest } from "../models/request/emailTokenRequest"; @@ -46,6 +36,7 @@ import { IapCheckRequest } from "../models/request/iapCheckRequest"; import { ApiTokenRequest } from "../models/request/identityToken/apiTokenRequest"; import { PasswordTokenRequest } from "../models/request/identityToken/passwordTokenRequest"; import { SsoTokenRequest } from "../models/request/identityToken/ssoTokenRequest"; +import { TokenRequestTwoFactor } from "../models/request/identityToken/tokenRequestTwoFactor"; import { ImportCiphersRequest } from "../models/request/importCiphersRequest"; import { ImportDirectoryRequest } from "../models/request/importDirectoryRequest"; import { ImportOrganizationCiphersRequest } from "../models/request/importOrganizationCiphersRequest"; @@ -56,6 +47,7 @@ import { OrganizationSponsorshipCreateRequest } from "../models/request/organiza import { OrganizationSponsorshipRedeemRequest } from "../models/request/organization/organizationSponsorshipRedeemRequest"; import { OrganizationSsoRequest } from "../models/request/organization/organizationSsoRequest"; import { OrganizationApiKeyRequest } from "../models/request/organizationApiKeyRequest"; +import { OrganizationConnectionRequest } from "../models/request/organizationConnectionRequest"; import { OrganizationCreateRequest } from "../models/request/organizationCreateRequest"; import { OrganizationImportRequest } from "../models/request/organizationImportRequest"; import { OrganizationKeysRequest } from "../models/request/organizationKeysRequest"; @@ -115,6 +107,8 @@ import { VerifyEmailRequest } from "../models/request/verifyEmailRequest"; import { ApiKeyResponse } from "../models/response/apiKeyResponse"; import { AttachmentResponse } from "../models/response/attachmentResponse"; import { AttachmentUploadDataResponse } from "../models/response/attachmentUploadDataResponse"; +import { BillingHistoryResponse } from "../models/response/billingHistoryResponse"; +import { BillingPaymentResponse } from "../models/response/billingPaymentResponse"; import { BillingResponse } from "../models/response/billingResponse"; import { BreachAccountResponse } from "../models/response/breachAccountResponse"; import { CipherResponse } from "../models/response/cipherResponse"; @@ -142,6 +136,10 @@ import { ListResponse } from "../models/response/listResponse"; import { OrganizationSsoResponse } from "../models/response/organization/organizationSsoResponse"; import { OrganizationApiKeyInformationResponse } from "../models/response/organizationApiKeyInformationResponse"; import { OrganizationAutoEnrollStatusResponse } from "../models/response/organizationAutoEnrollStatusResponse"; +import { + OrganizationConnectionConfigApis, + OrganizationConnectionResponse, +} from "../models/response/organizationConnectionResponse"; import { OrganizationKeysResponse } from "../models/response/organizationKeysResponse"; import { OrganizationResponse } from "../models/response/organizationResponse"; import { OrganizationSponsorshipSyncStatusResponse } from "../models/response/organizationSponsorshipSyncStatusResponse"; @@ -174,6 +172,7 @@ import { SendAccessResponse } from "../models/response/sendAccessResponse"; import { SendFileDownloadDataResponse } from "../models/response/sendFileDownloadDataResponse"; import { SendFileUploadDataResponse } from "../models/response/sendFileUploadDataResponse"; import { SendResponse } from "../models/response/sendResponse"; +import { SsoPreValidateResponse } from "../models/response/ssoPreValidateResponse"; import { SubscriptionResponse } from "../models/response/subscriptionResponse"; import { SyncResponse } from "../models/response/syncResponse"; import { TaxInfoResponse } from "../models/response/taxInfoResponse"; diff --git a/libs/common/tsconfig.json b/libs/common/tsconfig.json index 0d578efad2..6004a56fb5 100644 --- a/libs/common/tsconfig.json +++ b/libs/common/tsconfig.json @@ -1,10 +1,5 @@ { - "extends": "../shared/tsconfig", - "compilerOptions": { - "paths": { - "jslib-common/*": ["./src/*"] - } - }, + "extends": "../shared/tsconfig.libs", "include": ["src", "spec"], "exclude": ["node_modules", "dist"] } diff --git a/libs/components/src/callout/callout.component.spec.ts b/libs/components/src/callout/callout.component.spec.ts index 987d2e9669..f98dc37e50 100644 --- a/libs/components/src/callout/callout.component.spec.ts +++ b/libs/components/src/callout/callout.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { I18nMockService } from "../utils/i18n-mock.service"; diff --git a/libs/components/src/callout/callout.component.ts b/libs/components/src/callout/callout.component.ts index e7f5c51c0e..33dc2414ef 100644 --- a/libs/components/src/callout/callout.component.ts +++ b/libs/components/src/callout/callout.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnInit } from "@angular/core"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; type CalloutTypes = "success" | "info" | "warning" | "danger"; diff --git a/libs/components/src/callout/callout.stories.ts b/libs/components/src/callout/callout.stories.ts index d2cb0f6962..f9a1568556 100644 --- a/libs/components/src/callout/callout.stories.ts +++ b/libs/components/src/callout/callout.stories.ts @@ -1,6 +1,6 @@ import { Meta, moduleMetadata, Story } from "@storybook/angular"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { I18nMockService } from "../utils/i18n-mock.service"; diff --git a/libs/components/src/form-field/error-summary.stories.ts b/libs/components/src/form-field/error-summary.stories.ts index 1bd866e589..a3dca8c997 100644 --- a/libs/components/src/form-field/error-summary.stories.ts +++ b/libs/components/src/form-field/error-summary.stories.ts @@ -1,12 +1,11 @@ import { FormBuilder, FormsModule, ReactiveFormsModule, Validators } from "@angular/forms"; import { Meta, moduleMetadata, Story } from "@storybook/angular"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; - -import { InputModule } from "src/input/input.module"; -import { I18nMockService } from "src/utils/i18n-mock.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { ButtonModule } from "../button"; +import { InputModule } from "../input/input.module"; +import { I18nMockService } from "../utils/i18n-mock.service"; import { BitFormFieldComponent } from "./form-field.component"; import { FormFieldModule } from "./form-field.module"; diff --git a/libs/components/src/form-field/error.component.ts b/libs/components/src/form-field/error.component.ts index 72846307ac..26c1eec78f 100644 --- a/libs/components/src/form-field/error.component.ts +++ b/libs/components/src/form-field/error.component.ts @@ -1,6 +1,6 @@ import { Component, HostBinding, Input } from "@angular/core"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; // Increments for each instance of this component let nextId = 0; diff --git a/libs/components/src/form-field/form-field.module.ts b/libs/components/src/form-field/form-field.module.ts index 323d5a5269..1796bae4d7 100644 --- a/libs/components/src/form-field/form-field.module.ts +++ b/libs/components/src/form-field/form-field.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from "@angular/common"; import { NgModule, Pipe, PipeTransform } from "@angular/core"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { BitInputDirective } from "../input/input.directive"; import { InputModule } from "../input/input.module"; diff --git a/libs/components/src/form-field/form-field.stories.ts b/libs/components/src/form-field/form-field.stories.ts index ae4d9cf5dd..c2c1694d15 100644 --- a/libs/components/src/form-field/form-field.stories.ts +++ b/libs/components/src/form-field/form-field.stories.ts @@ -9,12 +9,11 @@ import { } from "@angular/forms"; import { Meta, moduleMetadata, Story } from "@storybook/angular"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; - -import { InputModule } from "src/input/input.module"; -import { I18nMockService } from "src/utils/i18n-mock.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { ButtonModule } from "../button"; +import { InputModule } from "../input/input.module"; +import { I18nMockService } from "../utils/i18n-mock.service"; import { BitFormFieldComponent } from "./form-field.component"; import { FormFieldModule } from "./form-field.module"; diff --git a/libs/components/src/utils/i18n-mock.service.ts b/libs/components/src/utils/i18n-mock.service.ts index 9eb200b3d3..ffc2b031d3 100644 --- a/libs/components/src/utils/i18n-mock.service.ts +++ b/libs/components/src/utils/i18n-mock.service.ts @@ -1,4 +1,4 @@ -import { I18nService } from "jslib-common/abstractions/i18n.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; export class I18nMockService implements I18nService { locale: string; diff --git a/libs/components/tsconfig.json b/libs/components/tsconfig.json index 549eeed211..69cc9a3ede 100644 --- a/libs/components/tsconfig.json +++ b/libs/components/tsconfig.json @@ -19,8 +19,8 @@ "module": "es2020", "lib": ["es2020", "dom"], "paths": { - "jslib-common/*": ["../common/src/*"], - "jslib-angular/*": ["../angular/src/*"] + "@bitwarden/common/*": ["../common/src/*"], + "@bitwarden/angular/*": ["../angular/src/*"] } }, "angularCompilerOptions": { diff --git a/libs/electron/jest.config.js b/libs/electron/jest.config.js index 523c0354e2..ff97e478b7 100644 --- a/libs/electron/jest.config.js +++ b/libs/electron/jest.config.js @@ -1,6 +1,6 @@ const { pathsToModuleNameMapper } = require("ts-jest"); -const { compilerOptions } = require("./tsconfig"); +const { compilerOptions } = require("../shared/tsconfig.libs"); module.exports = { preset: "ts-jest", diff --git a/libs/electron/package.json b/libs/electron/package.json index fa2a472ada..1ecbea89a1 100644 --- a/libs/electron/package.json +++ b/libs/electron/package.json @@ -1,5 +1,5 @@ { - "name": "@bitwarden/jslib-electron", + "name": "@bitwarden/electron", "version": "0.0.0", "description": "Common code used across Bitwarden JavaScript projects.", "keywords": [ @@ -18,6 +18,6 @@ "build:watch": "npm run clean && tsc -watch" }, "dependencies": { - "@bitwarden/jslib-common": "file:../common" + "@bitwarden/common": "file:../common" } } diff --git a/libs/electron/spec/services/electronLog.service.spec.ts b/libs/electron/spec/services/electronLog.service.spec.ts index 5952da4302..5802478fb7 100644 --- a/libs/electron/spec/services/electronLog.service.spec.ts +++ b/libs/electron/spec/services/electronLog.service.spec.ts @@ -1,4 +1,4 @@ -import { ElectronLogService } from "jslib-electron/services/electronLog.service"; +import { ElectronLogService } from "@bitwarden/electron/services/electronLog.service"; describe("ElectronLogService", () => { it("sets dev based on electron method", () => { diff --git a/libs/electron/spec/utils.spec.ts b/libs/electron/spec/utils.spec.ts index f9e95a2d96..96af43eb75 100644 --- a/libs/electron/spec/utils.spec.ts +++ b/libs/electron/spec/utils.spec.ts @@ -1,4 +1,4 @@ -import { cleanUserAgent } from "jslib-electron/utils"; +import { cleanUserAgent } from "@bitwarden/electron/utils"; const expectedUserAgent = `Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${process.versions.chrome} Safari/537.36`; diff --git a/libs/electron/src/baseMenu.ts b/libs/electron/src/baseMenu.ts index 09d47f7ec1..6682f896c6 100644 --- a/libs/electron/src/baseMenu.ts +++ b/libs/electron/src/baseMenu.ts @@ -1,6 +1,6 @@ import { Menu, MenuItemConstructorOptions } from "electron"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { WindowMain } from "./window.main"; diff --git a/libs/electron/src/services/electronCrypto.service.ts b/libs/electron/src/services/electronCrypto.service.ts index 36ea813211..161de70342 100644 --- a/libs/electron/src/services/electronCrypto.service.ts +++ b/libs/electron/src/services/electronCrypto.service.ts @@ -1,10 +1,10 @@ -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { KeySuffixOptions } from "jslib-common/enums/keySuffixOptions"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; -import { CryptoService } from "jslib-common/services/crypto.service"; +import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.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 { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { CryptoService } from "@bitwarden/common/services/crypto.service"; export class ElectronCryptoService extends CryptoService { constructor( diff --git a/libs/electron/src/services/electronLog.service.ts b/libs/electron/src/services/electronLog.service.ts index c6195416f2..9d18096aac 100644 --- a/libs/electron/src/services/electronLog.service.ts +++ b/libs/electron/src/services/electronLog.service.ts @@ -2,8 +2,8 @@ import * as path from "path"; import log from "electron-log"; -import { LogLevelType } from "jslib-common/enums/logLevelType"; -import { ConsoleLogService as BaseLogService } from "jslib-common/services/consoleLog.service"; +import { LogLevelType } from "@bitwarden/common/enums/logLevelType"; +import { ConsoleLogService as BaseLogService } from "@bitwarden/common/services/consoleLog.service"; import { isDev } from "../utils"; diff --git a/libs/electron/src/services/electronMainMessaging.service.ts b/libs/electron/src/services/electronMainMessaging.service.ts index 9a6923e84b..a025e32e37 100644 --- a/libs/electron/src/services/electronMainMessaging.service.ts +++ b/libs/electron/src/services/electronMainMessaging.service.ts @@ -1,7 +1,7 @@ import { app, dialog, ipcMain, Menu, MenuItem, nativeTheme, session } from "electron"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { ThemeType } from "jslib-common/enums/themeType"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { ThemeType } from "@bitwarden/common/enums/themeType"; import { RendererMenuItem } from "../utils"; import { WindowMain } from "../window.main"; diff --git a/libs/electron/src/services/electronPlatformUtils.service.ts b/libs/electron/src/services/electronPlatformUtils.service.ts index 3774f3c37a..a07e354aed 100644 --- a/libs/electron/src/services/electronPlatformUtils.service.ts +++ b/libs/electron/src/services/electronPlatformUtils.service.ts @@ -1,12 +1,12 @@ import { clipboard, ipcRenderer, shell } from "electron"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { ClientType } from "jslib-common/enums/clientType"; -import { DeviceType } from "jslib-common/enums/deviceType"; -import { ThemeType } from "jslib-common/enums/themeType"; +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 { StateService } from "@bitwarden/common/abstractions/state.service"; +import { ClientType } from "@bitwarden/common/enums/clientType"; +import { DeviceType } from "@bitwarden/common/enums/deviceType"; +import { ThemeType } from "@bitwarden/common/enums/themeType"; import { isDev, isMacAppStore } from "../utils"; diff --git a/libs/electron/src/services/electronRendererMessaging.service.ts b/libs/electron/src/services/electronRendererMessaging.service.ts index 89350a65f2..842c26a2e0 100644 --- a/libs/electron/src/services/electronRendererMessaging.service.ts +++ b/libs/electron/src/services/electronRendererMessaging.service.ts @@ -1,7 +1,7 @@ import { ipcRenderer } from "electron"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; +import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; export class ElectronRendererMessagingService implements MessagingService { constructor(private broadcasterService: BroadcasterService) { diff --git a/libs/electron/src/services/electronRendererSecureStorage.service.ts b/libs/electron/src/services/electronRendererSecureStorage.service.ts index 5c3f3c7453..ac329532b8 100644 --- a/libs/electron/src/services/electronRendererSecureStorage.service.ts +++ b/libs/electron/src/services/electronRendererSecureStorage.service.ts @@ -1,7 +1,7 @@ import { ipcRenderer } from "electron"; -import { StorageService } from "jslib-common/abstractions/storage.service"; -import { StorageOptions } from "jslib-common/models/domain/storageOptions"; +import { StorageService } from "@bitwarden/common/abstractions/storage.service"; +import { StorageOptions } from "@bitwarden/common/models/domain/storageOptions"; export class ElectronRendererSecureStorageService implements StorageService { async get(key: string, options?: StorageOptions): Promise { diff --git a/libs/electron/src/services/electronRendererStorage.service.ts b/libs/electron/src/services/electronRendererStorage.service.ts index 69436bfe1b..574eadee12 100644 --- a/libs/electron/src/services/electronRendererStorage.service.ts +++ b/libs/electron/src/services/electronRendererStorage.service.ts @@ -1,6 +1,6 @@ import { ipcRenderer } from "electron"; -import { StorageService } from "jslib-common/abstractions/storage.service"; +import { StorageService } from "@bitwarden/common/abstractions/storage.service"; export class ElectronRendererStorageService implements StorageService { get(key: string): Promise { diff --git a/libs/electron/src/services/electronStorage.service.ts b/libs/electron/src/services/electronStorage.service.ts index fdabf2a2ba..0b19bb0755 100644 --- a/libs/electron/src/services/electronStorage.service.ts +++ b/libs/electron/src/services/electronStorage.service.ts @@ -2,8 +2,8 @@ import * as fs from "fs"; import { ipcMain } from "electron"; -import { StorageService } from "jslib-common/abstractions/storage.service"; -import { NodeUtils } from "jslib-common/misc/nodeUtils"; +import { StorageService } from "@bitwarden/common/abstractions/storage.service"; +import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; // eslint-disable-next-line const Store = require("electron-store"); diff --git a/libs/electron/src/tray.main.ts b/libs/electron/src/tray.main.ts index ebbc56875b..aea05d6606 100644 --- a/libs/electron/src/tray.main.ts +++ b/libs/electron/src/tray.main.ts @@ -2,8 +2,8 @@ import * as path from "path"; import { app, BrowserWindow, Menu, MenuItemConstructorOptions, nativeImage, Tray } from "electron"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { StateService } from "jslib-common/abstractions/state.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; import { WindowMain } from "./window.main"; diff --git a/libs/electron/src/updater.main.ts b/libs/electron/src/updater.main.ts index 881208f8d3..638c5efeda 100644 --- a/libs/electron/src/updater.main.ts +++ b/libs/electron/src/updater.main.ts @@ -2,7 +2,7 @@ import { dialog, shell } from "electron"; import log from "electron-log"; import { autoUpdater } from "electron-updater"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { isAppImage, isDev, isMacAppStore, isWindowsPortable, isWindowsStore } from "./utils"; import { WindowMain } from "./window.main"; diff --git a/libs/electron/src/window.main.ts b/libs/electron/src/window.main.ts index 66d4c78031..47f7e4e9cd 100644 --- a/libs/electron/src/window.main.ts +++ b/libs/electron/src/window.main.ts @@ -3,8 +3,8 @@ import * as url from "url"; import { app, BrowserWindow, screen } from "electron"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { StateService } from "jslib-common/abstractions/state.service"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; import { cleanUserAgent, isDev, isMacAppStore, isSnapStore } from "./utils"; diff --git a/libs/electron/tsconfig.json b/libs/electron/tsconfig.json index d5501ab34e..6004a56fb5 100644 --- a/libs/electron/tsconfig.json +++ b/libs/electron/tsconfig.json @@ -1,11 +1,5 @@ { - "extends": "../shared/tsconfig", - "compilerOptions": { - "paths": { - "jslib-common/*": ["../common/src/*"], - "jslib-electron/*": ["./src/*"] - } - }, + "extends": "../shared/tsconfig.libs", "include": ["src", "spec"], "exclude": ["node_modules", "dist"] } diff --git a/libs/node/jest.config.js b/libs/node/jest.config.js index 48c4b61d3a..8fe21f8af5 100644 --- a/libs/node/jest.config.js +++ b/libs/node/jest.config.js @@ -1,6 +1,6 @@ const { pathsToModuleNameMapper } = require("ts-jest"); -const { compilerOptions } = require("./tsconfig"); +const { compilerOptions } = require("../shared/tsconfig.libs"); module.exports = { preset: "ts-jest", diff --git a/libs/node/package.json b/libs/node/package.json index 1505d924ed..104551ad86 100644 --- a/libs/node/package.json +++ b/libs/node/package.json @@ -1,5 +1,5 @@ { - "name": "@bitwarden/jslib-node", + "name": "@bitwarden/node", "version": "0.0.0", "description": "Common code used across Bitwarden JavaScript projects.", "keywords": [ @@ -18,6 +18,6 @@ "build:watch": "npm run clean && tsc -watch" }, "dependencies": { - "@bitwarden/jslib-common": "file:../common" + "@bitwarden/common": "file:../common" } } diff --git a/libs/node/spec/cli/consoleLog.service.spec.ts b/libs/node/spec/cli/consoleLog.service.spec.ts index 3c76d5a681..eefc3f4c66 100644 --- a/libs/node/spec/cli/consoleLog.service.spec.ts +++ b/libs/node/spec/cli/consoleLog.service.spec.ts @@ -1,9 +1,9 @@ import { interceptConsole, restoreConsole, -} from "jslib-common/../spec/services/consolelog.service.spec"; +} from "@bitwarden/common/../spec/services/consolelog.service.spec"; -import { ConsoleLogService } from "jslib-node/cli/services/consoleLog.service"; +import { ConsoleLogService } from "@bitwarden/node/cli/services/consoleLog.service"; let caughtMessage: any = {}; diff --git a/libs/node/spec/services/nodeCryptoFunction.service.spec.ts b/libs/node/spec/services/nodeCryptoFunction.service.spec.ts index 79572fcc98..5b8c7c78c6 100644 --- a/libs/node/spec/services/nodeCryptoFunction.service.spec.ts +++ b/libs/node/spec/services/nodeCryptoFunction.service.spec.ts @@ -1,6 +1,6 @@ -import { Utils } from "jslib-common/misc/utils"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; -import { NodeCryptoFunctionService } from "jslib-node/services/nodeCryptoFunction.service"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { NodeCryptoFunctionService } from "@bitwarden/node/services/nodeCryptoFunction.service"; const RsaPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl0Vawl/toXzkEvB82FEtqHP" + diff --git a/libs/node/src/cli/baseProgram.ts b/libs/node/src/cli/baseProgram.ts index 4a2ec904a1..46e9db3ec9 100644 --- a/libs/node/src/cli/baseProgram.ts +++ b/libs/node/src/cli/baseProgram.ts @@ -1,6 +1,6 @@ import * as chalk from "chalk"; -import { StateService } from "jslib-common/abstractions/state.service"; +import { StateService } from "@bitwarden/common/abstractions/state.service"; import { Response } from "./models/response"; import { ListResponse } from "./models/response/listResponse"; diff --git a/libs/node/src/cli/commands/login.command.ts b/libs/node/src/cli/commands/login.command.ts index ee6f822845..9d24211364 100644 --- a/libs/node/src/cli/commands/login.command.ts +++ b/libs/node/src/cli/commands/login.command.ts @@ -4,30 +4,30 @@ import * as program from "commander"; import * as inquirer from "inquirer"; import Separator from "inquirer/lib/objects/separator"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service"; -import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType"; -import { NodeUtils } from "jslib-common/misc/nodeUtils"; -import { Utils } from "jslib-common/misc/utils"; -import { AuthResult } from "jslib-common/models/domain/authResult"; +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 { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PolicyService } from "@bitwarden/common/abstractions/policy.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 { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { AuthResult } from "@bitwarden/common/models/domain/authResult"; import { ApiLogInCredentials, PasswordLogInCredentials, SsoLogInCredentials, -} from "jslib-common/models/domain/logInCredentials"; -import { TokenRequestTwoFactor } from "jslib-common/models/request/identityToken/tokenRequestTwoFactor"; -import { TwoFactorEmailRequest } from "jslib-common/models/request/twoFactorEmailRequest"; -import { UpdateTempPasswordRequest } from "jslib-common/models/request/updateTempPasswordRequest"; -import { ErrorResponse } from "jslib-common/models/response/errorResponse"; +} from "@bitwarden/common/models/domain/logInCredentials"; +import { TokenRequestTwoFactor } from "@bitwarden/common/models/request/identityToken/tokenRequestTwoFactor"; +import { TwoFactorEmailRequest } from "@bitwarden/common/models/request/twoFactorEmailRequest"; +import { UpdateTempPasswordRequest } from "@bitwarden/common/models/request/updateTempPasswordRequest"; +import { ErrorResponse } from "@bitwarden/common/models/response/errorResponse"; import { Response } from "../models/response"; import { MessageResponse } from "../models/response/messageResponse"; diff --git a/libs/node/src/cli/commands/logout.command.ts b/libs/node/src/cli/commands/logout.command.ts index 6074ba9cf9..9f8a544410 100644 --- a/libs/node/src/cli/commands/logout.command.ts +++ b/libs/node/src/cli/commands/logout.command.ts @@ -1,5 +1,5 @@ -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; +import { AuthService } from "@bitwarden/common/abstractions/auth.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { Response } from "../models/response"; import { MessageResponse } from "../models/response/messageResponse"; diff --git a/libs/node/src/cli/commands/update.command.ts b/libs/node/src/cli/commands/update.command.ts index 1b9408a35f..534e11de47 100644 --- a/libs/node/src/cli/commands/update.command.ts +++ b/libs/node/src/cli/commands/update.command.ts @@ -1,7 +1,7 @@ import * as fetch from "node-fetch"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { Response } from "../models/response"; import { MessageResponse } from "../models/response/messageResponse"; diff --git a/libs/node/src/cli/services/cliPlatformUtils.service.ts b/libs/node/src/cli/services/cliPlatformUtils.service.ts index 520170c2cc..936e62d87e 100644 --- a/libs/node/src/cli/services/cliPlatformUtils.service.ts +++ b/libs/node/src/cli/services/cliPlatformUtils.service.ts @@ -1,9 +1,9 @@ import * as child_process from "child_process"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { ClientType } from "jslib-common/enums/clientType"; -import { DeviceType } from "jslib-common/enums/deviceType"; -import { ThemeType } from "jslib-common/enums/themeType"; +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { ClientType } from "@bitwarden/common/enums/clientType"; +import { DeviceType } from "@bitwarden/common/enums/deviceType"; +import { ThemeType } from "@bitwarden/common/enums/themeType"; // eslint-disable-next-line const open = require("open"); diff --git a/libs/node/src/cli/services/consoleLog.service.ts b/libs/node/src/cli/services/consoleLog.service.ts index 73dfcc5540..c3e6fd7a75 100644 --- a/libs/node/src/cli/services/consoleLog.service.ts +++ b/libs/node/src/cli/services/consoleLog.service.ts @@ -1,5 +1,5 @@ -import { LogLevelType } from "jslib-common/enums/logLevelType"; -import { ConsoleLogService as BaseConsoleLogService } from "jslib-common/services/consoleLog.service"; +import { LogLevelType } from "@bitwarden/common/enums/logLevelType"; +import { ConsoleLogService as BaseConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; export class ConsoleLogService extends BaseConsoleLogService { constructor(isDev: boolean, filter: (level: LogLevelType) => boolean = null) { diff --git a/libs/node/src/services/lowdbStorage.service.ts b/libs/node/src/services/lowdbStorage.service.ts index e78fe2e49a..e7db9ec692 100644 --- a/libs/node/src/services/lowdbStorage.service.ts +++ b/libs/node/src/services/lowdbStorage.service.ts @@ -4,11 +4,11 @@ import * as path from "path"; import * as lowdb from "lowdb"; import * as FileSync from "lowdb/adapters/FileSync"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { StorageService } from "jslib-common/abstractions/storage.service"; -import { NodeUtils } from "jslib-common/misc/nodeUtils"; -import { sequentialize } from "jslib-common/misc/sequentialize"; -import { Utils } from "jslib-common/misc/utils"; +import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { StorageService } from "@bitwarden/common/abstractions/storage.service"; +import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; +import { sequentialize } from "@bitwarden/common/misc/sequentialize"; +import { Utils } from "@bitwarden/common/misc/utils"; export class LowdbStorageService implements StorageService { protected dataFilePath: string; diff --git a/libs/node/src/services/nodeApi.service.ts b/libs/node/src/services/nodeApi.service.ts index 7dd0341213..2036ccc61c 100644 --- a/libs/node/src/services/nodeApi.service.ts +++ b/libs/node/src/services/nodeApi.service.ts @@ -2,11 +2,11 @@ import * as FormData from "form-data"; import { HttpsProxyAgent } from "https-proxy-agent"; import * as fe from "node-fetch"; -import { AppIdService } from "jslib-common/abstractions/appId.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { TokenService } from "jslib-common/abstractions/token.service"; -import { ApiService } from "jslib-common/services/api.service"; +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 { ApiService } from "@bitwarden/common/services/api.service"; (global as any).fetch = fe.default; (global as any).Request = fe.Request; diff --git a/libs/node/src/services/nodeCryptoFunction.service.ts b/libs/node/src/services/nodeCryptoFunction.service.ts index 90a045740e..2c18f36899 100644 --- a/libs/node/src/services/nodeCryptoFunction.service.ts +++ b/libs/node/src/services/nodeCryptoFunction.service.ts @@ -2,10 +2,10 @@ import * as crypto from "crypto"; import * as forge from "node-forge"; -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { Utils } from "jslib-common/misc/utils"; -import { DecryptParameters } from "jslib-common/models/domain/decryptParameters"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; +import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; +import { Utils } from "@bitwarden/common/misc/utils"; +import { DecryptParameters } from "@bitwarden/common/models/domain/decryptParameters"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; export class NodeCryptoFunctionService implements CryptoFunctionService { pbkdf2( diff --git a/libs/node/tsconfig.json b/libs/node/tsconfig.json index f544d7ce54..6004a56fb5 100644 --- a/libs/node/tsconfig.json +++ b/libs/node/tsconfig.json @@ -1,11 +1,5 @@ { - "extends": "../shared/tsconfig", - "compilerOptions": { - "paths": { - "jslib-common/*": ["../common/src/*"], - "jslib-node/*": ["./src/*"] - } - }, + "extends": "../shared/tsconfig.libs", "include": ["src", "spec"], "exclude": ["node_modules", "dist"] } diff --git a/libs/package-lock.json b/libs/package-lock.json deleted file mode 100644 index 535189c985..0000000000 --- a/libs/package-lock.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "name": "@bitwarden/jslib", - "version": "0.0.0", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "@bitwarden/jslib", - "version": "0.0.0", - "license": "GPL-3.0", - "dependencies": { - "@bitwarden/jslib-angular": "file:angular", - "@bitwarden/jslib-common": "file:common", - "@bitwarden/jslib-electron": "file:electron", - "@bitwarden/jslib-node": "file:node" - } - }, - "angular": { - "version": "0.0.0", - "license": "GPL-3.0", - "dependencies": { - "@bitwarden/jslib-common": "file:../common" - } - }, - "common": { - "version": "0.0.0", - "license": "GPL-3.0" - }, - "electron": { - "version": "0.0.0", - "license": "GPL-3.0", - "dependencies": { - "@bitwarden/jslib-common": "file:../common" - } - }, - "node": { - "version": "0.0.0", - "license": "GPL-3.0", - "dependencies": { - "@bitwarden/jslib-common": "file:../common" - } - }, - "node_modules/@bitwarden/jslib-angular": { - "resolved": "angular", - "link": true - }, - "node_modules/@bitwarden/jslib-common": { - "resolved": "common", - "link": true - }, - "node_modules/@bitwarden/jslib-electron": { - "resolved": "electron", - "link": true - }, - "node_modules/@bitwarden/jslib-node": { - "resolved": "node", - "link": true - } - }, - "dependencies": { - "@bitwarden/jslib-angular": { - "version": "file:angular", - "requires": { - "@bitwarden/jslib-common": "file:../common" - } - }, - "@bitwarden/jslib-common": { - "version": "file:common" - }, - "@bitwarden/jslib-electron": { - "version": "file:electron", - "requires": { - "@bitwarden/jslib-common": "file:../common" - } - }, - "@bitwarden/jslib-node": { - "version": "file:node", - "requires": { - "@bitwarden/jslib-common": "file:../common" - } - } - } -} diff --git a/libs/package.json b/libs/package.json deleted file mode 100644 index 652cf2ee06..0000000000 --- a/libs/package.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "@bitwarden/jslib", - "version": "0.0.0", - "description": "Common code used across Bitwarden JavaScript projects.", - "keywords": [ - "bitwarden" - ], - "author": "Bitwarden Inc.", - "homepage": "https://bitwarden.com", - "repository": { - "type": "git", - "url": "https://github.com/bitwarden/jslib" - }, - "license": "GPL-3.0", - "scripts": { - "clean": "rimraf dist/**/*", - "test": "jest", - "test:watch": "jest --watch", - "test:watch:all": "jest --watchAll" - }, - "dependencies": { - "@bitwarden/jslib-angular": "file:angular", - "@bitwarden/jslib-common": "file:common", - "@bitwarden/jslib-electron": "file:electron", - "@bitwarden/jslib-node": "file:node" - } -} diff --git a/libs/shared/tsconfig.libs.json b/libs/shared/tsconfig.libs.json new file mode 100644 index 0000000000..5ac6b719fa --- /dev/null +++ b/libs/shared/tsconfig.libs.json @@ -0,0 +1,11 @@ +{ + "extends": "./tsconfig", + "compilerOptions": { + "paths": { + "@bitwarden/common/*": ["../common/src/*"], + "@bitwarden/angular/*": ["../angular/src/*"], + "@bitwarden/electron/*": ["../electron/src/*"], + "@bitwarden/node/*": ["../node/src/*"] + } + } +} diff --git a/libs/tsconfig.spec.json b/libs/tsconfig.spec.json deleted file mode 100644 index fc8520e737..0000000000 --- a/libs/tsconfig.spec.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "./tsconfig.json" -} diff --git a/package-lock.json b/package-lock.json index f00486ab03..7697f19534 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,10 @@ "name": "@bitwarden/clients", "version": "0.0.0", "license": "GPL-3.0", + "workspaces": [ + "apps/*", + "libs/*" + ], "dependencies": { "@angular/animations": "^12.2.13", "@angular/cdk": "^12.2.13", @@ -32,8 +36,9 @@ "core-js": "^3.11.0", "date-input-polyfill": "^2.14.0", "duo_web_sdk": "github:duosecurity/duo_web_sdk", - "https-proxy-agent": "^5.0.0", - "inquirer": "^8.2.4", + "form-data": "4.0.0", + "https-proxy-agent": "5.0.0", + "inquirer": "8.0.0", "jquery": "3.6.0", "jsdom": "^16.7.0", "jszip": "^3.10.0", @@ -175,6 +180,85 @@ "npm": "~8" } }, + "apps/browser": { + "name": "@bitwarden/browser", + "version": "0.0.0" + }, + "apps/cli": { + "name": "@bitwarden/cli", + "version": "1.22.1", + "license": "GPL-3.0-only", + "dependencies": { + "@koa/multer": "^3.0.0", + "@koa/router": "^10.1.1", + "big-integer": "^1.6.51", + "browser-hrtime": "^1.1.8", + "chalk": "^4.1.1", + "commander": "7.2.0", + "form-data": "4.0.0", + "https-proxy-agent": "5.0.0", + "inquirer": "8.0.0", + "jsdom": "^16.7.0", + "jszip": "^3.10.0", + "koa": "^2.13.4", + "koa-bodyparser": "^4.3.0", + "koa-json": "^2.0.2", + "lowdb": "1.0.0", + "lunr": "^2.3.9", + "multer": "^1.4.5-lts.1", + "node-fetch": "^2.6.7", + "node-forge": "1.3.1", + "open": "^8.4.0", + "papaparse": "^5.3.2", + "proper-lockfile": "^4.1.2", + "rxjs": "^7.5.5", + "tldjs": "^2.3.1", + "zxcvbn": "^4.4.2" + }, + "bin": { + "bw": "build/bw.js" + } + }, + "apps/desktop": { + "name": "@bitwarden/desktop", + "version": "0.0.0", + "hasInstallScript": true, + "license": "GPL-3.0" + }, + "apps/web": { + "name": "@bitwarden/web-vault", + "version": "2022.05.0" + }, + "libs/angular": { + "name": "@bitwarden/angular", + "version": "0.0.0", + "license": "GPL-3.0" + }, + "libs/common": { + "name": "@bitwarden/common", + "version": "0.0.0", + "license": "GPL-3.0" + }, + "libs/components": { + "name": "@bitwarden/components", + "version": "0.0.0" + }, + "libs/electron": { + "name": "@bitwarden/electron", + "version": "0.0.0", + "license": "GPL-3.0", + "dependencies": { + "@bitwarden/common": "file:../common" + } + }, + "libs/node": { + "name": "@bitwarden/node", + "version": "0.0.0", + "license": "GPL-3.0", + "dependencies": { + "@bitwarden/common": "file:../common" + } + }, "node_modules/@aduh95/viz.js": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/@aduh95/viz.js/-/viz.js-3.6.0.tgz", @@ -1109,19 +1193,6 @@ "node": ">=4.0.0" } }, - "node_modules/@angular-devkit/build-angular/node_modules/https-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", - "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", - "dev": true, - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/@angular-devkit/build-angular/node_modules/import-local": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz", @@ -1715,7 +1786,7 @@ "node_modules/@angular-devkit/build-angular/node_modules/to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", "dev": true, "dependencies": { "is-number": "^3.0.0", @@ -2681,18 +2752,18 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.17.10", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz", - "integrity": "sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==", + "version": "7.18.5", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.5.tgz", + "integrity": "sha512-BxhE40PVCBxVEJsSBhB6UWyAuqJRxGsAw8BdHMJ3AKGydcwuWW4kOO3HmqBQAdcq/OP+/DlTVxLvsCzRTnZuGg==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.2.tgz", - "integrity": "sha512-A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ==", + "version": "7.18.5", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.5.tgz", + "integrity": "sha512-MGY8vg3DxMnctw0LdvSEojOsumc70g0t18gNyUdAZqB1Rpd1Bqo/svHGvt+UJ6JcGX+DIekGFDxxIWofBxLCnQ==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.1.0", @@ -2701,10 +2772,10 @@ "@babel/helper-compilation-targets": "^7.18.2", "@babel/helper-module-transforms": "^7.18.0", "@babel/helpers": "^7.18.2", - "@babel/parser": "^7.18.0", + "@babel/parser": "^7.18.5", "@babel/template": "^7.16.7", - "@babel/traverse": "^7.18.2", - "@babel/types": "^7.18.2", + "@babel/traverse": "^7.18.5", + "@babel/types": "^7.18.4", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -3324,9 +3395,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.18.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.4.tgz", - "integrity": "sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow==", + "version": "7.18.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.5.tgz", + "integrity": "sha512-YZWVaglMiplo7v8f1oMQ5ZPQr0vn7HPeZXxXWsxXJRjGVrzUFn9OxFQl1sb5wzfootjA/yChhW84BV+383FSOw==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -4212,9 +4283,9 @@ } }, "node_modules/@babel/plugin-transform-modules-systemjs": { - "version": "7.18.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.4.tgz", - "integrity": "sha512-lH2UaQaHVOAeYrUUuZ8i38o76J/FnO8vu21OE+tD1MyP9lxdZoSfz+pDbWkq46GogUrdrMz3tiz/FYGB+bVThg==", + "version": "7.18.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.5.tgz", + "integrity": "sha512-SEewrhPpcqMF1V7DhnEbhVJLrC+nnYfe1E0piZMZXBpxi9WvZqWGwpsk7JYP7wPWeqaBh4gyKlBhHJu3uz5g4Q==", "dev": true, "dependencies": { "@babel/helper-hoist-variables": "^7.16.7", @@ -4263,9 +4334,9 @@ } }, "node_modules/@babel/plugin-transform-new-target": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.17.12.tgz", - "integrity": "sha512-CaOtzk2fDYisbjAD4Sd1MTKGVIpRtx9bWLyj24Y/k6p4s4gQ3CqDGJauFJxt8M/LEx003d0i3klVqnN73qvK3w==", + "version": "7.18.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.5.tgz", + "integrity": "sha512-TuRL5uGW4KXU6OsRj+mLp9BM7pO8e7SGNTEokQRRxHFkXYMFiy2jlKSZPFtI/mKORDzciH+hneskcSOp0gU8hg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.17.12" @@ -4878,9 +4949,9 @@ } }, "node_modules/@babel/traverse": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.2.tgz", - "integrity": "sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA==", + "version": "7.18.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.5.tgz", + "integrity": "sha512-aKXj1KT66sBj0vVzk6rEeAO6Z9aiiQ68wfDgge3nHhA/my6xMM/7HGQUNumKZaoa2qUPQ5whJG9aAifsxUKfLA==", "dev": true, "dependencies": { "@babel/code-frame": "^7.16.7", @@ -4889,8 +4960,8 @@ "@babel/helper-function-name": "^7.17.9", "@babel/helper-hoist-variables": "^7.16.7", "@babel/helper-split-export-declaration": "^7.16.7", - "@babel/parser": "^7.18.0", - "@babel/types": "^7.18.2", + "@babel/parser": "^7.18.5", + "@babel/types": "^7.18.4", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -4946,6 +5017,42 @@ "dev": true, "peer": true }, + "node_modules/@bitwarden/angular": { + "resolved": "libs/angular", + "link": true + }, + "node_modules/@bitwarden/browser": { + "resolved": "apps/browser", + "link": true + }, + "node_modules/@bitwarden/cli": { + "resolved": "apps/cli", + "link": true + }, + "node_modules/@bitwarden/common": { + "resolved": "libs/common", + "link": true + }, + "node_modules/@bitwarden/components": { + "resolved": "libs/components", + "link": true + }, + "node_modules/@bitwarden/desktop": { + "resolved": "apps/desktop", + "link": true + }, + "node_modules/@bitwarden/electron": { + "resolved": "libs/electron", + "link": true + }, + "node_modules/@bitwarden/node": { + "resolved": "libs/node", + "link": true + }, + "node_modules/@bitwarden/web-vault": { + "resolved": "apps/web", + "link": true + }, "node_modules/@braintree/asset-loader": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/@braintree/asset-loader/-/asset-loader-0.4.4.tgz", @@ -9283,7 +9390,7 @@ "node_modules/@storybook/builder-webpack4/node_modules/to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", "dev": true, "dependencies": { "is-number": "^3.0.0", @@ -10836,7 +10943,7 @@ "node_modules/@storybook/core-common/node_modules/to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", "dev": true, "dependencies": { "is-number": "^3.0.0", @@ -11670,7 +11777,7 @@ "node_modules/@storybook/core-server/node_modules/to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", "dev": true, "dependencies": { "is-number": "^3.0.0", @@ -11754,9 +11861,9 @@ } }, "node_modules/@storybook/core-server/node_modules/ws": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.7.0.tgz", - "integrity": "sha512-c2gsP0PRwcLFzUiA8Mkr37/MI7ilIlHQxaEAtd0uNMbVMoy8puJyafRlm0bV9MbGSabUPeLrRRaqIBcFcA2Pqg==", + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz", + "integrity": "sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==", "dev": true, "engines": { "node": ">=10.0.0" @@ -12896,7 +13003,7 @@ "node_modules/@storybook/manager-webpack4/node_modules/to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", "dev": true, "dependencies": { "is-number": "^3.0.0", @@ -14234,6 +14341,20 @@ "form-data": "^3.0.0" } }, + "node_modules/@types/node-fetch/node_modules/form-data": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", + "dev": true, + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/@types/node-forge": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.0.2.tgz", @@ -14454,9 +14575,9 @@ "dev": true }, "node_modules/@types/uglify-js": { - "version": "3.13.3", - "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.3.tgz", - "integrity": "sha512-9dmBYXt/rKxedUXfCvXSxyiPvpDXLkiRlv17DnqdhS+pRustL1967rI1jZVt1xysTO+xJGMoZzcy3cWC9+b6Tw==", + "version": "3.16.0", + "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.16.0.tgz", + "integrity": "sha512-0yeUr92L3r0GLRnBOvtYK1v2SjqMIqQDHMl7GLb+l2L8+6LSFWEEWEIgVsPdMn5ImLM8qzWT8xFPtQYpp8co0g==", "dev": true, "dependencies": { "source-map": "^0.6.1" @@ -14562,14 +14683,14 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.27.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.27.1.tgz", - "integrity": "sha512-6dM5NKT57ZduNnJfpY81Phe9nc9wolnMCnknb1im6brWi1RYv84nbMS3olJa27B6+irUVV1X/Wb+Am0FjJdGFw==", + "version": "5.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.28.0.tgz", + "integrity": "sha512-DXVU6Cg29H2M6EybqSg2A+x8DgO9TCUBRp4QEXQHJceLS7ogVDP0g3Lkg/SZCqcvkAP/RruuQqK0gdlkgmhSUA==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.27.1", - "@typescript-eslint/type-utils": "5.27.1", - "@typescript-eslint/utils": "5.27.1", + "@typescript-eslint/scope-manager": "5.28.0", + "@typescript-eslint/type-utils": "5.28.0", + "@typescript-eslint/utils": "5.28.0", "debug": "^4.3.4", "functional-red-black-tree": "^1.0.1", "ignore": "^5.2.0", @@ -14627,14 +14748,14 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.27.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.27.1.tgz", - "integrity": "sha512-7Va2ZOkHi5NP+AZwb5ReLgNF6nWLGTeUJfxdkVUAPPSaAdbWNnFZzLZ4EGGmmiCTg+AwlbE1KyUYTBglosSLHQ==", + "version": "5.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.28.0.tgz", + "integrity": "sha512-ekqoNRNK1lAcKhZESN/PdpVsWbP9jtiNqzFWkp/yAUdZvJalw2heCYuqRmM5eUJSIYEkgq5sGOjq+ZqsLMjtRA==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.27.1", - "@typescript-eslint/types": "5.27.1", - "@typescript-eslint/typescript-estree": "5.27.1", + "@typescript-eslint/scope-manager": "5.28.0", + "@typescript-eslint/types": "5.28.0", + "@typescript-eslint/typescript-estree": "5.28.0", "debug": "^4.3.4" }, "engines": { @@ -14671,13 +14792,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.27.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.27.1.tgz", - "integrity": "sha512-fQEOSa/QroWE6fAEg+bJxtRZJTH8NTskggybogHt4H9Da8zd4cJji76gA5SBlR0MgtwF7rebxTbDKB49YUCpAg==", + "version": "5.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.28.0.tgz", + "integrity": "sha512-LeBLTqF/he1Z+boRhSqnso6YrzcKMTQ8bO/YKEe+6+O/JGof9M0g3IJlIsqfrK/6K03MlFIlycbf1uQR1IjE+w==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.27.1", - "@typescript-eslint/visitor-keys": "5.27.1" + "@typescript-eslint/types": "5.28.0", + "@typescript-eslint/visitor-keys": "5.28.0" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -14688,12 +14809,12 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.27.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.27.1.tgz", - "integrity": "sha512-+UC1vVUWaDHRnC2cQrCJ4QtVjpjjCgjNFpg8b03nERmkHv9JV9X5M19D7UFMd+/G7T/sgFwX2pGmWK38rqyvXw==", + "version": "5.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.28.0.tgz", + "integrity": "sha512-SyKjKh4CXPglueyC6ceAFytjYWMoPHMswPQae236zqe1YbhvCVQyIawesYywGiu98L9DwrxsBN69vGIVxJ4mQQ==", "dev": true, "dependencies": { - "@typescript-eslint/utils": "5.27.1", + "@typescript-eslint/utils": "5.28.0", "debug": "^4.3.4", "tsutils": "^3.21.0" }, @@ -14731,9 +14852,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "5.27.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.27.1.tgz", - "integrity": "sha512-LgogNVkBhCTZU/m8XgEYIWICD6m4dmEDbKXESCbqOXfKZxRKeqpiJXQIErv66sdopRKZPo5l32ymNqibYEH/xg==", + "version": "5.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.28.0.tgz", + "integrity": "sha512-2OOm8ZTOQxqkPbf+DAo8oc16sDlVR5owgJfKheBkxBKg1vAfw2JsSofH9+16VPlN9PWtv8Wzhklkqw3k/zCVxA==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -14744,13 +14865,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.27.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.27.1.tgz", - "integrity": "sha512-DnZvvq3TAJ5ke+hk0LklvxwYsnXpRdqUY5gaVS0D4raKtbznPz71UJGnPTHEFo0GDxqLOLdMkkmVZjSpET1hFw==", + "version": "5.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.28.0.tgz", + "integrity": "sha512-9GX+GfpV+F4hdTtYc6OV9ZkyYilGXPmQpm6AThInpBmKJEyRSIjORJd1G9+bknb7OTFYL+Vd4FBJAO6T78OVqA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.27.1", - "@typescript-eslint/visitor-keys": "5.27.1", + "@typescript-eslint/types": "5.28.0", + "@typescript-eslint/visitor-keys": "5.28.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -14803,15 +14924,15 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "5.27.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.27.1.tgz", - "integrity": "sha512-mZ9WEn1ZLDaVrhRaYgzbkXBkTPghPFsup8zDbbsYTxC5OmqrFE7skkKS/sraVsLP3TcT3Ki5CSyEFBRkLH/H/w==", + "version": "5.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.28.0.tgz", + "integrity": "sha512-E60N5L0fjv7iPJV3UGc4EC+A3Lcj4jle9zzR0gW7vXhflO7/J29kwiTGITA2RlrmPokKiZbBy2DgaclCaEUs6g==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.9", - "@typescript-eslint/scope-manager": "5.27.1", - "@typescript-eslint/types": "5.27.1", - "@typescript-eslint/typescript-estree": "5.27.1", + "@typescript-eslint/scope-manager": "5.28.0", + "@typescript-eslint/types": "5.28.0", + "@typescript-eslint/typescript-estree": "5.28.0", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" }, @@ -14827,12 +14948,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.27.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.27.1.tgz", - "integrity": "sha512-xYs6ffo01nhdJgPieyk7HAOpjhTsx7r/oB9LWEhwAXgwn33tkr+W8DI2ChboqhZlC4q3TC6geDYPoiX8ROqyOQ==", + "version": "5.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.28.0.tgz", + "integrity": "sha512-BtfP1vCor8cWacovzzPFOoeW4kBQxzmhxGoOpt0v1SFvG+nJ0cWaVdJk7cky1ArTcFHHKNIxyo2LLr3oNkSuXA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.27.1", + "@typescript-eslint/types": "5.28.0", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -15108,9 +15229,9 @@ "dev": true }, "node_modules/@webpack-cli/configtest": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.1.tgz", - "integrity": "sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz", + "integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==", "dev": true, "peerDependencies": { "webpack": "4.x.x || 5.x.x", @@ -15118,9 +15239,9 @@ } }, "node_modules/@webpack-cli/info": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.1.tgz", - "integrity": "sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz", + "integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==", "dev": true, "dependencies": { "envinfo": "^7.7.3" @@ -15130,9 +15251,9 @@ } }, "node_modules/@webpack-cli/serve": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.1.tgz", - "integrity": "sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz", + "integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==", "dev": true, "peerDependencies": { "webpack-cli": "4.x.x" @@ -16094,7 +16215,7 @@ "node_modules/assert/node_modules/util": { "version": "0.10.3", "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", - "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", + "integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==", "dev": true, "dependencies": { "inherits": "2.0.1" @@ -16879,6 +17000,7 @@ "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "dev": true, "funding": [ { "type": "github", @@ -18454,6 +18576,7 @@ "version": "2.6.1", "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", + "dev": true, "engines": { "node": ">=6" }, @@ -18515,6 +18638,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", + "dev": true, "engines": { "node": ">=0.8" } @@ -19710,7 +19834,7 @@ "node_modules/cpy/node_modules/to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", "dev": true, "dependencies": { "is-number": "^3.0.0", @@ -20020,9 +20144,9 @@ } }, "node_modules/css-declaration-sorter": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.2.2.tgz", - "integrity": "sha512-Ufadglr88ZLsrvS11gjeu/40Lw74D9Am/Jpr3LlYm5Q4ZP5KdlUhG+6u2EjyXeZcxmZ2h1ebCKngDjolpeLHpg==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.0.tgz", + "integrity": "sha512-OGT677UGHJTAVMRhPO+HJ4oKln3wkBTwtDFH0ojbqm+MJm6xuDMHp2nkhh/ThaBqq20IbraBQSWKfSLNHQO9Og==", "dev": true, "engines": { "node": "^10 || ^12 || >=14" @@ -20713,6 +20837,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", "integrity": "sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA==", + "dev": true, "dependencies": { "clone": "^1.0.2" } @@ -21467,7 +21592,7 @@ "node_modules/editorconfig/node_modules/yallist": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", + "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==", "dev": true }, "node_modules/ee-first": { @@ -21874,34 +21999,34 @@ } }, "node_modules/electron-store": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/electron-store/-/electron-store-8.0.1.tgz", - "integrity": "sha512-ZyLvNywiqSpbwC/pp89O/AycVWY/UJIkmtyzF2Bd0Nm/rLmcFc0NTGuLdg6+LE8mS8qsiK5JMoe4PnrecLHH5w==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/electron-store/-/electron-store-8.0.2.tgz", + "integrity": "sha512-9GwUMv51w8ydbkaG7X0HrPlElXLApg63zYy1/VZ/a08ndl0gfm4iCoD3f0E1JvP3V16a+7KxqriCI0c122stiA==", "dev": true, "dependencies": { - "conf": "^10.0.3", - "type-fest": "^1.0.2" + "conf": "^10.1.2", + "type-fest": "^2.12.2" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/electron-store/node_modules/type-fest": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", - "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.13.1.tgz", + "integrity": "sha512-hXYyrPFwETT2swFLHeoKtJrvSF/ftG/sA15/8nGaLuaDGfVAaq8DYFpu4yOyV4tzp082WqnTEoMsm3flKMI2FQ==", "dev": true, "engines": { - "node": ">=10" + "node": ">=12.20" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/electron-to-chromium": { - "version": "1.4.150", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.150.tgz", - "integrity": "sha512-MP3oBer0X7ZeS9GJ0H6lmkn561UxiwOIY9TTkdxVY7lI9G6GVCKfgJaHaDcakwdKxBXA4T3ybeswH/WBIN/KTA==", + "version": "1.4.152", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.152.tgz", + "integrity": "sha512-jk4Ju5SGZAQQJ1iI4Rgru7dDlvkQPLpNPWH9gIZmwCD4YteA5Bbk1xPcPDUf5jUYs3e1e80RXdi8XgKQZaigeg==", "dev": true }, "node_modules/electron-updater": { @@ -22692,7 +22817,7 @@ "node_modules/escodegen/node_modules/type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", "dependencies": { "prelude-ls": "~1.1.2" }, @@ -24503,7 +24628,7 @@ "node_modules/findup-sync/node_modules/to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", "dev": true, "dependencies": { "is-number": "^3.0.0", @@ -24869,7 +24994,7 @@ "node_modules/fork-ts-checker-webpack-plugin/node_modules/to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", "dev": true, "dependencies": { "is-number": "^3.0.0", @@ -24880,9 +25005,9 @@ } }, "node_modules/form-data": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", - "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -25584,7 +25709,7 @@ "node_modules/glob-watcher/node_modules/to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", "dev": true, "dependencies": { "is-number": "^3.0.0", @@ -26045,13 +26170,13 @@ "node_modules/gulp-cli/node_modules/which-module": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", + "integrity": "sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ==", "dev": true }, "node_modules/gulp-cli/node_modules/wrap-ansi": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "integrity": "sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==", "dev": true, "dependencies": { "string-width": "^1.0.1", @@ -26817,9 +26942,9 @@ } }, "node_modules/html-minifier-terser/node_modules/terser": { - "version": "5.14.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.0.tgz", - "integrity": "sha512-JC6qfIEkPBd9j1SMO3Pfn+A6w2kQV54tv+ABQLgZr7dA3k/DL/OBoYSWxzVpZev3J+bUHXfr55L8Mox7AaNo6g==", + "version": "5.14.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.1.tgz", + "integrity": "sha512-+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ==", "dev": true, "dependencies": { "@jridgewell/source-map": "^0.3.2", @@ -27087,9 +27212,9 @@ "dev": true }, "node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", + "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", "dependencies": { "agent-base": "6", "debug": "4" @@ -27211,6 +27336,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "dev": true, "funding": [ { "type": "github", @@ -27474,30 +27600,44 @@ "dev": true }, "node_modules/inquirer": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.4.tgz", - "integrity": "sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.0.0.tgz", + "integrity": "sha512-ON8pEJPPCdyjxj+cxsYRe6XfCJepTxANdNnTebsTuQgXpRyZRRT9t4dJwjRubgmvn20CLSEnozRUayXyM9VTXA==", "dependencies": { "ansi-escapes": "^4.2.1", - "chalk": "^4.1.1", + "chalk": "^4.1.0", "cli-cursor": "^3.1.0", "cli-width": "^3.0.0", "external-editor": "^3.0.3", "figures": "^3.0.0", "lodash": "^4.17.21", "mute-stream": "0.0.8", - "ora": "^5.4.1", "run-async": "^2.4.0", - "rxjs": "^7.5.5", + "rxjs": "^6.6.6", "string-width": "^4.1.0", "strip-ansi": "^6.0.0", - "through": "^2.3.6", - "wrap-ansi": "^7.0.0" + "through": "^2.3.6" }, "engines": { - "node": ">=12.0.0" + "node": ">=8.0.0" } }, + "node_modules/inquirer/node_modules/rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, + "node_modules/inquirer/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, "node_modules/inside": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/inside/-/inside-1.0.0.tgz", @@ -28097,6 +28237,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", + "dev": true, "engines": { "node": ">=8" } @@ -28396,6 +28537,7 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true, "engines": { "node": ">=10" }, @@ -30550,6 +30692,19 @@ } } }, + "node_modules/jsdom/node_modules/form-data": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/jsdom/node_modules/parse5": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", @@ -31596,6 +31751,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "dev": true, "dependencies": { "chalk": "^4.1.0", "is-unicode-supported": "^0.1.0" @@ -31975,9 +32131,9 @@ } }, "node_modules/marked": { - "version": "4.0.16", - "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.16.tgz", - "integrity": "sha512-wahonIQ5Jnyatt2fn8KqF/nIqZM8mh3oRu2+l5EANGMhu6RFjiSG52QNE2eWzFMI94HqYSgN184NurgNG6CztA==", + "version": "4.0.17", + "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.17.tgz", + "integrity": "sha512-Wfk0ATOK5iPxM4ptrORkFemqroz0ZDxp5MWfYA7H/F+wO17NRWV5Ypxi6p3g2Xmw2bKeiYOl6oVnLHKxBA0VhA==", "dev": true, "bin": { "marked": "bin/marked.js" @@ -32154,7 +32310,7 @@ "node_modules/matchdep/node_modules/to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", "dev": true, "dependencies": { "is-number": "^3.0.0", @@ -33257,17 +33413,17 @@ "node_modules/node-fetch/node_modules/tr46": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, "node_modules/node-fetch/node_modules/webidl-conversions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" }, "node_modules/node-fetch/node_modules/whatwg-url": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" @@ -34123,6 +34279,7 @@ "version": "5.4.1", "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", + "dev": true, "dependencies": { "bl": "^4.1.0", "chalk": "^4.1.0", @@ -34145,6 +34302,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "dev": true, "dependencies": { "buffer": "^5.5.0", "inherits": "^2.0.4", @@ -34155,6 +34313,7 @@ "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "dev": true, "funding": [ { "type": "github", @@ -34178,6 +34337,7 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dev": true, "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -35337,7 +35497,7 @@ "node_modules/plist/node_modules/xmlbuilder": { "version": "9.0.7", "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", - "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", + "integrity": "sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ==", "dev": true, "engines": { "node": ">=4.0" @@ -38779,7 +38939,7 @@ "node_modules/regedit/node_modules/through2": { "version": "0.6.5", "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", - "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "integrity": "sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==", "dev": true, "dependencies": { "readable-stream": ">=1.0.33-1 <1.1.0-0", @@ -39986,7 +40146,7 @@ "node_modules/sane/node_modules/to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", "dev": true, "dependencies": { "is-number": "^3.0.0", @@ -41406,7 +41566,7 @@ "node_modules/static-eval/node_modules/type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", "dev": true, "dependencies": { "prelude-ls": "~1.1.2" @@ -41659,7 +41819,7 @@ "node_modules/static-module/node_modules/type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", "dev": true, "dependencies": { "prelude-ls": "~1.1.2" @@ -41691,9 +41851,9 @@ "dev": true }, "node_modules/storybook-addon-designs": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/storybook-addon-designs/-/storybook-addon-designs-6.2.1.tgz", - "integrity": "sha512-ihsscab8185HnxqTNZlM4TfrCPVsO7AimVA8BapuqT/sfZQF9m5H9C0plT3kbECdIMh2cmzMBF1Tc9ckWRgpWg==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/storybook-addon-designs/-/storybook-addon-designs-6.3.1.tgz", + "integrity": "sha512-QCHZp4KuUikOq52MPiMfU8QifYTfhHar5vWlbcfkFDz1YrgGMy+QAEt5Y3Vdnffl4GKSK1lAsLuvTuzqTBRvnw==", "dev": true, "dependencies": { "@figspec/react": "^1.0.0" @@ -42192,7 +42352,7 @@ "node_modules/sver-compat": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz", - "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=", + "integrity": "sha512-aFTHfmjwizMNlNE6dsGmoAM4lHjL0CyiobWaFiXWSlD7cIxshW422Nb8KbXCmR6z+0ZEPY+daXJrDyh/vuwTyg==", "dev": true, "dependencies": { "es6-iterator": "^2.0.1", @@ -42326,15 +42486,15 @@ "dev": true }, "node_modules/tailwindcss": { - "version": "3.0.24", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.24.tgz", - "integrity": "sha512-H3uMmZNWzG6aqmg9q07ZIRNIawoiEcNFKDfL+YzOPuPsXuDXxJxB9icqzLgdzKNwjG3SAro2h9SYav8ewXNgig==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.1.2.tgz", + "integrity": "sha512-yJ6L5s1U5AeS5g7HHy212zdQfjwD426FBfm59pet/JsyneuZuD4C2W7PpJEg4ppisiB21uLqtNagv8KXury3+Q==", "dev": true, "dependencies": { "arg": "^5.0.1", "chokidar": "^3.5.3", "color-name": "^1.1.4", - "detective": "^5.2.0", + "detective": "^5.2.1", "didyoumean": "^1.2.2", "dlv": "^1.1.3", "fast-glob": "^3.2.11", @@ -42344,7 +42504,8 @@ "normalize-path": "^3.0.0", "object-hash": "^3.0.0", "picocolors": "^1.0.0", - "postcss": "^8.4.12", + "postcss": "^8.4.14", + "postcss-import": "^14.1.0", "postcss-js": "^4.0.0", "postcss-load-config": "^3.1.4", "postcss-nested": "5.0.6", @@ -42376,6 +42537,23 @@ "node": ">=10.13.0" } }, + "node_modules/tailwindcss/node_modules/postcss-import": { + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-14.1.0.tgz", + "integrity": "sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==", + "dev": true, + "dependencies": { + "postcss-value-parser": "^4.0.0", + "read-cache": "^1.0.0", + "resolve": "^1.1.7" + }, + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "postcss": "^8.0.0" + } + }, "node_modules/tailwindcss/node_modules/resolve": { "version": "1.22.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", @@ -42688,7 +42866,7 @@ "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", "dev": true }, "node_modules/textextensions": { @@ -42722,7 +42900,7 @@ "node_modules/through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==" }, "node_modules/through2": { "version": "3.0.2", @@ -42763,7 +42941,7 @@ "node_modules/time-stamp": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", - "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=", + "integrity": "sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==", "dev": true, "engines": { "node": ">=0.10.0" @@ -42840,7 +43018,7 @@ "node_modules/to-absolute-glob": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz", - "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=", + "integrity": "sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA==", "dev": true, "dependencies": { "is-absolute": "^1.0.0", @@ -42853,13 +43031,13 @@ "node_modules/to-arraybuffer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", - "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", + "integrity": "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==", "dev": true }, "node_modules/to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", "dev": true, "engines": { "node": ">=4" @@ -42868,7 +43046,7 @@ "node_modules/to-object-path": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", - "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", + "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==", "dev": true, "dependencies": { "kind-of": "^3.0.2" @@ -42934,7 +43112,7 @@ "node_modules/to-through": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz", - "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=", + "integrity": "sha512-+QIz37Ly7acM4EMdw2PRN389OneM5+d844tirkGp4dPKzI5OE72V9OsbFp+CIYJDahZ41ZV05hNtcPAQUAm9/Q==", "dev": true, "dependencies": { "through2": "^2.0.3" @@ -43003,7 +43181,7 @@ "node_modules/traverse": { "version": "0.6.6", "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz", - "integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=", + "integrity": "sha512-kdf4JKs8lbARxWdp7RKdNzoJBhGUcIalSYibuGyHJbmk40pOysQ0+QPvlkCOICOivDWU2IJo2rkrxyTK2AH4fw==", "dev": true }, "node_modules/tree-kill": { @@ -43018,13 +43196,13 @@ "node_modules/trim": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz", - "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=", + "integrity": "sha512-YzQV+TZg4AxpKxaTHK3c3D+kRDCGVEE7LemdlQZoQXn0iennk10RsIoY6ikzAqJTc9Xjl9C1/waHom/J86ziAQ==", "dev": true }, "node_modules/trim-newlines": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", - "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", + "integrity": "sha512-Nm4cF79FhSTzrLKGDMi3I4utBtFv8qKy4sq1enftf2gMdpqI8oVQTAfySkTz5r49giVzDj88SVZXP4CeYQwjaw==", "dev": true, "optional": true, "engines": { @@ -43054,7 +43232,7 @@ "node_modules/truncate-utf8-bytes": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz", - "integrity": "sha1-QFkjkJWS1W94pYGENLC3hInKXys=", + "integrity": "sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ==", "dev": true, "dependencies": { "utf8-byte-length": "^1.0.1" @@ -43287,7 +43465,7 @@ "node_modules/tty-browserify": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", - "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", + "integrity": "sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==", "dev": true }, "node_modules/tunnel": { @@ -43303,7 +43481,7 @@ "node_modules/tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", "dev": true, "dependencies": { "safe-buffer": "^5.0.1" @@ -43366,7 +43544,7 @@ "node_modules/typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" + "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==" }, "node_modules/typedarray-to-buffer": { "version": "3.1.5", @@ -43421,7 +43599,7 @@ "node_modules/unc-path-regex": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", - "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=", + "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==", "dev": true, "engines": { "node": ">=0.10.0" @@ -43451,7 +43629,7 @@ "node_modules/undertaker-registry": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz", - "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=", + "integrity": "sha512-UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw==", "dev": true, "engines": { "node": ">= 0.10" @@ -43594,7 +43772,7 @@ "node_modules/uniq": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", - "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=", + "integrity": "sha512-Gw+zz50YNKPDKXs+9d+aKAjVwpjNwqzvNpLigIruT4HA9lMZNdMqs9x07kKHB/L9WRzqp4+DlTU5s4wG2esdoA==", "dev": true }, "node_modules/unique-filename": { @@ -43763,7 +43941,7 @@ "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", "engines": { "node": ">= 0.8" } @@ -43771,7 +43949,7 @@ "node_modules/unset-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", - "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", + "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==", "dev": true, "dependencies": { "has-value": "^0.3.1", @@ -43825,7 +44003,7 @@ "node_modules/untildify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/untildify/-/untildify-2.1.0.tgz", - "integrity": "sha1-F+soB5h/dpUunASF/DEdBqgmouA=", + "integrity": "sha512-sJjbDp2GodvkB0FZZcn7k6afVisqX5BZD7Yq3xp4nN2O15BBK0cLm3Vwn2vQaF7UDS0UUsrQMkkplmDI5fskig==", "dev": true, "optional": true, "dependencies": { @@ -43912,14 +44090,14 @@ "node_modules/urix": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", - "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", + "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==", "deprecated": "Please see https://github.com/lydell/urix#deprecated", "dev": true }, "node_modules/url": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", + "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==", "dev": true, "dependencies": { "punycode": "1.3.2", @@ -44015,7 +44193,7 @@ "node_modules/url-parse-lax": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", - "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", + "integrity": "sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==", "dev": true, "dependencies": { "prepend-http": "^2.0.0" @@ -44054,7 +44232,7 @@ "node_modules/utf8-byte-length": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz", - "integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=", + "integrity": "sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA==", "dev": true }, "node_modules/util": { @@ -44074,7 +44252,7 @@ "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, "node_modules/util.promisify": { "version": "1.0.0", @@ -44089,13 +44267,13 @@ "node_modules/utila": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz", - "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=", + "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==", "dev": true }, "node_modules/utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", + "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", "dev": true, "engines": { "node": ">= 0.4.0" @@ -44113,7 +44291,7 @@ "node_modules/uuid-browser": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/uuid-browser/-/uuid-browser-3.1.0.tgz", - "integrity": "sha1-DwWkCu90+eWVHiDvv0SxGHHlZBA=", + "integrity": "sha512-dsNgbLaTrd6l3MMxTtouOCFw4CBFc/3a+GgYA2YyrJvyQ1u6q4pcu3ktLoUZ/VN/Aw9WsauazbgsgdfVWgAKQg==", "dev": true }, "node_modules/v8-compile-cache": { @@ -44162,7 +44340,7 @@ "node_modules/validate-npm-package-name": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz", - "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=", + "integrity": "sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==", "dev": true, "dependencies": { "builtins": "^1.0.3" @@ -44171,7 +44349,7 @@ "node_modules/value-or-function": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz", - "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=", + "integrity": "sha512-jdBB2FrWvQC/pnPtIqcLsMaQgjhdb6B7tk1MMyTKapox+tQZbdRP4uLxu/JY0t7fbfDCUMnuelzEYv5GsxHhdg==", "dev": true, "engines": { "node": ">= 0.10" @@ -44180,7 +44358,7 @@ "node_modules/vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", "engines": { "node": ">= 0.8" } @@ -44305,7 +44483,7 @@ "node_modules/vinyl-sourcemap": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz", - "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=", + "integrity": "sha512-NiibMgt6VJGJmyw7vtzhctDcfKch4e4n9TBeoWlirb7FMg9/1Ov9k+A5ZRAtywBpRPiyECvQRQllYM8dECegVA==", "dev": true, "dependencies": { "append-buffer": "^1.0.2", @@ -44662,7 +44840,7 @@ "node_modules/watchpack-chokidar2/node_modules/to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", "dev": true, "optional": true, "dependencies": { @@ -44685,7 +44863,8 @@ "node_modules/wcwidth": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", - "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=", + "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", + "dev": true, "dependencies": { "defaults": "^1.0.3" } @@ -44776,18 +44955,18 @@ } }, "node_modules/webpack-cli": { - "version": "4.9.2", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.2.tgz", - "integrity": "sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ==", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz", + "integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==", "dev": true, "dependencies": { "@discoveryjs/json-ext": "^0.5.0", - "@webpack-cli/configtest": "^1.1.1", - "@webpack-cli/info": "^1.4.1", - "@webpack-cli/serve": "^1.6.1", + "@webpack-cli/configtest": "^1.2.0", + "@webpack-cli/info": "^1.5.0", + "@webpack-cli/serve": "^1.7.0", "colorette": "^2.0.14", "commander": "^7.0.0", - "execa": "^5.0.0", + "cross-spawn": "^7.0.3", "fastest-levenshtein": "^1.0.12", "import-local": "^3.0.2", "interpret": "^2.2.0", @@ -44800,6 +44979,10 @@ "engines": { "node": ">=10.13.0" }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, "peerDependencies": { "webpack": "4.x.x || 5.x.x" }, @@ -45035,9 +45218,9 @@ } }, "node_modules/webpack-dev-server/node_modules/ws": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.7.0.tgz", - "integrity": "sha512-c2gsP0PRwcLFzUiA8Mkr37/MI7ilIlHQxaEAtd0uNMbVMoy8puJyafRlm0bV9MbGSabUPeLrRRaqIBcFcA2Pqg==", + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz", + "integrity": "sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==", "dev": true, "engines": { "node": ">=10.0.0" @@ -45312,7 +45495,7 @@ "node_modules/which-module": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==", "dev": true }, "node_modules/which-pm-runs": { @@ -45444,7 +45627,7 @@ "node_modules/wordwrap": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", + "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", "dev": true }, "node_modules/worker-farm": { @@ -45469,6 +45652,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -45484,7 +45668,7 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", "dev": true }, "node_modules/write-file-atomic": { @@ -45510,7 +45694,7 @@ "node_modules/x-default-browser": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/x-default-browser/-/x-default-browser-0.4.0.tgz", - "integrity": "sha1-cM8NqF2nwKtcsPFaiX8jIqa91IE=", + "integrity": "sha512-7LKo7RtWfoFN/rHx1UELv/2zHGMx8MkZKDq1xENmOCTkfIqZJ0zZ26NEJX8czhnPXVcqS0ARjjfJB+eJ0/5Cvw==", "dev": true, "bin": { "x-default-browser": "bin/x-default-browser.js" @@ -45619,7 +45803,7 @@ "node_modules/yauzl": { "version": "2.10.0", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", + "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", "dev": true, "dependencies": { "buffer-crc32": "~0.2.3", @@ -45676,7 +45860,7 @@ "node_modules/zxcvbn": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/zxcvbn/-/zxcvbn-4.4.2.tgz", - "integrity": "sha1-KOwXzwl0PtyrBW3dixsGJizHPDA=" + "integrity": "sha512-Bq0B+ixT/DMyG8kgX2xWcI5jUvCwqrMxSFam7m0lAf78nf04hv6lNCsyLYdyYTrCVMqNDY/206K7eExYCeSyUQ==" } }, "dependencies": { @@ -46397,16 +46581,6 @@ "micromatch": "^3.1.10" } }, - "https-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", - "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", - "dev": true, - "requires": { - "agent-base": "6", - "debug": "4" - } - }, "import-local": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz", @@ -46842,7 +47016,7 @@ "to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", "dev": true, "requires": { "is-number": "^3.0.0", @@ -47537,15 +47711,15 @@ } }, "@babel/compat-data": { - "version": "7.17.10", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz", - "integrity": "sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==", + "version": "7.18.5", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.5.tgz", + "integrity": "sha512-BxhE40PVCBxVEJsSBhB6UWyAuqJRxGsAw8BdHMJ3AKGydcwuWW4kOO3HmqBQAdcq/OP+/DlTVxLvsCzRTnZuGg==", "dev": true }, "@babel/core": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.2.tgz", - "integrity": "sha512-A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ==", + "version": "7.18.5", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.5.tgz", + "integrity": "sha512-MGY8vg3DxMnctw0LdvSEojOsumc70g0t18gNyUdAZqB1Rpd1Bqo/svHGvt+UJ6JcGX+DIekGFDxxIWofBxLCnQ==", "dev": true, "requires": { "@ampproject/remapping": "^2.1.0", @@ -47554,10 +47728,10 @@ "@babel/helper-compilation-targets": "^7.18.2", "@babel/helper-module-transforms": "^7.18.0", "@babel/helpers": "^7.18.2", - "@babel/parser": "^7.18.0", + "@babel/parser": "^7.18.5", "@babel/template": "^7.16.7", - "@babel/traverse": "^7.18.2", - "@babel/types": "^7.18.2", + "@babel/traverse": "^7.18.5", + "@babel/types": "^7.18.4", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -48049,9 +48223,9 @@ } }, "@babel/parser": { - "version": "7.18.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.4.tgz", - "integrity": "sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow==", + "version": "7.18.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.5.tgz", + "integrity": "sha512-YZWVaglMiplo7v8f1oMQ5ZPQr0vn7HPeZXxXWsxXJRjGVrzUFn9OxFQl1sb5wzfootjA/yChhW84BV+383FSOw==", "dev": true }, "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { @@ -48632,9 +48806,9 @@ } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.18.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.4.tgz", - "integrity": "sha512-lH2UaQaHVOAeYrUUuZ8i38o76J/FnO8vu21OE+tD1MyP9lxdZoSfz+pDbWkq46GogUrdrMz3tiz/FYGB+bVThg==", + "version": "7.18.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.5.tgz", + "integrity": "sha512-SEewrhPpcqMF1V7DhnEbhVJLrC+nnYfe1E0piZMZXBpxi9WvZqWGwpsk7JYP7wPWeqaBh4gyKlBhHJu3uz5g4Q==", "dev": true, "requires": { "@babel/helper-hoist-variables": "^7.16.7", @@ -48665,9 +48839,9 @@ } }, "@babel/plugin-transform-new-target": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.17.12.tgz", - "integrity": "sha512-CaOtzk2fDYisbjAD4Sd1MTKGVIpRtx9bWLyj24Y/k6p4s4gQ3CqDGJauFJxt8M/LEx003d0i3klVqnN73qvK3w==", + "version": "7.18.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.5.tgz", + "integrity": "sha512-TuRL5uGW4KXU6OsRj+mLp9BM7pO8e7SGNTEokQRRxHFkXYMFiy2jlKSZPFtI/mKORDzciH+hneskcSOp0gU8hg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.17.12" @@ -49107,9 +49281,9 @@ } }, "@babel/traverse": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.2.tgz", - "integrity": "sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA==", + "version": "7.18.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.5.tgz", + "integrity": "sha512-aKXj1KT66sBj0vVzk6rEeAO6Z9aiiQ68wfDgge3nHhA/my6xMM/7HGQUNumKZaoa2qUPQ5whJG9aAifsxUKfLA==", "dev": true, "requires": { "@babel/code-frame": "^7.16.7", @@ -49118,8 +49292,8 @@ "@babel/helper-function-name": "^7.17.9", "@babel/helper-hoist-variables": "^7.16.7", "@babel/helper-split-export-declaration": "^7.16.7", - "@babel/parser": "^7.18.0", - "@babel/types": "^7.18.2", + "@babel/parser": "^7.18.5", + "@babel/types": "^7.18.4", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -49165,6 +49339,66 @@ "dev": true, "peer": true }, + "@bitwarden/angular": { + "version": "file:libs/angular" + }, + "@bitwarden/browser": { + "version": "file:apps/browser" + }, + "@bitwarden/cli": { + "version": "file:apps/cli", + "requires": { + "@koa/multer": "^3.0.0", + "@koa/router": "^10.1.1", + "big-integer": "^1.6.51", + "browser-hrtime": "^1.1.8", + "chalk": "^4.1.1", + "commander": "7.2.0", + "form-data": "4.0.0", + "https-proxy-agent": "5.0.0", + "inquirer": "8.0.0", + "jsdom": "^16.7.0", + "jszip": "^3.10.0", + "koa": "^2.13.4", + "koa-bodyparser": "^4.3.0", + "koa-json": "^2.0.2", + "lowdb": "1.0.0", + "lunr": "^2.3.9", + "multer": "^1.4.5-lts.1", + "node-fetch": "^2.6.7", + "node-forge": "1.3.1", + "open": "^8.4.0", + "papaparse": "^5.3.2", + "proper-lockfile": "^4.1.2", + "rxjs": "^7.5.5", + "tldjs": "^2.3.1", + "zxcvbn": "^4.4.2" + } + }, + "@bitwarden/common": { + "version": "file:libs/common" + }, + "@bitwarden/components": { + "version": "file:libs/components" + }, + "@bitwarden/desktop": { + "version": "file:apps/desktop" + }, + "@bitwarden/electron": { + "version": "file:libs/electron", + "requires": { + "@bitwarden/common": "file:../common" + } + }, + "@bitwarden/node": { + "version": "file:libs/node", + "requires": { + "@bitwarden/common": "file:../common" + } + }, + "@bitwarden/web-vault": { + "version": "file:apps/web" + }, "@braintree/asset-loader": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/@braintree/asset-loader/-/asset-loader-0.4.4.tgz", @@ -52506,7 +52740,7 @@ "to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", "dev": true, "requires": { "is-number": "^3.0.0", @@ -53717,7 +53951,7 @@ "to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", "dev": true, "requires": { "is-number": "^3.0.0", @@ -54403,7 +54637,7 @@ "to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", "dev": true, "requires": { "is-number": "^3.0.0", @@ -54466,9 +54700,9 @@ } }, "ws": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.7.0.tgz", - "integrity": "sha512-c2gsP0PRwcLFzUiA8Mkr37/MI7ilIlHQxaEAtd0uNMbVMoy8puJyafRlm0bV9MbGSabUPeLrRRaqIBcFcA2Pqg==", + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz", + "integrity": "sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==", "dev": true, "requires": {} }, @@ -55379,7 +55613,7 @@ "to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", "dev": true, "requires": { "is-number": "^3.0.0", @@ -56517,6 +56751,19 @@ "requires": { "@types/node": "*", "form-data": "^3.0.0" + }, + "dependencies": { + "form-data": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", + "dev": true, + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + } } }, "@types/node-forge": { @@ -56739,9 +56986,9 @@ "dev": true }, "@types/uglify-js": { - "version": "3.13.3", - "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.3.tgz", - "integrity": "sha512-9dmBYXt/rKxedUXfCvXSxyiPvpDXLkiRlv17DnqdhS+pRustL1967rI1jZVt1xysTO+xJGMoZzcy3cWC9+b6Tw==", + "version": "3.16.0", + "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.16.0.tgz", + "integrity": "sha512-0yeUr92L3r0GLRnBOvtYK1v2SjqMIqQDHMl7GLb+l2L8+6LSFWEEWEIgVsPdMn5ImLM8qzWT8xFPtQYpp8co0g==", "dev": true, "requires": { "source-map": "^0.6.1" @@ -56845,14 +57092,14 @@ "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "5.27.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.27.1.tgz", - "integrity": "sha512-6dM5NKT57ZduNnJfpY81Phe9nc9wolnMCnknb1im6brWi1RYv84nbMS3olJa27B6+irUVV1X/Wb+Am0FjJdGFw==", + "version": "5.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.28.0.tgz", + "integrity": "sha512-DXVU6Cg29H2M6EybqSg2A+x8DgO9TCUBRp4QEXQHJceLS7ogVDP0g3Lkg/SZCqcvkAP/RruuQqK0gdlkgmhSUA==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "5.27.1", - "@typescript-eslint/type-utils": "5.27.1", - "@typescript-eslint/utils": "5.27.1", + "@typescript-eslint/scope-manager": "5.28.0", + "@typescript-eslint/type-utils": "5.28.0", + "@typescript-eslint/utils": "5.28.0", "debug": "^4.3.4", "functional-red-black-tree": "^1.0.1", "ignore": "^5.2.0", @@ -56882,14 +57129,14 @@ } }, "@typescript-eslint/parser": { - "version": "5.27.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.27.1.tgz", - "integrity": "sha512-7Va2ZOkHi5NP+AZwb5ReLgNF6nWLGTeUJfxdkVUAPPSaAdbWNnFZzLZ4EGGmmiCTg+AwlbE1KyUYTBglosSLHQ==", + "version": "5.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.28.0.tgz", + "integrity": "sha512-ekqoNRNK1lAcKhZESN/PdpVsWbP9jtiNqzFWkp/yAUdZvJalw2heCYuqRmM5eUJSIYEkgq5sGOjq+ZqsLMjtRA==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "5.27.1", - "@typescript-eslint/types": "5.27.1", - "@typescript-eslint/typescript-estree": "5.27.1", + "@typescript-eslint/scope-manager": "5.28.0", + "@typescript-eslint/types": "5.28.0", + "@typescript-eslint/typescript-estree": "5.28.0", "debug": "^4.3.4" }, "dependencies": { @@ -56905,22 +57152,22 @@ } }, "@typescript-eslint/scope-manager": { - "version": "5.27.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.27.1.tgz", - "integrity": "sha512-fQEOSa/QroWE6fAEg+bJxtRZJTH8NTskggybogHt4H9Da8zd4cJji76gA5SBlR0MgtwF7rebxTbDKB49YUCpAg==", + "version": "5.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.28.0.tgz", + "integrity": "sha512-LeBLTqF/he1Z+boRhSqnso6YrzcKMTQ8bO/YKEe+6+O/JGof9M0g3IJlIsqfrK/6K03MlFIlycbf1uQR1IjE+w==", "dev": true, "requires": { - "@typescript-eslint/types": "5.27.1", - "@typescript-eslint/visitor-keys": "5.27.1" + "@typescript-eslint/types": "5.28.0", + "@typescript-eslint/visitor-keys": "5.28.0" } }, "@typescript-eslint/type-utils": { - "version": "5.27.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.27.1.tgz", - "integrity": "sha512-+UC1vVUWaDHRnC2cQrCJ4QtVjpjjCgjNFpg8b03nERmkHv9JV9X5M19D7UFMd+/G7T/sgFwX2pGmWK38rqyvXw==", + "version": "5.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.28.0.tgz", + "integrity": "sha512-SyKjKh4CXPglueyC6ceAFytjYWMoPHMswPQae236zqe1YbhvCVQyIawesYywGiu98L9DwrxsBN69vGIVxJ4mQQ==", "dev": true, "requires": { - "@typescript-eslint/utils": "5.27.1", + "@typescript-eslint/utils": "5.28.0", "debug": "^4.3.4", "tsutils": "^3.21.0" }, @@ -56937,19 +57184,19 @@ } }, "@typescript-eslint/types": { - "version": "5.27.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.27.1.tgz", - "integrity": "sha512-LgogNVkBhCTZU/m8XgEYIWICD6m4dmEDbKXESCbqOXfKZxRKeqpiJXQIErv66sdopRKZPo5l32ymNqibYEH/xg==", + "version": "5.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.28.0.tgz", + "integrity": "sha512-2OOm8ZTOQxqkPbf+DAo8oc16sDlVR5owgJfKheBkxBKg1vAfw2JsSofH9+16VPlN9PWtv8Wzhklkqw3k/zCVxA==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "5.27.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.27.1.tgz", - "integrity": "sha512-DnZvvq3TAJ5ke+hk0LklvxwYsnXpRdqUY5gaVS0D4raKtbznPz71UJGnPTHEFo0GDxqLOLdMkkmVZjSpET1hFw==", + "version": "5.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.28.0.tgz", + "integrity": "sha512-9GX+GfpV+F4hdTtYc6OV9ZkyYilGXPmQpm6AThInpBmKJEyRSIjORJd1G9+bknb7OTFYL+Vd4FBJAO6T78OVqA==", "dev": true, "requires": { - "@typescript-eslint/types": "5.27.1", - "@typescript-eslint/visitor-keys": "5.27.1", + "@typescript-eslint/types": "5.28.0", + "@typescript-eslint/visitor-keys": "5.28.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -56978,26 +57225,26 @@ } }, "@typescript-eslint/utils": { - "version": "5.27.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.27.1.tgz", - "integrity": "sha512-mZ9WEn1ZLDaVrhRaYgzbkXBkTPghPFsup8zDbbsYTxC5OmqrFE7skkKS/sraVsLP3TcT3Ki5CSyEFBRkLH/H/w==", + "version": "5.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.28.0.tgz", + "integrity": "sha512-E60N5L0fjv7iPJV3UGc4EC+A3Lcj4jle9zzR0gW7vXhflO7/J29kwiTGITA2RlrmPokKiZbBy2DgaclCaEUs6g==", "dev": true, "requires": { "@types/json-schema": "^7.0.9", - "@typescript-eslint/scope-manager": "5.27.1", - "@typescript-eslint/types": "5.27.1", - "@typescript-eslint/typescript-estree": "5.27.1", + "@typescript-eslint/scope-manager": "5.28.0", + "@typescript-eslint/types": "5.28.0", + "@typescript-eslint/typescript-estree": "5.28.0", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" } }, "@typescript-eslint/visitor-keys": { - "version": "5.27.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.27.1.tgz", - "integrity": "sha512-xYs6ffo01nhdJgPieyk7HAOpjhTsx7r/oB9LWEhwAXgwn33tkr+W8DI2ChboqhZlC4q3TC6geDYPoiX8ROqyOQ==", + "version": "5.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.28.0.tgz", + "integrity": "sha512-BtfP1vCor8cWacovzzPFOoeW4kBQxzmhxGoOpt0v1SFvG+nJ0cWaVdJk7cky1ArTcFHHKNIxyo2LLr3oNkSuXA==", "dev": true, "requires": { - "@typescript-eslint/types": "5.27.1", + "@typescript-eslint/types": "5.28.0", "eslint-visitor-keys": "^3.3.0" } }, @@ -57272,25 +57519,25 @@ "dev": true }, "@webpack-cli/configtest": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.1.tgz", - "integrity": "sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz", + "integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==", "dev": true, "requires": {} }, "@webpack-cli/info": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.1.tgz", - "integrity": "sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz", + "integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==", "dev": true, "requires": { "envinfo": "^7.7.3" } }, "@webpack-cli/serve": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.1.tgz", - "integrity": "sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz", + "integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==", "dev": true, "requires": {} }, @@ -58024,7 +58271,7 @@ "util": { "version": "0.10.3", "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", - "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", + "integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==", "dev": true, "requires": { "inherits": "2.0.1" @@ -58638,7 +58885,8 @@ "base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "dev": true }, "basic-auth": { "version": "2.0.1", @@ -59887,7 +60135,8 @@ "cli-spinners": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", - "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==" + "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", + "dev": true }, "cli-table3": { "version": "0.6.2", @@ -59928,7 +60177,8 @@ "clone": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==" + "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", + "dev": true }, "clone-buffer": { "version": "1.0.0", @@ -60883,7 +61133,7 @@ "to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", "dev": true, "requires": { "is-number": "^3.0.0", @@ -61145,9 +61395,9 @@ } }, "css-declaration-sorter": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.2.2.tgz", - "integrity": "sha512-Ufadglr88ZLsrvS11gjeu/40Lw74D9Am/Jpr3LlYm5Q4ZP5KdlUhG+6u2EjyXeZcxmZ2h1ebCKngDjolpeLHpg==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.0.tgz", + "integrity": "sha512-OGT677UGHJTAVMRhPO+HJ4oKln3wkBTwtDFH0ojbqm+MJm6xuDMHp2nkhh/ThaBqq20IbraBQSWKfSLNHQO9Og==", "dev": true, "requires": {} }, @@ -61643,6 +61893,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", "integrity": "sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA==", + "dev": true, "requires": { "clone": "^1.0.2" } @@ -62250,7 +62501,7 @@ "yallist": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", + "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==", "dev": true } } @@ -62569,27 +62820,27 @@ } }, "electron-store": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/electron-store/-/electron-store-8.0.1.tgz", - "integrity": "sha512-ZyLvNywiqSpbwC/pp89O/AycVWY/UJIkmtyzF2Bd0Nm/rLmcFc0NTGuLdg6+LE8mS8qsiK5JMoe4PnrecLHH5w==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/electron-store/-/electron-store-8.0.2.tgz", + "integrity": "sha512-9GwUMv51w8ydbkaG7X0HrPlElXLApg63zYy1/VZ/a08ndl0gfm4iCoD3f0E1JvP3V16a+7KxqriCI0c122stiA==", "dev": true, "requires": { - "conf": "^10.0.3", - "type-fest": "^1.0.2" + "conf": "^10.1.2", + "type-fest": "^2.12.2" }, "dependencies": { "type-fest": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", - "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.13.1.tgz", + "integrity": "sha512-hXYyrPFwETT2swFLHeoKtJrvSF/ftG/sA15/8nGaLuaDGfVAaq8DYFpu4yOyV4tzp082WqnTEoMsm3flKMI2FQ==", "dev": true } } }, "electron-to-chromium": { - "version": "1.4.150", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.150.tgz", - "integrity": "sha512-MP3oBer0X7ZeS9GJ0H6lmkn561UxiwOIY9TTkdxVY7lI9G6GVCKfgJaHaDcakwdKxBXA4T3ybeswH/WBIN/KTA==", + "version": "1.4.152", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.152.tgz", + "integrity": "sha512-jk4Ju5SGZAQQJ1iI4Rgru7dDlvkQPLpNPWH9gIZmwCD4YteA5Bbk1xPcPDUf5jUYs3e1e80RXdi8XgKQZaigeg==", "dev": true }, "electron-updater": { @@ -63176,7 +63427,7 @@ "type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", "requires": { "prelude-ls": "~1.1.2" } @@ -64629,7 +64880,7 @@ "to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", "dev": true, "requires": { "is-number": "^3.0.0", @@ -64920,7 +65171,7 @@ "to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", "dev": true, "requires": { "is-number": "^3.0.0", @@ -64930,9 +65181,9 @@ } }, "form-data": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", - "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -65494,7 +65745,7 @@ "to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", "dev": true, "requires": { "is-number": "^3.0.0", @@ -65859,13 +66110,13 @@ "which-module": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", + "integrity": "sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ==", "dev": true }, "wrap-ansi": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "integrity": "sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==", "dev": true, "requires": { "string-width": "^1.0.1", @@ -66472,9 +66723,9 @@ } }, "terser": { - "version": "5.14.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.0.tgz", - "integrity": "sha512-JC6qfIEkPBd9j1SMO3Pfn+A6w2kQV54tv+ABQLgZr7dA3k/DL/OBoYSWxzVpZev3J+bUHXfr55L8Mox7AaNo6g==", + "version": "5.14.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.1.tgz", + "integrity": "sha512-+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ==", "dev": true, "requires": { "@jridgewell/source-map": "^0.3.2", @@ -66674,9 +66925,9 @@ "dev": true }, "https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", + "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", "requires": { "agent-base": "6", "debug": "4" @@ -66753,7 +67004,8 @@ "ieee754": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "dev": true }, "if-async": { "version": "3.7.4", @@ -66944,25 +67196,38 @@ "dev": true }, "inquirer": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.4.tgz", - "integrity": "sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.0.0.tgz", + "integrity": "sha512-ON8pEJPPCdyjxj+cxsYRe6XfCJepTxANdNnTebsTuQgXpRyZRRT9t4dJwjRubgmvn20CLSEnozRUayXyM9VTXA==", "requires": { "ansi-escapes": "^4.2.1", - "chalk": "^4.1.1", + "chalk": "^4.1.0", "cli-cursor": "^3.1.0", "cli-width": "^3.0.0", "external-editor": "^3.0.3", "figures": "^3.0.0", "lodash": "^4.17.21", "mute-stream": "0.0.8", - "ora": "^5.4.1", "run-async": "^2.4.0", - "rxjs": "^7.5.5", + "rxjs": "^6.6.6", "string-width": "^4.1.0", "strip-ansi": "^6.0.0", - "through": "^2.3.6", - "wrap-ansi": "^7.0.0" + "through": "^2.3.6" + }, + "dependencies": { + "rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "requires": { + "tslib": "^1.9.0" + } + }, + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + } } }, "inside": { @@ -67382,7 +67647,8 @@ "is-interactive": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", - "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==" + "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", + "dev": true }, "is-lambda": { "version": "1.0.1", @@ -67587,7 +67853,8 @@ "is-unicode-supported": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", - "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==" + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true }, "is-utf8": { "version": "0.2.1", @@ -69361,6 +69628,16 @@ "xml-name-validator": "^3.0.0" }, "dependencies": { + "form-data": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + }, "parse5": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", @@ -70147,6 +70424,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "dev": true, "requires": { "chalk": "^4.1.0", "is-unicode-supported": "^0.1.0" @@ -70438,9 +70716,9 @@ "dev": true }, "marked": { - "version": "4.0.16", - "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.16.tgz", - "integrity": "sha512-wahonIQ5Jnyatt2fn8KqF/nIqZM8mh3oRu2+l5EANGMhu6RFjiSG52QNE2eWzFMI94HqYSgN184NurgNG6CztA==", + "version": "4.0.17", + "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.17.tgz", + "integrity": "sha512-Wfk0ATOK5iPxM4ptrORkFemqroz0ZDxp5MWfYA7H/F+wO17NRWV5Ypxi6p3g2Xmw2bKeiYOl6oVnLHKxBA0VhA==", "dev": true }, "matchdep": { @@ -70584,7 +70862,7 @@ "to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", "dev": true, "requires": { "is-number": "^3.0.0", @@ -71473,17 +71751,17 @@ "tr46": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, "webidl-conversions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" }, "whatwg-url": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", "requires": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" @@ -72170,6 +72448,7 @@ "version": "5.4.1", "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", + "dev": true, "requires": { "bl": "^4.1.0", "chalk": "^4.1.0", @@ -72186,6 +72465,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "dev": true, "requires": { "buffer": "^5.5.0", "inherits": "^2.0.4", @@ -72196,6 +72476,7 @@ "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "dev": true, "requires": { "base64-js": "^1.3.1", "ieee754": "^1.1.13" @@ -72205,6 +72486,7 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dev": true, "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -73109,7 +73391,7 @@ "xmlbuilder": { "version": "9.0.7", "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", - "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", + "integrity": "sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ==", "dev": true } } @@ -75698,7 +75980,7 @@ "through2": { "version": "0.6.5", "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", - "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "integrity": "sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==", "dev": true, "requires": { "readable-stream": ">=1.0.33-1 <1.1.0-0", @@ -76653,7 +76935,7 @@ "to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", "dev": true, "requires": { "is-number": "^3.0.0", @@ -77791,7 +78073,7 @@ "type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", "dev": true, "requires": { "prelude-ls": "~1.1.2" @@ -78000,7 +78282,7 @@ "type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", "dev": true, "requires": { "prelude-ls": "~1.1.2" @@ -78028,9 +78310,9 @@ "dev": true }, "storybook-addon-designs": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/storybook-addon-designs/-/storybook-addon-designs-6.2.1.tgz", - "integrity": "sha512-ihsscab8185HnxqTNZlM4TfrCPVsO7AimVA8BapuqT/sfZQF9m5H9C0plT3kbECdIMh2cmzMBF1Tc9ckWRgpWg==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/storybook-addon-designs/-/storybook-addon-designs-6.3.1.tgz", + "integrity": "sha512-QCHZp4KuUikOq52MPiMfU8QifYTfhHar5vWlbcfkFDz1YrgGMy+QAEt5Y3Vdnffl4GKSK1lAsLuvTuzqTBRvnw==", "dev": true, "requires": { "@figspec/react": "^1.0.0" @@ -78416,7 +78698,7 @@ "sver-compat": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz", - "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=", + "integrity": "sha512-aFTHfmjwizMNlNE6dsGmoAM4lHjL0CyiobWaFiXWSlD7cIxshW422Nb8KbXCmR6z+0ZEPY+daXJrDyh/vuwTyg==", "dev": true, "requires": { "es6-iterator": "^2.0.1", @@ -78519,15 +78801,15 @@ "dev": true }, "tailwindcss": { - "version": "3.0.24", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.24.tgz", - "integrity": "sha512-H3uMmZNWzG6aqmg9q07ZIRNIawoiEcNFKDfL+YzOPuPsXuDXxJxB9icqzLgdzKNwjG3SAro2h9SYav8ewXNgig==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.1.2.tgz", + "integrity": "sha512-yJ6L5s1U5AeS5g7HHy212zdQfjwD426FBfm59pet/JsyneuZuD4C2W7PpJEg4ppisiB21uLqtNagv8KXury3+Q==", "dev": true, "requires": { "arg": "^5.0.1", "chokidar": "^3.5.3", "color-name": "^1.1.4", - "detective": "^5.2.0", + "detective": "^5.2.1", "didyoumean": "^1.2.2", "dlv": "^1.1.3", "fast-glob": "^3.2.11", @@ -78537,7 +78819,8 @@ "normalize-path": "^3.0.0", "object-hash": "^3.0.0", "picocolors": "^1.0.0", - "postcss": "^8.4.12", + "postcss": "^8.4.14", + "postcss-import": "^14.1.0", "postcss-js": "^4.0.0", "postcss-load-config": "^3.1.4", "postcss-nested": "5.0.6", @@ -78556,6 +78839,17 @@ "is-glob": "^4.0.3" } }, + "postcss-import": { + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-14.1.0.tgz", + "integrity": "sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==", + "dev": true, + "requires": { + "postcss-value-parser": "^4.0.0", + "read-cache": "^1.0.0", + "resolve": "^1.1.7" + } + }, "resolve": { "version": "1.22.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", @@ -78804,7 +79098,7 @@ "text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", "dev": true }, "textextensions": { @@ -78829,7 +79123,7 @@ "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==" }, "through2": { "version": "3.0.2", @@ -78872,7 +79166,7 @@ "time-stamp": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", - "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=", + "integrity": "sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==", "dev": true }, "timers-browserify": { @@ -78935,7 +79229,7 @@ "to-absolute-glob": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz", - "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=", + "integrity": "sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA==", "dev": true, "requires": { "is-absolute": "^1.0.0", @@ -78945,19 +79239,19 @@ "to-arraybuffer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", - "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", + "integrity": "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==", "dev": true }, "to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", "dev": true }, "to-object-path": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", - "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", + "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==", "dev": true, "requires": { "kind-of": "^3.0.2" @@ -79010,7 +79304,7 @@ "to-through": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz", - "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=", + "integrity": "sha512-+QIz37Ly7acM4EMdw2PRN389OneM5+d844tirkGp4dPKzI5OE72V9OsbFp+CIYJDahZ41ZV05hNtcPAQUAm9/Q==", "dev": true, "requires": { "through2": "^2.0.3" @@ -79067,7 +79361,7 @@ "traverse": { "version": "0.6.6", "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz", - "integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=", + "integrity": "sha512-kdf4JKs8lbARxWdp7RKdNzoJBhGUcIalSYibuGyHJbmk40pOysQ0+QPvlkCOICOivDWU2IJo2rkrxyTK2AH4fw==", "dev": true }, "tree-kill": { @@ -79079,13 +79373,13 @@ "trim": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz", - "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=", + "integrity": "sha512-YzQV+TZg4AxpKxaTHK3c3D+kRDCGVEE7LemdlQZoQXn0iennk10RsIoY6ikzAqJTc9Xjl9C1/waHom/J86ziAQ==", "dev": true }, "trim-newlines": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", - "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", + "integrity": "sha512-Nm4cF79FhSTzrLKGDMi3I4utBtFv8qKy4sq1enftf2gMdpqI8oVQTAfySkTz5r49giVzDj88SVZXP4CeYQwjaw==", "dev": true, "optional": true }, @@ -79104,7 +79398,7 @@ "truncate-utf8-bytes": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz", - "integrity": "sha1-QFkjkJWS1W94pYGENLC3hInKXys=", + "integrity": "sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ==", "dev": true, "requires": { "utf8-byte-length": "^1.0.1" @@ -79274,7 +79568,7 @@ "tty-browserify": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", - "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", + "integrity": "sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==", "dev": true }, "tunnel": { @@ -79287,7 +79581,7 @@ "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", "dev": true, "requires": { "safe-buffer": "^5.0.1" @@ -79332,7 +79626,7 @@ "typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" + "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==" }, "typedarray-to-buffer": { "version": "3.1.5", @@ -79371,7 +79665,7 @@ "unc-path-regex": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", - "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=", + "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==", "dev": true }, "undertaker": { @@ -79403,7 +79697,7 @@ "undertaker-registry": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz", - "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=", + "integrity": "sha512-UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw==", "dev": true }, "unfetch": { @@ -79515,7 +79809,7 @@ "uniq": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", - "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=", + "integrity": "sha512-Gw+zz50YNKPDKXs+9d+aKAjVwpjNwqzvNpLigIruT4HA9lMZNdMqs9x07kKHB/L9WRzqp4+DlTU5s4wG2esdoA==", "dev": true }, "unique-filename": { @@ -79642,12 +79936,12 @@ "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==" }, "unset-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", - "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", + "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==", "dev": true, "requires": { "has-value": "^0.3.1", @@ -79693,7 +79987,7 @@ "untildify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/untildify/-/untildify-2.1.0.tgz", - "integrity": "sha1-F+soB5h/dpUunASF/DEdBqgmouA=", + "integrity": "sha512-sJjbDp2GodvkB0FZZcn7k6afVisqX5BZD7Yq3xp4nN2O15BBK0cLm3Vwn2vQaF7UDS0UUsrQMkkplmDI5fskig==", "dev": true, "optional": true, "requires": { @@ -79765,13 +80059,13 @@ "urix": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", - "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", + "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==", "dev": true }, "url": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", + "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==", "dev": true, "requires": { "punycode": "1.3.2", @@ -79848,7 +80142,7 @@ "url-parse-lax": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", - "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", + "integrity": "sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==", "dev": true, "requires": { "prepend-http": "^2.0.0" @@ -79871,7 +80165,7 @@ "utf8-byte-length": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz", - "integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=", + "integrity": "sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA==", "dev": true }, "util": { @@ -79891,7 +80185,7 @@ "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, "util.promisify": { "version": "1.0.0", @@ -79906,13 +80200,13 @@ "utila": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz", - "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=", + "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==", "dev": true }, "utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", + "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", "dev": true }, "uuid": { @@ -79924,7 +80218,7 @@ "uuid-browser": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/uuid-browser/-/uuid-browser-3.1.0.tgz", - "integrity": "sha1-DwWkCu90+eWVHiDvv0SxGHHlZBA=", + "integrity": "sha512-dsNgbLaTrd6l3MMxTtouOCFw4CBFc/3a+GgYA2YyrJvyQ1u6q4pcu3ktLoUZ/VN/Aw9WsauazbgsgdfVWgAKQg==", "dev": true }, "v8-compile-cache": { @@ -79967,7 +80261,7 @@ "validate-npm-package-name": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz", - "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=", + "integrity": "sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==", "dev": true, "requires": { "builtins": "^1.0.3" @@ -79976,13 +80270,13 @@ "value-or-function": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz", - "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=", + "integrity": "sha512-jdBB2FrWvQC/pnPtIqcLsMaQgjhdb6B7tk1MMyTKapox+tQZbdRP4uLxu/JY0t7fbfDCUMnuelzEYv5GsxHhdg==", "dev": true }, "vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==" }, "verror": { "version": "1.10.1", @@ -80095,7 +80389,7 @@ "vinyl-sourcemap": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz", - "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=", + "integrity": "sha512-NiibMgt6VJGJmyw7vtzhctDcfKch4e4n9TBeoWlirb7FMg9/1Ov9k+A5ZRAtywBpRPiyECvQRQllYM8dECegVA==", "dev": true, "requires": { "append-buffer": "^1.0.2", @@ -80393,7 +80687,7 @@ "to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", "dev": true, "optional": true, "requires": { @@ -80415,7 +80709,8 @@ "wcwidth": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", - "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=", + "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", + "dev": true, "requires": { "defaults": "^1.0.3" } @@ -80531,18 +80826,18 @@ } }, "webpack-cli": { - "version": "4.9.2", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.2.tgz", - "integrity": "sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ==", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz", + "integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==", "dev": true, "requires": { "@discoveryjs/json-ext": "^0.5.0", - "@webpack-cli/configtest": "^1.1.1", - "@webpack-cli/info": "^1.4.1", - "@webpack-cli/serve": "^1.6.1", + "@webpack-cli/configtest": "^1.2.0", + "@webpack-cli/info": "^1.5.0", + "@webpack-cli/serve": "^1.7.0", "colorette": "^2.0.14", "commander": "^7.0.0", - "execa": "^5.0.0", + "cross-spawn": "^7.0.3", "fastest-levenshtein": "^1.0.12", "import-local": "^3.0.2", "interpret": "^2.2.0", @@ -80699,9 +80994,9 @@ } }, "ws": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.7.0.tgz", - "integrity": "sha512-c2gsP0PRwcLFzUiA8Mkr37/MI7ilIlHQxaEAtd0uNMbVMoy8puJyafRlm0bV9MbGSabUPeLrRRaqIBcFcA2Pqg==", + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz", + "integrity": "sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==", "dev": true, "requires": {} } @@ -80863,7 +81158,7 @@ "which-module": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==", "dev": true }, "which-pm-runs": { @@ -80961,7 +81256,7 @@ "wordwrap": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", + "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", "dev": true }, "worker-farm": { @@ -80986,6 +81281,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, "requires": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -80995,7 +81291,7 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", "dev": true }, "write-file-atomic": { @@ -81021,7 +81317,7 @@ "x-default-browser": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/x-default-browser/-/x-default-browser-0.4.0.tgz", - "integrity": "sha1-cM8NqF2nwKtcsPFaiX8jIqa91IE=", + "integrity": "sha512-7LKo7RtWfoFN/rHx1UELv/2zHGMx8MkZKDq1xENmOCTkfIqZJ0zZ26NEJX8czhnPXVcqS0ARjjfJB+eJ0/5Cvw==", "dev": true, "requires": { "default-browser-id": "^1.0.4" @@ -81106,7 +81402,7 @@ "yauzl": { "version": "2.10.0", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", + "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", "dev": true, "requires": { "buffer-crc32": "~0.2.3", @@ -81150,7 +81446,7 @@ "zxcvbn": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/zxcvbn/-/zxcvbn-4.4.2.tgz", - "integrity": "sha1-KOwXzwl0PtyrBW3dixsGJizHPDA=" + "integrity": "sha512-Bq0B+ixT/DMyG8kgX2xWcI5jUvCwqrMxSFam7m0lAf78nf04hv6lNCsyLYdyYTrCVMqNDY/206K7eExYCeSyUQ==" } } } diff --git a/package.json b/package.json index e687208e52..ca5e4722d2 100644 --- a/package.json +++ b/package.json @@ -13,11 +13,18 @@ }, "homepage": "https://bitwarden.com", "scripts": { + "prepare": "husky install", "lint": "eslint . && prettier --check .", "lint:fix": "eslint . --fix", "prettier": "prettier --write .", - "prepare": "husky install" + "test": "jest", + "test:watch": "jest --watch", + "test:watch:all": "jest --watchAll" }, + "workspaces": [ + "apps/*", + "libs/*" + ], "devDependencies": { "@angular-devkit/build-angular": "^12.2.13", "@angular/cli": "^12.2.13", @@ -149,8 +156,9 @@ "core-js": "^3.11.0", "date-input-polyfill": "^2.14.0", "duo_web_sdk": "github:duosecurity/duo_web_sdk", - "https-proxy-agent": "^5.0.0", - "inquirer": "^8.2.4", + "form-data": "4.0.0", + "https-proxy-agent": "5.0.0", + "inquirer": "8.0.0", "jquery": "3.6.0", "jsdom": "^16.7.0", "jszip": "^3.10.0", diff --git a/libs/tsconfig.json b/tsconfig.json similarity index 73% rename from libs/tsconfig.json rename to tsconfig.json index 63b3da4e0f..e1c4414687 100644 --- a/libs/tsconfig.json +++ b/tsconfig.json @@ -15,10 +15,10 @@ "outDir": "dist", "baseUrl": ".", "paths": { - "jslib-common/*": ["common/src/*"], - "jslib-angular/*": ["angular/src/*"], - "jslib-electron/*": ["electron/src/*"], - "jslib-node/*": ["node/src/*"] + "@bitwarden/common/*": ["./libs/common/src/*"], + "@bitwarden/angular/*": ["./libs/angular/src/*"], + "@bitwarden/electron/*": ["./libs/electron/src/*"], + "@bitwarden/node/*": ["./libs/node/src/*"] }, "plugins": [ {