Upstream
/
harbor
mirror of https://github.com/goharbor/harbor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Modify usage of LDAP ping API on UI (#14440) 

Signed-off-by: AllForNothing <sshijun@vmware.com>
This commit is contained in:
Will Sun 2021-03-15 15:56:54 +08:00 committed by GitHub
parent fb3b1311d8
commit f03ca3b087
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/portal/src/app/base/left-side-nav/config/auth/config-auth.component.ts
View File

@ -24,6 +24,7 @@ import { clone, isEmpty, getChanges as getChangesFunc } from "../../../../shared
import { CONFIG_AUTH_MODE } from "../../../../shared/entities/shared.const";
import { errorHandler } from "../../../../shared/units/shared.utils";
import { Configuration } from "../config";
import { finalize } from "rxjs/operators";
const fakePass = 'aWpLOSYkIzJTTU4wMDkx';
@Component({
@ -138,11 +139,14 @@ export class ConfigurationAuthComponent implements OnChanges, OnInit {
settings['ldap_scope'] = +settings['ldap_scope'];
this.configService.testLDAPServer(settings)
.subscribe(respone => {
this.testingOnGoing = false;
this.msgHandler.showSuccess('CONFIG.TEST_LDAP_SUCCESS');
.pipe(finalize(() => this.testingOnGoing = false))
.subscribe(res => {
if (res && res.success) {
this.msgHandler.showSuccess('CONFIG.TEST_LDAP_SUCCESS');
} else if (res && res.message) {
this.msgHandler.showError('CONFIG.TEST_LDAP_FAILED', { 'param': res.message });
}
}, error => {
this.testingOnGoing = false;
let err = errorHandler(error);
if (!err || !err.trim()) {
err = 'UNKNOWN';