1
0
mirror of https://github.com/bitwarden/browser.git synced 2025-02-19 01:51:27 +01:00

Crypto Agent (#1243)

This commit is contained in:
Oscar Hinton 2021-10-26 01:14:16 +02:00 committed by GitHub
parent 6d4f163824
commit c46ca2f9e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 2 deletions

View File

@ -24,6 +24,18 @@
</select> </select>
</div> </div>
<div class="form-group">
<div class="form-check">
<input class="form-check-input" type="checkbox" id="useCryptoAgent" formControlName="useCryptoAgent">
<label class="form-check-label" for="useCryptoAgent">{{'enabled' | i18n}}</label>
</div>
</div>
<div class="form-group">
<label>{{'cryptoAgentUrl' | i18n}}</label>
<input class="form-control" formControlName="cryptoAgentUrl">
</div>
<!-- OIDC --> <!-- OIDC -->
<div *ngIf="data.value.configType == 1"> <div *ngIf="data.value.configType == 1">
<div class="config-section"> <div class="config-section">

View File

@ -37,6 +37,9 @@ export class SsoComponent implements OnInit {
data = this.fb.group({ data = this.fb.group({
configType: [], configType: [],
useCryptoAgent: [],
cryptoAgentUrl: [],
// OpenId // OpenId
authority: [], authority: [],
clientId: [], clientId: [],

2
jslib

@ -1 +1 @@
Subproject commit 24fe836032354d4ec39435776e54dd0995e1b389 Subproject commit 71f8ef601fb0a426264c1fdfd19edb4de2c648fa

View File

@ -135,7 +135,7 @@ const totpService = new TotpService(storageService, cryptoFunctionService, conso
const containerService = new ContainerService(cryptoService); const containerService = new ContainerService(cryptoService);
const authService = new AuthService(cryptoService, apiService, const authService = new AuthService(cryptoService, apiService,
userService, tokenService, appIdService, i18nService, platformUtilsService, messagingService, vaultTimeoutService, userService, tokenService, appIdService, i18nService, platformUtilsService, messagingService, vaultTimeoutService,
consoleLogService); consoleLogService, cryptoFunctionService);
const exportService = new ExportService(folderService, cipherService, apiService, cryptoService); const exportService = new ExportService(folderService, cipherService, apiService, cryptoService);
const importService = new ImportService(cipherService, folderService, apiService, i18nService, collectionService, const importService = new ImportService(cipherService, folderService, apiService, i18nService, collectionService,
platformUtilsService, cryptoService); platformUtilsService, cryptoService);

View File

@ -4451,5 +4451,8 @@
}, },
"ssoSettingsSaved": { "ssoSettingsSaved": {
"message": "Single Sign-On configuration was saved." "message": "Single Sign-On configuration was saved."
},
"ssoCryptoAgentUnavailable": {
"message": "Unable to reach the crypto agent, try again later."
} }
} }