Merge pull request #7712 from jwangyangls/oidc_like_ldap

Fix “Delete” and "Reset Password" should be hidden in user management page;forget Password should be hidden when oidc mode;
This commit is contained in:
jwangyangls 2019-05-08 11:01:19 +08:00 committed by GitHub
commit f4f2278805
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View File

@ -145,7 +145,8 @@ export class SignInComponent implements AfterViewChecked, OnInit {
return this.appConfig.auth_mode === 'oidc_auth';
}
public get showForgetPwd(): boolean {
return this.appConfig.auth_mode !== 'ldap_auth' && this.appConfig.auth_mode !== 'uaa_auth';
return this.appConfig.auth_mode !== 'ldap_auth' && this.appConfig.auth_mode !== 'uaa_auth'
&& this.appConfig.auth_mode !== 'oidc_auth';
}
clickRememberMe($event: any): void {
if ($event && $event.target) {

View File

@ -106,7 +106,7 @@ export class UserComponent implements OnInit, OnDestroy {
public get canCreateUser(): boolean {
let appConfig = this.appConfigService.getConfig();
if (appConfig) {
return !(appConfig.auth_mode === 'ldap_auth' || appConfig.auth_mode === 'uaa_auth');
return !(appConfig.auth_mode === 'ldap_auth' || appConfig.auth_mode === 'uaa_auth' || appConfig.auth_mode === 'oidc_auth');
} else {
return true;
}