AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup library access guard.

Browse source
This commit is contained in:
Joseph Milazzo 2021-01-02 08:59:28 -06:00
parent cb9e88acdc
commit 1fe055b27e
1 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/app/_guards/library-access.guard.ts
View file

@ -1,10 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree } from '@angular/router'; import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
import { ToastrService } from 'ngx-toastr';
import { Observable } from 'rxjs'; 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'; import { MemberService } from '../_services/member.service';
@Injectable({ @Injectable({
@ -12,24 +8,10 @@ import { MemberService } from '../_services/member.service';
}) })
export class LibraryAccessGuard implements CanActivate { 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<boolean> { canActivate(next: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
const libraryId = parseInt(state.url.split('library/')[1], 10); const libraryId = parseInt(state.url.split('library/')[1], 10);
return this.memberService.hasLibraryAccess(libraryId); 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;
// })
// );
} }
} }