mirror of
https://github.com/bitwarden/desktop.git
synced 2024-12-27 17:08:07 +01:00
Remove empty catch blocks and remove allow-empty-catch tslint rule (#1117)
This commit is contained in:
parent
66d560aab5
commit
6f69486c36
2
jslib
2
jslib
@ -1 +1 @@
|
|||||||
Subproject commit a20e935268c986538ff68f72016bb8c772ea3a1b
|
Subproject commit f09fb69882525b3be7b2e257e7723eeb79b343d1
|
@ -3,6 +3,7 @@ import { Router } from '@angular/router';
|
|||||||
|
|
||||||
import { ApiService } from 'jslib-common/abstractions/api.service';
|
import { ApiService } from 'jslib-common/abstractions/api.service';
|
||||||
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
||||||
|
import { LogService } from 'jslib-common/abstractions/log.service';
|
||||||
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
||||||
|
|
||||||
import { HintComponent as BaseHintComponent } from 'jslib-angular/components/hint.component';
|
import { HintComponent as BaseHintComponent } from 'jslib-angular/components/hint.component';
|
||||||
@ -13,7 +14,7 @@ import { HintComponent as BaseHintComponent } from 'jslib-angular/components/hin
|
|||||||
})
|
})
|
||||||
export class HintComponent extends BaseHintComponent {
|
export class HintComponent extends BaseHintComponent {
|
||||||
constructor(router: Router, platformUtilsService: PlatformUtilsService,
|
constructor(router: Router, platformUtilsService: PlatformUtilsService,
|
||||||
i18nService: I18nService, apiService: ApiService) {
|
i18nService: I18nService, apiService: ApiService, logService: LogService) {
|
||||||
super(router, i18nService, apiService, platformUtilsService);
|
super(router, i18nService, apiService, platformUtilsService, logService);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -13,6 +13,7 @@ import { ApiService } from 'jslib-common/abstractions/api.service';
|
|||||||
import { CryptoService } from 'jslib-common/abstractions/crypto.service';
|
import { CryptoService } from 'jslib-common/abstractions/crypto.service';
|
||||||
import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
|
import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
|
||||||
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
||||||
|
import { LogService } from 'jslib-common/abstractions/log.service';
|
||||||
import { MessagingService } from 'jslib-common/abstractions/messaging.service';
|
import { MessagingService } from 'jslib-common/abstractions/messaging.service';
|
||||||
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
||||||
import { StateService } from 'jslib-common/abstractions/state.service';
|
import { StateService } from 'jslib-common/abstractions/state.service';
|
||||||
@ -41,9 +42,10 @@ export class LockComponent extends BaseLockComponent implements OnDestroy {
|
|||||||
storageService: StorageService, vaultTimeoutService: VaultTimeoutService,
|
storageService: StorageService, vaultTimeoutService: VaultTimeoutService,
|
||||||
environmentService: EnvironmentService, stateService: StateService,
|
environmentService: EnvironmentService, stateService: StateService,
|
||||||
apiService: ApiService, private route: ActivatedRoute,
|
apiService: ApiService, private route: ActivatedRoute,
|
||||||
private broadcasterService: BroadcasterService, private ngZone: NgZone) {
|
private broadcasterService: BroadcasterService, private ngZone: NgZone,
|
||||||
|
logService: LogService) {
|
||||||
super(router, i18nService, platformUtilsService, messagingService, userService, cryptoService,
|
super(router, i18nService, platformUtilsService, messagingService, userService, cryptoService,
|
||||||
storageService, vaultTimeoutService, environmentService, stateService, apiService);
|
storageService, vaultTimeoutService, environmentService, stateService, apiService, logService);
|
||||||
}
|
}
|
||||||
|
|
||||||
async ngOnInit() {
|
async ngOnInit() {
|
||||||
|
@ -14,6 +14,7 @@ import { AuthService } from 'jslib-common/abstractions/auth.service';
|
|||||||
import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.service';
|
import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.service';
|
||||||
import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
|
import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
|
||||||
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
||||||
|
import { LogService } from 'jslib-common/abstractions/log.service';
|
||||||
import { MessagingService } from 'jslib-common/abstractions/messaging.service';
|
import { MessagingService } from 'jslib-common/abstractions/messaging.service';
|
||||||
import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
|
import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
|
||||||
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
||||||
@ -45,9 +46,9 @@ export class LoginComponent extends BaseLoginComponent implements OnDestroy {
|
|||||||
environmentService: EnvironmentService, passwordGenerationService: PasswordGenerationService,
|
environmentService: EnvironmentService, passwordGenerationService: PasswordGenerationService,
|
||||||
cryptoFunctionService: CryptoFunctionService, storageService: StorageService,
|
cryptoFunctionService: CryptoFunctionService, storageService: StorageService,
|
||||||
private broadcasterService: BroadcasterService, private ngZone: NgZone,
|
private broadcasterService: BroadcasterService, private ngZone: NgZone,
|
||||||
private messagingService: MessagingService) {
|
private messagingService: MessagingService, logService: LogService) {
|
||||||
super(authService, router, platformUtilsService, i18nService, stateService, environmentService,
|
super(authService, router, platformUtilsService, i18nService, stateService, environmentService,
|
||||||
passwordGenerationService, cryptoFunctionService, storageService);
|
passwordGenerationService, cryptoFunctionService, storageService, logService);
|
||||||
super.onSuccessfulLogin = () => {
|
super.onSuccessfulLogin = () => {
|
||||||
return syncService.fullSync(true);
|
return syncService.fullSync(true);
|
||||||
};
|
};
|
||||||
|
@ -1,13 +1,9 @@
|
|||||||
import {
|
import { Component } from '@angular/core';
|
||||||
Component,
|
|
||||||
NgZone,
|
|
||||||
} from '@angular/core';
|
|
||||||
|
|
||||||
import { ApiService } from 'jslib-common/abstractions/api.service';
|
import { ApiService } from 'jslib-common/abstractions/api.service';
|
||||||
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
||||||
import { MessagingService } from 'jslib-common/abstractions/messaging.service';
|
import { LogService } from 'jslib-common/abstractions/log.service';
|
||||||
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
||||||
import { SyncService } from 'jslib-common/abstractions/sync.service';
|
|
||||||
import { UserService } from 'jslib-common/abstractions/user.service';
|
import { UserService } from 'jslib-common/abstractions/user.service';
|
||||||
|
|
||||||
import { PremiumComponent as BasePremiumComponent } from 'jslib-angular/components/premium.component';
|
import { PremiumComponent as BasePremiumComponent } from 'jslib-angular/components/premium.component';
|
||||||
@ -19,8 +15,7 @@ import { PremiumComponent as BasePremiumComponent } from 'jslib-angular/componen
|
|||||||
export class PremiumComponent extends BasePremiumComponent {
|
export class PremiumComponent extends BasePremiumComponent {
|
||||||
constructor(i18nService: I18nService, platformUtilsService: PlatformUtilsService,
|
constructor(i18nService: I18nService, platformUtilsService: PlatformUtilsService,
|
||||||
apiService: ApiService, userService: UserService,
|
apiService: ApiService, userService: UserService,
|
||||||
private ngZone: NgZone, private messagingService: MessagingService,
|
logService: LogService) {
|
||||||
private syncService: SyncService) {
|
super(i18nService, platformUtilsService, apiService, userService, logService);
|
||||||
super(i18nService, platformUtilsService, apiService, userService);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -11,6 +11,7 @@ import { AuthService } from 'jslib-common/abstractions/auth.service';
|
|||||||
import { CryptoService } from 'jslib-common/abstractions/crypto.service';
|
import { CryptoService } from 'jslib-common/abstractions/crypto.service';
|
||||||
import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
|
import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
|
||||||
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
||||||
|
import { LogService } from 'jslib-common/abstractions/log.service';
|
||||||
import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
|
import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
|
||||||
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
||||||
import { StateService } from 'jslib-common/abstractions/state.service';
|
import { StateService } from 'jslib-common/abstractions/state.service';
|
||||||
@ -31,9 +32,9 @@ export class RegisterComponent extends BaseRegisterComponent implements OnInit,
|
|||||||
apiService: ApiService, stateService: StateService,
|
apiService: ApiService, stateService: StateService,
|
||||||
platformUtilsService: PlatformUtilsService, passwordGenerationService: PasswordGenerationService,
|
platformUtilsService: PlatformUtilsService, passwordGenerationService: PasswordGenerationService,
|
||||||
environmentService: EnvironmentService, private broadcasterService: BroadcasterService,
|
environmentService: EnvironmentService, private broadcasterService: BroadcasterService,
|
||||||
private ngZone: NgZone) {
|
private ngZone: NgZone, logService: LogService) {
|
||||||
super(authService, router, i18nService, cryptoService, apiService, stateService, platformUtilsService,
|
super(authService, router, i18nService, cryptoService, apiService, stateService, platformUtilsService,
|
||||||
passwordGenerationService, environmentService);
|
passwordGenerationService, environmentService, logService);
|
||||||
}
|
}
|
||||||
|
|
||||||
async ngOnInit() {
|
async ngOnInit() {
|
||||||
|
@ -10,6 +10,7 @@ import { AuthService } from 'jslib-common/abstractions/auth.service';
|
|||||||
import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.service';
|
import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.service';
|
||||||
import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
|
import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
|
||||||
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
||||||
|
import { LogService } from 'jslib-common/abstractions/log.service';
|
||||||
import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
|
import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
|
||||||
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
||||||
import { StateService } from 'jslib-common/abstractions/state.service';
|
import { StateService } from 'jslib-common/abstractions/state.service';
|
||||||
@ -28,9 +29,9 @@ export class SsoComponent extends BaseSsoComponent {
|
|||||||
storageService: StorageService, stateService: StateService,
|
storageService: StorageService, stateService: StateService,
|
||||||
platformUtilsService: PlatformUtilsService, apiService: ApiService,
|
platformUtilsService: PlatformUtilsService, apiService: ApiService,
|
||||||
cryptoFunctionService: CryptoFunctionService, environmentService: EnvironmentService,
|
cryptoFunctionService: CryptoFunctionService, environmentService: EnvironmentService,
|
||||||
passwordGenerationService: PasswordGenerationService) {
|
passwordGenerationService: PasswordGenerationService, logService: LogService) {
|
||||||
super(authService, router, i18nService, route, storageService, stateService, platformUtilsService,
|
super(authService, router, i18nService, route, storageService, stateService, platformUtilsService,
|
||||||
apiService, cryptoFunctionService, environmentService, passwordGenerationService);
|
apiService, cryptoFunctionService, environmentService, passwordGenerationService, logService);
|
||||||
super.onSuccessfulLogin = () => {
|
super.onSuccessfulLogin = () => {
|
||||||
return syncService.fullSync(true);
|
return syncService.fullSync(true);
|
||||||
};
|
};
|
||||||
|
@ -17,6 +17,7 @@ import { ApiService } from 'jslib-common/abstractions/api.service';
|
|||||||
import { AuthService } from 'jslib-common/abstractions/auth.service';
|
import { AuthService } from 'jslib-common/abstractions/auth.service';
|
||||||
import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
|
import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
|
||||||
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
||||||
|
import { LogService } from 'jslib-common/abstractions/log.service';
|
||||||
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
||||||
import { StateService } from 'jslib-common/abstractions/state.service';
|
import { StateService } from 'jslib-common/abstractions/state.service';
|
||||||
import { StorageService } from 'jslib-common/abstractions/storage.service';
|
import { StorageService } from 'jslib-common/abstractions/storage.service';
|
||||||
@ -39,9 +40,10 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
|
|||||||
i18nService: I18nService, apiService: ApiService,
|
i18nService: I18nService, apiService: ApiService,
|
||||||
platformUtilsService: PlatformUtilsService, syncService: SyncService,
|
platformUtilsService: PlatformUtilsService, syncService: SyncService,
|
||||||
environmentService: EnvironmentService, private modalService: ModalService,
|
environmentService: EnvironmentService, private modalService: ModalService,
|
||||||
stateService: StateService, storageService: StorageService, route: ActivatedRoute) {
|
stateService: StateService, storageService: StorageService, route: ActivatedRoute,
|
||||||
|
logService: LogService) {
|
||||||
super(authService, router, i18nService, apiService, platformUtilsService, window, environmentService,
|
super(authService, router, i18nService, apiService, platformUtilsService, window, environmentService,
|
||||||
stateService, storageService, route);
|
stateService, storageService, route, logService);
|
||||||
super.onSuccessfulLogin = () => {
|
super.onSuccessfulLogin = () => {
|
||||||
return syncService.fullSync(true);
|
return syncService.fullSync(true);
|
||||||
};
|
};
|
||||||
|
@ -3,6 +3,7 @@ import { Component } from '@angular/core';
|
|||||||
import { ApiService } from 'jslib-common/abstractions/api.service';
|
import { ApiService } from 'jslib-common/abstractions/api.service';
|
||||||
import { CryptoService } from 'jslib-common/abstractions/crypto.service';
|
import { CryptoService } from 'jslib-common/abstractions/crypto.service';
|
||||||
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
||||||
|
import { LogService } from 'jslib-common/abstractions/log.service';
|
||||||
import { MessagingService } from 'jslib-common/abstractions/messaging.service';
|
import { MessagingService } from 'jslib-common/abstractions/messaging.service';
|
||||||
import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
|
import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
|
||||||
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
||||||
@ -57,8 +58,8 @@ export class UpdateTempPasswordComponent extends BaseUpdateTempPasswordComponent
|
|||||||
passwordGenerationService: PasswordGenerationService, policyService: PolicyService,
|
passwordGenerationService: PasswordGenerationService, policyService: PolicyService,
|
||||||
cryptoService: CryptoService, userService: UserService,
|
cryptoService: CryptoService, userService: UserService,
|
||||||
messagingService: MessagingService, apiService: ApiService,
|
messagingService: MessagingService, apiService: ApiService,
|
||||||
syncService: SyncService) {
|
syncService: SyncService, logService: LogService) {
|
||||||
super(i18nService, platformUtilsService, passwordGenerationService, policyService, cryptoService,
|
super(i18nService, platformUtilsService, passwordGenerationService, policyService, cryptoService,
|
||||||
userService, messagingService, apiService, syncService);
|
userService, messagingService, apiService, syncService, logService);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -7,7 +7,6 @@ import {
|
|||||||
|
|
||||||
import {
|
import {
|
||||||
Component,
|
Component,
|
||||||
ComponentFactoryResolver,
|
|
||||||
NgZone,
|
NgZone,
|
||||||
OnInit,
|
OnInit,
|
||||||
SecurityContext,
|
SecurityContext,
|
||||||
@ -31,6 +30,7 @@ import { CryptoService } from 'jslib-common/abstractions/crypto.service';
|
|||||||
import { EventService } from 'jslib-common/abstractions/event.service';
|
import { EventService } from 'jslib-common/abstractions/event.service';
|
||||||
import { FolderService } from 'jslib-common/abstractions/folder.service';
|
import { FolderService } from 'jslib-common/abstractions/folder.service';
|
||||||
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
||||||
|
import { LogService } from 'jslib-common/abstractions/log.service';
|
||||||
import { MessagingService } from 'jslib-common/abstractions/messaging.service';
|
import { MessagingService } from 'jslib-common/abstractions/messaging.service';
|
||||||
import { NotificationsService } from 'jslib-common/abstractions/notifications.service';
|
import { NotificationsService } from 'jslib-common/abstractions/notifications.service';
|
||||||
import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
|
import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
|
||||||
@ -103,7 +103,7 @@ export class AppComponent implements OnInit {
|
|||||||
private toasterService: ToasterService, private i18nService: I18nService,
|
private toasterService: ToasterService, private i18nService: I18nService,
|
||||||
private sanitizer: DomSanitizer, private ngZone: NgZone,
|
private sanitizer: DomSanitizer, private ngZone: NgZone,
|
||||||
private vaultTimeoutService: VaultTimeoutService, private storageService: StorageService,
|
private vaultTimeoutService: VaultTimeoutService, private storageService: StorageService,
|
||||||
private cryptoService: CryptoService, private componentFactoryResolver: ComponentFactoryResolver,
|
private cryptoService: CryptoService, private logService: LogService,
|
||||||
private messagingService: MessagingService, private collectionService: CollectionService,
|
private messagingService: MessagingService, private collectionService: CollectionService,
|
||||||
private searchService: SearchService, private notificationsService: NotificationsService,
|
private searchService: SearchService, private notificationsService: NotificationsService,
|
||||||
private platformUtilsService: PlatformUtilsService, private systemService: SystemService,
|
private platformUtilsService: PlatformUtilsService, private systemService: SystemService,
|
||||||
@ -238,7 +238,9 @@ export class AppComponent implements OnInit {
|
|||||||
if (lastSyncAgo >= SyncInterval) {
|
if (lastSyncAgo >= SyncInterval) {
|
||||||
await this.syncService.fullSync(false);
|
await this.syncService.fullSync(false);
|
||||||
}
|
}
|
||||||
} catch { }
|
} catch (e) {
|
||||||
|
this.logService.error(e);
|
||||||
|
}
|
||||||
this.messagingService.send('scheduleNextSync');
|
this.messagingService.send('scheduleNextSync');
|
||||||
break;
|
break;
|
||||||
case 'exportVault':
|
case 'exportVault':
|
||||||
|
@ -4,6 +4,7 @@ import { Component } from '@angular/core';
|
|||||||
|
|
||||||
import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
|
import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
|
||||||
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
||||||
|
import { LogService } from 'jslib-common/abstractions/log.service';
|
||||||
import { MessagingService } from 'jslib-common/abstractions/messaging.service';
|
import { MessagingService } from 'jslib-common/abstractions/messaging.service';
|
||||||
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
||||||
import { PolicyService } from 'jslib-common/abstractions/policy.service';
|
import { PolicyService } from 'jslib-common/abstractions/policy.service';
|
||||||
@ -20,9 +21,11 @@ export class AddEditComponent extends BaseAddEditComponent {
|
|||||||
constructor(i18nService: I18nService, platformUtilsService: PlatformUtilsService,
|
constructor(i18nService: I18nService, platformUtilsService: PlatformUtilsService,
|
||||||
environmentService: EnvironmentService, datePipe: DatePipe,
|
environmentService: EnvironmentService, datePipe: DatePipe,
|
||||||
sendService: SendService, userService: UserService,
|
sendService: SendService, userService: UserService,
|
||||||
messagingService: MessagingService, policyService: PolicyService) {
|
messagingService: MessagingService, policyService: PolicyService,
|
||||||
|
logService: LogService) {
|
||||||
super(i18nService, platformUtilsService, environmentService,
|
super(i18nService, platformUtilsService, environmentService,
|
||||||
datePipe, sendService, userService, messagingService, policyService);
|
datePipe, sendService, userService, messagingService, policyService,
|
||||||
|
logService);
|
||||||
}
|
}
|
||||||
|
|
||||||
async refresh() {
|
async refresh() {
|
||||||
|
@ -8,6 +8,7 @@ import {
|
|||||||
|
|
||||||
import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
|
import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
|
||||||
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
||||||
|
import { LogService } from 'jslib-common/abstractions/log.service';
|
||||||
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
||||||
import { PolicyService } from 'jslib-common/abstractions/policy.service';
|
import { PolicyService } from 'jslib-common/abstractions/policy.service';
|
||||||
import { SearchService } from 'jslib-common/abstractions/search.service';
|
import { SearchService } from 'jslib-common/abstractions/search.service';
|
||||||
@ -45,10 +46,10 @@ export class SendComponent extends BaseSendComponent implements OnInit, OnDestro
|
|||||||
platformUtilsService: PlatformUtilsService, environmentService: EnvironmentService,
|
platformUtilsService: PlatformUtilsService, environmentService: EnvironmentService,
|
||||||
private broadcasterService: BroadcasterService, ngZone: NgZone,
|
private broadcasterService: BroadcasterService, ngZone: NgZone,
|
||||||
searchService: SearchService, policyService: PolicyService,
|
searchService: SearchService, policyService: PolicyService,
|
||||||
userService: UserService) {
|
userService: UserService, logService: LogService) {
|
||||||
super(sendService, i18nService, platformUtilsService,
|
super(sendService, i18nService, platformUtilsService,
|
||||||
environmentService, ngZone, searchService,
|
environmentService, ngZone, searchService,
|
||||||
policyService, userService);
|
policyService, userService, logService);
|
||||||
}
|
}
|
||||||
|
|
||||||
async ngOnInit() {
|
async ngOnInit() {
|
||||||
|
@ -111,22 +111,23 @@ const settingsService = new SettingsService(userService, storageService);
|
|||||||
export let searchService: SearchService = null;
|
export let searchService: SearchService = null;
|
||||||
const fileUploadService = new FileUploadService(logService, apiService);
|
const fileUploadService = new FileUploadService(logService, apiService);
|
||||||
const cipherService = new CipherService(cryptoService, userService, settingsService,
|
const cipherService = new CipherService(cryptoService, userService, settingsService,
|
||||||
apiService, fileUploadService, storageService, i18nService, () => searchService);
|
apiService, fileUploadService, storageService, i18nService, () => searchService,
|
||||||
|
logService);
|
||||||
const folderService = new FolderService(cryptoService, userService, apiService, storageService,
|
const folderService = new FolderService(cryptoService, userService, apiService, storageService,
|
||||||
i18nService, cipherService);
|
i18nService, cipherService);
|
||||||
const collectionService = new CollectionService(cryptoService, userService, storageService, i18nService);
|
const collectionService = new CollectionService(cryptoService, userService, storageService, i18nService);
|
||||||
searchService = new SearchService(cipherService, logService, i18nService);
|
searchService = new SearchService(cipherService, logService, i18nService);
|
||||||
const sendService = new SendService(cryptoService, userService, apiService, fileUploadService, storageService,
|
const sendService = new SendService(cryptoService, userService, apiService, fileUploadService, storageService,
|
||||||
i18nService, cryptoFunctionService);
|
i18nService, cryptoFunctionService);
|
||||||
const policyService = new PolicyService(userService, storageService);
|
const policyService = new PolicyService(userService, storageService, apiService);
|
||||||
const vaultTimeoutService = new VaultTimeoutService(cipherService, folderService, collectionService,
|
const vaultTimeoutService = new VaultTimeoutService(cipherService, folderService, collectionService,
|
||||||
cryptoService, platformUtilsService, storageService, messagingService, searchService, userService, tokenService,
|
cryptoService, platformUtilsService, storageService, messagingService, searchService, userService, tokenService,
|
||||||
policyService, null, async () => messagingService.send('logout', { expired: false }));
|
policyService, null, async () => messagingService.send('logout', { expired: false }));
|
||||||
const syncService = new SyncService(userService, apiService, settingsService,
|
const syncService = new SyncService(userService, apiService, settingsService,
|
||||||
folderService, cipherService, cryptoService, collectionService, storageService, messagingService, policyService,
|
folderService, cipherService, cryptoService, collectionService, storageService, messagingService, policyService,
|
||||||
sendService, async (expired: boolean) => messagingService.send('logout', { expired: expired }));
|
sendService, logService, async (expired: boolean) => messagingService.send('logout', { expired: expired }));
|
||||||
const passwordGenerationService = new PasswordGenerationService(cryptoService, storageService, policyService);
|
const passwordGenerationService = new PasswordGenerationService(cryptoService, storageService, policyService);
|
||||||
const totpService = new TotpService(storageService, cryptoFunctionService);
|
const totpService = new TotpService(storageService, cryptoFunctionService, logService);
|
||||||
const containerService = new ContainerService(cryptoService);
|
const containerService = new ContainerService(cryptoService);
|
||||||
const authService = new AuthService(cryptoService, apiService, userService, tokenService, appIdService,
|
const authService = new AuthService(cryptoService, apiService, userService, tokenService, appIdService,
|
||||||
i18nService, platformUtilsService, messagingService, vaultTimeoutService, logService);
|
i18nService, platformUtilsService, messagingService, vaultTimeoutService, logService);
|
||||||
@ -134,7 +135,7 @@ const exportService = new ExportService(folderService, cipherService, apiService
|
|||||||
const auditService = new AuditService(cryptoFunctionService, apiService);
|
const auditService = new AuditService(cryptoFunctionService, apiService);
|
||||||
const notificationsService = new NotificationsService(userService, syncService, appIdService,
|
const notificationsService = new NotificationsService(userService, syncService, appIdService,
|
||||||
apiService, vaultTimeoutService, environmentService, async () => messagingService.send('logout', { expired: true }), logService);
|
apiService, vaultTimeoutService, environmentService, async () => messagingService.send('logout', { expired: true }), logService);
|
||||||
const eventService = new EventService(storageService, apiService, userService, cipherService);
|
const eventService = new EventService(storageService, apiService, userService, cipherService, logService);
|
||||||
const systemService = new SystemService(storageService, vaultTimeoutService, messagingService, platformUtilsService,
|
const systemService = new SystemService(storageService, vaultTimeoutService, messagingService, platformUtilsService,
|
||||||
null);
|
null);
|
||||||
const nativeMessagingService = new NativeMessagingService(cryptoFunctionService, cryptoService, platformUtilsService,
|
const nativeMessagingService = new NativeMessagingService(cryptoFunctionService, cryptoService, platformUtilsService,
|
||||||
|
@ -13,6 +13,7 @@ import { CollectionService } from 'jslib-common/abstractions/collection.service'
|
|||||||
import { EventService } from 'jslib-common/abstractions/event.service';
|
import { EventService } from 'jslib-common/abstractions/event.service';
|
||||||
import { FolderService } from 'jslib-common/abstractions/folder.service';
|
import { FolderService } from 'jslib-common/abstractions/folder.service';
|
||||||
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
||||||
|
import { LogService } from 'jslib-common/abstractions/log.service';
|
||||||
import { MessagingService } from 'jslib-common/abstractions/messaging.service';
|
import { MessagingService } from 'jslib-common/abstractions/messaging.service';
|
||||||
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
||||||
import { PolicyService } from 'jslib-common/abstractions/policy.service';
|
import { PolicyService } from 'jslib-common/abstractions/policy.service';
|
||||||
@ -39,9 +40,9 @@ export class AddEditComponent extends BaseAddEditComponent implements OnChanges,
|
|||||||
userService: UserService, collectionService: CollectionService,
|
userService: UserService, collectionService: CollectionService,
|
||||||
messagingService: MessagingService, eventService: EventService,
|
messagingService: MessagingService, eventService: EventService,
|
||||||
policyService: PolicyService, private broadcasterService: BroadcasterService,
|
policyService: PolicyService, private broadcasterService: BroadcasterService,
|
||||||
private ngZone: NgZone) {
|
private ngZone: NgZone, logService: LogService) {
|
||||||
super(cipherService, folderService, i18nService, platformUtilsService, auditService, stateService,
|
super(cipherService, folderService, i18nService, platformUtilsService, auditService, stateService,
|
||||||
userService, collectionService, messagingService, eventService, policyService);
|
userService, collectionService, messagingService, eventService, policyService, logService);
|
||||||
}
|
}
|
||||||
|
|
||||||
async ngOnInit() {
|
async ngOnInit() {
|
||||||
|
@ -4,6 +4,7 @@ import { ApiService } from 'jslib-common/abstractions/api.service';
|
|||||||
import { CipherService } from 'jslib-common/abstractions/cipher.service';
|
import { CipherService } from 'jslib-common/abstractions/cipher.service';
|
||||||
import { CryptoService } from 'jslib-common/abstractions/crypto.service';
|
import { CryptoService } from 'jslib-common/abstractions/crypto.service';
|
||||||
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
||||||
|
import { LogService } from 'jslib-common/abstractions/log.service';
|
||||||
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
||||||
import { UserService } from 'jslib-common/abstractions/user.service';
|
import { UserService } from 'jslib-common/abstractions/user.service';
|
||||||
|
|
||||||
@ -16,7 +17,9 @@ import { AttachmentsComponent as BaseAttachmentsComponent } from 'jslib-angular/
|
|||||||
export class AttachmentsComponent extends BaseAttachmentsComponent {
|
export class AttachmentsComponent extends BaseAttachmentsComponent {
|
||||||
constructor(cipherService: CipherService, i18nService: I18nService,
|
constructor(cipherService: CipherService, i18nService: I18nService,
|
||||||
cryptoService: CryptoService, userService: UserService,
|
cryptoService: CryptoService, userService: UserService,
|
||||||
platformUtilsService: PlatformUtilsService, apiService: ApiService) {
|
platformUtilsService: PlatformUtilsService, apiService: ApiService,
|
||||||
super(cipherService, i18nService, cryptoService, userService, platformUtilsService, apiService, window);
|
logService: LogService) {
|
||||||
|
super(cipherService, i18nService, cryptoService, userService, platformUtilsService,
|
||||||
|
apiService, window, logService);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3,6 +3,7 @@ import { Component } from '@angular/core';
|
|||||||
import { CipherService } from 'jslib-common/abstractions/cipher.service';
|
import { CipherService } from 'jslib-common/abstractions/cipher.service';
|
||||||
import { CollectionService } from 'jslib-common/abstractions/collection.service';
|
import { CollectionService } from 'jslib-common/abstractions/collection.service';
|
||||||
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
||||||
|
import { LogService } from 'jslib-common/abstractions/log.service';
|
||||||
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
||||||
|
|
||||||
import { CollectionsComponent as BaseCollectionsComponent } from 'jslib-angular/components/collections.component';
|
import { CollectionsComponent as BaseCollectionsComponent } from 'jslib-angular/components/collections.component';
|
||||||
@ -13,7 +14,8 @@ import { CollectionsComponent as BaseCollectionsComponent } from 'jslib-angular/
|
|||||||
})
|
})
|
||||||
export class CollectionsComponent extends BaseCollectionsComponent {
|
export class CollectionsComponent extends BaseCollectionsComponent {
|
||||||
constructor(cipherService: CipherService, i18nService: I18nService,
|
constructor(cipherService: CipherService, i18nService: I18nService,
|
||||||
collectionService: CollectionService, platformUtilsService: PlatformUtilsService) {
|
collectionService: CollectionService, platformUtilsService: PlatformUtilsService,
|
||||||
super(collectionService, platformUtilsService, i18nService, cipherService);
|
logService: LogService) {
|
||||||
|
super(collectionService, platformUtilsService, i18nService, cipherService, logService);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -10,12 +10,13 @@ import { CryptoService } from 'jslib-common/abstractions/crypto.service';
|
|||||||
import { EventService } from 'jslib-common/abstractions/event.service';
|
import { EventService } from 'jslib-common/abstractions/event.service';
|
||||||
import { ExportService } from 'jslib-common/abstractions/export.service';
|
import { ExportService } from 'jslib-common/abstractions/export.service';
|
||||||
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
||||||
|
import { LogService } from 'jslib-common/abstractions/log.service';
|
||||||
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
||||||
|
import { PolicyService } from 'jslib-common/abstractions/policy.service';
|
||||||
|
|
||||||
import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
|
import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
|
||||||
|
|
||||||
import { ExportComponent as BaseExportComponent } from 'jslib-angular/components/export.component';
|
import { ExportComponent as BaseExportComponent } from 'jslib-angular/components/export.component';
|
||||||
import { PolicyService } from 'jslib-common/abstractions/policy.service';
|
|
||||||
|
|
||||||
const BroadcasterSubscriptionId = 'ExportComponent';
|
const BroadcasterSubscriptionId = 'ExportComponent';
|
||||||
|
|
||||||
@ -27,8 +28,10 @@ export class ExportComponent extends BaseExportComponent implements OnInit {
|
|||||||
constructor(cryptoService: CryptoService, i18nService: I18nService,
|
constructor(cryptoService: CryptoService, i18nService: I18nService,
|
||||||
platformUtilsService: PlatformUtilsService, exportService: ExportService,
|
platformUtilsService: PlatformUtilsService, exportService: ExportService,
|
||||||
eventService: EventService, policyService: PolicyService,
|
eventService: EventService, policyService: PolicyService,
|
||||||
private broadcasterService: BroadcasterService, private ngZone: NgZone) {
|
private broadcasterService: BroadcasterService, private ngZone: NgZone,
|
||||||
super(cryptoService, i18nService, platformUtilsService, exportService, eventService, policyService, window);
|
logService: LogService) {
|
||||||
|
super(cryptoService, i18nService, platformUtilsService, exportService, eventService,
|
||||||
|
policyService, window, logService);
|
||||||
}
|
}
|
||||||
|
|
||||||
async ngOnInit() {
|
async ngOnInit() {
|
||||||
|
@ -2,6 +2,7 @@ import { Component } from '@angular/core';
|
|||||||
|
|
||||||
import { FolderService } from 'jslib-common/abstractions/folder.service';
|
import { FolderService } from 'jslib-common/abstractions/folder.service';
|
||||||
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
||||||
|
import { LogService } from 'jslib-common/abstractions/log.service';
|
||||||
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
@ -14,7 +15,7 @@ import {
|
|||||||
})
|
})
|
||||||
export class FolderAddEditComponent extends BaseFolderAddEditComponent {
|
export class FolderAddEditComponent extends BaseFolderAddEditComponent {
|
||||||
constructor(folderService: FolderService, i18nService: I18nService,
|
constructor(folderService: FolderService, i18nService: I18nService,
|
||||||
platformUtilsService: PlatformUtilsService) {
|
platformUtilsService: PlatformUtilsService, logService: LogService) {
|
||||||
super(folderService, i18nService, platformUtilsService);
|
super(folderService, i18nService, platformUtilsService, logService);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3,6 +3,7 @@ import { Component } from '@angular/core';
|
|||||||
import { CipherService } from 'jslib-common/abstractions/cipher.service';
|
import { CipherService } from 'jslib-common/abstractions/cipher.service';
|
||||||
import { CollectionService } from 'jslib-common/abstractions/collection.service';
|
import { CollectionService } from 'jslib-common/abstractions/collection.service';
|
||||||
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
||||||
|
import { LogService } from 'jslib-common/abstractions/log.service';
|
||||||
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
||||||
import { UserService } from 'jslib-common/abstractions/user.service';
|
import { UserService } from 'jslib-common/abstractions/user.service';
|
||||||
|
|
||||||
@ -15,7 +16,8 @@ import { ShareComponent as BaseShareComponent } from 'jslib-angular/components/s
|
|||||||
export class ShareComponent extends BaseShareComponent {
|
export class ShareComponent extends BaseShareComponent {
|
||||||
constructor(cipherService: CipherService, i18nService: I18nService,
|
constructor(cipherService: CipherService, i18nService: I18nService,
|
||||||
collectionService: CollectionService, userService: UserService,
|
collectionService: CollectionService, userService: UserService,
|
||||||
platformUtilsService: PlatformUtilsService) {
|
platformUtilsService: PlatformUtilsService, logService: LogService) {
|
||||||
super(collectionService, platformUtilsService, i18nService, userService, cipherService);
|
super(collectionService, platformUtilsService, i18nService, userService, cipherService,
|
||||||
|
logService);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -13,6 +13,7 @@ import { CipherService } from 'jslib-common/abstractions/cipher.service';
|
|||||||
import { CryptoService } from 'jslib-common/abstractions/crypto.service';
|
import { CryptoService } from 'jslib-common/abstractions/crypto.service';
|
||||||
import { EventService } from 'jslib-common/abstractions/event.service';
|
import { EventService } from 'jslib-common/abstractions/event.service';
|
||||||
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
||||||
|
import { LogService } from 'jslib-common/abstractions/log.service';
|
||||||
import { MessagingService } from 'jslib-common/abstractions/messaging.service';
|
import { MessagingService } from 'jslib-common/abstractions/messaging.service';
|
||||||
import { PasswordRepromptService } from 'jslib-common/abstractions/passwordReprompt.service';
|
import { PasswordRepromptService } from 'jslib-common/abstractions/passwordReprompt.service';
|
||||||
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
|
||||||
@ -41,10 +42,11 @@ export class ViewComponent extends BaseViewComponent implements OnChanges {
|
|||||||
auditService: AuditService, broadcasterService: BroadcasterService,
|
auditService: AuditService, broadcasterService: BroadcasterService,
|
||||||
ngZone: NgZone, changeDetectorRef: ChangeDetectorRef,
|
ngZone: NgZone, changeDetectorRef: ChangeDetectorRef,
|
||||||
userService: UserService, eventService: EventService, apiService: ApiService,
|
userService: UserService, eventService: EventService, apiService: ApiService,
|
||||||
private messagingService: MessagingService, passwordRepromptService: PasswordRepromptService) {
|
private messagingService: MessagingService, passwordRepromptService: PasswordRepromptService,
|
||||||
|
logService: LogService) {
|
||||||
super(cipherService, totpService, tokenService, i18nService, cryptoService, platformUtilsService,
|
super(cipherService, totpService, tokenService, i18nService, cryptoService, platformUtilsService,
|
||||||
auditService, window, broadcasterService, ngZone, changeDetectorRef, userService, eventService,
|
auditService, window, broadcasterService, ngZone, changeDetectorRef, userService, eventService,
|
||||||
apiService, passwordRepromptService);
|
apiService, passwordRepromptService, logService);
|
||||||
}
|
}
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
super.ngOnInit();
|
super.ngOnInit();
|
||||||
|
@ -73,7 +73,7 @@ export class Main {
|
|||||||
storageDefaults[ConstantsService.vaultTimeoutActionKey] = 'lock';
|
storageDefaults[ConstantsService.vaultTimeoutActionKey] = 'lock';
|
||||||
this.storageService = new ElectronStorageService(app.getPath('userData'), storageDefaults);
|
this.storageService = new ElectronStorageService(app.getPath('userData'), storageDefaults);
|
||||||
|
|
||||||
this.windowMain = new WindowMain(this.storageService, true, undefined, undefined,
|
this.windowMain = new WindowMain(this.storageService, this.logService, true, undefined, undefined,
|
||||||
arg => this.processDeepLink(arg), win => this.trayMain.setupWindowListeners(win));
|
arg => this.processDeepLink(arg), win => this.trayMain.setupWindowListeners(win));
|
||||||
this.messagingMain = new MessagingMain(this, this.storageService);
|
this.messagingMain = new MessagingMain(this, this.storageService);
|
||||||
this.updaterMain = new UpdaterMain(this.i18nService, this.windowMain, 'desktop', () => {
|
this.updaterMain = new UpdaterMain(this.i18nService, this.windowMain, 'desktop', () => {
|
||||||
|
@ -249,7 +249,7 @@ export class NativeMessagingMain {
|
|||||||
await list(key);
|
await list(key);
|
||||||
await deleteKey(key);
|
await deleteKey(key);
|
||||||
} catch {
|
} catch {
|
||||||
// Do nothing
|
this.logService.error(`Unable to delete registry key: ${key}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"no-empty": [ true, "allow-empty-catch" ],
|
"no-empty": [ true ],
|
||||||
"object-literal-sort-keys": false,
|
"object-literal-sort-keys": false,
|
||||||
"object-literal-shorthand": [ true, "never" ],
|
"object-literal-shorthand": [ true, "never" ],
|
||||||
"prefer-for-of": false,
|
"prefer-for-of": false,
|
||||||
|
Loading…
Reference in New Issue
Block a user