diff --git a/console/src/app/pages/orgs/org-create/org-create.component.html b/console/src/app/pages/orgs/org-create/org-create.component.html index 064bddce9..60aeccf55 100644 --- a/console/src/app/pages/orgs/org-create/org-create.component.html +++ b/console/src/app/pages/orgs/org-create/org-create.component.html @@ -12,11 +12,11 @@

{{'ORG.PAGES.ORGDETAIL_TITLE' | translate}}

- + {{ 'ORG_DETAIL.DETAIL.NAME' | translate }} - + {{ 'ORG_DETAIL.DETAIL.DOMAIN' | translate }} @@ -122,7 +122,8 @@

{{ 'USER.CREATE.PASSWORDSECTION' | translate }}

- + diff --git a/console/src/app/pages/orgs/org-create/org-create.component.scss b/console/src/app/pages/orgs/org-create/org-create.component.scss index 69de66ea4..1365af707 100644 --- a/console/src/app/pages/orgs/org-create/org-create.component.scss +++ b/console/src/app/pages/orgs/org-create/org-create.component.scss @@ -156,3 +156,8 @@ h1 { flex-basis: 100%; margin: .5rem; } + +.complexity-view { + width: 100%; + margin: 0 .5rem; +} diff --git a/console/src/app/pages/orgs/org-create/org-create.component.ts b/console/src/app/pages/orgs/org-create/org-create.component.ts index ceede0ecf..1e958adf0 100644 --- a/console/src/app/pages/orgs/org-create/org-create.component.ts +++ b/console/src/app/pages/orgs/org-create/org-create.component.ts @@ -89,8 +89,12 @@ export class OrgCreateComponent { registerUserRequest.setLastName(this.lastName?.value); registerUserRequest.setNickName(this.nickName?.value); registerUserRequest.setGender(this.gender?.value); - registerUserRequest.setPassword(this.password?.value); registerUserRequest.setPreferredLanguage(this.preferredLanguage?.value); + + if (this.usePassword && this.password) { + registerUserRequest.setPassword(this.password?.value); + } + this.adminService .SetUpOrg(createOrgRequest, registerUserRequest) .then((data: OrgSetUpResponse) => { diff --git a/console/src/app/pages/projects/apps/app-create/app-create.component.ts b/console/src/app/pages/projects/apps/app-create/app-create.component.ts index 7da973a54..0e05a5c01 100644 --- a/console/src/app/pages/projects/apps/app-create/app-create.component.ts +++ b/console/src/app/pages/projects/apps/app-create/app-create.component.ts @@ -102,8 +102,6 @@ export class AppCreateComponent implements OnInit, OnDestroy { this.oidcApp.responseTypesList = this.formresponseTypesList?.value; this.oidcApp.grantTypesList = this.formgrantTypesList?.value; this.oidcApp.authMethodType = this.formauthMethodType?.value; - - console.log(this.oidcApp); }); this.firstFormGroup = this.fb.group({ @@ -113,10 +111,8 @@ export class AppCreateComponent implements OnInit, OnDestroy { this.firstFormGroup.valueChanges.subscribe(value => { if (this.firstFormGroup.valid) { - console.log('change firstform', value); switch (value.applicationType) { case OIDCApplicationType.OIDCAPPLICATIONTYPE_NATIVE: - console.log('NATIVE'); this.oidcResponseTypes[0].checked = true; this.oidcApp.responseTypesList = [OIDCResponseType.OIDCRESPONSETYPE_CODE]; @@ -128,8 +124,6 @@ export class AppCreateComponent implements OnInit, OnDestroy { this.postRedirectControl = new FormControl('', [nativeValidator as ValidatorFn]); break; case OIDCApplicationType.OIDCAPPLICATIONTYPE_WEB: - console.log('WEB'); - this.oidcAuthMethodType[0].disabled = false; this.oidcAuthMethodType[1].disabled = true; // NONE DISABLED this.oidcAuthMethodType[2].disabled = false; // POST POSSIBLE @@ -147,8 +141,6 @@ export class AppCreateComponent implements OnInit, OnDestroy { this.postRedirectControl = new FormControl('', [webValidator as ValidatorFn]); break; case OIDCApplicationType.OIDCAPPLICATIONTYPE_USER_AGENT: - console.log('USERAGENT'); - this.oidcResponseTypes[0].checked = true; this.oidcApp.responseTypesList = [OIDCResponseType.OIDCRESPONSETYPE_CODE]; diff --git a/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-grid/granted-project-grid.component.ts b/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-grid/granted-project-grid.component.ts index 2e8cef6b2..1441587c6 100644 --- a/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-grid/granted-project-grid.component.ts +++ b/console/src/app/pages/projects/granted-projects/granted-project-list/granted-project-grid/granted-project-grid.component.ts @@ -2,8 +2,9 @@ import { animate, animateChild, query, stagger, style, transition, trigger } fro import { SelectionModel } from '@angular/cdk/collections'; import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; import { Router } from '@angular/router'; +import { Org } from 'src/app/proto/generated/auth_pb'; import { ProjectGrantView, ProjectState, ProjectType } from 'src/app/proto/generated/management_pb'; -import { AuthService } from 'src/app/services/auth.service'; +import { StorageKey, StorageService } from 'src/app/services/storage.service'; @Component({ selector: 'app-granted-project-grid', @@ -41,7 +42,7 @@ export class GrantedProjectGridComponent implements OnChanges { public ProjectState: any = ProjectState; public ProjectType: any = ProjectType; - constructor(private authService: AuthService, private router: Router) { + constructor(private storage: StorageService, private router: Router) { this.selection.changed.subscribe(selection => { this.setPrefixedItem('pinned-granted-projects', JSON.stringify( this.selection.selected.map(item => item.projectId), @@ -90,13 +91,13 @@ export class GrantedProjectGridComponent implements OnChanges { } private async getPrefixedItem(key: string): Promise { - const prefix = (await this.authService.GetActiveOrg()).id; - return localStorage.getItem(`${prefix}:${key}`); + const org = this.storage.getItem(StorageKey.organization) as Org.AsObject; + return localStorage.getItem(`${org.id}:${key}`); } private async setPrefixedItem(key: string, value: any): Promise { - const prefix = (await this.authService.GetActiveOrg()).id; - return localStorage.setItem(`${prefix}:${key}`, value); + const org = this.storage.getItem(StorageKey.organization) as Org.AsObject; + return localStorage.setItem(`${org.id}:${key}`, value); } public navigateToProject(projectId: string, id: string, event: any): void { diff --git a/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-grid/owned-project-grid.component.ts b/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-grid/owned-project-grid.component.ts index 094720c22..ac6be8881 100644 --- a/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-grid/owned-project-grid.component.ts +++ b/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-grid/owned-project-grid.component.ts @@ -2,8 +2,10 @@ import { animate, animateChild, keyframes, query, stagger, style, transition, tr import { SelectionModel } from '@angular/cdk/collections'; import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; import { Router } from '@angular/router'; +import { Org } from 'src/app/proto/generated/auth_pb'; import { ProjectState, ProjectType, ProjectView } from 'src/app/proto/generated/management_pb'; import { AuthService } from 'src/app/services/auth.service'; +import { StorageKey, StorageService } from 'src/app/services/storage.service'; @Component({ selector: 'app-owned-project-grid', @@ -47,7 +49,7 @@ export class OwnedProjectGridComponent implements OnChanges { public ProjectState: any = ProjectState; public ProjectType: any = ProjectType; - constructor(private router: Router, private authService: AuthService) { + constructor(private router: Router, private authService: AuthService, private storage: StorageService) { this.selection.changed.subscribe(selection => { this.setPrefixedItem('pinned-projects', JSON.stringify( this.selection.selected.map(item => item.projectId), @@ -87,7 +89,6 @@ export class OwnedProjectGridComponent implements OnChanges { const array: string[] = JSON.parse(storageEntry); const toSelect: ProjectView.AsObject[] = this.items.filter((item, index) => { if (array.includes(item.projectId)) { - // this.notPinned.splice(index, 1); return true; } }); @@ -104,13 +105,13 @@ export class OwnedProjectGridComponent implements OnChanges { } private async getPrefixedItem(key: string): Promise { - const prefix = (await this.authService.GetActiveOrg()).id; - return localStorage.getItem(`${prefix}:${key}`); + const org = this.storage.getItem(StorageKey.organization) as Org.AsObject; + return localStorage.getItem(`${org.id}:${key}`); } private async setPrefixedItem(key: string, value: any): Promise { - const prefix = (await this.authService.GetActiveOrg()).id; - return localStorage.setItem(`${prefix}:${key}`, value); + const org = this.storage.getItem(StorageKey.organization) as Org.AsObject; + return localStorage.setItem(`${org.id}:${key}`, value); } public navigateToProject(id: string, event: any): void { diff --git a/console/src/app/pages/projects/project-role-create/project-role-create.component.ts b/console/src/app/pages/projects/project-role-create/project-role-create.component.ts index 3b4cf59f4..85e6981c3 100644 --- a/console/src/app/pages/projects/project-role-create/project-role-create.component.ts +++ b/console/src/app/pages/projects/project-role-create/project-role-create.component.ts @@ -84,7 +84,6 @@ export class ProjectRoleCreateComponent implements OnInit, OnDestroy { } public addRole(): void { - console.log(this.formArray.value); const rolesToAdd: ProjectRoleAdd[] = this.formArray.value.map((element: any) => { const role = new ProjectRoleAdd(); role.setKey(element.key); diff --git a/console/src/app/services/auth.service.ts b/console/src/app/services/auth.service.ts index faebbf344..e7b38ed48 100644 --- a/console/src/app/services/auth.service.ts +++ b/console/src/app/services/auth.service.ts @@ -45,8 +45,7 @@ export class AuthService { ), ).pipe( take(1), - mergeMap(token => { - console.log(token); + mergeMap(() => { return from(this.userService.GetMyUserProfile().then(userprofile => userprofile.toObject())); }), finalize(() => { @@ -55,7 +54,6 @@ export class AuthService { ); this.activeOrgChanged.subscribe(() => { - console.log('org change'); this.loadPermissions(); }); }