Upstream/bitwarden-desktop
1
0
Fork 0
mirror of https://github.com/bitwarden/desktop.git synced 2025-01-03 18:17:48 +01:00
Code Issues Projects Releases Wiki Activity

Add support for helpers in environment service (#1002)

Browse Source 
* Add support for helpers in environment service

* Add environment service to register component

* Bump jslib
This commit is contained in:
Oscar Hinton 2021-07-23 23:15:32 +02:00 committed by GitHub
parent c863d68057
commit 20561fff87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit c77441b35348c821af7fd6261b6dc72732d5ebad Subproject commit e1ce72136490b9055d8d6a03988e9d39ac560a89

5
src/app/accounts/sso.component.ts
View File

@ -8,6 +8,7 @@ import {
import { ApiService } from 'jslib-common/abstractions/api.service'; 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 { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.service'; import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.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 { 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';
@ -26,10 +27,10 @@ export class SsoComponent extends BaseSsoComponent {
i18nService: I18nService, syncService: SyncService, route: ActivatedRoute, i18nService: I18nService, syncService: SyncService, route: ActivatedRoute,
storageService: StorageService, stateService: StateService, storageService: StorageService, stateService: StateService,
platformUtilsService: PlatformUtilsService, apiService: ApiService, platformUtilsService: PlatformUtilsService, apiService: ApiService,
cryptoFunctionService: CryptoFunctionService, cryptoFunctionService: CryptoFunctionService, environmentService: EnvironmentService,
passwordGenerationService: PasswordGenerationService) { passwordGenerationService: PasswordGenerationService) {
super(authService, router, i18nService, route, storageService, stateService, platformUtilsService, super(authService, router, i18nService, route, storageService, stateService, platformUtilsService,
apiService, cryptoFunctionService, passwordGenerationService); apiService, cryptoFunctionService, environmentService, passwordGenerationService);
super.onSuccessfulLogin = () => { super.onSuccessfulLogin = () => {
return syncService.fullSync(true); return syncService.fullSync(true);
}; };

8
src/app/services.module.ts
View File

@ -101,7 +101,8 @@ const cryptoService = new ElectronCryptoService(storageService, secureStorageSer
platformUtilsService, logService); platformUtilsService, logService);
const tokenService = new TokenService(storageService); const tokenService = new TokenService(storageService);
const appIdService = new AppIdService(storageService); const appIdService = new AppIdService(storageService);
const apiService = new ApiService(tokenService, platformUtilsService, const environmentService = new EnvironmentService(storageService);
const apiService = new ApiService(tokenService, platformUtilsService, environmentService,
async (expired: boolean) => messagingService.send('logout', { expired: expired })); async (expired: boolean) => messagingService.send('logout', { expired: expired }));
const userService = new UserService(tokenService, storageService); const userService = new UserService(tokenService, storageService);
const settingsService = new SettingsService(userService, storageService); const settingsService = new SettingsService(userService, storageService);
@ -130,8 +131,7 @@ const authService = new AuthService(cryptoService, apiService, userService, toke
const exportService = new ExportService(folderService, cipherService, apiService, cryptoService); const exportService = new ExportService(folderService, cipherService, apiService, cryptoService);
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, async () => messagingService.send('logout', { expired: true }), logService); apiService, vaultTimeoutService, environmentService, async () => messagingService.send('logout', { expired: true }), logService);
const environmentService = new EnvironmentService(apiService, storageService, notificationsService);
const eventService = new EventService(storageService, apiService, userService, cipherService); const eventService = new EventService(storageService, apiService, userService, cipherService);
const systemService = new SystemService(storageService, vaultTimeoutService, messagingService, platformUtilsService, const systemService = new SystemService(storageService, vaultTimeoutService, messagingService, platformUtilsService,
null); null);
@ -150,7 +150,7 @@ export function initFactory(): Function {
await i18nService.init(locale); await i18nService.init(locale);
eventService.init(true); eventService.init(true);
authService.init(); authService.init();
setTimeout(() => notificationsService.init(environmentService), 3000); setTimeout(() => notificationsService.init(), 3000);
const htmlEl = window.document.documentElement; const htmlEl = window.document.documentElement;
htmlEl.classList.add('os_' + platformUtilsService.getDeviceString()); htmlEl.classList.add('os_' + platformUtilsService.getDeviceString());
htmlEl.classList.add('locale_' + i18nService.translationLocale); htmlEl.classList.add('locale_' + i18nService.translationLocale);