From f0cc12238e228b1faef3a69544d84b3f73bcd4bb Mon Sep 17 00:00:00 2001
From: Max Peintner <max@caos.ch>
Date: Wed, 7 Apr 2021 11:32:39 +0200
Subject: [PATCH] fix(console): some bugs (#1538)

* fix feature pipe, only org check

* fix user, email update

* fix roles
---
 .../login-policy/login-policy.component.html  | 31 ++++++++++++-------
 .../policy-grid/policy-grid.component.html    | 13 +++++---
 .../granted-project-grid.component.html       |  6 ++--
 .../granted-project-list.component.html       | 16 +++++-----
 .../granted-project-list.component.ts         |  1 +
 .../user-grant-create.component.html          |  6 ++--
 .../user-grant-create.component.ts            | 13 ++++----
 .../auth-user-detail.component.ts             |  2 +-
 .../user-detail/user-detail.component.ts      |  1 +
 console/src/app/services/grpc-auth.service.ts |  2 +-
 console/src/app/services/mgmt.service.ts      |  4 +++
 console/src/assets/environment.json           |  2 +-
 12 files changed, 57 insertions(+), 40 deletions(-)

diff --git a/console/src/app/modules/policies/login-policy/login-policy.component.html b/console/src/app/modules/policies/login-policy/login-policy.component.html
index fd7969579..00d3d957c 100644
--- a/console/src/app/modules/policies/login-policy/login-policy.component.html
+++ b/console/src/app/modules/policies/login-policy/login-policy.component.html
@@ -38,7 +38,8 @@
                 {{'POLICY.DATA.ALLOWREGISTER' | translate}}
             </mat-slide-toggle>
 
-            <ng-container *ngIf="(['login_policy.registration'] | hasFeature | async) == false; else regInfo">
+            <ng-container
+                *ngIf="serviceType == PolicyComponentServiceType.MGMT && (['login_policy.registration'] | hasFeature | async) == false; else regInfo">
                 <cnsl-info-section type="WARN">{{'FEATURES.NOTAVAILABLE' | translate: ({value:
                     'login_policy.registration'})}}
                 </cnsl-info-section>
@@ -72,13 +73,14 @@
             <cnsl-form-field class="form-field" label="Access Code" required="true">
                 <cnsl-label>{{'LOGINPOLICY.PASSWORDLESS' | translate}}</cnsl-label>
                 <mat-select [(ngModel)]="loginData.passwordlessType"
-                    [disabled]="disabled || (['login_policy.passwordless'] | hasFeature | async) == false">
+                    [disabled]="disabled || (serviceType == PolicyComponentServiceType.MGMT && (['login_policy.passwordless'] | hasFeature | async) == false)">
                     <mat-option *ngFor="let pt of passwordlessTypes" [value]="pt">
                         {{'LOGINPOLICY.PASSWORDLESSTYPE.'+pt | translate}}
                     </mat-option>
                 </mat-select>
             </cnsl-form-field>
-            <ng-container *ngIf="(['login_policy.passwordless'] | hasFeature | async) == false">
+            <ng-container
+                *ngIf="serviceType == PolicyComponentServiceType.MGMT && (['login_policy.passwordless'] | hasFeature | async) == false">
                 <cnsl-info-section type="WARN">{{'FEATURES.NOTAVAILABLE' | translate: ({value:
                     'login_policy.passwordless'})}}
                 </cnsl-info-section>
@@ -94,7 +96,8 @@
     <ng-container *ngIf="!isDefault">
         <h3 class="subheader">{{ 'MFA.LIST.MULTIFACTORTITLE' | translate }}</h3>
         <p class="subdesc">{{ 'MFA.LIST.MULTIFACTORDESCRIPTION' | translate }}</p>
-        <ng-container *ngIf="(['login_policy.factors'] | hasFeature | async) == false">
+        <ng-container
+            *ngIf="serviceType == PolicyComponentServiceType.MGMT && (['login_policy.factors'] | hasFeature | async) == false">
             <cnsl-info-section type="WARN">{{'FEATURES.NOTAVAILABLE' | translate: ({value: 'login_policy.factors'})}}
             </cnsl-info-section>
         </ng-container>
@@ -105,29 +108,33 @@
 
         <h3 class="subheader">{{ 'MFA.LIST.SECONDFACTORTITLE' | translate }}</h3>
         <p class="subdesc">{{ 'MFA.LIST.SECONDFACTORDESCRIPTION' | translate }}</p>
-        <ng-container *ngIf="(['login_policy.factors'] | hasFeature | async) == false">
+        <ng-container
+            *ngIf="serviceType == PolicyComponentServiceType.MGMT && (['login_policy.factors'] | hasFeature | async) == false">
             <cnsl-info-section type="WARN">{{'FEATURES.NOTAVAILABLE' | translate: ({value: 'login_policy.factors'})}}
             </cnsl-info-section>
         </ng-container>
         <app-mfa-table [service]="service" [serviceType]="serviceType"
             [componentType]="LoginMethodComponentType.SecondFactor"
-            [disabled]="([serviceType == PolicyComponentServiceType.ADMIN ? 'iam.policy.write' : serviceType == PolicyComponentServiceType.MGMT ? 'policy.write' : ''] | hasRole | async) == false || ((['login_policy.factors'] | hasFeature | async) == false)">
+            [disabled]="([serviceType == PolicyComponentServiceType.ADMIN ? 'iam.policy.write' : serviceType == PolicyComponentServiceType.MGMT ? 'policy.write' : ''] | hasRole | async) == false || (['login_policy.factors'] | hasFeature | async) == false">
         </app-mfa-table>
     </ng-container>
 
     <h3 class="subheader">{{'LOGINPOLICY.IDPS' | translate}}</h3>
 
-    <ng-container *ngIf="(['login_policy.idp'] | hasFeature | async) == false">
+    <ng-container
+        *ngIf="serviceType == PolicyComponentServiceType.MGMT && (['login_policy.idp'] | hasFeature | async) == false">
         <cnsl-info-section type="WARN">{{'FEATURES.NOTAVAILABLE' | translate: ({value:
             'login_policy.idp'})}}
         </cnsl-info-section>
     </ng-container>
 
     <div class="idps">
-        <div class="idp" [ngClass]="{'disabled': disabled || (['login_policy.idp'] | hasFeature | async) == false}"
+        <div class="idp"
+            [ngClass]="{'disabled': disabled || (serviceType == PolicyComponentServiceType.MGMT && (['login_policy.idp'] | hasFeature | async) == false)}"
             *ngFor="let idp of idps">
-            <button [disabled]="disabled || (['login_policy.idp'] | hasFeature | async) == false" mat-icon-button
-                (click)="removeIdp(idp)" class="rm">
+            <button
+                [disabled]="disabled || (serviceType == PolicyComponentServiceType.MGMT && (['login_policy.idp'] | hasFeature | async) == false)"
+                mat-icon-button (click)="removeIdp(idp)" class="rm">
                 <mat-icon matTooltip="{{'ACTIONS.REMOVE' | translate}}">
                     remove_circle</mat-icon>
             </button>
@@ -143,8 +150,8 @@
                 </div>
             </div>
         </div>
-        <div *ngIf="!disabled && (['login_policy.idp'] | hasFeature | async)" class="new-idp" (click)="openDialog()"
-            matRipple>
+        <div *ngIf="!disabled && (serviceType == PolicyComponentServiceType.MGMT && (['login_policy.idp'] | hasFeature | async))"
+            class="new-idp" (click)="openDialog()" matRipple>
             <mat-icon>add</mat-icon>
         </div>
     </div>
diff --git a/console/src/app/modules/policy-grid/policy-grid.component.html b/console/src/app/modules/policy-grid/policy-grid.component.html
index f0ad7b8be..fe19598ea 100644
--- a/console/src/app/modules/policy-grid/policy-grid.component.html
+++ b/console/src/app/modules/policy-grid/policy-grid.component.html
@@ -56,8 +56,8 @@
 
             <p class="desc">
                 {{'POLICY.IAM_POLICY.DESCRIPTION' | translate}}</p>
-
-            <cnsl-info-section class="warn" *ngIf="(['password_complexity_policy'] | hasFeature | async) == false"
+            <cnsl-info-section class="warn"
+                *ngIf="type == PolicyGridType.ORG && (['password_complexity_policy'] | hasFeature | async) == false"
                 type="WARN">
                 {{'FEATURES.NOTAVAILABLE' | translate: ({value:
                 'password_complexity_policy'})}}
@@ -66,7 +66,8 @@
             <span class="fill-space"></span>
             <div class="btn-wrapper">
                 <ng-template appHasRole [appHasRole]="['iam.policy.write']">
-                    <button [disabled]="(['password_complexity_policy'] | hasFeature | async) == false"
+                    <button
+                        [disabled]="type == PolicyGridType.ORG && (['password_complexity_policy'] | hasFeature | async) == false"
                         [routerLink]="[type == PolicyGridType.IAM ? '/iam' : type == PolicyGridType.ORG ?  '/org' : '','policy', PolicyComponentType.IAM ]"
                         mat-stroked-button>{{'POLICY.BTN_EDIT' | translate}}</button>
                 </ng-template>
@@ -117,7 +118,8 @@
                 <p class="desc">
                     {{'POLICY.LABEL.DESCRIPTION' | translate}}</p>
 
-                <cnsl-info-section class="warn" *ngIf="(['label_policy'] | hasFeature | async) == false" type="WARN">
+                <cnsl-info-section class="warn"
+                    *ngIf="type == PolicyGridType.ORG && (['label_policy'] | hasFeature | async) == false" type="WARN">
                     {{'FEATURES.NOTAVAILABLE' | translate: ({value:
                     'label_policy'})}}
                 </cnsl-info-section>
@@ -127,7 +129,8 @@
                     <ng-template appHasRole [appHasRole]="['iam.policy.write']">
                         <button
                             [routerLink]="[type == PolicyGridType.IAM ? '/iam' : type == PolicyGridType.ORG ?  '/org' : '','policy', PolicyComponentType.LABEL ]"
-                            mat-stroked-button [disabled]="(['label_policy'] | hasFeature | async) == false">
+                            mat-stroked-button
+                            [disabled]="type == PolicyGridType.ORG && (['label_policy'] | hasFeature | async) == false">
                             {{'POLICY.BTN_EDIT' | translate}}</button>
                     </ng-template>
                 </div>
diff --git a/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-grid/granted-project-grid.component.html b/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-grid/granted-project-grid.component.html
index 55bce1d57..95ad64496 100644
--- a/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-grid/granted-project-grid.component.html
+++ b/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-grid/granted-project-grid.component.html
@@ -17,7 +17,7 @@
                 item.details.changeDate | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm'
                 }}</span>
             <span class="name" *ngIf="item.projectName">{{ item.projectName }}</span>
