Pear-Trading/FoodLoop-Web
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #6 from Pear-Trading/TBSliver/Guard-Fixes

Browse source 
Made guards less likely to give infinite loop
This commit is contained in:
Tom Bloor 2017-09-05 11:42:17 +01:00 committed by GitHub
commit e0a78c0f43
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/app/_guards/customer.guard.ts
View file

@ -7,15 +7,16 @@ export class CustomerGuard implements CanActivate {
constructor(private router: Router) { } constructor(private router: Router) { }
canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) { canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
if (localStorage.getItem('usertype') == 'customer') { if (localStorage.getItem('usertype') === 'customer') {
console.log('Customer logged in') console.log('Customer logged in');
// customer logged in so return true // customer logged in so return true
return true; return true;
} else if (localStorage.getItem('usertype') === 'organisation') {
console.log('not an customer');
this.router.navigate(['/dashboard']);
return false;
} }
this.router.navigate(['/login']);
// customer not logged in so redirect to org dashboard
console.log('not an customer')
this.router.navigate(['/dashboard']);
return false; return false;
} }
} }

13
src/app/_guards/org.guard.ts
View file

@ -7,15 +7,16 @@ export class OrgGuard implements CanActivate {
constructor(private router: Router) { } constructor(private router: Router) { }
canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) { canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
if (localStorage.getItem('usertype') == 'organisation') { if (localStorage.getItem('usertype') === 'organisation') {
console.log('Organisation logged in') console.log('Organisation logged in');
// org logged in so return true // org logged in so return true
return true; return true;
} else if (localStorage.getItem('usertype') === 'customer') {
console.log('not an organisation');
this.router.navigate(['/dashboard-customer']);
return false;
} }
this.router.navigate(['/login']);
// org not logged in so redirect to customer dashboard
console.log('not an organisation')
this.router.navigate(['/dashboard-customer']);
return false; return false;
} }
} }