diff --git a/src/background/idle.background.ts b/src/background/idle.background.ts index 514a80caf31..5c679bfe0f3 100644 --- a/src/background/idle.background.ts +++ b/src/background/idle.background.ts @@ -2,7 +2,7 @@ import ConstantsService from '../services/constants.service'; import LockService from '../services/lock.service'; import MainBackground from './main.background'; -import { StorageService } from '../services/abstractions/storage.service'; +import { StorageService } from '@bitwarden/jslib'; export default class IdleBackground { private idle: any; diff --git a/src/background/main.background.ts b/src/background/main.background.ts index 8afab53ecce..955f88f0573 100644 --- a/src/background/main.background.ts +++ b/src/background/main.background.ts @@ -35,9 +35,7 @@ import TotpService from '../services/totp.service'; import UserService from '../services/user.service'; import UtilsService from '../services/utils.service'; -import { MessagingService } from '../services/abstractions/messaging.service'; -import { PlatformUtilsService } from '../services/abstractions/platformUtils.service'; -import { StorageService } from '../services/abstractions/storage.service'; +import { MessagingService, PlatformUtilsService, StorageService } from '@bitwarden/jslib'; export default class MainBackground { messagingService: MessagingService; diff --git a/src/background/runtime.background.ts b/src/background/runtime.background.ts index c9444fadbaa..4fc78c0c6da 100644 --- a/src/background/runtime.background.ts +++ b/src/background/runtime.background.ts @@ -8,7 +8,7 @@ import AutofillService from '../services/autofill.service'; import CipherService from '../services/cipher.service'; import UtilsService from '../services/utils.service'; -import { PlatformUtilsService } from '../services/abstractions/platformUtils.service'; +import { PlatformUtilsService } from '@bitwarden/jslib'; export default class RuntimeBackground { private runtime: any; diff --git a/src/background/webRequest.background.ts b/src/background/webRequest.background.ts index 9d2ed066b1e..ba9e3ecf420 100644 --- a/src/background/webRequest.background.ts +++ b/src/background/webRequest.background.ts @@ -1,6 +1,6 @@ import CipherService from '../services/cipher.service'; -import { PlatformUtilsService } from '../services/abstractions/platformUtils.service'; +import { PlatformUtilsService } from '@bitwarden/jslib'; export default class WebRequestBackground { private pendingAuthRequests: any[] = []; diff --git a/src/models/request/deviceRequest.ts b/src/models/request/deviceRequest.ts index 6a73f83a5bf..a6076f97822 100644 --- a/src/models/request/deviceRequest.ts +++ b/src/models/request/deviceRequest.ts @@ -1,5 +1,4 @@ -import { DeviceType } from '@bitwarden/jslib'; -import { PlatformUtilsService } from '../../services/abstractions/platformUtils.service'; +import { DeviceType, PlatformUtilsService } from '@bitwarden/jslib'; class DeviceRequest { type: DeviceType; diff --git a/src/popup/app/components/action-buttons.component.ts b/src/popup/app/components/action-buttons.component.ts index 020e7428f0c..f1c84c01a07 100644 --- a/src/popup/app/components/action-buttons.component.ts +++ b/src/popup/app/components/action-buttons.component.ts @@ -1,6 +1,6 @@ import * as template from './action-buttons.component.html'; -import { PlatformUtilsService } from '../../../services/abstractions/platformUtils.service'; +import { PlatformUtilsService } from '@bitwarden/jslib'; export class ActionButtonsController implements ng.IController { onView: Function; diff --git a/src/popup/app/components/pop-out.component.ts b/src/popup/app/components/pop-out.component.ts index 1328b2586d9..d974bf83351 100644 --- a/src/popup/app/components/pop-out.component.ts +++ b/src/popup/app/components/pop-out.component.ts @@ -1,6 +1,6 @@ import * as template from './pop-out.component.html'; -import { PlatformUtilsService } from '../../../services/abstractions/platformUtils.service'; +import { PlatformUtilsService } from '@bitwarden/jslib'; export class PopOutController implements ng.IController { i18n: any; diff --git a/src/popup/app/current/current.component.ts b/src/popup/app/current/current.component.ts index d32ea674828..7d0bbae7314 100644 --- a/src/popup/app/current/current.component.ts +++ b/src/popup/app/current/current.component.ts @@ -1,7 +1,6 @@ import { CipherType } from '@bitwarden/jslib'; -import { PlatformUtilsService } from '../../../services/abstractions/platformUtils.service'; -import { UtilsService } from '../../../services/abstractions/utils.service'; +import { PlatformUtilsService, UtilsService } from '@bitwarden/jslib'; import * as template from './current.component.html'; export class CurrentController { diff --git a/src/popup/app/global/main.controller.ts b/src/popup/app/global/main.controller.ts index ab339250120..2f70b9c7490 100644 --- a/src/popup/app/global/main.controller.ts +++ b/src/popup/app/global/main.controller.ts @@ -1,4 +1,4 @@ -import { UtilsService } from '../../../services/abstractions/utils.service'; +import { UtilsService } from '@bitwarden/jslib'; export class MainController implements ng.IController { smBody: boolean; diff --git a/src/popup/app/lock/lock.component.ts b/src/popup/app/lock/lock.component.ts index 4f9dccb0550..7648517e012 100644 --- a/src/popup/app/lock/lock.component.ts +++ b/src/popup/app/lock/lock.component.ts @@ -2,8 +2,8 @@ import * as angular from 'angular'; import * as template from './lock.component.html'; import { CryptoService } from '../../../services/abstractions/crypto.service'; -import { MessagingService } from '../../../services/abstractions/messaging.service'; -import { PlatformUtilsService } from '../../../services/abstractions/platformUtils.service'; + +import { MessagingService, PlatformUtilsService } from '@bitwarden/jslib'; export class LockController { i18n: any; diff --git a/src/popup/app/services/auth.service.ts b/src/popup/app/services/auth.service.ts index 5f78f16e6cd..8b62c6f2a9d 100644 --- a/src/popup/app/services/auth.service.ts +++ b/src/popup/app/services/auth.service.ts @@ -2,8 +2,8 @@ import { DeviceRequest } from '../../../models/request/deviceRequest'; import { TokenRequest } from '../../../models/request/tokenRequest'; import { CryptoService } from '../../../services/abstractions/crypto.service'; -import { MessagingService } from '../../../services/abstractions/messaging.service'; -import { PlatformUtilsService } from '../../../services/abstractions/platformUtils.service'; + +import { MessagingService, PlatformUtilsService } from '@bitwarden/jslib'; class AuthService { constructor(public cryptoService: CryptoService, public apiService: any, public userService: any, diff --git a/src/popup/app/services/background.service.ts b/src/popup/app/services/background.service.ts index 7e9189e7a34..5ef03597b5d 100644 --- a/src/popup/app/services/background.service.ts +++ b/src/popup/app/services/background.service.ts @@ -1,7 +1,6 @@ import { CryptoService } from '../../../services/abstractions/crypto.service'; -import { PlatformUtilsService } from '../../../services/abstractions/platformUtils.service'; -import { StorageService } from '../../../services/abstractions/storage.service'; -import { UtilsService } from '../../../services/abstractions/utils.service'; + +import { PlatformUtilsService, StorageService, UtilsService } from '@bitwarden/jslib'; function getBackgroundService(service: string) { return (): T => { diff --git a/src/popup/app/services/state.service.ts b/src/popup/app/services/state.service.ts index 2dc98ef0770..9dedbd9bc00 100644 --- a/src/popup/app/services/state.service.ts +++ b/src/popup/app/services/state.service.ts @@ -1,4 +1,4 @@ -import { StorageService } from '../../../services/abstractions/storage.service'; +import { StorageService } from '@bitwarden/jslib'; class StateService { private state: any = {}; diff --git a/src/popup/app/settings/environment.component.ts b/src/popup/app/settings/environment.component.ts index 871de70f8b3..437b33d5446 100644 --- a/src/popup/app/settings/environment.component.ts +++ b/src/popup/app/settings/environment.component.ts @@ -1,7 +1,7 @@ import * as angular from 'angular'; import * as template from './environment.component.html'; -import { PlatformUtilsService } from '../../../services/abstractions/platformUtils.service'; +import { PlatformUtilsService } from '@bitwarden/jslib'; export class EnvironmentController { iconsUrl: string; diff --git a/src/popup/app/settings/folders/add-folder.component.ts b/src/popup/app/settings/folders/add-folder.component.ts index 5ba46d3e926..1442a99e934 100644 --- a/src/popup/app/settings/folders/add-folder.component.ts +++ b/src/popup/app/settings/folders/add-folder.component.ts @@ -2,7 +2,7 @@ import * as angular from 'angular'; import { Folder } from '../../../../models/domain/folder'; import * as template from './add-folder.component.html'; -import { PlatformUtilsService } from '../../../../services/abstractions/platformUtils.service'; +import { PlatformUtilsService } from '@bitwarden/jslib'; export class AddFolderController { savePromise: any; diff --git a/src/popup/app/settings/folders/edit-folder.component.ts b/src/popup/app/settings/folders/edit-folder.component.ts index 4911941331c..4f698c663e9 100644 --- a/src/popup/app/settings/folders/edit-folder.component.ts +++ b/src/popup/app/settings/folders/edit-folder.component.ts @@ -2,7 +2,7 @@ import * as angular from 'angular'; import { Folder } from '../../../../models/domain/folder'; import * as template from './edit-folder.component.html'; -import { PlatformUtilsService } from '../../../../services/abstractions/platformUtils.service'; +import { PlatformUtilsService } from '@bitwarden/jslib'; export class EditFolderController { $transition$: any; diff --git a/src/popup/app/settings/options.component.ts b/src/popup/app/settings/options.component.ts index 49e76e233b0..b8407579dff 100644 --- a/src/popup/app/settings/options.component.ts +++ b/src/popup/app/settings/options.component.ts @@ -1,7 +1,7 @@ import * as angular from 'angular'; -import { MessagingService } from '../../../services/abstractions/messaging.service'; -import { PlatformUtilsService } from '../../../services/abstractions/platformUtils.service'; -import { StorageService } from '../../../services/abstractions/storage.service'; + +import { MessagingService, PlatformUtilsService, StorageService } from '@bitwarden/jslib'; + import StateService from '../services/state.service'; import * as template from './options.component.html'; diff --git a/src/popup/app/settings/settings.component.ts b/src/popup/app/settings/settings.component.ts index cc0996a3790..b018ebbc021 100644 --- a/src/popup/app/settings/settings.component.ts +++ b/src/popup/app/settings/settings.component.ts @@ -1,11 +1,8 @@ import * as angular from 'angular'; -import { DeviceType } from '@bitwarden/jslib'; +import { DeviceType, MessagingService, PlatformUtilsService, StorageService } from '@bitwarden/jslib'; import { CryptoService } from '../../../services/abstractions/crypto.service'; -import { MessagingService } from '../../../services/abstractions/messaging.service'; -import { PlatformUtilsService } from '../../../services/abstractions/platformUtils.service'; -import { StorageService } from '../../../services/abstractions/storage.service'; import ConstantsService from '../../../services/constants.service'; import * as template from './settings.component.html'; diff --git a/src/popup/app/tools/export.component.ts b/src/popup/app/tools/export.component.ts index 0a3c8e65640..daf8330ddec 100644 --- a/src/popup/app/tools/export.component.ts +++ b/src/popup/app/tools/export.component.ts @@ -2,10 +2,9 @@ import * as angular from 'angular'; import * as papa from 'papaparse'; import * as template from './export.component.html'; -import { CipherType } from '@bitwarden/jslib'; +import { CipherType, UtilsService } from '@bitwarden/jslib'; import { CryptoService } from '../../../services/abstractions/crypto.service'; -import { UtilsService } from '../../../services/abstractions/utils.service'; export class ExportController { i18n: any; diff --git a/src/popup/app/tools/password-generator.component.ts b/src/popup/app/tools/password-generator.component.ts index 28d39bffbaf..016033e7ff3 100644 --- a/src/popup/app/tools/password-generator.component.ts +++ b/src/popup/app/tools/password-generator.component.ts @@ -1,7 +1,7 @@ import * as angular from 'angular'; import * as template from './password-generator.component.html'; -import { PlatformUtilsService } from '../../../services/abstractions/platformUtils.service'; +import { PlatformUtilsService } from '@bitwarden/jslib'; export class PasswordGeneratorController { $transition$: any; diff --git a/src/popup/app/tools/tools.component.ts b/src/popup/app/tools/tools.component.ts index f5af8671686..3db5c005ae0 100644 --- a/src/popup/app/tools/tools.component.ts +++ b/src/popup/app/tools/tools.component.ts @@ -1,6 +1,6 @@ import * as template from './tools.component.html'; -import { PlatformUtilsService } from '../../../services/abstractions/platformUtils.service'; +import { PlatformUtilsService } from '@bitwarden/jslib'; export class ToolsController { showExport: boolean; diff --git a/src/services/abstractions/messaging.service.ts b/src/services/abstractions/messaging.service.ts deleted file mode 100644 index 6bafce93e40..00000000000 --- a/src/services/abstractions/messaging.service.ts +++ /dev/null @@ -1,3 +0,0 @@ -export interface MessagingService { - send(subscriber: string, arg?: any): void; -} diff --git a/src/services/abstractions/platformUtils.service.ts b/src/services/abstractions/platformUtils.service.ts deleted file mode 100644 index f1d78f5a7b3..00000000000 --- a/src/services/abstractions/platformUtils.service.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { DeviceType } from '@bitwarden/jslib'; - -export interface PlatformUtilsService { - getDevice(): DeviceType; - getDeviceString(): string; - isFirefox(): boolean; - isChrome(): boolean; - isEdge(): boolean; - isOpera(): boolean; - analyticsId(): string; - initListSectionItemListeners(doc: Document, angular: any): void; - getDomain(uriString: string): string; - inSidebar(theWindow: Window): boolean; - inTab(theWindow: Window): boolean; - inPopout(theWindow: Window): boolean; - inPopup(theWindow: Window): boolean; - isViewOpen(): boolean; -} diff --git a/src/services/abstractions/storage.service.ts b/src/services/abstractions/storage.service.ts deleted file mode 100644 index 5d070d0a555..00000000000 --- a/src/services/abstractions/storage.service.ts +++ /dev/null @@ -1,5 +0,0 @@ -export interface StorageService { - get(key: string): Promise; - save(key: string, obj: any): Promise; - remove(key: string): Promise; -} diff --git a/src/services/abstractions/utils.service.ts b/src/services/abstractions/utils.service.ts deleted file mode 100644 index a251eedeaac..00000000000 --- a/src/services/abstractions/utils.service.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface UtilsService { - copyToClipboard(text: string, doc?: Document): void; - getHostname(uriString: string): string; -} diff --git a/src/services/api.service.ts b/src/services/api.service.ts index e48f72a5f54..08f9aee490d 100644 --- a/src/services/api.service.ts +++ b/src/services/api.service.ts @@ -2,7 +2,7 @@ import AppIdService from './appId.service'; import ConstantsService from './constants.service'; import TokenService from './token.service'; -import { PlatformUtilsService } from './abstractions/platformUtils.service'; +import { PlatformUtilsService } from '@bitwarden/jslib'; import EnvironmentUrls from '../models/domain/environmentUrls'; diff --git a/src/services/appId.service.ts b/src/services/appId.service.ts index c51dbed1df0..50cbc65ba6c 100644 --- a/src/services/appId.service.ts +++ b/src/services/appId.service.ts @@ -1,6 +1,6 @@ import UtilsService from './utils.service'; -import { StorageService } from './abstractions/storage.service'; +import { StorageService } from '@bitwarden/jslib'; export default class AppIdService { constructor(private storageService: StorageService) { diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts index 8463635d2aa..187ec4e34fb 100644 --- a/src/services/autofill.service.ts +++ b/src/services/autofill.service.ts @@ -10,7 +10,7 @@ import TokenService from './token.service'; import TotpService from './totp.service'; import UtilsService from './utils.service'; -import { PlatformUtilsService } from '../services/abstractions/platformUtils.service'; +import { PlatformUtilsService } from '@bitwarden/jslib'; const CardAttributes: string[] = ['autoCompleteType', 'data-stripe', 'htmlName', 'htmlID', 'label-tag', 'placeholder', 'label-left', 'label-top']; diff --git a/src/services/browserMessaging.service.ts b/src/services/browserMessaging.service.ts index f7c8d5600e4..1ce2521a3c1 100644 --- a/src/services/browserMessaging.service.ts +++ b/src/services/browserMessaging.service.ts @@ -1,5 +1,4 @@ -import { MessagingService as MessagingServiceInterface } from './abstractions/messaging.service'; -import { PlatformUtilsService } from './abstractions/platformUtils.service'; +import { MessagingService as MessagingServiceInterface, PlatformUtilsService } from '@bitwarden/jslib'; export default class BrowserMessagingService implements MessagingServiceInterface { constructor(private platformUtilsService: PlatformUtilsService) { diff --git a/src/services/browserPlatformUtils.service.ts b/src/services/browserPlatformUtils.service.ts index f926884893b..c25ddcf43e8 100644 --- a/src/services/browserPlatformUtils.service.ts +++ b/src/services/browserPlatformUtils.service.ts @@ -1,8 +1,6 @@ import * as tldjs from 'tldjs'; -import { DeviceType } from '@bitwarden/jslib'; - -import { PlatformUtilsService as PlatformUtilsServiceInterface } from './abstractions/platformUtils.service'; +import { DeviceType, PlatformUtilsService as PlatformUtilsServiceInterface } from '@bitwarden/jslib'; const AnalyticsIds = { [DeviceType.Chrome]: 'UA-81915606-6', diff --git a/src/services/browserStorage.service.ts b/src/services/browserStorage.service.ts index 80b060e7ff4..131b057019f 100644 --- a/src/services/browserStorage.service.ts +++ b/src/services/browserStorage.service.ts @@ -1,5 +1,4 @@ -import { PlatformUtilsService } from './abstractions/platformUtils.service'; -import { StorageService as StorageServiceInterface } from './abstractions/storage.service'; +import { PlatformUtilsService, StorageService as StorageServiceInterface } from '@bitwarden/jslib'; export default class BrowserStorageService implements StorageServiceInterface { constructor(private platformUtilsService: PlatformUtilsService) { diff --git a/src/services/cipher.service.ts b/src/services/cipher.service.ts index 2f7f79c896f..2bda5e8d104 100644 --- a/src/services/cipher.service.ts +++ b/src/services/cipher.service.ts @@ -17,7 +17,7 @@ import CryptoService from './crypto.service'; import SettingsService from './settings.service'; import UserService from './user.service'; -import { StorageService } from './abstractions/storage.service'; +import { StorageService } from '@bitwarden/jslib'; const Keys = { ciphersPrefix: 'ciphers_', diff --git a/src/services/collection.service.ts b/src/services/collection.service.ts index fa1e1434e1d..2b6a04b6f83 100644 --- a/src/services/collection.service.ts +++ b/src/services/collection.service.ts @@ -6,7 +6,7 @@ import { CollectionData } from '../models/data/collectionData'; import CryptoService from './crypto.service'; import UserService from './user.service'; -import { StorageService } from './abstractions/storage.service'; +import { StorageService } from '@bitwarden/jslib'; const Keys = { collectionsPrefix: 'collections_', diff --git a/src/services/constants.service.ts b/src/services/constants.service.ts index 9dfd82eb8d7..bc519d3aaa3 100644 --- a/src/services/constants.service.ts +++ b/src/services/constants.service.ts @@ -1,4 +1,4 @@ -import { PlatformUtilsService } from './abstractions/platformUtils.service'; +import { PlatformUtilsService } from '@bitwarden/jslib'; export default class ConstantsService { static readonly environmentUrlsKey: string = 'environmentUrls'; diff --git a/src/services/crypto.service.ts b/src/services/crypto.service.ts index f62c776e21b..e648d30f6d7 100644 --- a/src/services/crypto.service.ts +++ b/src/services/crypto.service.ts @@ -11,7 +11,8 @@ import ConstantsService from './constants.service'; import UtilsService from './utils.service'; import { CryptoService as CryptoServiceInterface } from './abstractions/crypto.service'; -import { StorageService } from './abstractions/storage.service'; + +import { StorageService } from '@bitwarden/jslib'; const Keys = { key: 'key', diff --git a/src/services/environment.service.ts b/src/services/environment.service.ts index 797d9d5b8d5..55d2361eeb7 100644 --- a/src/services/environment.service.ts +++ b/src/services/environment.service.ts @@ -1,7 +1,7 @@ import ApiService from './api.service'; import ConstantsService from './constants.service'; -import { StorageService } from './abstractions/storage.service'; +import { StorageService } from '@bitwarden/jslib'; import EnvironmentUrls from '../models/domain/environmentUrls'; diff --git a/src/services/folder.service.ts b/src/services/folder.service.ts index a0af57f5eaa..fbd89000c15 100644 --- a/src/services/folder.service.ts +++ b/src/services/folder.service.ts @@ -10,7 +10,7 @@ import ApiService from './api.service'; import CryptoService from './crypto.service'; import UserService from './user.service'; -import { StorageService } from './abstractions/storage.service'; +import { StorageService } from '@bitwarden/jslib'; const Keys = { foldersPrefix: 'folders_', diff --git a/src/services/i18n.service.ts b/src/services/i18n.service.ts index 1c6bba7a681..50a332dae23 100644 --- a/src/services/i18n.service.ts +++ b/src/services/i18n.service.ts @@ -1,4 +1,4 @@ -import { PlatformUtilsService } from './abstractions/platformUtils.service'; +import { PlatformUtilsService } from '@bitwarden/jslib'; export default function i18nService(platformUtilsService: PlatformUtilsService) { const edgeMessages: any = {}; diff --git a/src/services/lock.service.ts b/src/services/lock.service.ts index 356ada7a2e8..e1969a79a22 100644 --- a/src/services/lock.service.ts +++ b/src/services/lock.service.ts @@ -4,8 +4,7 @@ import ConstantsService from './constants.service'; import CryptoService from './crypto.service'; import FolderService from './folder.service'; -import { PlatformUtilsService } from './abstractions/platformUtils.service'; -import { StorageService } from './abstractions/storage.service'; +import { PlatformUtilsService, StorageService } from '@bitwarden/jslib'; export default class LockService { constructor(private cipherService: CipherService, private folderService: FolderService, diff --git a/src/services/passwordGeneration.service.ts b/src/services/passwordGeneration.service.ts index 23f1ad9c91d..b9fa82be653 100644 --- a/src/services/passwordGeneration.service.ts +++ b/src/services/passwordGeneration.service.ts @@ -4,7 +4,7 @@ import PasswordHistory from '../models/domain/passwordHistory'; import CryptoService from './crypto.service'; import UtilsService from './utils.service'; -import { StorageService } from './abstractions/storage.service'; +import { StorageService } from '@bitwarden/jslib'; const DefaultOptions = { length: 14, diff --git a/src/services/settings.service.ts b/src/services/settings.service.ts index 4980849467e..983763cadf1 100644 --- a/src/services/settings.service.ts +++ b/src/services/settings.service.ts @@ -1,6 +1,6 @@ import UserService from './user.service'; -import { StorageService } from './abstractions/storage.service'; +import { StorageService } from '@bitwarden/jslib'; const Keys = { settingsPrefix: 'settings_', diff --git a/src/services/sync.service.ts b/src/services/sync.service.ts index 3dfb37a938e..e869ddbbeb5 100644 --- a/src/services/sync.service.ts +++ b/src/services/sync.service.ts @@ -17,8 +17,7 @@ import FolderService from './folder.service'; import SettingsService from './settings.service'; import UserService from './user.service'; -import { MessagingService } from './abstractions/messaging.service'; -import { StorageService } from './abstractions/storage.service'; +import { MessagingService, StorageService } from '@bitwarden/jslib'; const Keys = { lastSyncPrefix: 'lastSync_', diff --git a/src/services/token.service.ts b/src/services/token.service.ts index 527305b2f30..d06e4ca13cc 100644 --- a/src/services/token.service.ts +++ b/src/services/token.service.ts @@ -1,7 +1,7 @@ import ConstantsService from './constants.service'; import UtilsService from './utils.service'; -import { StorageService } from './abstractions/storage.service'; +import { StorageService } from '@bitwarden/jslib'; const Keys = { accessToken: 'accessToken', diff --git a/src/services/totp.service.ts b/src/services/totp.service.ts index e1a00b937e9..059db51995a 100644 --- a/src/services/totp.service.ts +++ b/src/services/totp.service.ts @@ -1,6 +1,6 @@ import ConstantsService from './constants.service'; -import { StorageService } from './abstractions/storage.service'; +import { StorageService } from '@bitwarden/jslib'; const b32Chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567'; diff --git a/src/services/user.service.ts b/src/services/user.service.ts index 3a5f80a86a1..c37649111cf 100644 --- a/src/services/user.service.ts +++ b/src/services/user.service.ts @@ -1,6 +1,6 @@ import TokenService from './token.service'; -import { StorageService } from './abstractions/storage.service'; +import { StorageService } from '@bitwarden/jslib'; const Keys = { userId: 'userId', diff --git a/src/services/utils.service.ts b/src/services/utils.service.ts index d16438924d0..01f671260a5 100644 --- a/src/services/utils.service.ts +++ b/src/services/utils.service.ts @@ -1,4 +1,4 @@ -import { UtilsService as UtilsServiceInterface } from './abstractions/utils.service'; +import { UtilsService as UtilsServiceInterface } from '@bitwarden/jslib'; export default class UtilsService implements UtilsServiceInterface { static copyToClipboard(text: string, doc?: Document): void {