From 95dfe76fb02f8ac37ef61a9b34b7588246c7a12c Mon Sep 17 00:00:00 2001
From: Dhaverd <jedi55@mail.ru>
Date: Sun, 27 Oct 2024 03:55:29 +0800
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D0=B5=D1=81=20?=
 =?UTF-8?q?=D0=B2=D1=81=D0=B5=20axios-=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81?=
 =?UTF-8?q?=D1=8B=20=D0=B2=20store?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/store/user.js               | 69 +++++++++++++++++++++++++++
 resources/views/Auth/Login.vue        | 35 +++++++-------
 resources/views/Auth/Registration.vue | 30 ++++++------
 resources/views/Welcome.vue           | 55 ++++-----------------
 4 files changed, 108 insertions(+), 81 deletions(-)

diff --git a/resources/store/user.js b/resources/store/user.js
index db2d8b8..4e8c64e 100644
--- a/resources/store/user.js
+++ b/resources/store/user.js
@@ -1,4 +1,5 @@
 import { defineStore } from 'pinia'
+import axios from "axios";
 
 export const useUserStore = defineStore('user', {
     state: () => ({
@@ -15,5 +16,73 @@ export const useUserStore = defineStore('user', {
             this.token = token;
             localStorage.setItem('auth_token', token);
         },
+        checkUser(){
+            axios.get(
+                '/api/auth/user',
+                {
+                    headers:
+                        {
+                            Authorization: `Bearer ${this.token}`,
+                            token: this.token
+                        }
+                }
+            ).then((res) => {
+                this.setUser(res.data);
+            }).catch((error)=>{
+                this.nullifyUser();
+            })
+        },
+        async login(email, password, rememberMe){
+            await axios.post(
+                '/api/auth/login',
+                {
+                    'email': email,
+                    'password': password,
+                    'remember_me': rememberMe
+            }).then((res) => {
+                this.setUser(res.data.user);
+                this.setToken(res.data.accessToken);
+                return true;
+            }).catch((error)=>{
+                if (!error.response){
+                    return false;
+                }
+                return error.response.data.message;
+            })
+        },
+       async registration(login, email, password, repeatPassword){
+            await axios.post(
+                '/api/auth/register',
+                {'name': login,
+                    'email': email,
+                    'password': password,
+                    'c_password': repeatPassword
+                }).then((res) => {
+                this.setUser(res.data.user);
+                this.setToken(res.data.accessToken);
+                return true;
+            }).catch((error)=>{
+                if (!error.response){
+                    return false;
+                }
+                return error.response.data.message;
+            })
+        },
+        logout(){
+            axios.get('/api/auth/logout',
+                {
+                    headers:
+                        {
+                            Authorization: `Bearer ${this.token}`,
+                            token: this.token
+                        }
+                }
+            );
+            this.nullifyUser();
+        },
+        nullifyUser(){
+            this.setUser(null);
+            this.setToken(null);
+        }
     },
 })
diff --git a/resources/views/Auth/Login.vue b/resources/views/Auth/Login.vue
index fd01392..89e6162 100644
--- a/resources/views/Auth/Login.vue
+++ b/resources/views/Auth/Login.vue
@@ -1,5 +1,4 @@
 <script>
-import axios from "axios";
 import {useUserStore} from "../../store/user.js";
 
 export default {
@@ -15,25 +14,23 @@ export default {
     }),
     methods: {
         loginAction(){
-            axios.post(
-                '/api/auth/login',
-                {'name': this.login,
-                    'email': this.email,
-                    'password': this.password,
-                    'remember_me': this.rememberMe
-                }).then((res) => {
-                this.userStore.setUser(res.data.user);
-                this.userStore.setToken(res.data.accessToken);
-                this.$router.push('/');
-            }).catch((error)=>{
-                if (!error.response){
-                    this.errorMessage = '';
-                    this.errorMessageContainerStyle = 'display: none;';
-                    return;
+            this.userStore.login(this.email, this.password, this.rememberMe).then((isLogged) => {
+                if (typeof isLogged == "boolean") {
+                    if (isLogged){
+                        this.errorMessage = '';
+                        this.errorMessageContainerStyle = 'display: none;';
+                        this.$router.push('/');
+                    } else {
+                        this.errorMessage = 'Authentication error';
+                        this.errorMessageContainerStyle = '';
+                    }
+                } else if (typeof isLogged == "string") {
+                    this.errorMessage = isLogged;
+                    this.errorMessageContainerStyle = '';
                 }
-                this.errorMessage = error.response.data.message;
-                this.errorMessageContainerStyle = '';
-            })
+            });
+
+
         }
     }
 }
diff --git a/resources/views/Auth/Registration.vue b/resources/views/Auth/Registration.vue
index 514f215..f12b271 100644
--- a/resources/views/Auth/Registration.vue
+++ b/resources/views/Auth/Registration.vue
@@ -1,5 +1,4 @@
 <script>
-import axios from "axios";
 import {useUserStore} from "../../store/user.js";
 
 export default {
@@ -16,20 +15,21 @@ export default {
     }),
     methods: {
         registrationAction(){
-            axios.post(
-                '/api/auth/register',
-                {'name': this.login,
-                    'email': this.email,
-                    'password': this.password,
-                    'c_password': this.repeatPassword
-            }).then((res) => {
-                this.userStore.setUser(res.data.user);
-                this.userStore.setToken(res.data.accessToken);
-                this.$router.push('/');
-            }).catch((error)=>{
-                this.errorMessage = error;
-                this.errorMessageContainerStyle = '';
-            })
+            this.userStore.registration(this.login, this.email, this.password, this.repeatPassword).then((isRegistred)=>{
+                if (typeof isRegistred == "boolean") {
+                    if (isRegistred){
+                        this.errorMessage = '';
+                        this.errorMessageContainerStyle = 'display: none;';
+                        this.$router.push('/');
+                    } else {
+                        this.errorMessage = 'Registration error';
+                        this.errorMessageContainerStyle = '';
+                    }
+                } else if (typeof isRegistred == "string") {
+                    this.errorMessage = isRegistred;
+                    this.errorMessageContainerStyle = '';
+                }
+            });
         }
     }
 }
diff --git a/resources/views/Welcome.vue b/resources/views/Welcome.vue
index 251163e..809b133 100644
--- a/resources/views/Welcome.vue
+++ b/resources/views/Welcome.vue
@@ -20,7 +20,6 @@
 </template>
 
 <script>
-import axios from "axios";
 import {useUserStore} from "../store/user.js";
 import {watch} from "vue";
 export default {
@@ -28,61 +27,23 @@ export default {
     data: () => ({
         cardTitle: 'Hello world!',
         isAuthenticated: false,
-        username: ''
+        username: '',
+        userStore: useUserStore()
     }),
     computed: {
         user() {
-            const authStore = useUserStore();
-            return authStore.user;
+            return this.userStore.user;
         },
     },
     methods: {
         async logout() {
-            try {
-                const authStore = useUserStore();
-                let token = authStore.token;
-                await axios.get('/api/auth/logout',
-                    {
-                        headers:
-                            {
-                                Authorization: `Bearer ${token}`,
-                                token: token
-                            }
-                    }
-                );
-                authStore.setUser(null);
-                authStore.setToken(null);
-                this.$router.push('/auth_options');
-            } catch (error) {
-                alert('Ошибка выхода');
-            }
-        },
-        checkUser(){
-            const authStore = useUserStore();
-            let token = authStore.token;
-            if (token){
-                axios.get(
-                    '/api/auth/user',
-                    {
-                        headers:
-                            {
-                                Authorization: `Bearer ${token}`,
-                                token: token
-                            }
-                    }
-                ).then((res) => {
-                    authStore.setUser(res.data);
-                }).catch((error)=>{
-                    authStore.setUser(null);
-                    authStore.setToken(null);
-                })
-            }
-        },
+            this.userStore.logout();
+            this.$router.push('/auth_options');
+        }
     },
     mounted() {
         this.$router.push('/auth_options');
-        const authStore = useUserStore();
-        watch(authStore, (newStore, oldStore)=>{
+        watch(this.userStore, (newStore, oldStore)=>{
             this.isAuthenticated = newStore.user !== null && newStore.user !== undefined;
             if (this.isAuthenticated) {
                 this.$router.push('/wishlist');
@@ -90,7 +51,7 @@ export default {
                 this.$router.push('/auth_options');
             }
         });
-        this.checkUser();
+        this.userStore.checkUser();
     }
 }
 </script>