-            <span class="description" *ngIf="item.resourceOwnerName">{{item.resourceOwnerName}}</span>
+            <span class="description" *ngIf="item.projectOwnerName">{{item.projectOwnerName}}</span>
             <span *ngIf="item.details.creationDate" class="created">{{'PROJECT.PAGES.CREATEDON' | translate}}
                 {{ item.details.creationDate | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm'
                 }}</span>
@@ -25,8 +25,6 @@
         </div>
 
         <template [ngTemplateOutlet]="toggleButton" [ngTemplateOutletContext]="{key: item}"></template>
-
-
     </div>
 
 </div>
@@ -42,7 +40,7 @@
                 item.details.changeDate | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm'
                 }}</span>
             <span class="name" *ngIf="item.projectName">{{ item.projectName }}</span>
-            <span class="description" *ngIf="item.resourceOwnerName">{{item.resourceOwnerName}}</span>
+            <span class="description" *ngIf="item.projectOwnerName">{{item.projectOwnerName}}</span>
             <span *ngIf="item.details.creationDate" class="created">{{'PROJECT.PAGES.CREATEDON' | translate}}
                 {{ item.details.creationDate | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm' }}</span>
             <span class="fill-space"></span>
diff --git a/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-list.component.html b/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-list.component.html
index 98b2666f6..c64f07966 100644
--- a/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-list.component.html
+++ b/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-list.component.html
@@ -37,20 +37,21 @@
                 <ng-container matColumnDef="resourceOwnerName">
                     <th mat-header-cell *matHeaderCellDef> {{ 'PROJECT.TABLE.RESOURCEOWNER' | translate }} </th>
                     <td class="pointer" mat-cell *matCellDef="let project">
-                        {{project.resourceOwnerName}} </td>
+                        {{project.projectOwnerName}} </td>
                 </ng-container>
 
                 <ng-container matColumnDef="state">
                     <th mat-header-cell *matHeaderCellDef> {{ 'PROJECT.TABLE.STATE' | translate }} </th>
-                    <td mat-cell *matCellDef="let project"><span
-                            *ngIf="project.state">{{'PROJECT.STATE.'+project.state | translate}}</span></td>
+                    <td mat-cell *matCellDef="let project"><span *ngIf="project.state">{{'PROJECT.STATE.'+project.state
+                            | translate}}</span></td>
                 </ng-container>
 
                 <ng-container matColumnDef="creationDate">
                     <th mat-header-cell *matHeaderCellDef> {{ 'PROJECT.TABLE.CREATIONDATE' | translate }} </th>
                     <td mat-cell *matCellDef="let project">
-                        <span
-                            *ngIf="project.creationDate">{{project.creationDate | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm'}}</span>
+                        <span *ngIf="project.details.creationDate">{{project.details.creationDate | timestampToDate |
+                            localizedDate:
+                            'EEE dd. MMM, HH:mm'}}</span>
                     </td>
                 </ng-container>
 
@@ -58,8 +59,9 @@
                 <ng-container matColumnDef="changeDate">
                     <th mat-header-cell *matHeaderCellDef> {{ 'PROJECT.TABLE.CHANGEDATE' | translate }} </th>
                     <td mat-cell *matCellDef="let project">
-                        <span
-                            *ngIf="project.changeDate">{{project.changeDate | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm'}}</span>
+                        <span *ngIf="project.details.changeDate">
+                            {{project.details.changeDate
+                            | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm'}}</span>
                     </td>
                 </ng-container>
 
diff --git a/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-list.component.ts b/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-list.component.ts
index 7cfacf24d..7d1cf8058 100644
--- a/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-list.component.ts
+++ b/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-list.component.ts
@@ -101,6 +101,7 @@ export class GrantedProjectListComponent implements OnInit, OnDestroy {
                 this.grid = false;
             }
             this.dataSource.data = this.grantedProjectList;
+            console.log(resp.resultList);
 
             this.loadingSubject.next(false);
         }).catch(error => {
diff --git a/console/src/app/pages/user-grant-create/user-grant-create.component.html b/console/src/app/pages/user-grant-create/user-grant-create.component.html
index f9e499ab4..0a09562e6 100644
--- a/console/src/app/pages/user-grant-create/user-grant-create.component.html
+++ b/console/src/app/pages/user-grant-create/user-grant-create.component.html
@@ -37,7 +37,7 @@
     <ng-container *ngIf="currentCreateStep === STEPS">
         <h1>{{'PROJECT.GRANT.CREATE.SEL_ROLES' | translate}}</h1>
         <ng-container
-            *ngIf="(projectId && (context === UserGrantContext.OWNED_PROJECT || ((context === UserGrantContext.USER || context === UserGrantContext.NONE) && $any(project)?.id == undefined)))">
+            *ngIf="$any(project)?.id && (context === UserGrantContext.OWNED_PROJECT || context === UserGrantContext.USER || context === UserGrantContext.NONE)">
             <app-card>
                 <app-project-roles (changedSelection)="selectRoles($event)" [projectId]="projectId">
                 </app-project-roles>
@@ -45,11 +45,11 @@
         </ng-container>
 
         <ng-container
-            *ngIf="(context === UserGrantContext.GRANTED_PROJECT || ((context === UserGrantContext.USER || context === UserGrantContext.NONE) && $any(project)?.id)) && grantRolesKeyList">
+            *ngIf="$any(project)?.projectId && (context === UserGrantContext.GRANTED_PROJECT || context === UserGrantContext.USER || context === UserGrantContext.NONE) && grantedRoleKeysList">
             <cnsl-form-field class="form-field" appearance="outline">
                 <cnsl-label>{{ 'PROJECT.GRANT.ROLENAMESLIST' | translate }}</cnsl-label>
                 <mat-select multiple (selectionChange)="rolesList = $event.value">
-                    <mat-option *ngFor="let role of grantRolesKeyList" [value]="role">
+                    <mat-option *ngFor="let role of grantedRoleKeysList" [value]="role">
                         {{role}}
                     </mat-option>
                 </mat-select>
diff --git a/console/src/app/pages/user-grant-create/user-grant-create.component.ts b/console/src/app/pages/user-grant-create/user-grant-create.component.ts
index 89f3a5aa4..c90dde5b2 100644
--- a/console/src/app/pages/user-grant-create/user-grant-create.component.ts
+++ b/console/src/app/pages/user-grant-create/user-grant-create.component.ts
@@ -37,7 +37,7 @@ export class UserGrantCreateComponent implements OnDestroy {
 
     public UserGrantContext: any = UserGrantContext;
 
-    public grantRolesKeyList: string[] = [];
+    public grantedRoleKeysList: string[] = [];
 
     public user!: User.AsObject;
     public UserTarget: any = UserTarget;
@@ -66,7 +66,7 @@ export class UserGrantCreateComponent implements OnDestroy {
                 this.context = UserGrantContext.GRANTED_PROJECT;
                 this.mgmtService.getGrantedProjectByID(this.projectId, this.grantId).then(resp => {
                     if (resp.grantedProject?.grantedRoleKeysList) {
-                        this.grantRolesKeyList = resp.grantedProject?.grantedRoleKeysList;
+                        this.grantedRoleKeysList = resp.grantedProject?.grantedRoleKeysList;
                     }
                 }).catch((error: any) => {
                     this.toast.showError(error);
@@ -139,10 +139,11 @@ export class UserGrantCreateComponent implements OnDestroy {
                 });
                 break;
             case UserGrantContext.NONE:
+                console.log('none');
                 let tempGrantId;
 
-                if ((this.project as GrantedProject.AsObject)?.projectId) {
-                    tempGrantId = (this.project as GrantedProject.AsObject).projectId;
+                if ((this.project as GrantedProject.AsObject)?.grantId) {
+                    tempGrantId = (this.project as GrantedProject.AsObject).grantId;
                 }
 
                 this.userService.addUserGrant(
@@ -158,13 +159,13 @@ export class UserGrantCreateComponent implements OnDestroy {
                 });
                 break;
         }
-
     }
 
     public selectProject(project: Project.AsObject | GrantedProject.AsObject | any): void {
         this.project = project;
         this.projectId = project.id || project.projectId;
-        this.grantRolesKeyList = project.roleKeysList ?? [];
+
+        this.grantedRoleKeysList = project.grantedRoleKeysList ?? [];
     }
 
     public selectUser(user: User.AsObject): void {
diff --git a/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-detail.component.ts b/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-detail.component.ts
index 562453582..3c396e5f8 100644
--- a/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-detail.component.ts
+++ b/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-detail.component.ts
@@ -85,7 +85,7 @@ export class AuthUserDetailComponent implements OnDestroy {
 
     public saveEmail(email: string): void {
         this.userService
-            .setMyPhone(email).then(() => {
+            .setMyEmail(email).then(() => {
                 this.toast.showInfo('USER.TOAST.EMAILSAVED', true);
                 if (this.user.human) {
                     const mailToSet = new Email();
diff --git a/console/src/app/pages/users/user-detail/user-detail/user-detail.component.ts b/console/src/app/pages/users/user-detail/user-detail/user-detail.component.ts
index 8bfd091c4..482835b48 100644
--- a/console/src/app/pages/users/user-detail/user-detail/user-detail.component.ts
+++ b/console/src/app/pages/users/user-detail/user-detail/user-detail.component.ts
@@ -90,6 +90,7 @@ export class UserDetailComponent implements OnInit {
                     this.user.human.profile.firstName,
                     this.user.human.profile.lastName,
                     this.user.human.profile.nickName,
+                    this.user.human.profile.displayName,
                     this.user.human.profile.preferredLanguage,
                     this.user.human.profile.gender)
                 .then(() => {
diff --git a/console/src/app/services/grpc-auth.service.ts b/console/src/app/services/grpc-auth.service.ts
index 93d764f3f..1b7e8739e 100644
--- a/console/src/app/services/grpc-auth.service.ts
+++ b/console/src/app/services/grpc-auth.service.ts
@@ -230,7 +230,7 @@ export class GrpcAuthService {
      */
     public canUseFeature(features: string[] | RegExp[]): Observable<boolean> {
         if (features && features.length > 0) {
-            return this.zitadelPermissions.pipe(switchMap(zFeatures => of(this.hasFeature(zFeatures, features))));
+            return this.zitadelFeatures.pipe(switchMap(zFeatures => of(this.hasFeature(zFeatures, features))));
         } else {
             return of(false);
         }
diff --git a/console/src/app/services/mgmt.service.ts b/console/src/app/services/mgmt.service.ts
index 252638a36..799faee6c 100644
--- a/console/src/app/services/mgmt.service.ts
+++ b/console/src/app/services/mgmt.service.ts
@@ -919,6 +919,7 @@ export class ManagementService {
         firstName?: string,
         lastName?: string,
         nickName?: string,
+        displayName?: string,
         preferredLanguage?: string,
         gender?: Gender
     ): Promise<UpdateHumanProfileResponse.AsObject> {
@@ -933,6 +934,9 @@ export class ManagementService {
         if (nickName) {
             req.setNickName(nickName);
         }
+        if (displayName) {
+            req.setDisplayName(displayName);
+        }
         if (gender) {
             req.setGender(gender);
         }
diff --git a/console/src/assets/environment.json b/console/src/assets/environment.json
index 79be3c987..0cf96248f 100644
--- a/console/src/assets/environment.json
+++ b/console/src/assets/environment.json
@@ -3,5 +3,5 @@
     "mgmtServiceUrl": "https://api.zitadel.io",
     "adminServiceUrl":"https://api.zitadel.io",
     "issuer": "https://issuer.zitadel.io",
-    "clientid": "100992085175427532@zitadel"
+    "clientid": "69234247558357051@zitadel"
 }