remove keycloak

bizmatch/src/app/components/header/header.component.ts

@@ -6,7 +6,6 @@ import { NavigationEnd, Router, RouterModule } from '@angular/router';
 import { faUserGear } from '@fortawesome/free-solid-svg-icons';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
 import { Collapse, Dropdown, initFlowbite } from 'flowbite';
-import { KeycloakService } from 'keycloak-angular';
 import { filter, Observable, Subject, Subscription } from 'rxjs';
 import { SortByOptions, User } from '../../../../../bizmatch-server/src/models/db.model';
 import { BusinessListingCriteria, CommercialPropertyListingCriteria, emailToDirName, KeycloakUser, KeyValueAsSortBy, UserListingCriteria } from '../../../../../bizmatch-server/src/models/main.model';
@@ -17,7 +16,7 @@ import { SearchService } from '../../services/search.service';
 import { SelectOptionsService } from '../../services/select-options.service';
 import { SharedService } from '../../services/shared.service';
 import { UserService } from '../../services/user.service';
-import { assignProperties, compareObjects, createEmptyBusinessListingCriteria, createEmptyCommercialPropertyListingCriteria, createEmptyUserListingCriteria, getCriteriaProxy, map2User } from '../../utils/utils';
+import { assignProperties, compareObjects, createEmptyBusinessListingCriteria, createEmptyCommercialPropertyListingCriteria, createEmptyUserListingCriteria, getCriteriaProxy, isAdmin, map2User } from '../../utils/utils';
 import { DropdownComponent } from '../dropdown/dropdown.component';
 import { ModalService } from '../search-modal/modal.service';
 @UntilDestroy()
@@ -48,7 +47,6 @@ export class HeaderComponent {
   sortDropdownVisible: boolean;
   sortByOptions: KeyValueAsSortBy[] = [];
   constructor(
-    public keycloakService: KeycloakService,
     private router: Router,
     private userService: UserService,
     private sharedService: SharedService,
@@ -67,7 +65,6 @@ export class HeaderComponent {
     }
   }
   async ngOnInit() {
-    //const token = await this.keycloakService.getToken();
     const token = await this.authService.getToken();
     this.keycloakUser = map2User(token);
     if (this.keycloakUser) {
@@ -127,11 +124,6 @@ export class HeaderComponent {
   navigateWithState(dest: string, state: any) {
     this.router.navigate([dest], { state: state });
   }
-  login() {
-    this.keycloakService.login({
-      redirectUri: `${window.location.origin}/login${this.router.routerState.snapshot.url}`,
-    });
-  }
 
   isActive(route: string): boolean {
     return this.router.url === route;
@@ -192,9 +184,7 @@ export class HeaderComponent {
       return 0;
     }
   }
-  isAdmin() {
-    return this.keycloakService.getUserRoles(true).includes('ADMIN');
-  }
+
   sortBy(sortBy: SortByOptions) {
     this.criteria.sortBy = sortBy;
     this.sortDropdownVisible = false;
@@ -203,4 +193,7 @@ export class HeaderComponent {
   toggleSortDropdown() {
     this.sortDropdownVisible = !this.sortDropdownVisible;
   }
+  isAdmin() {
+    return isAdmin(this.user.email);
+  }
 }

bizmatch/src/app/components/logout/logout.component.ts

@@ -1,7 +1,7 @@
 import { CommonModule } from '@angular/common';
 import { Component } from '@angular/core';
 import { Router, RouterModule } from '@angular/router';
-import { KeycloakService } from 'keycloak-angular';
+
 import { AuthService } from '../../services/auth.service';
 
 @Component({
@@ -11,9 +11,7 @@ import { AuthService } from '../../services/auth.service';
   template: ``,
 })
 export class LogoutComponent {
-  constructor(public keycloakService: KeycloakService, private authService: AuthService, private router: Router) {
-    //sessionStorage.removeItem('USERID');
-    //keycloakService.logout(window.location.origin + '/home');
+  constructor(private authService: AuthService, private router: Router) {
     this.authService.logout();
     this.router.navigate(['/home']);
   }