PS-589 Added Device Verification section for enable/disable the feature of 2FA email on new device login
This commit is contained in:
parent
57b647bde5
commit
0d35dff990
2
jslib
2
jslib
|
@ -1 +1 @@
|
|||
Subproject commit 3cb94623e2c6a3ac6cf6dbcd516ba23b03a7aee7
|
||||
Subproject commit 52cc64053760100662c99bd57ac413acbd3a1c1b
|
|
@ -3,7 +3,10 @@ import { ActivatedRoute } from "@angular/router";
|
|||
|
||||
import { ModalService } from "jslib-angular/services/modal.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 { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
|
||||
import { PolicyService } from "jslib-common/abstractions/policy.service";
|
||||
import { StateService } from "jslib-common/abstractions/state.service";
|
||||
import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType";
|
||||
|
@ -22,9 +25,21 @@ export class TwoFactorSetupComponent extends BaseTwoFactorSetupComponent {
|
|||
messagingService: MessagingService,
|
||||
policyService: PolicyService,
|
||||
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() {
|
||||
|
|
|
@ -55,6 +55,40 @@
|
|||
</div>
|
||||
</li>
|
||||
</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 #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 { ModalService } from "jslib-angular/services/modal.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 { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
|
||||
import { PolicyService } from "jslib-common/abstractions/policy.service";
|
||||
import { StateService } from "jslib-common/abstractions/state.service";
|
||||
import { PolicyType } from "jslib-common/enums/policyType";
|
||||
import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType";
|
||||
import { DeviceVerificationRequest } from "jslib-common/models/request/DeviceVerificationRequest";
|
||||
import { TwoFactorProviders } from "jslib-common/services/twoFactor.service";
|
||||
|
||||
import { TwoFactorAuthenticatorComponent } from "./two-factor-authenticator.component";
|
||||
|
@ -39,18 +43,32 @@ export class TwoFactorSetupComponent implements OnInit {
|
|||
canAccessPremium: boolean;
|
||||
showPolicyWarning = false;
|
||||
loading = true;
|
||||
enableDeviceVerification: boolean;
|
||||
isDeviceVerificationSectionEnabled: boolean;
|
||||
modal: ModalRef;
|
||||
formPromise: Promise<any>;
|
||||
|
||||
constructor(
|
||||
protected apiService: ApiService,
|
||||
protected modalService: ModalService,
|
||||
protected messagingService: MessagingService,
|
||||
protected policyService: PolicyService,
|
||||
private stateService: StateService
|
||||
private stateService: StateService,
|
||||
private platformUtilsService: PlatformUtilsService,
|
||||
private i18nService: I18nService,
|
||||
private logService: LogService
|
||||
) {}
|
||||
|
||||
async ngOnInit() {
|
||||
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) {
|
||||
// eslint-disable-next-line
|
||||
|
@ -186,4 +204,20 @@ export class TwoFactorSetupComponent implements OnInit {
|
|||
this.showPolicyWarning = false;
|
||||
}
|
||||
}
|
||||
|
||||
async submit() {
|
||||
try {
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -5069,5 +5069,17 @@
|
|||
},
|
||||
"apiAccessToken": {
|
||||
"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"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue