From 6ab444a9868c32ac53761f9d233d816744da9a1d Mon Sep 17 00:00:00 2001 From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com> Date: Fri, 21 Aug 2020 12:25:33 -0500 Subject: [PATCH] Updated depdency chain -> end result to allieviate issues in directory connector (#155) --- .../components/change-password.component.ts | 16 ++++----------- .../components/set-password.component.ts | 20 ++++++------------- 2 files changed, 10 insertions(+), 26 deletions(-) diff --git a/src/angular/components/change-password.component.ts b/src/angular/components/change-password.component.ts index 797170cb51..f4ec66e31e 100644 --- a/src/angular/components/change-password.component.ts +++ b/src/angular/components/change-password.component.ts @@ -1,17 +1,11 @@ import { OnInit } from '@angular/core'; -import { Router } from '@angular/router'; - -import { ApiService } from '../../abstractions/api.service'; -import { CipherService } from '../../abstractions/cipher.service'; import { CryptoService } from '../../abstractions/crypto.service'; -import { FolderService } from '../../abstractions/folder.service'; import { I18nService } from '../../abstractions/i18n.service'; import { MessagingService } from '../../abstractions/messaging.service'; import { PasswordGenerationService } from '../../abstractions/passwordGeneration.service'; import { PlatformUtilsService } from '../../abstractions/platformUtils.service'; import { PolicyService } from '../../abstractions/policy.service'; -import { SyncService } from '../../abstractions/sync.service'; import { UserService } from '../../abstractions/user.service'; import { CipherString } from '../../models/domain/cipherString'; @@ -33,12 +27,10 @@ export class ChangePasswordComponent implements OnInit { private masterPasswordStrengthTimeout: any; private email: string; - constructor(protected apiService: ApiService, protected i18nService: I18nService, - protected cryptoService: CryptoService, protected messagingService: MessagingService, - protected userService: UserService, protected passwordGenerationService: PasswordGenerationService, - protected platformUtilsService: PlatformUtilsService, protected folderService: FolderService, - protected cipherService: CipherService, protected syncService: SyncService, - protected policyService: PolicyService, protected router: Router) { } + constructor(protected i18nService: I18nService, protected cryptoService: CryptoService, + protected messagingService: MessagingService, protected userService: UserService, + protected passwordGenerationService: PasswordGenerationService, + protected platformUtilsService: PlatformUtilsService, protected policyService: PolicyService) { } async ngOnInit() { this.email = await this.userService.getEmail(); diff --git a/src/angular/components/set-password.component.ts b/src/angular/components/set-password.component.ts index d2d33817ef..4bb1932967 100644 --- a/src/angular/components/set-password.component.ts +++ b/src/angular/components/set-password.component.ts @@ -1,18 +1,12 @@ -import { - ActivatedRoute, - Router, -} from '@angular/router'; +import { Router } from '@angular/router'; import { ApiService } from '../../abstractions/api.service'; -import { CipherService } from '../../abstractions/cipher.service'; import { CryptoService } from '../../abstractions/crypto.service'; -import { FolderService } from '../../abstractions/folder.service'; import { I18nService } from '../../abstractions/i18n.service'; import { MessagingService } from '../../abstractions/messaging.service'; import { PasswordGenerationService } from '../../abstractions/passwordGeneration.service'; import { PlatformUtilsService } from '../../abstractions/platformUtils.service'; import { PolicyService } from '../../abstractions/policy.service'; -import { SyncService } from '../../abstractions/sync.service'; import { UserService } from '../../abstractions/user.service'; import { CipherString } from '../../models/domain/cipherString'; @@ -32,14 +26,12 @@ export class SetPasswordComponent extends BaseChangePasswordComponent { onSuccessfulChangePassword: () => Promise; successRoute = 'vault'; - constructor(apiService: ApiService, i18nService: I18nService, - cryptoService: CryptoService, messagingService: MessagingService, + constructor(i18nService: I18nService, cryptoService: CryptoService, messagingService: MessagingService, userService: UserService, passwordGenerationService: PasswordGenerationService, - platformUtilsService: PlatformUtilsService, folderService: FolderService, - cipherService: CipherService, syncService: SyncService, - policyService: PolicyService, router: Router, private route: ActivatedRoute) { - super(apiService, i18nService, cryptoService, messagingService, userService, passwordGenerationService, - platformUtilsService, folderService, cipherService, syncService, policyService, router); + platformUtilsService: PlatformUtilsService, policyService: PolicyService, private router: Router, + private apiService: ApiService) { + super(i18nService, cryptoService, messagingService, userService, passwordGenerationService, + platformUtilsService, policyService); } async setupSubmitActions() {