fix appLogin when already logged in

src/_store/account.module.js

@@ -258,7 +258,10 @@ const mutations = {
         state.user = null;
     },
 
-    appLoginRequest(state) {},
+    appLoginRequest(state) {
+        state.loginError = null;
+        state.status = Object.assign({}, state.status, {loggingIn: true});
+    },
     appLoginSuccess(state, {user, uri}) {
         if (user.token) {
             if (util.currentUser() === null) {

src/account/profile/ProfilePage.vue

@@ -219,9 +219,9 @@
         watch: {
             user (u) {
                 if (u) {
-                    console.log('watch.user: received: '+JSON.stringify(u));
+                    // console.log('watch.user: received: '+JSON.stringify(u));
                     if (this.submitted) {
-                        console.log('watch.user: action was successful, refreshing page');
+                        // console.log('watch.user: action was successful, refreshing page');
                         if (this.me) {
                             this.$router.push('/');
                         } else if (this.admin) {

src/admin/AccountsPage.vue

@@ -105,7 +105,7 @@
         watch: {
             users (uList) {
                 if (uList !== null && this.lastAction !== null) {
-                    console.log('watch.users: updated, refreshing...');
+                    // console.log('watch.users: updated, refreshing...');
                     this.lastAction = null;
                     this.refreshData()
                 }

src/app/App.vue

@@ -87,7 +87,11 @@ export default {
             } else {
                 const user = util.currentUser();
                 if (user !== null && (typeof user.token !== 'undefined' && user.token !== null)) {
-                    this.checkSession({messages: this.messages, errors: this.errors});
+                    if (this.status.loggingIn || this.status.loggedIn) {
+                        // console.log('activated: this.status.loggingIn='+this.status.loggingIn+', this.status.loggedIn='+this.status.loggedIn+', not checking session');
+                    } else {
+                        this.checkSession({messages: this.messages, errors: this.errors});
+                    }
                 }
             }
         },

src/auth/AppLoginPage.vue

@@ -53,6 +53,14 @@
         methods: {
             ...mapActions('account', ['login', 'logout', 'appLogin']),
             ...mapActions('system', ['loadSystemConfigs', 'loadMessages']),
+        },
+        watch: {
+            user (u) {
+                if (u.token) {
+                    this.loadMessages('post_auth', u.locale);
+                    this.loadMessages('apps', u.locale);
+                }
+            }
         }
     };
 </script>