Fix on authToken and get this user route

LiamTX · Oct 18, 2020 · 5d6985d · 5d6985d
1 parent 5cd3b97
commit 5d6985d
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 17 deletions.
diff --git a/src/components/cpmToolBar.vue b/src/components/cpmToolBar.vue
@@ -64,7 +64,7 @@
 
           <div>
             <v-col align="center" class="mt-10">
-              <v-btn to="/Login" await @click="logOff()" color="red" dark>SAIR</v-btn>
+              <v-btn @click="logOff" color="red" dark>SAIR</v-btn>
             </v-col>
           </div>
 
@@ -85,7 +85,8 @@
     }),
     methods: {
       async logOff(){
-        localStorage.removeItem('token')
+        await localStorage.removeItem('token');
+        await localStorage.removeItem('id');
 
         await this.$router.push('/')
       }

diff --git a/src/store/modules/LoginVuex.js b/src/store/modules/LoginVuex.js
@@ -29,11 +29,11 @@ export default {
 
     },
 
-    async authToken (context, newData) {
+    async authToken (context) {
 
-      const autho = await axios.post(process.env.VUE_APP_BASE_URL + '/user/authToken', newData + 'a')
+      const autho = await axios.post(process.env.VUE_APP_BASE_URL + '/user/authToken')
 
-      return autho
+      return autho.data;
 
     },
 

diff --git a/src/store/modules/ProfileVuex.js b/src/store/modules/ProfileVuex.js
@@ -20,12 +20,8 @@ export default {
 
   actions: {
     async getUser(context){
-      const token = localStorage.getItem('token');
-      const decodedToken = await axios.post(process.env.VUE_APP_BASE_URL+'/user/authToken', token);
-
-      console.log(decodedToken)
-
-      const user = await axios.get(process.env.VUE_APP_BASE_URL+`/user/mail/${decodedToken.data}`);
+
+      const user = await axios.get(process.env.VUE_APP_BASE_URL+`/user/this`);
       return user.data;
     },
 

diff --git a/src/views/private/Profile.vue b/src/views/private/Profile.vue
@@ -49,7 +49,7 @@
           </v-row>
         </div>
 
-        <div class="mb-6" v-else v-for="event in events" :key="event.id">
+        <div class="mb-6 p10" v-else v-for="event in events" :key="event.id">
           <EventCard class="mt-4 card" :cardData="event" />
         </div>
 
@@ -58,7 +58,7 @@
         </div>
       </v-card>
                 <v-col class="text-center mt-7" cols="1" sm="12">
-            <v-btn align="center" class="ml-2" color="red" dark>SAIR</v-btn>
+            <v-btn align="center" class="ml-2" color="red" @click="logOut()" dark>SAIR</v-btn>
           </v-col>
     </v-card>
   </div>
@@ -105,7 +105,12 @@ export default {
       getMyEvents: "ProfileVuex/getMyEvents",
       updateAvatar: "ProfileVuex/updateAvatar",
     }),
+    logOut(){
+      localStorage.removeItem('token');
+      localStorage.removeItem('id');
 
+      this.$router.push('/Home');
+    },
     async loadUser() {
       const user = await this.getUser();
 

diff --git a/src/views/public/Login.vue b/src/views/public/Login.vue
@@ -40,8 +40,7 @@ export default {
   created() {
     if (localStorage.token) {
 
-      this.checkToken().then(() => this.$router.push('/Feed'))
-
+      this.checkToken();
 
     }
   },
@@ -84,15 +83,17 @@ export default {
 
     async checkToken() {
 
-      const isAuth = await this.authToken(localStorage.token)
+      const isAuth = await this.authToken();
 
-      if (isAuth) {
+      if (isAuth != false) {
         this.$toast.success('Logado!', 'Hey', {
           position: "topCenter"
         })
 
         this.$router.push('/Feed')
       }
+
+      console.log(isAuth)
     }
   }
 }