From a70ec8a49a8fac59a18888a3f933e20e535f2ce2 Mon Sep 17 00:00:00 2001
From: Aleksei Tsybin <atsybin@saber3d.net>
Date: Wed, 2 Mar 2022 17:51:30 +0300
Subject: [PATCH] feature: complete full auth

---
 src/App.vue                        |  2 +-
 src/components/HeaderComponent.vue | 18 +++++++++++++++++-
 src/main.js                        |  1 +
 src/router/index.js                |  4 ++--
 src/views/LoginView.vue            | 25 ++++++++++++++-----------
 5 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 5853f0b..68e9d1a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1 +1 @@
-<template>
  <div id="app">
    <div class="container">
      <HeaderComponent @logOut="logOut" :auth="isAuth" />
      <router-view @loggedIn="loggedIn"></router-view>
    </div>
  </div>
</template>

<script>
import HeaderComponent from '@/components/HeaderComponent'

export default {
  components: { HeaderComponent },
  data() {
    return {
      isAuth: false,
    }
  },
  methods: {
    loggedIn() {
      this.isAuth = true
    },
    logOut() {
      this.isAuth = false
    },
  },
}
</script>
\ No newline at end of file
+<template>
  <div id="app">
    <div class="container">
      <HeaderComponent @checkAuth="checkAuth" :auth="isAuth" :user="user" />
      <router-view @checkAuth="checkAuth"></router-view>
    </div>
  </div>
</template>

<script>
import HeaderComponent from '@/components/HeaderComponent'

export default {
  components: { HeaderComponent },
  data() {
    return {
      isAuth: null,
      user: '',
    }
  },
  methods: {
    loggedOut() {
      this.isAuth = false
    },
    async checkAuth() {
      this.isAuth = localStorage.getItem('jwt') != null
      if (this.isAuth) {
        await this.$http
          .get('me', {
            headers: { Authorization: `Bearer ${localStorage.getItem('jwt')}` },
          })
          .then((response) => {
            localStorage.setItem('user', JSON.stringify(response.data.user))
            this.user = response.data.user
          })
          .catch(function (error) {
            console.error(error.response)
          })
      }
    },
  },
  async mounted() {
    await this.checkAuth()
  },
}
</script>
\ No newline at end of file
diff --git a/src/components/HeaderComponent.vue b/src/components/HeaderComponent.vue
index 6b219d6..1d825ae 100644
--- a/src/components/HeaderComponent.vue
+++ b/src/components/HeaderComponent.vue
@@ -36,6 +36,9 @@
 
     <template #end>
       <b-navbar-item tag="div">
+        <p v-if="auth" class="mx-2 has-text-grey">
+          {{ user.username }}
+        </p>
         <div class="buttons">
           <router-link
             v-if="auth"
@@ -48,7 +51,7 @@
           <b-button
             v-if="auth"
             class="button is-light is-rounded"
-            @click="$emit('logOut')"
+            @click="loggedOut"
           >
             Log out
           </b-button>
@@ -70,10 +73,23 @@ export default {
   name: 'HeaderComponent',
   props: {
     auth: Boolean,
+    user: {
+      type: [String, Object],
+    },
   },
   data() {
     return {}
   },
+  methods: {
+    loggedOut() {
+      localStorage.removeItem('jwt')
+      localStorage.removeItem('user')
+      if (localStorage.getItem('jwt') == null) {
+        this.$emit('checkAuth')
+        this.$router.push('login')
+      }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/main.js b/src/main.js
index 7066a01..05d46b9 100644
--- a/src/main.js
+++ b/src/main.js
@@ -5,6 +5,7 @@ import Buefy from 'buefy'
 import Axios from 'axios'
 import './assets/scss/main.scss'
 
+Axios.defaults.baseURL = 'https://avatars.zorg.cc/api/'
 Vue.prototype.$http = Axios
 
 Vue.config.productionTip = false
diff --git a/src/router/index.js b/src/router/index.js
index 6bbd06d..b6f2bce 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -38,8 +38,8 @@ router.beforeEach((to, from, next) => {
   if (to.matched.some((record) => record.meta.requiresAuth)) {
     if (localStorage.getItem('jwt') == null) {
       next({
-        path: '/login',
-        params: { nextUrl: to.fullPath },
+        name: 'login',
+        query: { nextUrl: to.fullPath },
       })
     } else {
       next()
diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue
index 1977db4..3cc1edd 100644
--- a/src/views/LoginView.vue
+++ b/src/views/LoginView.vue
@@ -65,34 +65,37 @@ export default {
   data() {
     return {
       isValid: true,
-      username: null,
-      password: null,
+      username: '',
+      password: '',
     }
   },
   methods: {
-    handleSubmit() {
-      this.$emit('loggedIn') // TODO убрать
+    async handleSubmit() {
+      let vm = this
       if (this.password.length > 0 && this.username.length > 0) {
-        this.$http
-          .post('https://avatars.zorg.cc/api/login', {
+        await this.$http
+          .post('login', {
             username: this.username,
             password: this.password,
           })
           .then((response) => {
-            // localStorage.setItem('user', JSON.stringify(response.data.user))
             localStorage.setItem('jwt', response.data.jwt_token)
             if (localStorage.getItem('jwt') != null) {
-              this.$emit('loggedIn')
-              if (this.$route.params.nextUrl != null) {
-                this.$router.push(this.$route.params.nextUrl)
+              // this.$emit('loggedIn')
+              this.$emit('checkAuth')
+              if (this.$route.query.nextUrl != null) {
+                this.$router.push({ path: `${this.$route.query.nextUrl}` })
               } else {
-                this.$router.push('home')
+                this.$router.push({ name: 'home' })
               }
             }
           })
           .catch(function (error) {
+            vm.isValid = false
             console.error(error.response)
           })
+      } else {
+        this.isValid = false
       }
     },
   },