new initialization process, keycloak update 24.0.4

bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.ts

@@ -9,6 +9,7 @@ import { BusinessListing, User } from '../../../../../../bizmatch-server/src/mod
 import { KeycloakUser, ListingCriteria, MailInfo } from '../../../../../../bizmatch-server/src/models/main.model';
 import { environment } from '../../../../environments/environment';
 import { HistoryService } from '../../../services/history.service';
+import { KeycloakService } from '../../../services/keycloak.service';
 import { ListingsService } from '../../../services/listings.service';
 import { MailService } from '../../../services/mail.service';
 import { SelectOptionsService } from '../../../services/select-options.service';
@@ -64,6 +65,7 @@ export class DetailsBusinessListingComponent {
     private messageService: MessageService,
     private sanitizer: DomSanitizer,
     public historyService: HistoryService,
+    public keycloakService: KeycloakService,
   ) {
     this.router.events.subscribe(event => {
       if (event instanceof NavigationEnd) {
@@ -71,9 +73,7 @@ export class DetailsBusinessListingComponent {
       }
     });
     this.mailinfo = { sender: {}, userId: '', email: '', url: environment.mailinfoUrl };
-    this.userService.getUserObservable().subscribe(user => {
-      this.user = user;
-    });
+    this.user;
     this.criteria = onChange(getCriteriaStateObject(), getSessionStorageHandler);
   }
 
@@ -84,7 +84,7 @@ export class DetailsBusinessListingComponent {
   }
 
   isAdmin() {
-    return this.userService.hasAdminRole();
+    return this.keycloakService.getUserRoles(true).includes('ADMIN');
   }
   async mail() {
     this.mailinfo.email = this.listingUser.email;

bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.ts

@@ -9,12 +9,13 @@ import { CommercialPropertyListing, User } from '../../../../../../bizmatch-serv
 import { ErrorResponse, KeycloakUser, ListingCriteria, MailInfo } from '../../../../../../bizmatch-server/src/models/main.model';
 import { environment } from '../../../../environments/environment';
 import { HistoryService } from '../../../services/history.service';
+import { KeycloakService } from '../../../services/keycloak.service';
 import { ListingsService } from '../../../services/listings.service';
 import { MailService } from '../../../services/mail.service';
 import { SelectOptionsService } from '../../../services/select-options.service';
 import { UserService } from '../../../services/user.service';
 import { SharedModule } from '../../../shared/shared/shared.module';
-import { getCriteriaStateObject, getSessionStorageHandler } from '../../../utils/utils';
+import { getCriteriaStateObject, getSessionStorageHandler, map2User } from '../../../utils/utils';
 
 @Component({
   selector: 'app-details-commercial-property-listing',
@@ -65,22 +66,23 @@ export class DetailsCommercialPropertyListingComponent {
     private messageService: MessageService,
     private sanitizer: DomSanitizer,
     public historyService: HistoryService,
+    public keycloakService: KeycloakService,
   ) {
     this.mailinfo = { sender: {}, userId: '', email: '', url: environment.mailinfoUrl };
-    this.userService.getUserObservable().subscribe(user => {
-      this.user = user;
-    });
+
     this.criteria = onChange(getCriteriaStateObject(), getSessionStorageHandler);
   }
 
   async ngOnInit() {
+    const token = await this.keycloakService.getToken();
+    this.user = map2User(token);
     this.listing = await lastValueFrom(this.listingsService.getListingById(this.id, 'commercialProperty'));
     this.propertyImages = await this.listingsService.getPropertyImages(this.listing.id);
     this.listingUser = await this.userService.getById(this.listing.userId);
     this.description = this.sanitizer.bypassSecurityTrustHtml(this.listing.description);
   }
   isAdmin() {
-    return this.userService.hasAdminRole();
+    return this.keycloakService.getUserRoles(true).includes('ADMIN');
   }
   async mail() {
     this.mailinfo.email = this.listingUser.email;

bizmatch/src/app/pages/details/details-user/details-user.component.html

@@ -138,7 +138,7 @@
           </ul>
         </div>
       </div>
-      @if( user?.email===(user$| async)?.email || isAdmin()){
+      @if( user?.email===keycloakUser?.email || isAdmin()){
       <button pButton pRipple label="Edit" icon="pi pi-file-edit" class="w-auto" [routerLink]="['/account', user.id]"></button>
       }
     </div>

bizmatch/src/app/pages/details/details-user/details-user.component.ts

@@ -9,10 +9,12 @@ import { KeycloakUser, ListingCriteria } from '../../../../../../bizmatch-server
 import { environment } from '../../../../environments/environment';
 import { HistoryService } from '../../../services/history.service';
 import { ImageService } from '../../../services/image.service';
+import { KeycloakService } from '../../../services/keycloak.service';
 import { ListingsService } from '../../../services/listings.service';
 import { SelectOptionsService } from '../../../services/select-options.service';
 import { UserService } from '../../../services/user.service';
 import { SharedModule } from '../../../shared/shared/shared.module';
+import { map2User } from '../../../utils/utils';
 
 @Component({
   selector: 'app-details-user',
@@ -26,6 +28,7 @@ export class DetailsUserComponent {
   private id: string | undefined = this.activatedRoute.snapshot.params['id'] as string | undefined;
   user: User;
   user$: Observable<KeycloakUser>;
+  keycloakUser: KeycloakUser;
   environment = environment;
   criteria: ListingCriteria;
   businessListings: BusinessListing[];
@@ -44,6 +47,7 @@ export class DetailsUserComponent {
     private sanitizer: DomSanitizer,
     private imageService: ImageService,
     public historyService: HistoryService,
+    public keycloakService: KeycloakService,
   ) {}
 
   async ngOnInit() {
@@ -53,12 +57,14 @@ export class DetailsUserComponent {
     // Zuweisen der Ergebnisse zu den Member-Variablen der Klasse
     this.businessListings = results[0];
     this.commercialPropListings = results[1];
-    this.user$ = this.userService.getUserObservable();
+    //this.user$ = this.userService.getUserObservable();
+    const token = await this.keycloakService.getToken();
+    this.keycloakUser = map2User(token);
     this.companyOverview = this.sanitizer.bypassSecurityTrustHtml(this.user.companyOverview);
     this.offeredServices = this.sanitizer.bypassSecurityTrustHtml(this.user.offeredServices);
   }
 
   isAdmin() {
-    return this.userService.hasAdminRole();
+    return this.keycloakService.getUserRoles(true).includes('ADMIN');
   }
 }