Merge pull request #4 from MohamedBoukthir/keyclock

implement : finish keycloak integration
MohamedBoukthir · Jun 8, 2024 · 7975b2d · 7975b2d
2 parents df08b11 + 48b77f8
commit 7975b2d
Show file tree

Hide file tree

Showing 52 changed files with 2,406 additions and 387 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
diff --git a/.idea/discord.xml b/.idea/discord.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/readly.iml b/.idea/readly.iml
diff --git a/.idea/swagger-settings.xml b/.idea/swagger-settings.xml
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -22,6 +22,21 @@ services:
     ports:
       - 1080:1080
       - 1025:1025
+    networks:
+      - readly-network
+
+  keycloak:
+    container_name: keycloak-readly
+    image: quay.io/keycloak/keycloak:latest
+    ports:
+      - 9090:8080
+    environment:
+      KEYCLOAK_ADMIN: admin
+      KEYCLOAK_ADMIN_PASSWORD: admin
+    networks:
+      - readly-network
+    command:
+      - "start-dev"
 
   readly-api:
     container_name: readly-api

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -22,6 +22,7 @@
     "@auth0/angular-jwt": "^5.2.0",
     "@fortawesome/fontawesome-free": "^6.5.2",
     "angular-code-input": "^2.0.0",
+    "keycloak-js": "^24.0.5",
     "ng-openapi-gen": "^0.51.0",
     "rxjs": "~7.8.0",
     "tailwind-scrollbar": "^3.1.0",

diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts
@@ -6,6 +6,7 @@ import {ActivateAccountComponent} from "./pages/activate-account/activate-accoun
 import {authGuard} from "./services/guard/auth.guard";
 
 const routes: Routes = [
+  {path:'', redirectTo: 'books', pathMatch: 'full'},
   {path: 'login', component: LoginComponent},
   {path: 'register', component: RegisterComponent},
   {path: 'activate-account', component: ActivateAccountComponent},

diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
@@ -1,4 +1,4 @@
-import {NgModule} from '@angular/core';
+import {APP_INITIALIZER, NgModule} from '@angular/core';
 import {BrowserModule} from '@angular/platform-browser';
 
 import {AppRoutingModule} from './app-routing.module';
@@ -11,6 +11,11 @@ import {ActivateAccountComponent} from './pages/activate-account/activate-accoun
 import {CodeInputModule} from "angular-code-input";
 import {NavbarComponent} from './components/navbar/navbar.component';
 import {HttpTokenInterceptor} from "./services/interceptor/http-token.interceptor";
+import {KeycloakService} from "./services/keycloak/keycloak.service";
+
+export function kcFactory(kc: KeycloakService) {
+  return () => kc.init();
+}
 
 @NgModule({
   bootstrap: [AppComponent],
@@ -36,6 +41,12 @@ import {HttpTokenInterceptor} from "./services/interceptor/http-token.intercepto
       provide: HTTP_INTERCEPTORS,
       useClass: HttpTokenInterceptor,
       multi: true
+    },
+    {
+      provide: APP_INITIALIZER,
+      deps: [KeycloakService],
+      useFactory: kcFactory,
+      multi: true
     }
   ]
 })

diff --git a/frontend/src/app/modules/book/components/navbar/navbar.component.ts b/frontend/src/app/modules/book/components/navbar/navbar.component.ts
@@ -1,4 +1,5 @@
 import {Component} from '@angular/core';
+import {KeycloakService} from "../../../../services/keycloak/keycloak.service";
 
 @Component({
   selector: 'app-navbar',
@@ -7,16 +8,19 @@ import {Component} from '@angular/core';
 })
 export class NavbarComponent {
 
+  constructor(
+    private keycloakService: KeycloakService,
+  ) {}
+
   menuHidden = true;
   currentYear = new Date().getFullYear();
 
   toggleMenu(): void {
     this.menuHidden = !this.menuHidden;
   }
 
-  logout() {
-    sessionStorage.clear();
-    window.location.reload();
+  async logout() {
+    this.keycloakService.logout();
   }
 }