From 3a51918d89d731831905e186e9b40cea06866524 Mon Sep 17 00:00:00 2001
From: Svitlana <sfedoriv@itekako.com>
Date: Mon, 15 Jun 2020 20:25:25 +0200
Subject: [PATCH] Set user in local storage

---
 src/_services/user.service.js |  1 -
 src/auth/AppLoginPage.vue     | 14 ++++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/_services/user.service.js b/src/_services/user.service.js
index cbec198..ec14dc7 100644
--- a/src/_services/user.service.js
+++ b/src/_services/user.service.js
@@ -6,7 +6,6 @@ import config from 'config';
 import { util } from '../_helpers';
 
 export const userService = {
-    setSessionUser,
     login,
     logout,
     forgotPassword,
diff --git a/src/auth/AppLoginPage.vue b/src/auth/AppLoginPage.vue
index 20ef14e..450dc01 100644
--- a/src/auth/AppLoginPage.vue
+++ b/src/auth/AppLoginPage.vue
@@ -27,13 +27,16 @@
 
             if (!this.$route.query.hasOwnProperty('session') || typeof session === 'undefined' || session === null) {
                 console.warn('AppLoginPage.created: session parameter is empty, sending to login page');
-                this.$router.push('/login');
+                if (util.userLoggedIn()) {
+                    this.logout({messages: this.messages, errors: this.errors});
+                }
+                this.$router.replace('/login');
                 return;
             }
 
-            if (!this.$route.query.hasOwnProperty('uri') || (typeof uri !== 'undefined' && uri !== null && uri.length > 0 && uri[0] !== '/')) {
+            if  (typeof uri !== 'undefined' && uri !== null && uri.length > 0 && uri[0] !== '/') {
                 console.warn('AppLoginPage.created: uri parameter is not empty, sending to login page');
-                this.$router.push('/login');
+                this.$router.replace('/login');
                 return;
             }
 
@@ -45,15 +48,14 @@
             if (uri.startsWith('/appLogin')) {
                 uri = '/';
             }
-            this.user.token = session;
-            this.setSessionUser(this.user);
+            user.token = session;
+            localStorage.setItem(util.USER_KEY, JSON.stringify(user));
             this.checkSession({messages: this.messages, errors: this.errors});
             this.$router.push({path: uri});
             return;
         },
         methods: {
             ...mapActions('account', ['login', 'logout', 'checkSession']),
-            ...mapActions('users', ['setSessionUser']),
             ...mapActions('system', ['loadSystemConfigs', 'loadMessages']),
         }
     };