refactor: Redirect to orginal route after login, restructure project files
This commit is contained in:
parent
29d3c53b19
commit
704cc22858
6 changed files with 20 additions and 12 deletions
|
@ -1,8 +1,11 @@
|
|||
import { CanActivateFn } from '@angular/router';
|
||||
import { ActivatedRouteSnapshot, CanActivateFn, RouterStateSnapshot } from '@angular/router';
|
||||
import { inject } from '@angular/core';
|
||||
import { KeycloakService } from 'keycloak-angular';
|
||||
|
||||
export const authGuard: CanActivateFn = async () => {
|
||||
export const authGuard: CanActivateFn = async (
|
||||
route: ActivatedRouteSnapshot,
|
||||
state: RouterStateSnapshot
|
||||
) => {
|
||||
const keycloakService = inject(KeycloakService);
|
||||
const isLoggedIn = keycloakService.isLoggedIn();
|
||||
|
||||
|
@ -10,6 +13,11 @@ export const authGuard: CanActivateFn = async () => {
|
|||
return true;
|
||||
}
|
||||
|
||||
keycloakService.login();
|
||||
const baseurl = window.location.origin;
|
||||
|
||||
keycloakService.login({
|
||||
redirectUri: `${baseurl}${state.url}`,
|
||||
});
|
||||
|
||||
return false;
|
||||
};
|
||||
|
|
Reference in a new issue