bitwarden/directory-connector
1
0
Fork 0
mirror of https://github.com/bitwarden/directory-connector synced 2025-12-05 23:53:21 +00:00
Code Issues Releases Wiki Activity

Update electron to 14.2.0 (#174)

Browse Source 
* Pull in jslib and update electron to 14.2.0

* Fix build errors after pulling jslib

* Remove space from tslint ignore comment
This commit is contained in:
Daniel James Smith
2021-11-09 11:38:18 +01:00
committed by GitHub
parent a96144d6dc
commit 660ee538ce
6 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

Submodule jslib updated: f09fb69882...2db9e1ce0d

16
package-lock.json generated
View File

@@ -131,7 +131,7 @@
"dependencies": {
"@bitwarden/jslib-common": "file:../common",
"@nodert-win10-rs4/windows.security.credentials.ui": "^0.4.4",
"electron": "14.0.1",
"electron": "14.2.0",
"electron-log": "4.4.1",
"electron-store": "8.0.1",
"electron-updater": "4.3.9",
@@ -4651,9 +4651,9 @@
}
},
"node_modules/electron": {
"version": "14.0.1",
"resolved": "https://registry.npmjs.org/electron/-/electron-14.0.1.tgz",
"integrity": "sha512-1XILvfE5mQEBz5L/QeNfcwC3PxAIjwMyA3GR8Naw5C0IKAnHl3lAdjczbtGX8nqbcEpOAVo+4TMSpcPD3zxe8Q==",
"version": "14.2.0",
"resolved": "https://registry.npmjs.org/electron/-/electron-14.2.0.tgz",
"integrity": "sha512-6CmAv1P0xcwK3FQOSA27fHI36/wctSFVgj46VODn56srXXQWeolkK1VzeAFNE613iAuuH9jJdHvE3gz+c7XkNA==",
"hasInstallScript": true,
"dependencies": {
"@electron/get": "^1.0.1",
@@ -15223,7 +15223,7 @@
"@bitwarden/jslib-common": "file:../common",
"@nodert-win10-rs4/windows.security.credentials.ui": "^0.4.4",
"@types/node": "^14.17.1",
"electron": "14.0.1",
"electron": "14.2.0",
"electron-log": "4.4.1",
"electron-store": "8.0.1",
"electron-updater": "4.3.9",
@@ -18377,9 +18377,9 @@
}
},
"electron": {
"version": "14.0.1",
"resolved": "https://registry.npmjs.org/electron/-/electron-14.0.1.tgz",
"integrity": "sha512-1XILvfE5mQEBz5L/QeNfcwC3PxAIjwMyA3GR8Naw5C0IKAnHl3lAdjczbtGX8nqbcEpOAVo+4TMSpcPD3zxe8Q==",
"version": "14.2.0",
"resolved": "https://registry.npmjs.org/electron/-/electron-14.2.0.tgz",
"integrity": "sha512-6CmAv1P0xcwK3FQOSA27fHI36/wctSFVgj46VODn56srXXQWeolkK1VzeAFNE613iAuuH9jJdHvE3gz+c7XkNA==",
"requires": {
"@electron/get": "^1.0.1",
"@types/node": "^14.6.2",

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

@@ -78,7 +78,7 @@ const userService = new UserService(tokenService, storageService);
const apiKeyService = new ApiKeyService(tokenService, storageService);
const containerService = new ContainerService(cryptoService);
const authService = new AuthService(cryptoService, apiService, userService, tokenService, appIdService,
i18nService, platformUtilsService, messagingService, null, logService, apiKeyService, false);
i18nService, platformUtilsService, messagingService, null, logService, apiKeyService, cryptoFunctionService, false);
const configurationService = new ConfigurationService(storageService, secureStorageService);
const syncService = new SyncService(configurationService, logService, cryptoFunctionService, apiService,
messagingService, i18nService, environmentService);

2
src/bwdc.ts
View File

@@ -121,7 +121,7 @@ export class Main {
this.containerService = new ContainerService(this.cryptoService);
this.authService = new AuthService(this.cryptoService, this.apiService, this.userService, this.tokenService,
this.appIdService, this.i18nService, this.platformUtilsService, this.messagingService, null,
this.logService, this.apiKeyService, false);
this.logService, this.apiKeyService, this.cryptoFunctionService, false);
this.configurationService = new ConfigurationService(this.storageService, this.secureStorageService,
process.env.BITWARDENCLI_CONNECTOR_PLAINTEXT_SECRETS !== 'true');
this.syncService = new SyncService(this.configurationService, this.logService, this.cryptoFunctionService,

5
src/services/auth.service.ts
View File

@@ -2,6 +2,7 @@ import { ApiService } from 'jslib-common/abstractions/api.service';
import { ApiKeyService } from 'jslib-common/abstractions/apiKey.service';
import { AppIdService } from 'jslib-common/abstractions/appId.service';
import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.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';
@@ -23,9 +24,9 @@ export class AuthService extends AuthServiceBase {
tokenService: TokenService, appIdService: AppIdService, i18nService: I18nService,
platformUtilsService: PlatformUtilsService, messagingService: MessagingService,
vaultTimeoutService: VaultTimeoutService, logService: LogService, private apiKeyService: ApiKeyService,
setCryptoKeys = true) {
cryptoFunctionService: CryptoFunctionService, setCryptoKeys = true) {
super(cryptoService, apiService, userService, tokenService, appIdService, i18nService, platformUtilsService,
messagingService, vaultTimeoutService, logService, setCryptoKeys);
messagingService, vaultTimeoutService, logService, cryptoFunctionService, setCryptoKeys);
}
async logInApiKey(clientId: string, clientSecret: string): Promise<AuthResult> {

2
src/services/azure-directory.service.ts
View File

@@ -423,7 +423,7 @@ export class AzureDirectoryService extends BaseDirectoryService implements IDire
} else if (d.error != null && d.error_description != null) {
const shortError = d.error_description?.split('\n', 1)[0];
const err = new Error(d.error + ' (' + res.statusCode + '): ' + shortError);
// tslint: disable-next-line
// tslint:disable-next-line
console.error(d.error_description);
done(err, null);
} else {