Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-23 11:56:00 +01:00
Code Issues Projects Releases Wiki Activity

Updated depdency chain -> end result to allieviate issues in directory connector (#155)

Browse Source
This commit is contained in:
Vincent Salucci 2020-08-21 12:25:33 -05:00 committed by GitHub
parent 5d874d07b3
commit 6ab444a986
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/angular/components/change-password.component.ts
View File

@ -1,17 +1,11 @@
import { OnInit } from '@angular/core'; 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 { CryptoService } from '../../abstractions/crypto.service';
import { FolderService } from '../../abstractions/folder.service';
import { I18nService } from '../../abstractions/i18n.service'; import { I18nService } from '../../abstractions/i18n.service';
import { MessagingService } from '../../abstractions/messaging.service'; import { MessagingService } from '../../abstractions/messaging.service';
import { PasswordGenerationService } from '../../abstractions/passwordGeneration.service'; import { PasswordGenerationService } from '../../abstractions/passwordGeneration.service';
import { PlatformUtilsService } from '../../abstractions/platformUtils.service'; import { PlatformUtilsService } from '../../abstractions/platformUtils.service';
import { PolicyService } from '../../abstractions/policy.service'; import { PolicyService } from '../../abstractions/policy.service';
import { SyncService } from '../../abstractions/sync.service';
import { UserService } from '../../abstractions/user.service'; import { UserService } from '../../abstractions/user.service';
import { CipherString } from '../../models/domain/cipherString'; import { CipherString } from '../../models/domain/cipherString';
@ -33,12 +27,10 @@ export class ChangePasswordComponent implements OnInit {
private masterPasswordStrengthTimeout: any; private masterPasswordStrengthTimeout: any;
private email: string; private email: string;
constructor(protected apiService: ApiService, protected i18nService: I18nService, constructor(protected i18nService: I18nService, protected cryptoService: CryptoService,
protected cryptoService: CryptoService, protected messagingService: MessagingService, protected messagingService: MessagingService, protected userService: UserService,
protected userService: UserService, protected passwordGenerationService: PasswordGenerationService, protected passwordGenerationService: PasswordGenerationService,
protected platformUtilsService: PlatformUtilsService, protected folderService: FolderService, protected platformUtilsService: PlatformUtilsService, protected policyService: PolicyService) { }
protected cipherService: CipherService, protected syncService: SyncService,
protected policyService: PolicyService, protected router: Router) { }
async ngOnInit() { async ngOnInit() {
this.email = await this.userService.getEmail(); this.email = await this.userService.getEmail();

20
src/angular/components/set-password.component.ts
View File

@ -1,18 +1,12 @@
import { import { Router } from '@angular/router';
ActivatedRoute,
Router,
} from '@angular/router';
import { ApiService } from '../../abstractions/api.service'; import { ApiService } from '../../abstractions/api.service';
import { CipherService } from '../../abstractions/cipher.service';
import { CryptoService } from '../../abstractions/crypto.service'; import { CryptoService } from '../../abstractions/crypto.service';
import { FolderService } from '../../abstractions/folder.service';
import { I18nService } from '../../abstractions/i18n.service'; import { I18nService } from '../../abstractions/i18n.service';
import { MessagingService } from '../../abstractions/messaging.service'; import { MessagingService } from '../../abstractions/messaging.service';
import { PasswordGenerationService } from '../../abstractions/passwordGeneration.service'; import { PasswordGenerationService } from '../../abstractions/passwordGeneration.service';
import { PlatformUtilsService } from '../../abstractions/platformUtils.service'; import { PlatformUtilsService } from '../../abstractions/platformUtils.service';
import { PolicyService } from '../../abstractions/policy.service'; import { PolicyService } from '../../abstractions/policy.service';
import { SyncService } from '../../abstractions/sync.service';
import { UserService } from '../../abstractions/user.service'; import { UserService } from '../../abstractions/user.service';
import { CipherString } from '../../models/domain/cipherString'; import { CipherString } from '../../models/domain/cipherString';
@ -32,14 +26,12 @@ export class SetPasswordComponent extends BaseChangePasswordComponent {
onSuccessfulChangePassword: () => Promise<any>; onSuccessfulChangePassword: () => Promise<any>;
successRoute = 'vault'; successRoute = 'vault';
constructor(apiService: ApiService, i18nService: I18nService, constructor(i18nService: I18nService, cryptoService: CryptoService, messagingService: MessagingService,
cryptoService: CryptoService, messagingService: MessagingService,
userService: UserService, passwordGenerationService: PasswordGenerationService, userService: UserService, passwordGenerationService: PasswordGenerationService,
platformUtilsService: PlatformUtilsService, folderService: FolderService, platformUtilsService: PlatformUtilsService, policyService: PolicyService, private router: Router,
cipherService: CipherService, syncService: SyncService, private apiService: ApiService) {
policyService: PolicyService, router: Router, private route: ActivatedRoute) { super(i18nService, cryptoService, messagingService, userService, passwordGenerationService,
super(apiService, i18nService, cryptoService, messagingService, userService, passwordGenerationService, platformUtilsService, policyService);
platformUtilsService, folderService, cipherService, syncService, policyService, router);
} }
async setupSubmitActions() { async setupSubmitActions() {