diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 116b8c5e..3e39148a 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -114,6 +114,7 @@ class LoginController extends Controller return response()->json([ 'message' => 'authenticated', 'name' => $name, + 'email' => $this->guard()->user()->email, 'preferences' => $this->guard()->user()->preferences, 'is_admin' => $this->guard()->user()->is_admin, ], Response::HTTP_OK); diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index b8404aa8..b97774ef 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -47,6 +47,7 @@ class RegisterController extends Controller return response()->json([ 'message' => 'account created', 'name' => $user->name, + 'email' => $user->email, 'preferences' => $this->guard()->user()->preferences, 'is_admin' => $this->guard()->user()->is_admin, ], 201); diff --git a/resources/js_vue3/router/middlewares/authGuard.js b/resources/js_vue3/router/middlewares/authGuard.js index 1a24f3fe..779cadfe 100644 --- a/resources/js_vue3/router/middlewares/authGuard.js +++ b/resources/js_vue3/router/middlewares/authGuard.js @@ -10,6 +10,7 @@ export default async function auth({ to, next, stores }) { if (currentUser) { user.$patch({ name: currentUser.name, + email: currentUser.email, preferences: currentUser.preferences, isAdmin: currentUser.is_admin, }) diff --git a/resources/js_vue3/stores/user.js b/resources/js_vue3/stores/user.js index a9228bd6..d18d4d84 100644 --- a/resources/js_vue3/stores/user.js +++ b/resources/js_vue3/stores/user.js @@ -9,6 +9,7 @@ export const useUserStore = defineStore({ state: () => { return { name: undefined, + email: undefined, preferences: window.defaultPreferences, isAdmin: false, } diff --git a/resources/js_vue3/views/auth/Login.vue b/resources/js_vue3/views/auth/Login.vue index f75ae650..6424b801 100644 --- a/resources/js_vue3/views/auth/Login.vue +++ b/resources/js_vue3/views/auth/Login.vue @@ -32,6 +32,7 @@ .then(response => { user.$patch({ name: response.data.name, + email: response.data.email, preferences: response.data.preferences, isAdmin: response.data.is_admin, }) diff --git a/resources/js_vue3/views/auth/Register.vue b/resources/js_vue3/views/auth/Register.vue index a140fc0d..a69f2ff4 100644 --- a/resources/js_vue3/views/auth/Register.vue +++ b/resources/js_vue3/views/auth/Register.vue @@ -30,6 +30,7 @@ registerForm.post('/user').then(response => { user.$patch({ name: response.data.name, + email: response.data.email, preferences: response.data.preferences, isAdmin: response.data.is_admin ?? false, })