import 15.2.5

[ceph.git] / ceph / src / pybind / mgr / dashboard / frontend / src / app / core / auth / login / login.component.ts

diff --git a/ceph/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.ts b/ceph/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.ts
index 9286e31d30f107ea11a64662cdd9111cbacbda0b..770a4821db177d62bf0d164126d33821916df540 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.ts
+++ b/ceph/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.ts
@@ -1,6 +1,7 @@
 import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 
+import * as _ from 'lodash';
 import { BsModalService } from 'ngx-bootstrap/modal';
 
 import { AuthService } from '../../../shared/api/auth.service';
@@ -15,11 +16,13 @@ import { AuthStorageService } from '../../../shared/services/auth-storage.servic
 export class LoginComponent implements OnInit {
   model = new Credentials();
   isLoginActive = false;
+  returnUrl: string;
 
   constructor(
     private authService: AuthService,
     private authStorageService: AuthStorageService,
     private bsModalService: BsModalService,
+    private route: ActivatedRoute,
     private router: Router
   ) {}
 
@@ -64,7 +67,8 @@ export class LoginComponent implements OnInit {
 
   login() {
     this.authService.login(this.model).subscribe(() => {
-      this.router.navigate(['']);
+      const url = _.get(this.route.snapshot.queryParams, 'returnUrl', '/');
+      this.router.navigate([url]);
     });
   }
 }