mirror of
https://github.com/andwati/zitadel.git
synced 2026-11-16 02:35:12 +00:00
fix(console): LDAP UI optimization for better required field recognition, improve onboarding all done visibility (#5659)
* fix: onboarding all done styles * ldap UI change * rm log * set required marker to formfield, max width of string-list comp * seperate formfields * formarray * clear action * validator * hide pwd field * rm dead code * lint
This commit is contained in:
@@ -1,54 +1,65 @@
|
||||
<form [formGroup]="form" class="attribute-form">
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.LDAPIDATTRIBUTE' | translate }}*</cnsl-label>
|
||||
<input cnslInput formControlName="idAttribute" />
|
||||
</cnsl-form-field>
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.AVATARURLATTRIBUTE' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="avatarUrlAttribute" />
|
||||
</cnsl-form-field>
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.DISPLAYNAMEATTRIBUTE' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="displayNameAttribute" />
|
||||
</cnsl-form-field>
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.EMAILATTRIBUTEATTRIBUTE' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="emailAttribute" />
|
||||
</cnsl-form-field>
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.EMAILVERIFIEDATTRIBUTE' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="emailVerifiedAttribute" />
|
||||
</cnsl-form-field>
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.FIRSTNAMEATTRIBUTE' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="firstNameAttribute" />
|
||||
</cnsl-form-field>
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.LASTNAMEATTRIBUTE' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="lastNameAttribute" />
|
||||
</cnsl-form-field>
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.NICKNAMEATTRIBUTE' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="nickNameAttribute" />
|
||||
</cnsl-form-field>
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.PHONEATTRIBUTE' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="phoneAttribute" />
|
||||
</cnsl-form-field>
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.PHONEVERIFIEDATTRIBUTE' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="phoneVerifiedAttribute" />
|
||||
</cnsl-form-field>
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.PREFERREDLANGUAGEATTRIBUTE' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="preferredLanguageAttribute" />
|
||||
</cnsl-form-field>
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.PREFERREDUSERNAMEATTRIBUTE' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="preferredUsernameAttribute" />
|
||||
</cnsl-form-field>
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.PROFILEATTRIBUTE' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="profileAttribute" />
|
||||
<cnsl-label>{{ 'IDP.LDAPIDATTRIBUTE' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="idAttribute" required />
|
||||
</cnsl-form-field>
|
||||
|
||||
<div class="attribute-more-row">
|
||||
<span>{{ 'ACTIONS.MORE' | translate }}</span>
|
||||
<button (click)="showMore = !showMore" type="button" mat-icon-button>
|
||||
<mat-icon *ngIf="showMore">keyboard_arrow_up</mat-icon>
|
||||
<mat-icon *ngIf="!showMore">keyboard_arrow_down</mat-icon>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<ng-container *ngIf="showMore">
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.AVATARURLATTRIBUTE' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="avatarUrlAttribute" />
|
||||
</cnsl-form-field>
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.DISPLAYNAMEATTRIBUTE' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="displayNameAttribute" />
|
||||
</cnsl-form-field>
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.EMAILATTRIBUTEATTRIBUTE' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="emailAttribute" />
|
||||
</cnsl-form-field>
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.EMAILVERIFIEDATTRIBUTE' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="emailVerifiedAttribute" />
|
||||
</cnsl-form-field>
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.FIRSTNAMEATTRIBUTE' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="firstNameAttribute" />
|
||||
</cnsl-form-field>
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.LASTNAMEATTRIBUTE' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="lastNameAttribute" />
|
||||
</cnsl-form-field>
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.NICKNAMEATTRIBUTE' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="nickNameAttribute" />
|
||||
</cnsl-form-field>
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.PHONEATTRIBUTE' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="phoneAttribute" />
|
||||
</cnsl-form-field>
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.PHONEVERIFIEDATTRIBUTE' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="phoneVerifiedAttribute" />
|
||||
</cnsl-form-field>
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.PREFERREDLANGUAGEATTRIBUTE' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="preferredLanguageAttribute" />
|
||||
</cnsl-form-field>
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.PREFERREDUSERNAMEATTRIBUTE' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="preferredUsernameAttribute" />
|
||||
</cnsl-form-field>
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.PROFILEATTRIBUTE' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="profileAttribute" />
|
||||
</cnsl-form-field>
|
||||
</ng-container>
|
||||
</form>
|
||||
|
||||
@@ -4,3 +4,8 @@
|
||||
max-width: 400px;
|
||||
padding-bottom: 1rem;
|
||||
}
|
||||
|
||||
.attribute-more-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
@@ -29,6 +29,7 @@ export class LDAPAttributesComponent implements OnChanges, OnDestroy {
|
||||
profileAttribute: new FormControl('', []),
|
||||
});
|
||||
|
||||
public showMore: boolean = false;
|
||||
constructor() {
|
||||
this.form.valueChanges.pipe(takeUntil(this.destroy$)).subscribe((value) => {
|
||||
if (value) {
|
||||
|
||||
@@ -17,12 +17,13 @@
|
||||
<div class="identity-provider-content">
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.NAME' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="name" />
|
||||
<input cnslInput formControlName="name" required />
|
||||
</cnsl-form-field>
|
||||
|
||||
<h2 class="subheader">{{ 'IDP.LDAPCONNECTION' | translate }}</h2>
|
||||
|
||||
<cnsl-string-list
|
||||
class="string-list-component-wrapper"
|
||||
title="{{ 'IDP.SERVERS' | translate }}"
|
||||
formControlName="serversList"
|
||||
[required]="true"
|
||||
@@ -30,13 +31,13 @@
|
||||
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.BASEDN' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="baseDn" />
|
||||
<input cnslInput formControlName="baseDn" required />
|
||||
</cnsl-form-field>
|
||||
|
||||
<div [ngClass]="{ 'identity-provider-2-col': !provider }">
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.BINDDN' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="bindDn" />
|
||||
<input cnslInput formControlName="bindDn" required />
|
||||
</cnsl-form-field>
|
||||
|
||||
<mat-checkbox
|
||||
@@ -46,14 +47,14 @@
|
||||
[ngModelOptions]="{ standalone: true }"
|
||||
>{{ 'IDP.UPDATEBINDPASSWORD' | translate }}</mat-checkbox
|
||||
>
|
||||
<cnsl-form-field *ngIf="!provider || (provider && updateBindPassword)" class="formfield">
|
||||
<cnsl-form-field class="formfield pwd" [ngClass]="{ show: !provider || (provider && updateBindPassword) }">
|
||||
<cnsl-label>{{ 'IDP.BINDPASSWORD' | translate }}</cnsl-label>
|
||||
<input
|
||||
cnslInput
|
||||
name="bindpassword"
|
||||
formControlName="bindPassword"
|
||||
type="password"
|
||||
autocomplete="new-password"
|
||||
[required]="!provider"
|
||||
/>
|
||||
</cnsl-form-field>
|
||||
</div>
|
||||
@@ -62,16 +63,18 @@
|
||||
|
||||
<cnsl-form-field class="formfield">
|
||||
<cnsl-label>{{ 'IDP.USERBASE' | translate }}</cnsl-label>
|
||||
<input cnslInput formControlName="userBase" />
|
||||
<input cnslInput formControlName="userBase" required />
|
||||
</cnsl-form-field>
|
||||
|
||||
<cnsl-string-list
|
||||
class="string-list-component-wrapper"
|
||||
title="{{ 'IDP.USERFILTERS' | translate }}"
|
||||
formControlName="userFiltersList"
|
||||
[required]="true"
|
||||
></cnsl-string-list>
|
||||
|
||||
<cnsl-string-list
|
||||
class="string-list-component-wrapper"
|
||||
title="{{ 'IDP.USEROBJECTCLASSES' | translate }}"
|
||||
formControlName="userObjectClassesList"
|
||||
[required]="true"
|
||||
@@ -79,22 +82,11 @@
|
||||
|
||||
<div class="identity-provider-optional-h-wrapper">
|
||||
<h2>{{ 'IDP.LDAPATTRIBUTES' | translate }}</h2>
|
||||
|
||||
<button (click)="showAttributes = !showAttributes" type="button" mat-icon-button>
|
||||
<mat-icon *ngIf="showAttributes">keyboard_arrow_up</mat-icon>
|
||||
<mat-icon *ngIf="!showAttributes">keyboard_arrow_down</mat-icon>
|
||||
</button>
|
||||
|
||||
<span *ngIf="!provider?.config?.ldap?.attributes?.idAttribute" class="state error">{{
|
||||
'IDP.REQUIRED' | translate
|
||||
}}</span>
|
||||
</div>
|
||||
<div *ngIf="showAttributes">
|
||||
<cnsl-ldap-attributes
|
||||
[initialAttributes]="provider?.config?.ldap?.attributes"
|
||||
(attributesChanged)="attributes = $event"
|
||||
></cnsl-ldap-attributes>
|
||||
</div>
|
||||
<cnsl-ldap-attributes
|
||||
[initialAttributes]="provider?.config?.ldap?.attributes"
|
||||
(attributesChanged)="attributes = $event"
|
||||
></cnsl-ldap-attributes>
|
||||
|
||||
<div class="identity-provider-optional-h-wrapper">
|
||||
<h2>{{ 'IDP.OPTIONAL' | translate }}</h2>
|
||||
@@ -123,7 +115,7 @@
|
||||
color="primary"
|
||||
mat-raised-button
|
||||
class="continue-button"
|
||||
[disabled]="form.invalid || attributes.toObject().idAttribute === '' || form.disabled"
|
||||
[disabled]="!form.valid || !attributes.toObject().idAttribute || form.disabled"
|
||||
type="submit"
|
||||
>
|
||||
<span *ngIf="id">{{ 'ACTIONS.SAVE' | translate }}</span>
|
||||
|
||||
@@ -20,7 +20,7 @@ import { Breadcrumb, BreadcrumbService, BreadcrumbType } from 'src/app/services/
|
||||
import { GrpcAuthService } from 'src/app/services/grpc-auth.service';
|
||||
import { ManagementService } from 'src/app/services/mgmt.service';
|
||||
import { ToastService } from 'src/app/services/toast.service';
|
||||
import { requiredValidator } from '../../form-field/validators/validators';
|
||||
import { minArrayLengthValidator, requiredValidator } from '../../form-field/validators/validators';
|
||||
|
||||
import { PolicyComponentServiceType } from '../../policies/policy-component-types.enum';
|
||||
|
||||
@@ -30,7 +30,6 @@ import { PolicyComponentServiceType } from '../../policies/policy-component-type
|
||||
})
|
||||
export class ProviderLDAPComponent {
|
||||
public updateBindPassword: boolean = false;
|
||||
public showAttributes: boolean = false;
|
||||
public showOptional: boolean = false;
|
||||
public options: Options = new Options().setIsCreationAllowed(true).setIsLinkingAllowed(true);
|
||||
public attributes: LDAPAttributes = new LDAPAttributes();
|
||||
@@ -54,15 +53,15 @@ export class ProviderLDAPComponent {
|
||||
) {
|
||||
this.form = new FormGroup({
|
||||
name: new FormControl('', [requiredValidator]),
|
||||
serversList: new FormControl('', [requiredValidator]),
|
||||
serversList: new FormControl<string[]>([''], [minArrayLengthValidator(1)]),
|
||||
baseDn: new FormControl('', [requiredValidator]),
|
||||
bindDn: new FormControl('', [requiredValidator]),
|
||||
bindPassword: new FormControl('', [requiredValidator]),
|
||||
userBase: new FormControl('', [requiredValidator]),
|
||||
userFiltersList: new FormControl('', [requiredValidator]),
|
||||
userObjectClassesList: new FormControl('', [requiredValidator]),
|
||||
userFiltersList: new FormControl<string[]>([''], [minArrayLengthValidator(1)]),
|
||||
userObjectClassesList: new FormControl<string[]>([''], [minArrayLengthValidator(1)]),
|
||||
timeout: new FormControl<number>(0),
|
||||
startTls: new FormControl(false),
|
||||
startTls: new FormControl<boolean>(false),
|
||||
});
|
||||
|
||||
this.authService
|
||||
@@ -112,6 +111,7 @@ export class ProviderLDAPComponent {
|
||||
if (this.id) {
|
||||
this.getData(this.id);
|
||||
this.bindPassword?.setValidators([]);
|
||||
this.bindPassword?.updateValueAndValidity();
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -125,12 +125,25 @@ export class ProviderLDAPComponent {
|
||||
this.service
|
||||
.getProviderByID(req)
|
||||
.then((resp) => {
|
||||
this.provider = resp.idp;
|
||||
this.loading = false;
|
||||
if (this.provider?.config?.ldap) {
|
||||
this.form.patchValue(this.provider.config.ldap);
|
||||
if (resp.idp) {
|
||||
this.provider = resp.idp;
|
||||
this.loading = false;
|
||||
|
||||
this.name?.setValue(this.provider.name);
|
||||
this.timeout?.setValue(this.provider.config.ldap.timeout?.seconds);
|
||||
|
||||
const config = this.provider?.config?.ldap;
|
||||
if (config) {
|
||||
this.serversList?.setValue(config.serversList);
|
||||
this.startTls?.setValue(config.startTls);
|
||||
this.baseDn?.setValue(config.baseDn);
|
||||
this.bindDn?.setValue(config.bindDn);
|
||||
this.userBase?.setValue(config.userBase);
|
||||
this.userObjectClassesList?.setValue(config.userObjectClassesList);
|
||||
this.userFiltersList?.setValue(config.userFiltersList);
|
||||
if (this.provider?.config?.ldap?.timeout?.seconds) {
|
||||
this.timeout?.setValue(this.provider?.config?.ldap?.timeout?.seconds);
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
.catch((error) => {
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
@use '@angular/material' as mat;
|
||||
|
||||
@mixin identity-provider-theme($theme) {
|
||||
$is-dark-theme: map-get($theme, is-dark);
|
||||
$background: map-get($theme, background);
|
||||
|
||||
.identity-provider-desc {
|
||||
font-size: 14px;
|
||||
@@ -44,6 +47,14 @@
|
||||
display: block;
|
||||
max-width: 400px;
|
||||
|
||||
&.pwd {
|
||||
display: none;
|
||||
}
|
||||
|
||||
&.pwd.show {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.name-hint {
|
||||
font-size: 12px;
|
||||
}
|
||||
@@ -63,6 +74,10 @@
|
||||
}
|
||||
}
|
||||
|
||||
.string-list-component-wrapper {
|
||||
max-width: 400px;
|
||||
}
|
||||
|
||||
.identity-provider-content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
Reference in New Issue
Block a user