Bladeren bron

Removed code that did not work in the login promise

master
Lene Scholtz 5 jaren geleden
bovenliggende
commit
988d82e924
3 gewijzigde bestanden met toevoegingen van 23 en 32 verwijderingen
  1. 2
    1
      src/components/shared/navBar.vue
  2. 2
    1
      src/components/user/loginPage.vue
  3. 19
    30
      src/store/modules/user/authentication.js

+ 2
- 1
src/components/shared/navBar.vue Bestand weergeven

119
               </div>
119
               </div>
120
             </li>
120
             </li>
121
 
121
 
122
-            <li v-if="isLoggedIn" class="nav-item dropdown">
122
+            <li class="nav-item dropdown">
123
               <a
123
               <a
124
                 class="nav-link dropdown-toggle"
124
                 class="nav-link dropdown-toggle"
125
                 href="#"
125
                 href="#"
128
                 data-toggle="dropdown"
128
                 data-toggle="dropdown"
129
                 aria-haspopup="true"
129
                 aria-haspopup="true"
130
                 aria-expanded="false"
130
                 aria-expanded="false"
131
+                v-if="isLoggedIn"
131
               >Admin</a>
132
               >Admin</a>
132
               <div class="dropdown-menu" aria-labelledby="navbarDropdown">
133
               <div class="dropdown-menu" aria-labelledby="navbarDropdown">
133
                 <a class="dropdown-item cursor-pointer" @click="routerGoTo('/status/list')">Status</a>
134
                 <a class="dropdown-item cursor-pointer" @click="routerGoTo('/status/list')">Status</a>

+ 2
- 1
src/components/user/loginPage.vue Bestand weergeven

132
       this.login().then(() => {
132
       this.login().then(() => {
133
         if (this.$store.state.authentication.status === 'error') {
133
         if (this.$store.state.authentication.status === 'error') {
134
           this.$router.push('/user/login');
134
           this.$router.push('/user/login');
135
+        } else {
136
+          this.$router.push('/about/us');
135
         }
137
         }
136
       });
138
       });
137
     },
139
     },
145
     },
147
     },
146
     SendMail() {},
148
     SendMail() {},
147
     routerGoTo(goTo) {
149
     routerGoTo(goTo) {
148
-      console.log(goTo);
149
       this.$router.push(goTo);
150
       this.$router.push(goTo);
150
     },
151
     },
151
   },
152
   },

+ 19
- 30
src/store/modules/user/authentication.js Bestand weergeven

53
     authStatus: state => state.status,
53
     authStatus: state => state.status,
54
   },
54
   },
55
   actions: {
55
   actions: {
56
-    init({
57
-      commit,
58
-    }) {
56
+    init({ commit }) {
59
       if (!log.isLoggedIn() && log.tokenExpired) {
57
       if (!log.isLoggedIn() && log.tokenExpired) {
60
         log.clearValues();
58
         log.clearValues();
61
       } else log.updateTokenExpiry();
59
       } else log.updateTokenExpiry();
66
         agency: log.getJSONObject('agency'),
64
         agency: log.getJSONObject('agency'),
67
       });
65
       });
68
     },
66
     },
69
-    login({
70
-      commit,
71
-      state,
72
-    }) {
73
-      return new Promise((reject) => {
74
-        commit('auth_request');
75
-        const user = {
67
+    login({ commit, state }) {
68
+      axios({
69
+        url: '/api/register/authenticate',
70
+        data: {
76
           username: state.username,
71
           username: state.username,
77
           password: state.password,
72
           password: state.password,
78
-        };
79
-        axios({
80
-          url: '/api/register/authenticate',
81
-          data: user,
82
-          method: 'POST',
73
+        },
74
+        method: 'POST',
75
+      })
76
+        .then((resp) => {
77
+          log.clearValues();
78
+          log.setValues(resp.data);
79
+
80
+          commit('auth_success', resp.data);
83
         })
81
         })
84
-          .then((resp) => {
85
-            log.clearValues();
86
-            log.setValues(resp.data);
87
-            commit('auth_success', resp.data);
88
-          })
89
-          .catch((err) => {
90
-            commit('auth_error');
91
-            log.clearValues();
92
-            reject(err);
93
-            commit('auth_error', err.data);
94
-          });
95
-      });
82
+        .catch((err) => {
83
+          commit('auth_error');
84
+          log.clearValues();
85
+          commit('auth_error', err.data);
86
+        });
96
     },
87
     },
97
-    logout({
98
-      commit,
99
-    }) {
88
+    logout({ commit }) {
100
       return new Promise(() => {
89
       return new Promise(() => {
101
         commit('logout');
90
         commit('logout');
102
         log.clearValues();
91
         log.clearValues();

Laden…
Annuleren
Opslaan