remove keycloak

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

@@ -2,7 +2,6 @@ import { Component } from '@angular/core';
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
 import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
 import { LeafletModule } from '@bluehalo/ngx-leaflet';
-import { KeycloakService } from 'keycloak-angular';
 import { ShareButton } from 'ngx-sharebuttons/button';
 import { lastValueFrom } from 'rxjs';
 import { BusinessListing, EventTypeEnum, ShareByEMail, User } from '../../../../../../bizmatch-server/src/models/db.model';
@@ -22,7 +21,7 @@ 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 { createMailInfo, map2User } from '../../../utils/utils';
+import { createMailInfo, isAdmin, map2User } from '../../../utils/utils';
 // Import für Leaflet
 // Benannte Importe für Leaflet
 import { AuthService } from '../../../services/auth.service';
@@ -75,7 +74,6 @@ export class DetailsBusinessListingComponent extends BaseDetailsComponent {
     private mailService: MailService,
     private sanitizer: DomSanitizer,
     public historyService: HistoryService,
-    public keycloakService: KeycloakService,
     private validationMessagesService: ValidationMessagesService,
     private messageService: MessageService,
     private auditService: AuditService,
@@ -94,7 +92,6 @@ export class DetailsBusinessListingComponent extends BaseDetailsComponent {
   }
 
   async ngOnInit() {
-    // const token = await this.keycloakService.getToken();
     const token = await this.authService.getToken();
     this.keycloakUser = map2User(token);
     if (this.keycloakUser) {
@@ -119,7 +116,7 @@ export class DetailsBusinessListingComponent extends BaseDetailsComponent {
     this.validationMessagesService.clearMessages(); // Löschen Sie alle bestehenden Validierungsnachrichten
   }
   isAdmin() {
-    return this.keycloakService.getUserRoles(true).includes('ADMIN');
+    return isAdmin(this.keycloakUser.email); //this.keycloakService.getUserRoles(true).includes('ADMIN');
   }
   async mail() {
     try {

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

@@ -3,7 +3,6 @@ import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
 import { ActivatedRoute, Router } from '@angular/router';
 import { LeafletModule } from '@bluehalo/ngx-leaflet';
 import { faTimes } from '@fortawesome/free-solid-svg-icons';
-import { KeycloakService } from 'keycloak-angular';
 import { GalleryModule, ImageItem } from 'ng-gallery';
 import { ShareButton } from 'ngx-sharebuttons/button';
 import { lastValueFrom } from 'rxjs';
@@ -25,7 +24,7 @@ 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 { createMailInfo, map2User } from '../../../utils/utils';
+import { createMailInfo, isAdmin, map2User } from '../../../utils/utils';
 import { BaseDetailsComponent } from '../base-details.component';
 
 @Component({
@@ -78,7 +77,6 @@ export class DetailsCommercialPropertyListingComponent extends BaseDetailsCompon
     private mailService: MailService,
     private sanitizer: DomSanitizer,
     public historyService: HistoryService,
-    public keycloakService: KeycloakService,
     private imageService: ImageService,
     private ngZone: NgZone,
     private validationMessagesService: ValidationMessagesService,
@@ -92,7 +90,6 @@ export class DetailsCommercialPropertyListingComponent extends BaseDetailsCompon
   }
 
   async ngOnInit() {
-    // const token = await this.keycloakService.getToken();
     const token = await this.authService.getToken();
     this.keycloakUser = map2User(token);
     if (this.keycloakUser) {
@@ -143,7 +140,7 @@ export class DetailsCommercialPropertyListingComponent extends BaseDetailsCompon
     });
   }
   isAdmin() {
-    return this.keycloakService.getUserRoles(true).includes('ADMIN');
+    return isAdmin(this.keycloakUser.email);
   }
   async mail() {
     try {

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

@@ -1,7 +1,6 @@
 import { Component } from '@angular/core';
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
 import { ActivatedRoute, Router } from '@angular/router';
-import { KeycloakService } from 'keycloak-angular';
 import { Observable } from 'rxjs';
 import { BusinessListing, CommercialPropertyListing, User } from '../../../../../../bizmatch-server/src/models/db.model';
 import { KeycloakUser, emailToDirName } from '../../../../../../bizmatch-server/src/models/main.model';
@@ -13,7 +12,7 @@ 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 { formatPhoneNumber, map2User } from '../../../utils/utils';
+import { formatPhoneNumber, isAdmin, map2User } from '../../../utils/utils';
 
 @Component({
   selector: 'app-details-user',
@@ -46,7 +45,6 @@ export class DetailsUserComponent {
     private sanitizer: DomSanitizer,
     private imageService: ImageService,
     public historyService: HistoryService,
-    public keycloakService: KeycloakService,
     private authService: AuthService,
   ) {}
 
@@ -56,8 +54,6 @@ export class DetailsUserComponent {
     // Zuweisen der Ergebnisse zu den Member-Variablen der Klasse
     this.businessListings = results[0];
     this.commercialPropListings = results[1] as CommercialPropertyListing[];
-    //this.user$ = this.userService.getUserObservable();
-    // const token = await this.keycloakService.getToken();
     const token = await this.authService.getToken();
     this.keycloakUser = map2User(token);
     this.companyOverview = this.sanitizer.bypassSecurityTrustHtml(this.user.companyOverview ? this.user.companyOverview : '');
@@ -65,6 +61,6 @@ export class DetailsUserComponent {
   }
 
   isAdmin() {
-    return this.keycloakService.getUserRoles(true).includes('ADMIN');
+    return isAdmin(this.user.email);
   }
 }