TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-10-20 11:23:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: compute usernames in auth views correctly after domain policy change (#4860)

Browse Source 
* fix: compute usernames in auth views correctly after domain policy change

* userloginmustbedomain hint

Co-authored-by: Max Peintner <max@caos.ch>
This commit is contained in:
Livio Spring
2022-12-09 13:10:20 +01:00
committed by GitHub
parent 33b213ffce
commit c5ebeea590
9 changed files with 84 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
console/src/app/modules/policies/domain-policy/domain-policy.component.html
View File

@@ -28,7 +28,7 @@
</button>
<!-- </ng-template> -->
<div class="content" *ngIf="domainData">
<div class="domain-policy-content" *ngIf="domainData">
<div class="row">
<mat-checkbox
color="primary"
@@ -51,6 +51,34 @@
</mat-checkbox>
</div>
<cnsl-info-section>
<div>
<span>{{ 'POLICY.DATA.USERLOGINMUSTBEDOMAIN_DESCRIPTION' | translate }}</span>
<div class="loginname-preview">
<div class="left-right">
<div *ngIf="domainData.userLoginMustBeDomain"><small>domain</small><span>acme.com</span></div>
<div *ngIf="domainData.userLoginMustBeDomain"><small>username</small><span>john</span></div>
<div *ngIf="domainData.userLoginMustBeDomain"><small>loginname</small><span>john@acme.com</span></div>
<div *ngIf="!domainData.userLoginMustBeDomain"><small>domain</small><span>acme.com</span></div>
<div *ngIf="!domainData.userLoginMustBeDomain"><small>username</small><span>john@acme.com</span></div>
<div *ngIf="!domainData.userLoginMustBeDomain"><small>loginname</small><span>john@acme.com</span></div>
</div>
<i class="las la-arrow-right"></i>
<div class="left-right">
<div *ngIf="domainData.userLoginMustBeDomain"><small>domain</small><span>acme.com</span></div>
<div *ngIf="domainData.userLoginMustBeDomain"><small>username</small><span>john@acme.com</span></div>
<div *ngIf="domainData.userLoginMustBeDomain"><small>loginname</small><span>john@acme.com</span></div>
<div *ngIf="!domainData.userLoginMustBeDomain"><small>domain</small><span>acme.com</span></div>
<div *ngIf="!domainData.userLoginMustBeDomain"><small>username</small><span>john</span></div>
<div *ngIf="!domainData.userLoginMustBeDomain"><small>loginname</small><span>john@acme.com</span></div>
</div>
</div>
</div>
</cnsl-info-section>
<div class="row">
<mat-checkbox
color="primary"

35
console/src/app/modules/policies/domain-policy/domain-policy.component.scss
View File

@@ -8,16 +8,18 @@
font-size: 14px;
}
.content {
.domain-policy-content {
padding-top: 1rem;
display: flex;
flex-direction: column;
width: 100%;
max-width: 700px;
.row {
display: flex;
align-items: center;
padding: 0.3rem 0;
margin-top: 1rem;
.left-desc {
font-size: 0.9rem;
@@ -32,6 +34,37 @@
align-items: center;
}
}
.loginname-preview {
margin: 1rem 0;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
.left-right {
display: flex;
flex-direction: row;
@media only screen and (max-width: 600px) {
flex-direction: column;
}
div {
display: flex;
flex-direction: column;
margin: 0.5rem;
small {
opacity: 0.9;
}
}
}
i {
margin: 0 1rem;
}
}
}
.btn-container {