Merge remote-tracking branch 'origin/master'

mikelfried · Mar 30, 2018 · 0b1f3ca · 0b1f3ca
2 parents 14c7ea7 + 07869f3
commit 0b1f3ca
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/app/homepage/homepage.component.ts b/src/app/homepage/homepage.component.ts
@@ -18,6 +18,7 @@ import { Router, NavigationEnd } from '@angular/router';
 })
 export class HomepageComponent implements OnInit, AfterViewInit {
   isSidebarOpened = true;
+  previousWidth: number;
 
   constructor(
     private readonly cd: ChangeDetectorRef,
@@ -26,6 +27,7 @@ export class HomepageComponent implements OnInit, AfterViewInit {
 
   ngOnInit(): void {
     this.router.events.filter(e => e instanceof NavigationEnd).subscribe(() => {
+      this.previousWidth = window.innerWidth;
       this.checkWindowWidth(window.innerWidth);
     });
   }
@@ -45,7 +47,8 @@ export class HomepageComponent implements OnInit, AfterViewInit {
 
   checkWindowWidth(innerWidth?: number) {
     innerWidth = innerWidth ? innerWidth : window.innerWidth;
-    if (innerWidth <= 768) {
+    if (this.previousWidth !== innerWidth && innerWidth <= 768) {
+      this.previousWidth = innerWidth;
       this.isSidebarOpened = false;
       this.cd.detectChanges();
     }

diff --git a/src/app/homepage/pages/recipes/passport/passport.component.ts b/src/app/homepage/pages/recipes/passport/passport.component.ts
@@ -66,7 +66,7 @@ export class AuthService {
     return `
 import * as passport from 'passport';
 import { ExtractJwt, Strategy } from 'passport-jwt';
-import { Component, Inject } from '@nestjs/common';
+import { Component, Inject, UnauthorizedException } from '@nestjs/common';
 import { AuthService } from '../auth.service';
 
 @Component()
@@ -86,7 +86,7 @@ export class JwtStrategy extends Strategy {
   public async verify(req, payload, done) {
     const isValid = await this.authService.validateUser(payload);
     if (!isValid) {
-      return done('Unauthorized', false);
+      return done(new UnauthorizedException(), false);
     }
     done(null, payload);
   }