vincentRamiere/simpleat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into Romain

Browse Source
This commit is contained in:
Romain Verger 2022-03-09 16:05:47 +01:00
commit 2ba6818bc5
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/app-routing.module.ts
View File

@ -23,7 +23,7 @@ const routes: Routes = [
{ path: 'Deconnexion', redirectTo: 'home'},
{path: 'restaurants', canActivate: [AuthGuard], /*data : {ROLE : "ROLE_ADMIN"},*/ component: RestoPageComponent},
{path: 'page-not-found',component: PageNotFoundComponent},
{path: 'admin',canActivate: [AuthGuard], component: AdminPageComponent},
{path: 'admin',canActivate: [AuthGuard],data : {ROLE : "ROLE_ADMIN"}, component: AdminPageComponent},
{path: '**', redirectTo: 'page-not-found' }
];

8
src/app/services/auth.guard.ts
View File

@ -26,6 +26,8 @@ export class AuthGuard implements CanActivate {
const decodedToken = jwt_decode<any>(token);
// TODO boucle sur le ['auth'] pour controler le role et en fonction de ca renvoyer true ou false ac redirection page403
//console.log(decodedToken['auth'][0]['authority']);
console.log('decodedToken : ', decodedToken);
@ -37,13 +39,17 @@ export class AuthGuard implements CanActivate {
// le token a expiré, je n'autorise pas l'accès
this.tokenService.destroyToken(this.tokenKey);
this.router.navigate(['signin']);
return false;
}
if(route.data['ROLE'] && route.data['ROLE'] != localStorage.getItem('ROLE')){
this.router.navigate(['page-not-found']);
return false;
}
}
console.log("C'est ok ! ")
return true;
} else {
console.log("You shall not pass !!!!")
this.router.navigate(['signin']); // redirection de notre utilisateur vers une url de notre application (dans notre code TS)

8
src/app/services/auth.service.ts
View File

@ -34,12 +34,14 @@ export class AuthService {
return this.http.post(`${this.apiUrl}/signin`, body).pipe(
map((x: any) => {
console.log(x);
//console.log(x);
console.log('Service : ', x.token);
const decodedToken = jwt_decode<any>(x.token);
//console.log('Service : ', x.token);
// Modification à faire ici
localStorage.setItem(this.tokenKey, x.token);
//localStorage.setItem('ROLE', "ROLE_READER");
localStorage.setItem('ROLE', decodedToken['auth'][0]['authority']);
return x; // permet de renvoyer la réponse à l'initiateur (page Signin) après le traitement du map
})
);