From a848406ce0d683087071515e824d13a06541f0f8 Mon Sep 17 00:00:00 2001 From: Oscar Hinton Date: Fri, 17 Sep 2021 15:44:27 +0200 Subject: [PATCH] Use explicit import paths (#2074) --- jslib | 2 +- src/background/idle.background.ts | 10 +-- src/background/main.background.ts | 84 ++++++++++---------- src/background/nativeMessaging.background.ts | 2 +- src/background/runtime.background.ts | 3 +- src/background/webRequest.background.ts | 2 +- src/popup/vault/view.component.ts | 9 ++- src/services/autofill.service.ts | 29 +++---- 8 files changed, 65 insertions(+), 76 deletions(-) diff --git a/jslib b/jslib index da6fde4b15..83548a6753 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit da6fde4b151e7d154c7eb16d8f81926ad2f3ca22 +Subproject commit 83548a6753a974c57cb373b529a4da3ea5c3b5c0 diff --git a/src/background/idle.background.ts b/src/background/idle.background.ts index c9dfb7b481..8b66fb5473 100644 --- a/src/background/idle.background.ts +++ b/src/background/idle.background.ts @@ -1,10 +1,8 @@ -import { ConstantsService } from 'jslib-common/services/constants.service'; - -import { - StorageService, - VaultTimeoutService, -} from 'jslib-common/abstractions'; import { NotificationsService } from 'jslib-common/abstractions/notifications.service'; +import { StorageService } from 'jslib-common/abstractions/storage.service'; +import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.service'; + +import { ConstantsService } from 'jslib-common/services/constants.service'; const IdleInterval = 60 * 5; // 5 minutes diff --git a/src/background/main.background.ts b/src/background/main.background.ts index 5ecd2bf83a..161ca0ced9 100644 --- a/src/background/main.background.ts +++ b/src/background/main.background.ts @@ -1,69 +1,65 @@ -import { CipherType } from 'jslib-common/enums'; import { CipherRepromptType } from 'jslib-common/enums/cipherRepromptType'; +import { CipherType } from 'jslib-common/enums/cipherType'; -import { - ApiService, - AppIdService, - AuditService, - AuthService, - CipherService, - CollectionService, - ConstantsService, - ContainerService, - EnvironmentService, - FolderService, - PasswordGenerationService, - SettingsService, - StateService, - SyncService, - TokenService, - TotpService, - UserService, -} from 'jslib-common/services'; +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 { ConstantsService } from 'jslib-common/services/constants.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 { NotificationsService } from 'jslib-common/services/notifications.service'; +import { PasswordGenerationService } from 'jslib-common/services/passwordGeneration.service'; import { PolicyService } from 'jslib-common/services/policy.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 { 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 { UserService } from 'jslib-common/services/user.service'; import { WebCryptoFunctionService } from 'jslib-common/services/webCryptoFunction.service'; -import { - ApiService as ApiServiceAbstraction, - AppIdService as AppIdServiceAbstraction, - AuditService as AuditServiceAbstraction, - AuthService as AuthServiceAbstraction, - CipherService as CipherServiceAbstraction, - CollectionService as CollectionServiceAbstraction, - CryptoService as CryptoServiceAbstraction, - EnvironmentService as EnvironmentServiceAbstraction, - FolderService as FolderServiceAbstraction, - I18nService as I18nServiceAbstraction, - LogService as LogServiceAbstraction, - MessagingService as MessagingServiceAbstraction, - PasswordGenerationService as PasswordGenerationServiceAbstraction, - PlatformUtilsService as PlatformUtilsServiceAbstraction, - SettingsService as SettingsServiceAbstraction, - StateService as StateServiceAbstraction, - StorageService as StorageServiceAbstraction, - SyncService as SyncServiceAbstraction, - TokenService as TokenServiceAbstraction, - TotpService as TotpServiceAbstraction, - UserService as UserServiceAbstraction, - VaultTimeoutService as VaultTimeoutServiceAbstraction, -} from 'jslib-common/abstractions'; +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 { 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 { 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 { 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 { 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 { UserService as UserServiceAbstraction } from 'jslib-common/abstractions/user.service'; +import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from 'jslib-common/abstractions/vaultTimeout.service'; import { AutofillService as AutofillServiceAbstraction } from '../services/abstractions/autofill.service'; import { Utils } from 'jslib-common/misc/utils'; diff --git a/src/background/nativeMessaging.background.ts b/src/background/nativeMessaging.background.ts index 53d7aa1343..4f11bc3302 100644 --- a/src/background/nativeMessaging.background.ts +++ b/src/background/nativeMessaging.background.ts @@ -10,7 +10,7 @@ import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.serv import { ConstantsService } from 'jslib-common/services/constants.service'; import { Utils } from 'jslib-common/misc/utils'; -import { SymmetricCryptoKey } from 'jslib-common/models/domain'; +import { SymmetricCryptoKey } from 'jslib-common/models/domain/symmetricCryptoKey'; import { BrowserApi } from '../browser/browserApi'; import RuntimeBackground from './runtime.background'; diff --git a/src/background/runtime.background.ts b/src/background/runtime.background.ts index 583cc29f77..3034c66f58 100644 --- a/src/background/runtime.background.ts +++ b/src/background/runtime.background.ts @@ -1,4 +1,4 @@ -import { CipherType } from 'jslib-common/enums'; +import { CipherType } from 'jslib-common/enums/cipherType'; import { CipherView } from 'jslib-common/models/view/cipherView'; import { LoginUriView } from 'jslib-common/models/view/loginUriView'; @@ -25,7 +25,6 @@ import MainBackground from './main.background'; import { Utils } from 'jslib-common/misc/utils'; -import { OrganizationUserStatusType } from 'jslib-common/enums/organizationUserStatusType'; import { PolicyType } from 'jslib-common/enums/policyType'; export default class RuntimeBackground { diff --git a/src/background/webRequest.background.ts b/src/background/webRequest.background.ts index 65e080ec96..4c858c1034 100644 --- a/src/background/webRequest.background.ts +++ b/src/background/webRequest.background.ts @@ -2,7 +2,7 @@ import { CipherService } from 'jslib-common/abstractions/cipher.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.service'; -import { UriMatchType } from 'jslib-common/enums'; +import { UriMatchType } from 'jslib-common/enums/uriMatchType'; export default class WebRequestBackground { private pendingAuthRequests: any[] = []; diff --git a/src/popup/vault/view.component.ts b/src/popup/vault/view.component.ts index c4235c1f6f..06d32ff280 100644 --- a/src/popup/vault/view.component.ts +++ b/src/popup/vault/view.component.ts @@ -21,18 +21,19 @@ import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.se import { TokenService } from 'jslib-common/abstractions/token.service'; import { TotpService } from 'jslib-common/abstractions/totp.service'; import { UserService } from 'jslib-common/abstractions/user.service'; -import { Cipher } from 'jslib-common/models/domain'; -import { LoginUriView } from 'jslib-common/models/view'; import { BroadcasterService } from 'jslib-angular/services/broadcaster.service'; +import { Cipher } from 'jslib-common/models/domain/cipher'; +import { LoginUriView } from 'jslib-common/models/view/loginUriView'; + +import { CipherType } from 'jslib-common/enums/cipherType'; + import { ViewComponent as BaseViewComponent } from 'jslib-angular/components/view.component'; import { BrowserApi } from '../../browser/browserApi'; import { AutofillService } from '../../services/abstractions/autofill.service'; import { PopupUtilsService } from '../services/popup-utils.service'; -import { CipherType } from 'jslib-common/enums'; - const BroadcasterSubscriptionId = 'ChildViewComponent'; @Component({ diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts index 1f0984a5a2..1298727b5a 100644 --- a/src/services/autofill.service.ts +++ b/src/services/autofill.service.ts @@ -1,9 +1,16 @@ -import { - CipherType, - FieldType, -} from 'jslib-common/enums'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { EventService } from 'jslib-common/abstractions/event.service'; +import { TotpService } from 'jslib-common/abstractions/totp.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { CipherView } from 'jslib-common/models/view'; +import { AutofillService as AutofillServiceInterface } from './abstractions/autofill.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 AutofillField from '../models/autofillField'; import AutofillPageDetails from '../models/autofillPageDetails'; @@ -11,18 +18,6 @@ import AutofillScript from '../models/autofillScript'; import { BrowserApi } from '../browser/browserApi'; -import { AutofillService as AutofillServiceInterface } from './abstractions/autofill.service'; - -import { - CipherService, - TotpService, - UserService, -} from 'jslib-common/abstractions'; - -import { EventService } from 'jslib-common/abstractions/event.service'; -import { CipherRepromptType } from 'jslib-common/enums/cipherRepromptType'; -import { EventType } from 'jslib-common/enums/eventType'; - const CardAttributes: string[] = ['autoCompleteType', 'data-stripe', 'htmlName', 'htmlID', 'label-tag', 'placeholder', 'label-left', 'label-top', 'data-recurly'];