1 files changed, 9 insertions, 7 deletions
diff --git a/src/app/vnfs/userlogin-form/userlogin-form.component.ts b/src/app/vnfs/userlogin-form/userlogin-form.component.ts
index dfb665e..188fe81 100644
--- a/src/app/vnfs/userlogin-form/userlogin-form.component.ts
+++ b/src/app/vnfs/userlogin-form/userlogin-form.component.ts
@@ -16,36 +16,38 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-
-ECOMP is a trademark and service mark of AT&T Intellectual Property.
 ============LICENSE_END============================================
 */
 
 import {Component, OnInit} from '@angular/core';
-import {Router} from '@angular/router';
+
+import { ActivatedRoute } from '@angular/router';
 import {EmitterService} from '../../shared/services/emitter.service';
+import {Router} from '@angular/router';
 import {UtilityService} from '../../shared/services/utilityService/utility.service';
 
 @Component({selector: 'app-mvnfs-form', templateUrl: './userlogin-form.component.html', styleUrls: ['./userlogin-form.component.css']})
 export class userloginFormComponent implements OnInit {
 
     userId: string = '';
+    returnUrl:string
 
-    constructor(private router: Router, private utiltiy: UtilityService) {
+    constructor(private router: Router, private utiltiy: UtilityService, private route: ActivatedRoute
+        ) {
     }
 
     ngOnInit() {
+           this.returnUrl = this.route.snapshot.queryParams['returnUrl'] || '/home';
     }
 
+
     getData() {
         localStorage['userId'] = this.userId;
         localStorage['apiToken'] = this.utiltiy.randomId();
         EmitterService
             .get('userLogin')
             .emit(this.userId);
-        this
-            .router
-            .navigate(['vnfs', 'list']);
+       this.router.navigateByUrl(this.returnUrl);
     }
 
 }