Skip to content

Commit d9fd341

Browse files
authored
Merge pull request #1436 from jumpserver/pr@dev@fix_face_verify_error
fix: fix face verify dialog message
2 parents 8ec77b0 + 18900de commit d9fd341

1 file changed

Lines changed: 20 additions & 14 deletions

File tree

src/app/services/connect-token/acl-dialog/acl-dialog.component.ts

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { writeText } from 'clipboard-polyfill';
2-
import { I18nService } from '@app/services/i18n';
3-
import { HttpService } from '@app/services/http';
4-
import { FaceService } from '@app/services/face';
5-
import { HttpErrorResponse } from '@angular/common/http';
6-
import { Component, Inject, OnInit } from '@angular/core';
7-
import { Asset, ConnectData, ConnectionToken } from '@app/model';
8-
import { NzNotificationService } from 'ng-zorro-antd/notification';
9-
import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
10-
import { NZ_MODAL_DATA, NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
1+
import {writeText} from 'clipboard-polyfill';
2+
import {I18nService} from '@app/services/i18n';
3+
import {HttpService} from '@app/services/http';
4+
import {FaceService} from '@app/services/face';
5+
import {HttpErrorResponse} from '@angular/common/http';
6+
import {Component, Inject, OnInit} from '@angular/core';
7+
import {Asset, ConnectData, ConnectionToken} from '@app/model';
8+
import {NzNotificationService} from 'ng-zorro-antd/notification';
9+
import {DomSanitizer, SafeResourceUrl} from '@angular/platform-browser';
10+
import {NZ_MODAL_DATA, NzModalRef, NzModalService} from 'ng-zorro-antd/modal';
1111

1212
interface DialogAction {
1313
text: string;
@@ -92,7 +92,7 @@ export class ElementACLDialogComponent implements OnInit {
9292

9393
async onCopySuccess(evt) {
9494
const msg = await this._i18n.t('Copied');
95-
this._toastr.success(msg, '', { nzClass: 'custom-success-notification' });
95+
this._toastr.success(msg, '', {nzClass: 'custom-success-notification'});
9696
writeText(evt);
9797
}
9898

@@ -121,7 +121,7 @@ export class ElementACLDialogComponent implements OnInit {
121121
this.content = this.getDialogContent(this.code);
122122
} else {
123123
const msg = await this._i18n.t('Face verify success');
124-
this._toastr.success(msg, '', { nzClass: 'custom-success-notification' });
124+
this._toastr.success(msg, '', {nzClass: 'custom-success-notification'});
125125
this.dialogRef.close(connToken);
126126
this.faceService.openFaceMonitor();
127127
}
@@ -176,7 +176,7 @@ export class ElementACLDialogComponent implements OnInit {
176176
this.content = this.getDialogContent(this.code);
177177
} else {
178178
const msg = await this._i18n.t('Face verify success');
179-
this._toastr.success(msg, '', { nzClass: 'custom-success-notification' });
179+
this._toastr.success(msg, '', {nzClass: 'custom-success-notification'});
180180
this.dialogRef.close(connToken);
181181
}
182182
}
@@ -194,6 +194,7 @@ export class ElementACLDialogComponent implements OnInit {
194194
this.content = this.getDialogContent(this.code);
195195
};
196196

197+
197198
if (this.tokenAction === 'exchange') {
198199
this._http
199200
.exchangeConnectToken(this.tokenID, false, true)
@@ -281,7 +282,7 @@ export class ElementACLDialogComponent implements OnInit {
281282

282283
if (state === 'approved') {
283284
const msg = await this._i18n.t('Login review approved');
284-
this._toastr.success(msg, '', { nzClass: 'custom-success-notification' });
285+
this._toastr.success(msg, '', {nzClass: 'custom-success-notification'});
285286
this.dialogRef.close(this.connectionToken);
286287
} else if (state === 'rejected') {
287288
this.code = 'ticket_review_rejected';
@@ -373,6 +374,11 @@ export class ElementACLDialogComponent implements OnInit {
373374
}
374375
]
375376
},
377+
face_verify_capture: {
378+
title: 'Face Verify',
379+
message: 'Please complete the face verification',
380+
actions: [],
381+
},
376382
no_face_feature: {
377383
title: 'Login reminder',
378384
message: 'No facial features',

0 commit comments

Comments
 (0)