import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import {
  ActivatedRouteSnapshot,
  CanActivate,
  Router,
  RouterStateSnapshot
} from '@angular/router';
import { CurrentAccountService } from './current-account.service';

@Injectable()
export class AccountGuardService implements CanActivate {

  constructor(
    private currentAccountService: CurrentAccountService,
    private router: Router) { }

  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
    const url: string = state.url;
    return this.checkLogin(url);
  }

  checkLogin(url: string): Observable<boolean> {
    return this.currentAccountService.get().map((account: string) => {
      if (!account) {
        this.router.navigate(['accounts', 'login'], { queryParams: { redirectUrl: url } });
        return false;
      }
      return true;
    });
  }
}

import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import {
  ActivatedRouteSnapshot,
  CanActivate,
  Router,
  RouterStateSnapshot
} from '@angular/router';
import { CurrentAccountService } from './current-account.service';

@Injectable()
export class AccountGuardService implements CanActivate {

  constructor(
    private currentAccountService: CurrentAccountService,
    private router: Router) { }

  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
    const url: string = state.url;
    return this.checkLogin(url);
  }

  checkLogin(url: string): Observable<boolean> {
    return this.currentAccountService.get().map((account: string) => {
      if (! account) {
        // Store the attempted URL for redirecting after login
        this.currentAccountService.redirectUrl = url;

        this.router.navigate(['accounts', 'login']);
        return false;
      }
      return true;
    });
  }
}

--- 
+++ 
@@ -22,11 +22,8 @@
 
   checkLogin(url: string): Observable<boolean> {
     return this.currentAccountService.get().map((account: string) => {
-      if (! account) {
-        // Store the attempted URL for redirecting after login
-        this.currentAccountService.redirectUrl = url;
-
-        this.router.navigate(['accounts', 'login']);
+      if (!account) {
+        this.router.navigate(['accounts', 'login'], { queryParams: { redirectUrl: url } });
         return false;
       }
       return true;
Use query params for the redirect url
