From d2739b78e063bb5d3ba053630ab00db002401071 Mon Sep 17 00:00:00 2001 From: Addison Beck Date: Wed, 10 Jul 2024 15:50:54 -0400 Subject: [PATCH] Delete `ProviderService` --- .../src/services/jslib-services.module.ts | 10 ------ .../src/abstractions/provider.service.ts | 8 ----- jslib/common/src/services/provider.service.ts | 34 ------------------- jslib/common/src/services/sync.service.ts | 10 ------ src/bwdc.ts | 4 --- 5 files changed, 66 deletions(-) delete mode 100644 jslib/common/src/abstractions/provider.service.ts delete mode 100644 jslib/common/src/services/provider.service.ts diff --git a/jslib/angular/src/services/jslib-services.module.ts b/jslib/angular/src/services/jslib-services.module.ts index d62c9ded..78eeed54 100644 --- a/jslib/angular/src/services/jslib-services.module.ts +++ b/jslib/angular/src/services/jslib-services.module.ts @@ -19,7 +19,6 @@ import { PasswordGenerationService as PasswordGenerationServiceAbstraction } fro import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@/jslib/common/src/abstractions/passwordReprompt.service"; import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@/jslib/common/src/abstractions/platformUtils.service"; import { PolicyService as PolicyServiceAbstraction } from "@/jslib/common/src/abstractions/policy.service"; -import { ProviderService as ProviderServiceAbstraction } from "@/jslib/common/src/abstractions/provider.service"; import { SearchService as SearchServiceAbstraction } from "@/jslib/common/src/abstractions/search.service"; import { SettingsService as SettingsServiceAbstraction } from "@/jslib/common/src/abstractions/settings.service"; import { StateService as StateServiceAbstraction } from "@/jslib/common/src/abstractions/state.service"; @@ -46,7 +45,6 @@ import { NotificationsService } from "@/jslib/common/src/services/notifications. import { OrganizationService } from "@/jslib/common/src/services/organization.service"; import { PasswordGenerationService } from "@/jslib/common/src/services/passwordGeneration.service"; import { PolicyService } from "@/jslib/common/src/services/policy.service"; -import { ProviderService } from "@/jslib/common/src/services/provider.service"; import { SearchService } from "@/jslib/common/src/services/search.service"; import { SettingsService } from "@/jslib/common/src/services/settings.service"; import { StateService } from "@/jslib/common/src/services/state.service"; @@ -165,7 +163,6 @@ import { ValidationService } from "./validation.service"; keyConnectorService: KeyConnectorServiceAbstraction, stateService: StateServiceAbstraction, organizationService: OrganizationServiceAbstraction, - providerService: ProviderServiceAbstraction, ) => new SyncService( apiService, @@ -177,7 +174,6 @@ import { ValidationService } from "./validation.service"; keyConnectorService, stateService, organizationService, - providerService, async (expired: boolean) => messagingService.send("logout", { expired: expired }), ), deps: [ @@ -190,7 +186,6 @@ import { ValidationService } from "./validation.service"; KeyConnectorServiceAbstraction, StateServiceAbstraction, OrganizationServiceAbstraction, - ProviderServiceAbstraction, ], }, { provide: BroadcasterServiceAbstraction, useClass: BroadcasterService }, @@ -347,11 +342,6 @@ import { ValidationService } from "./validation.service"; useClass: OrganizationService, deps: [StateServiceAbstraction], }, - { - provide: ProviderServiceAbstraction, - useClass: ProviderService, - deps: [StateServiceAbstraction], - }, { provide: TwoFactorServiceAbstraction, useClass: TwoFactorService, diff --git a/jslib/common/src/abstractions/provider.service.ts b/jslib/common/src/abstractions/provider.service.ts deleted file mode 100644 index e4746369..00000000 --- a/jslib/common/src/abstractions/provider.service.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { ProviderData } from "../models/data/providerData"; -import { Provider } from "../models/domain/provider"; - -export abstract class ProviderService { - get: (id: string) => Promise; - getAll: () => Promise; - save: (providers: { [id: string]: ProviderData }) => Promise; -} diff --git a/jslib/common/src/services/provider.service.ts b/jslib/common/src/services/provider.service.ts deleted file mode 100644 index 53f09542..00000000 --- a/jslib/common/src/services/provider.service.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { ProviderService as ProviderServiceAbstraction } from "../abstractions/provider.service"; -import { StateService } from "../abstractions/state.service"; -import { ProviderData } from "../models/data/providerData"; -import { Provider } from "../models/domain/provider"; - -export class ProviderService implements ProviderServiceAbstraction { - constructor(private stateService: StateService) {} - - async get(id: string): Promise { - const providers = await this.stateService.getProviders(); - // eslint-disable-next-line - if (providers == null || !providers.hasOwnProperty(id)) { - return null; - } - - return new Provider(providers[id]); - } - - async getAll(): Promise { - const providers = await this.stateService.getProviders(); - const response: Provider[] = []; - for (const id in providers) { - // eslint-disable-next-line - if (providers.hasOwnProperty(id)) { - response.push(new Provider(providers[id])); - } - } - return response; - } - - async save(providers: { [id: string]: ProviderData }) { - await this.stateService.setProviders(providers); - } -} diff --git a/jslib/common/src/services/sync.service.ts b/jslib/common/src/services/sync.service.ts index 7fdb6e23..91446fdb 100644 --- a/jslib/common/src/services/sync.service.ts +++ b/jslib/common/src/services/sync.service.ts @@ -5,14 +5,12 @@ import { LogService } from "../abstractions/log.service"; import { MessagingService } from "../abstractions/messaging.service"; import { OrganizationService } from "../abstractions/organization.service"; import { PolicyService } from "../abstractions/policy.service"; -import { ProviderService } from "../abstractions/provider.service"; import { SettingsService } from "../abstractions/settings.service"; import { StateService } from "../abstractions/state.service"; import { SyncService as SyncServiceAbstraction } from "../abstractions/sync.service"; import { sequentialize } from "../misc/sequentialize"; import { OrganizationData } from "../models/data/organizationData"; import { PolicyData } from "../models/data/policyData"; -import { ProviderData } from "../models/data/providerData"; import { DomainsResponse } from "../models/response/domainsResponse"; import { PolicyResponse } from "../models/response/policyResponse"; import { ProfileResponse } from "../models/response/profileResponse"; @@ -30,7 +28,6 @@ export class SyncService implements SyncServiceAbstraction { private keyConnectorService: KeyConnectorService, private stateService: StateService, private organizationService: OrganizationService, - private providerService: ProviderService, private logoutCallback: (expired: boolean) => Promise, ) {} @@ -135,7 +132,6 @@ export class SyncService implements SyncServiceAbstraction { await this.cryptoService.setEncKey(response.key); await this.cryptoService.setEncPrivateKey(response.privateKey); - await this.cryptoService.setProviderKeys(response.providers); await this.cryptoService.setOrgKeys(response.organizations, response.providerOrganizations); await this.stateService.setSecurityStamp(response.securityStamp); await this.stateService.setEmailVerified(response.emailVerified); @@ -147,11 +143,6 @@ export class SyncService implements SyncServiceAbstraction { organizations[o.id] = new OrganizationData(o); }); - const providers: { [id: string]: ProviderData } = {}; - response.providers.forEach((p) => { - providers[p.id] = new ProviderData(p); - }); - response.providerOrganizations.forEach((o) => { if (organizations[o.id] == null) { organizations[o.id] = new OrganizationData(o); @@ -160,7 +151,6 @@ export class SyncService implements SyncServiceAbstraction { }); await this.organizationService.save(organizations); - await this.providerService.save(providers); if (await this.keyConnectorService.userNeedsMigration()) { await this.keyConnectorService.setConvertAccountRequired(true); diff --git a/src/bwdc.ts b/src/bwdc.ts index 0de5c713..5cad0139 100644 --- a/src/bwdc.ts +++ b/src/bwdc.ts @@ -17,7 +17,6 @@ import { NoopMessagingService } from "@/jslib/common/src/services/noopMessaging. import { OrganizationService } from "@/jslib/common/src/services/organization.service"; import { PasswordGenerationService } from "@/jslib/common/src/services/passwordGeneration.service"; import { PolicyService } from "@/jslib/common/src/services/policy.service"; -import { ProviderService } from "@/jslib/common/src/services/provider.service"; import { SearchService } from "@/jslib/common/src/services/search.service"; import { SettingsService } from "@/jslib/common/src/services/settings.service"; import { TokenService } from "@/jslib/common/src/services/token.service"; @@ -68,7 +67,6 @@ export class Main { stateService: StateService; stateMigrationService: StateMigrationService; organizationService: OrganizationService; - providerService: ProviderService; twoFactorService: TwoFactorServiceAbstraction; constructor() { @@ -214,8 +212,6 @@ export class Main { this.searchService = new SearchService(this.logService, this.i18nService); - this.providerService = new ProviderService(this.stateService); - this.program = new Program(this); }