From 1fe055b27ee5e20cac71cc018130fb571c1d3017 Mon Sep 17 00:00:00 2001 From: Joseph Milazzo Date: Sat, 2 Jan 2021 08:59:28 -0600 Subject: [PATCH] Cleanup library access guard. --- src/app/_guards/library-access.guard.ts | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/src/app/_guards/library-access.guard.ts b/src/app/_guards/library-access.guard.ts index 94159045c..611eb556d 100644 --- a/src/app/_guards/library-access.guard.ts +++ b/src/app/_guards/library-access.guard.ts @@ -1,10 +1,6 @@ import { Injectable } from '@angular/core'; -import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree } from '@angular/router'; -import { ToastrService } from 'ngx-toastr'; +import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; -import { map, take } from 'rxjs/operators'; -import { User } from '../_models/user'; -import { AccountService } from '../_services/account.service'; import { MemberService } from '../_services/member.service'; @Injectable({ @@ -12,24 +8,10 @@ import { MemberService } from '../_services/member.service'; }) export class LibraryAccessGuard implements CanActivate { - constructor(private accountService: AccountService, private toastr: ToastrService, private memberService: MemberService) {} + constructor(private memberService: MemberService) {} canActivate(next: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { - const libraryId = parseInt(state.url.split('library/')[1], 10); return this.memberService.hasLibraryAccess(libraryId); - - // return this.accountService.currentUser$.pipe( - // take((user: User) => { - // if (user) { - // const libraryId = parseInt(state.url.split('library/')[1], 10); - // return this.memberService.hasLibraryAccess(libraryId); - // //return true; - // } - // this.toastr.error('You are not authorized to view this page.'); - // return false; - // }) - // ); } - }