From b79f5eba3b9380934a9775fbb015a91ee6764d8e Mon Sep 17 00:00:00 2001 From: Thomas Rittson Date: Fri, 25 Mar 2022 14:03:22 +1000 Subject: [PATCH] Run Prettier --- angular/src/services/jslib-services.module.ts | 12 ++++++++---- common/src/abstractions/injectionTokens.ts | 16 +++++++++------- common/src/services/appId.service.ts | 3 ++- common/src/services/audit.service.ts | 3 ++- common/src/services/collection.service.ts | 3 ++- common/src/services/crypto.service.ts | 3 +-- common/src/services/environment.service.ts | 3 +-- common/src/services/event.service.ts | 2 +- common/src/services/export.service.ts | 3 +-- common/src/services/folder.service.ts | 2 +- common/src/services/import.service.ts | 2 +- common/src/services/keyConnector.service.ts | 2 +- common/src/services/organization.service.ts | 2 +- .../src/services/passwordGeneration.service.ts | 3 +-- common/src/services/policy.service.ts | 2 +- common/src/services/provider.service.ts | 3 ++- common/src/services/search.service.ts | 3 +-- common/src/services/send.service.ts | 2 +- common/src/services/settings.service.ts | 2 +- common/src/services/state.service.ts | 10 +++++++--- common/src/services/stateMigration.service.ts | 5 +++-- common/src/services/token.service.ts | 2 +- common/src/services/totp.service.ts | 2 +- common/src/services/twoFactor.service.ts | 2 +- common/src/services/userVerification.service.ts | 2 +- common/src/services/webCryptoFunction.service.ts | 5 ++--- 26 files changed, 54 insertions(+), 45 deletions(-) diff --git a/angular/src/services/jslib-services.module.ts b/angular/src/services/jslib-services.module.ts index ea08c900..c48b7e55 100644 --- a/angular/src/services/jslib-services.module.ts +++ b/angular/src/services/jslib-services.module.ts @@ -15,7 +15,11 @@ import { ExportService as ExportServiceAbstraction } from "jslib-common/abstract 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 { STATE_FACTORY, STATE_SERVICE_USE_CACHE, WINDOW_TOKEN } from 'jslib-common/abstractions/injectionTokens'; +import { + STATE_FACTORY, + STATE_SERVICE_USE_CACHE, + WINDOW_TOKEN, +} from "jslib-common/abstractions/injectionTokens"; 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"; @@ -300,15 +304,15 @@ import { ValidationService } from "./validation.service"; }, { provide: STATE_FACTORY, - useFactory: () => new StateFactory(GlobalState, Account) + useFactory: () => new StateFactory(GlobalState, Account), }, { provide: StateServiceAbstraction, - useClass: StateService + useClass: StateService, }, { provide: StateMigrationServiceAbstraction, - useClass: StateMigrationService + useClass: StateMigrationService, }, { provide: ExportServiceAbstraction, diff --git a/common/src/abstractions/injectionTokens.ts b/common/src/abstractions/injectionTokens.ts index 59699898..bc46c841 100644 --- a/common/src/abstractions/injectionTokens.ts +++ b/common/src/abstractions/injectionTokens.ts @@ -1,8 +1,10 @@ -import { InjectionToken } from '@angular/core'; -import { StateFactory } from '../factories/stateFactory'; -import { StorageService } from './storage.service'; +import { InjectionToken } from "@angular/core"; -export const STATE_SERVICE_USE_CACHE = new InjectionToken('STATE_SERVICE_USE_CACHE'); -export const STATE_FACTORY = new InjectionToken('STATE_FACTORY'); -export const SECURE_STORAGE = new InjectionToken('SECURE_STORAGE'); -export const WINDOW_TOKEN = new InjectionToken('WINDOW'); +import { StateFactory } from "../factories/stateFactory"; + +import { StorageService } from "./storage.service"; + +export const STATE_SERVICE_USE_CACHE = new InjectionToken("STATE_SERVICE_USE_CACHE"); +export const STATE_FACTORY = new InjectionToken("STATE_FACTORY"); +export const SECURE_STORAGE = new InjectionToken("SECURE_STORAGE"); +export const WINDOW_TOKEN = new InjectionToken("WINDOW"); diff --git a/common/src/services/appId.service.ts b/common/src/services/appId.service.ts index 0180183d..392a6eb9 100644 --- a/common/src/services/appId.service.ts +++ b/common/src/services/appId.service.ts @@ -1,4 +1,5 @@ -import { Injectable } from '@angular/core'; +import { Injectable } from "@angular/core"; + import { AppIdService as AppIdServiceAbstraction } from "../abstractions/appId.service"; import { StorageService } from "../abstractions/storage.service"; import { HtmlStorageLocation } from "../enums/htmlStorageLocation"; diff --git a/common/src/services/audit.service.ts b/common/src/services/audit.service.ts index c8e02993..f4161f07 100644 --- a/common/src/services/audit.service.ts +++ b/common/src/services/audit.service.ts @@ -1,4 +1,5 @@ -import { Injectable } from '@angular/core'; +import { Injectable } from "@angular/core"; + import { ApiService } from "../abstractions/api.service"; import { AuditService as AuditServiceAbstraction } from "../abstractions/audit.service"; import { CryptoFunctionService } from "../abstractions/cryptoFunction.service"; diff --git a/common/src/services/collection.service.ts b/common/src/services/collection.service.ts index 3bf0dd16..f9efd885 100644 --- a/common/src/services/collection.service.ts +++ b/common/src/services/collection.service.ts @@ -1,4 +1,5 @@ -import { Injectable } from '@angular/core'; +import { Injectable } from "@angular/core"; + import { CollectionService as CollectionServiceAbstraction } from "../abstractions/collection.service"; import { CryptoService } from "../abstractions/crypto.service"; import { I18nService } from "../abstractions/i18n.service"; diff --git a/common/src/services/crypto.service.ts b/common/src/services/crypto.service.ts index 7bca7ce4..196b02ea 100644 --- a/common/src/services/crypto.service.ts +++ b/common/src/services/crypto.service.ts @@ -1,5 +1,4 @@ -import { Injectable } from '@angular/core'; - +import { Injectable } from "@angular/core"; import * as bigInt from "big-integer"; import { CryptoService as CryptoServiceAbstraction } from "../abstractions/crypto.service"; diff --git a/common/src/services/environment.service.ts b/common/src/services/environment.service.ts index 3311852c..14b687a5 100644 --- a/common/src/services/environment.service.ts +++ b/common/src/services/environment.service.ts @@ -1,5 +1,4 @@ -import { Injectable } from '@angular/core'; - +import { Injectable } from "@angular/core"; import { Observable, Subject } from "rxjs"; import { diff --git a/common/src/services/event.service.ts b/common/src/services/event.service.ts index 4da96f84..f22abb5e 100644 --- a/common/src/services/event.service.ts +++ b/common/src/services/event.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Injectable } from "@angular/core"; import { ApiService } from "../abstractions/api.service"; import { CipherService } from "../abstractions/cipher.service"; diff --git a/common/src/services/export.service.ts b/common/src/services/export.service.ts index 32965328..beccd674 100644 --- a/common/src/services/export.service.ts +++ b/common/src/services/export.service.ts @@ -1,5 +1,4 @@ -import { Injectable } from '@angular/core'; - +import { Injectable } from "@angular/core"; import * as papa from "papaparse"; import { ApiService } from "../abstractions/api.service"; diff --git a/common/src/services/folder.service.ts b/common/src/services/folder.service.ts index aa8fd93b..c854d046 100644 --- a/common/src/services/folder.service.ts +++ b/common/src/services/folder.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Injectable } from "@angular/core"; import { ApiService } from "../abstractions/api.service"; import { CipherService } from "../abstractions/cipher.service"; diff --git a/common/src/services/import.service.ts b/common/src/services/import.service.ts index cf680592..10b76565 100644 --- a/common/src/services/import.service.ts +++ b/common/src/services/import.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Injectable } from "@angular/core"; import { ApiService } from "../abstractions/api.service"; import { CipherService } from "../abstractions/cipher.service"; diff --git a/common/src/services/keyConnector.service.ts b/common/src/services/keyConnector.service.ts index 276f114c..46ab6318 100644 --- a/common/src/services/keyConnector.service.ts +++ b/common/src/services/keyConnector.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Injectable } from "@angular/core"; import { ApiService } from "../abstractions/api.service"; import { CryptoService } from "../abstractions/crypto.service"; diff --git a/common/src/services/organization.service.ts b/common/src/services/organization.service.ts index 1fe08707..ae2d9abf 100644 --- a/common/src/services/organization.service.ts +++ b/common/src/services/organization.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Injectable } from "@angular/core"; import { OrganizationService as OrganizationServiceAbstraction } from "../abstractions/organization.service"; import { StateService } from "../abstractions/state.service"; diff --git a/common/src/services/passwordGeneration.service.ts b/common/src/services/passwordGeneration.service.ts index dd555ca9..36a6fe1b 100644 --- a/common/src/services/passwordGeneration.service.ts +++ b/common/src/services/passwordGeneration.service.ts @@ -1,5 +1,4 @@ -import { Injectable } from '@angular/core'; - +import { Injectable } from "@angular/core"; import * as zxcvbn from "zxcvbn"; import { CryptoService } from "../abstractions/crypto.service"; diff --git a/common/src/services/policy.service.ts b/common/src/services/policy.service.ts index 1a6d99b7..cc5b6d3a 100644 --- a/common/src/services/policy.service.ts +++ b/common/src/services/policy.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Injectable } from "@angular/core"; import { ApiService } from "../abstractions/api.service"; import { OrganizationService } from "../abstractions/organization.service"; diff --git a/common/src/services/provider.service.ts b/common/src/services/provider.service.ts index 28997035..9249c1a6 100644 --- a/common/src/services/provider.service.ts +++ b/common/src/services/provider.service.ts @@ -1,4 +1,5 @@ -import { Injectable } from '@angular/core'; +import { Injectable } from "@angular/core"; + import { ProviderService as ProviderServiceAbstraction } from "../abstractions/provider.service"; import { StateService } from "../abstractions/state.service"; import { ProviderData } from "../models/data/providerData"; diff --git a/common/src/services/search.service.ts b/common/src/services/search.service.ts index b3a2a83e..23ae5e77 100644 --- a/common/src/services/search.service.ts +++ b/common/src/services/search.service.ts @@ -1,5 +1,4 @@ -import { Injectable } from '@angular/core'; - +import { Injectable } from "@angular/core"; import * as lunr from "lunr"; import { CipherService } from "../abstractions/cipher.service"; diff --git a/common/src/services/send.service.ts b/common/src/services/send.service.ts index 58ed3ed2..1a3e4562 100644 --- a/common/src/services/send.service.ts +++ b/common/src/services/send.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Injectable } from "@angular/core"; import { ApiService } from "../abstractions/api.service"; import { CryptoService } from "../abstractions/crypto.service"; diff --git a/common/src/services/settings.service.ts b/common/src/services/settings.service.ts index c619c8dc..56c428b5 100644 --- a/common/src/services/settings.service.ts +++ b/common/src/services/settings.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Injectable } from "@angular/core"; import { SettingsService as SettingsServiceAbstraction } from "../abstractions/settings.service"; import { StateService } from "../abstractions/state.service"; diff --git a/common/src/services/state.service.ts b/common/src/services/state.service.ts index 432e1755..61b44c11 100644 --- a/common/src/services/state.service.ts +++ b/common/src/services/state.service.ts @@ -1,6 +1,11 @@ -import { Inject, Injectable } from '@angular/core'; +import { Inject, Injectable } from "@angular/core"; import { BehaviorSubject } from "rxjs"; +import { + SECURE_STORAGE, + STATE_FACTORY, + STATE_SERVICE_USE_CACHE, +} from "../abstractions/injectionTokens"; import { LogService } from "../abstractions/log.service"; import { StateService as StateServiceAbstraction } from "../abstractions/state.service"; import { StateMigrationService } from "../abstractions/stateMigration.service"; @@ -34,7 +39,6 @@ import { CollectionView } from "../models/view/collectionView"; import { FolderView } from "../models/view/folderView"; import { SendView } from "../models/view/sendView"; -import { SECURE_STORAGE, STATE_FACTORY, STATE_SERVICE_USE_CACHE } from "../abstractions/injectionTokens"; const keys = { global: "global", @@ -69,7 +73,7 @@ export class StateService< constructor( protected storageService: StorageService, - @Inject(SECURE_STORAGE) protected secureStorageService: StorageService, + @Inject(SECURE_STORAGE) protected secureStorageService: StorageService, protected logService: LogService, protected stateMigrationService: StateMigrationService, @Inject(STATE_FACTORY) protected stateFactory: StateFactory, diff --git a/common/src/services/stateMigration.service.ts b/common/src/services/stateMigration.service.ts index 56fbb408..ac8e7365 100644 --- a/common/src/services/stateMigration.service.ts +++ b/common/src/services/stateMigration.service.ts @@ -1,5 +1,6 @@ -import { Inject, Injectable } from '@angular/core'; -import { SECURE_STORAGE, STATE_FACTORY } from '../abstractions/injectionTokens'; +import { Inject, Injectable } from "@angular/core"; + +import { SECURE_STORAGE, STATE_FACTORY } from "../abstractions/injectionTokens"; import { StorageService } from "../abstractions/storage.service"; import { HtmlStorageLocation } from "../enums/htmlStorageLocation"; import { KdfType } from "../enums/kdfType"; diff --git a/common/src/services/token.service.ts b/common/src/services/token.service.ts index 35ffa8b1..3d144e6c 100644 --- a/common/src/services/token.service.ts +++ b/common/src/services/token.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Injectable } from "@angular/core"; import { StateService } from "../abstractions/state.service"; import { TokenService as TokenServiceAbstraction } from "../abstractions/token.service"; diff --git a/common/src/services/totp.service.ts b/common/src/services/totp.service.ts index 75aa982f..3b128349 100644 --- a/common/src/services/totp.service.ts +++ b/common/src/services/totp.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Injectable } from "@angular/core"; import { CryptoFunctionService } from "../abstractions/cryptoFunction.service"; import { LogService } from "../abstractions/log.service"; diff --git a/common/src/services/twoFactor.service.ts b/common/src/services/twoFactor.service.ts index f327b416..604d76d6 100644 --- a/common/src/services/twoFactor.service.ts +++ b/common/src/services/twoFactor.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Injectable } from "@angular/core"; import { I18nService } from "../abstractions/i18n.service"; import { PlatformUtilsService } from "../abstractions/platformUtils.service"; diff --git a/common/src/services/userVerification.service.ts b/common/src/services/userVerification.service.ts index 8d4d21e2..552677be 100644 --- a/common/src/services/userVerification.service.ts +++ b/common/src/services/userVerification.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Injectable } from "@angular/core"; import { ApiService } from "../abstractions/api.service"; import { CryptoService } from "../abstractions/crypto.service"; diff --git a/common/src/services/webCryptoFunction.service.ts b/common/src/services/webCryptoFunction.service.ts index 56254215..baf26980 100644 --- a/common/src/services/webCryptoFunction.service.ts +++ b/common/src/services/webCryptoFunction.service.ts @@ -1,9 +1,8 @@ -import { Inject, Injectable } from '@angular/core'; - +import { Inject, Injectable } from "@angular/core"; import * as forge from "node-forge"; import { CryptoFunctionService } from "../abstractions/cryptoFunction.service"; -import { WINDOW_TOKEN } from '../abstractions/injectionTokens'; +import { WINDOW_TOKEN } from "../abstractions/injectionTokens"; import { Utils } from "../misc/utils"; import { DecryptParameters } from "../models/domain/decryptParameters"; import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey";