From fab3680c07ecf1c988783dfeda19770a04c6287f Mon Sep 17 00:00:00 2001 From: Phan Huy Tran Date: Wed, 12 Feb 2025 11:15:27 +0100 Subject: [PATCH 1/2] feat: Add proper redirects to login and logout button --- .../homepage/homepage/homepage.component.ts | 8 ++++--- .../landing-page/landing-page.component.ts | 22 ++++++++++--------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/frontend/src/app/homepage/homepage/homepage.component.ts b/frontend/src/app/homepage/homepage/homepage.component.ts index 1f01382..2b2dda8 100644 --- a/frontend/src/app/homepage/homepage/homepage.component.ts +++ b/frontend/src/app/homepage/homepage/homepage.component.ts @@ -1,5 +1,5 @@ -import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; -import { KeycloakService } from 'keycloak-angular'; +import {ChangeDetectionStrategy, Component, inject} from '@angular/core'; +import {KeycloakService} from 'keycloak-angular'; @Component({ selector: 'app-homepage', @@ -12,6 +12,8 @@ export class HomepageComponent { private keycloakService: KeycloakService = inject(KeycloakService); logout() { - this.keycloakService.logout(); + const baseUrl = window.location.origin; + + this.keycloakService.logout(`${baseUrl}/`); } } diff --git a/frontend/src/app/landing-page/landing-page.component.ts b/frontend/src/app/landing-page/landing-page.component.ts index ff25911..eefe0d4 100644 --- a/frontend/src/app/landing-page/landing-page.component.ts +++ b/frontend/src/app/landing-page/landing-page.component.ts @@ -1,16 +1,18 @@ -import { Component, inject } from '@angular/core'; -import { KeycloakService } from 'keycloak-angular'; +import {Component, inject} from '@angular/core'; +import {KeycloakService} from 'keycloak-angular'; @Component({ - selector: 'app-landing-page', - standalone: true, - imports: [], - templateUrl: './landing-page.component.html', + selector: 'app-landing-page', + standalone: true, + imports: [], + templateUrl: './landing-page.component.html', }) export class LandingPageComponent { - private keycloakService: KeycloakService = inject(KeycloakService); + private keycloakService: KeycloakService = inject(KeycloakService); - login() { - this.keycloakService.login(); - } + login() { + const baseUrl = window.location.origin; + + this.keycloakService.login({redirectUri: `${baseUrl}/home`}); + } } From c64152b99fad46c310a8eb184731c4db7b373ca8 Mon Sep 17 00:00:00 2001 From: Phan Huy Tran Date: Wed, 12 Feb 2025 11:16:29 +0100 Subject: [PATCH 2/2] style: format code with prettier --- frontend/src/app/app.routes.ts | 2 +- .../homepage/homepage/homepage.component.ts | 4 ++-- .../landing-page/landing-page.component.ts | 22 +++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/frontend/src/app/app.routes.ts b/frontend/src/app/app.routes.ts index 2d53d28..02b958c 100644 --- a/frontend/src/app/app.routes.ts +++ b/frontend/src/app/app.routes.ts @@ -12,5 +12,5 @@ export const routes: Routes = [ path: 'home', component: HomepageComponent, canActivate: [authGuard], - } + }, ]; diff --git a/frontend/src/app/homepage/homepage/homepage.component.ts b/frontend/src/app/homepage/homepage/homepage.component.ts index 2b2dda8..ff894dc 100644 --- a/frontend/src/app/homepage/homepage/homepage.component.ts +++ b/frontend/src/app/homepage/homepage/homepage.component.ts @@ -1,5 +1,5 @@ -import {ChangeDetectionStrategy, Component, inject} from '@angular/core'; -import {KeycloakService} from 'keycloak-angular'; +import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; +import { KeycloakService } from 'keycloak-angular'; @Component({ selector: 'app-homepage', diff --git a/frontend/src/app/landing-page/landing-page.component.ts b/frontend/src/app/landing-page/landing-page.component.ts index eefe0d4..f7509cf 100644 --- a/frontend/src/app/landing-page/landing-page.component.ts +++ b/frontend/src/app/landing-page/landing-page.component.ts @@ -1,18 +1,18 @@ -import {Component, inject} from '@angular/core'; -import {KeycloakService} from 'keycloak-angular'; +import { Component, inject } from '@angular/core'; +import { KeycloakService } from 'keycloak-angular'; @Component({ - selector: 'app-landing-page', - standalone: true, - imports: [], - templateUrl: './landing-page.component.html', + selector: 'app-landing-page', + standalone: true, + imports: [], + templateUrl: './landing-page.component.html', }) export class LandingPageComponent { - private keycloakService: KeycloakService = inject(KeycloakService); + private keycloakService: KeycloakService = inject(KeycloakService); - login() { - const baseUrl = window.location.origin; + login() { + const baseUrl = window.location.origin; - this.keycloakService.login({redirectUri: `${baseUrl}/home`}); - } + this.keycloakService.login({ redirectUri: `${baseUrl}/home` }); + } }