mirror of
https://github.com/bitwarden/web
synced 2025-12-16 16:23:31 +00:00
Compare commits
3 Commits
bug/PS-250
...
PS-589-add
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c1f30641de | ||
|
|
6b0d793bf9 | ||
|
|
0d35dff990 |
2
jslib
2
jslib
Submodule jslib updated: a6fe5c7900...52cc640537
@@ -25,7 +25,7 @@ export class VaultFilterComponent extends BaseVaultFilterComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
searchTextChanged() {
|
searchTextChanged() {
|
||||||
this.onSearchTextChanged.emit(this.searchText);
|
this.onSearchTextChanged.emit(this.searchText.normalize("NFD").replace(/[\u0300-\u036f]/g, ""));
|
||||||
}
|
}
|
||||||
|
|
||||||
async initCollections() {
|
async initCollections() {
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.se
|
|||||||
import { StateService } from "jslib-common/abstractions/state.service";
|
import { StateService } from "jslib-common/abstractions/state.service";
|
||||||
import { SyncService } from "jslib-common/abstractions/sync.service";
|
import { SyncService } from "jslib-common/abstractions/sync.service";
|
||||||
import { TokenService } from "jslib-common/abstractions/token.service";
|
import { TokenService } from "jslib-common/abstractions/token.service";
|
||||||
|
import { CipherType } from "jslib-common/enums/cipherType";
|
||||||
import { CipherView } from "jslib-common/models/view/cipherView";
|
import { CipherView } from "jslib-common/models/view/cipherView";
|
||||||
|
|
||||||
import { UpdateKeyComponent } from "../../../../settings/update-key.component";
|
import { UpdateKeyComponent } from "../../../../settings/update-key.component";
|
||||||
|
|||||||
@@ -3,7 +3,10 @@ import { ActivatedRoute } from "@angular/router";
|
|||||||
|
|
||||||
import { ModalService } from "jslib-angular/services/modal.service";
|
import { ModalService } from "jslib-angular/services/modal.service";
|
||||||
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 { 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 { PolicyService } from "jslib-common/abstractions/policy.service";
|
import { PolicyService } from "jslib-common/abstractions/policy.service";
|
||||||
import { StateService } from "jslib-common/abstractions/state.service";
|
import { StateService } from "jslib-common/abstractions/state.service";
|
||||||
import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType";
|
import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType";
|
||||||
@@ -22,9 +25,21 @@ export class TwoFactorSetupComponent extends BaseTwoFactorSetupComponent {
|
|||||||
messagingService: MessagingService,
|
messagingService: MessagingService,
|
||||||
policyService: PolicyService,
|
policyService: PolicyService,
|
||||||
private route: ActivatedRoute,
|
private route: ActivatedRoute,
|
||||||
stateService: StateService
|
stateService: StateService,
|
||||||
|
platformUtilsService: PlatformUtilsService,
|
||||||
|
i18nService: I18nService,
|
||||||
|
logService: LogService
|
||||||
) {
|
) {
|
||||||
super(apiService, modalService, messagingService, policyService, stateService);
|
super(
|
||||||
|
apiService,
|
||||||
|
modalService,
|
||||||
|
messagingService,
|
||||||
|
policyService,
|
||||||
|
stateService,
|
||||||
|
platformUtilsService,
|
||||||
|
i18nService,
|
||||||
|
logService
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
async ngOnInit() {
|
async ngOnInit() {
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import { Component } from "@angular/core";
|
|||||||
import { ApiService } from "jslib-common/abstractions/api.service";
|
import { ApiService } from "jslib-common/abstractions/api.service";
|
||||||
import { LogService } from "jslib-common/abstractions/log.service";
|
import { LogService } from "jslib-common/abstractions/log.service";
|
||||||
import { OrganizationConnectionType } from "jslib-common/enums/organizationConnectionType";
|
import { OrganizationConnectionType } from "jslib-common/enums/organizationConnectionType";
|
||||||
import { Utils } from "jslib-common/misc/utils";
|
|
||||||
import { BillingSyncConfigApi } from "jslib-common/models/api/billingSyncConfigApi";
|
import { BillingSyncConfigApi } from "jslib-common/models/api/billingSyncConfigApi";
|
||||||
import { BillingSyncConfigRequest } from "jslib-common/models/request/billingSyncConfigRequest";
|
import { BillingSyncConfigRequest } from "jslib-common/models/request/billingSyncConfigRequest";
|
||||||
import { OrganizationConnectionRequest } from "jslib-common/models/request/organizationConnectionRequest";
|
import { OrganizationConnectionRequest } from "jslib-common/models/request/organizationConnectionRequest";
|
||||||
|
|||||||
@@ -83,11 +83,7 @@ export class PreferencesComponent implements OnInit {
|
|||||||
|
|
||||||
async submit() {
|
async submit() {
|
||||||
if (!this.vaultTimeout.valid) {
|
if (!this.vaultTimeout.valid) {
|
||||||
this.platformUtilsService.showToast(
|
this.platformUtilsService.showToast("error", null, this.i18nService.t("vaultTimeoutToLarge"));
|
||||||
"error",
|
|
||||||
null,
|
|
||||||
this.i18nService.t("vaultTimeoutRangeError")
|
|
||||||
);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -55,6 +55,40 @@
|
|||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
<form *ngIf="!loading" #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-12">
|
||||||
|
<h2 class="mt-5 spaced-header">
|
||||||
|
{{ "deviceVerification" | i18n }}
|
||||||
|
</h2>
|
||||||
|
<div class="form-group">
|
||||||
|
<div class="form-check">
|
||||||
|
<input
|
||||||
|
class="form-check-input"
|
||||||
|
type="checkbox"
|
||||||
|
id="enableDeviceVerification"
|
||||||
|
name="enableDeviceVerification"
|
||||||
|
disabled="{{ !isDeviceVerificationSectionEnabled }}"
|
||||||
|
[(ngModel)]="enableDeviceVerification"
|
||||||
|
/>
|
||||||
|
<label class="form-check-label" for="enableDeviceVerification">
|
||||||
|
{{ "enableDeviceVerification" | i18n }}
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<small class="form-text text-muted">{{ "deviceVerificationDesc" | i18n }}</small>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
type="submit"
|
||||||
|
class="btn btn-primary btn-submit"
|
||||||
|
[disabled]="form.loading"
|
||||||
|
*ngIf="isDeviceVerificationSectionEnabled"
|
||||||
|
>
|
||||||
|
<i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
|
||||||
|
<span>{{ "save" | i18n }}</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
|
||||||
<ng-template #authenticatorTemplate></ng-template>
|
<ng-template #authenticatorTemplate></ng-template>
|
||||||
<ng-template #recoveryTemplate></ng-template>
|
<ng-template #recoveryTemplate></ng-template>
|
||||||
|
|||||||
@@ -3,11 +3,15 @@ import { Component, OnInit, Type, ViewChild, ViewContainerRef } from "@angular/c
|
|||||||
import { ModalRef } from "jslib-angular/components/modal/modal.ref";
|
import { ModalRef } from "jslib-angular/components/modal/modal.ref";
|
||||||
import { ModalService } from "jslib-angular/services/modal.service";
|
import { ModalService } from "jslib-angular/services/modal.service";
|
||||||
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 { 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 { PolicyService } from "jslib-common/abstractions/policy.service";
|
import { PolicyService } from "jslib-common/abstractions/policy.service";
|
||||||
import { StateService } from "jslib-common/abstractions/state.service";
|
import { StateService } from "jslib-common/abstractions/state.service";
|
||||||
import { PolicyType } from "jslib-common/enums/policyType";
|
import { PolicyType } from "jslib-common/enums/policyType";
|
||||||
import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType";
|
import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType";
|
||||||
|
import { DeviceVerificationRequest } from "jslib-common/models/request/DeviceVerificationRequest";
|
||||||
import { TwoFactorProviders } from "jslib-common/services/twoFactor.service";
|
import { TwoFactorProviders } from "jslib-common/services/twoFactor.service";
|
||||||
|
|
||||||
import { TwoFactorAuthenticatorComponent } from "./two-factor-authenticator.component";
|
import { TwoFactorAuthenticatorComponent } from "./two-factor-authenticator.component";
|
||||||
@@ -39,18 +43,32 @@ export class TwoFactorSetupComponent implements OnInit {
|
|||||||
canAccessPremium: boolean;
|
canAccessPremium: boolean;
|
||||||
showPolicyWarning = false;
|
showPolicyWarning = false;
|
||||||
loading = true;
|
loading = true;
|
||||||
|
enableDeviceVerification: boolean;
|
||||||
|
isDeviceVerificationSectionEnabled: boolean;
|
||||||
modal: ModalRef;
|
modal: ModalRef;
|
||||||
|
formPromise: Promise<any>;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
protected apiService: ApiService,
|
protected apiService: ApiService,
|
||||||
protected modalService: ModalService,
|
protected modalService: ModalService,
|
||||||
protected messagingService: MessagingService,
|
protected messagingService: MessagingService,
|
||||||
protected policyService: PolicyService,
|
protected policyService: PolicyService,
|
||||||
private stateService: StateService
|
private stateService: StateService,
|
||||||
|
private platformUtilsService: PlatformUtilsService,
|
||||||
|
private i18nService: I18nService,
|
||||||
|
private logService: LogService
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async ngOnInit() {
|
async ngOnInit() {
|
||||||
this.canAccessPremium = await this.stateService.getCanAccessPremium();
|
this.canAccessPremium = await this.stateService.getCanAccessPremium();
|
||||||
|
try {
|
||||||
|
const deviceVerificationSettings = await this.apiService.getDeviceVerificationSettings();
|
||||||
|
this.isDeviceVerificationSectionEnabled =
|
||||||
|
deviceVerificationSettings.isDeviceVerificationSectionEnabled;
|
||||||
|
this.enableDeviceVerification = deviceVerificationSettings.unknownDeviceVerificationEnabled;
|
||||||
|
} catch (e) {
|
||||||
|
this.logService.error(e);
|
||||||
|
}
|
||||||
|
|
||||||
for (const key in TwoFactorProviders) {
|
for (const key in TwoFactorProviders) {
|
||||||
// eslint-disable-next-line
|
// eslint-disable-next-line
|
||||||
@@ -186,4 +204,37 @@ export class TwoFactorSetupComponent implements OnInit {
|
|||||||
this.showPolicyWarning = false;
|
this.showPolicyWarning = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async submit() {
|
||||||
|
try {
|
||||||
|
if (this.enableDeviceVerification) {
|
||||||
|
const email = await this.stateService.getEmail();
|
||||||
|
const confirmed = await this.platformUtilsService.showDialog(
|
||||||
|
this.i18nService.t(
|
||||||
|
"areYouSureYouWantToEnableDeviceVerificationTheVerificationCodeEmailsWillArriveAtX",
|
||||||
|
email
|
||||||
|
),
|
||||||
|
this.i18nService.t("deviceVerification"),
|
||||||
|
this.i18nService.t("yes"),
|
||||||
|
this.i18nService.t("no"),
|
||||||
|
"warning"
|
||||||
|
);
|
||||||
|
if (!confirmed) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this.formPromise = this.apiService.putDeviceVerificationSettings(
|
||||||
|
new DeviceVerificationRequest(this.enableDeviceVerification)
|
||||||
|
);
|
||||||
|
await this.formPromise;
|
||||||
|
this.platformUtilsService.showToast(
|
||||||
|
"success",
|
||||||
|
null,
|
||||||
|
this.i18nService.t("updatedDeviceVerification")
|
||||||
|
);
|
||||||
|
} catch (e) {
|
||||||
|
this.logService.error(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,9 +41,5 @@
|
|||||||
<small>{{ "minutes" | i18n }}</small>
|
<small>{{ "minutes" | i18n }}</small>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<small *ngIf="!exceedsMinimumTimout" class="tw-text-danger">
|
|
||||||
<i class="bwi bwi-error" aria-hidden="true"></i> {{ "vaultCustomTimeoutMinimum" | i18n }}
|
|
||||||
</small>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -4431,12 +4431,6 @@
|
|||||||
"vaultTimeoutToLarge": {
|
"vaultTimeoutToLarge": {
|
||||||
"message": "Your vault timeout exceeds the restriction set by your organization."
|
"message": "Your vault timeout exceeds the restriction set by your organization."
|
||||||
},
|
},
|
||||||
"vaultCustomTimeoutMinimum": {
|
|
||||||
"message": "Minimum custom timeout is 1 minute."
|
|
||||||
},
|
|
||||||
"vaultTimeoutRangeError": {
|
|
||||||
"message": "Vault Timeout is not within allowed range."
|
|
||||||
},
|
|
||||||
"disablePersonalVaultExport": {
|
"disablePersonalVaultExport": {
|
||||||
"message": "Disable Personal Vault Export"
|
"message": "Disable Personal Vault Export"
|
||||||
},
|
},
|
||||||
@@ -4680,8 +4674,8 @@
|
|||||||
"removeSponsorshipSuccess": {
|
"removeSponsorshipSuccess": {
|
||||||
"message": "Sponsorship Removed"
|
"message": "Sponsorship Removed"
|
||||||
},
|
},
|
||||||
"ssoKeyConnectorError": {
|
"ssoKeyConnectorUnavailable": {
|
||||||
"message": "Key Connector error: make sure Key Connector is available and working correctly."
|
"message": "Unable to reach the Key Connector, try again later."
|
||||||
},
|
},
|
||||||
"keyConnectorUrl": {
|
"keyConnectorUrl": {
|
||||||
"message": "Key Connector URL"
|
"message": "Key Connector URL"
|
||||||
@@ -5075,5 +5069,26 @@
|
|||||||
},
|
},
|
||||||
"apiAccessToken": {
|
"apiAccessToken": {
|
||||||
"message": "API Access Token"
|
"message": "API Access Token"
|
||||||
|
},
|
||||||
|
"deviceVerification": {
|
||||||
|
"message": "Device Verification"
|
||||||
|
},
|
||||||
|
"enableDeviceVerification": {
|
||||||
|
"message": "Enable Device Verification"
|
||||||
|
},
|
||||||
|
"deviceVerificationDesc": {
|
||||||
|
"message": "When enabled, verification codes are sent to your email address when logging in from an unrecognized device"
|
||||||
|
},
|
||||||
|
"updatedDeviceVerification": {
|
||||||
|
"message": "Updated Device Verification"
|
||||||
|
},
|
||||||
|
"areYouSureYouWantToEnableDeviceVerificationTheVerificationCodeEmailsWillArriveAtX": {
|
||||||
|
"message": "Are you sure you want to enable Device Verification? The verification code emails will arrive at: $EMAIL$",
|
||||||
|
"placeholders": {
|
||||||
|
"email": {
|
||||||
|
"content": "$1",
|
||||||
|
"example": "My Email"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user