Skip to content

A self-hosted media server and file management system

fix: api/auth returns an error 401 instead of useful data to signify auth state of session

aminnausin810a3437c8f6
diff --git a/app/Http/Controllers/Api/V1/AuthController.php b/app/Http/Controllers/Api/V1/AuthController.php
index b518ffc7..3f71384c 100755
--- a/app/Http/Controllers/Api/V1/AuthController.php
+++ b/app/Http/Controllers/Api/V1/AuthController.php
@@ -59,13 +59,19 @@ class AuthController extends Controller {
}
public function authenticate() {
- try {
- $user = Auth::user();
+ $user = Auth::user();
- return $this->success(['user' => $user], 'Authenticated as ' . $user->name);
- } catch (\Throwable $th) {
- return response(['error' => $th->getMessage(), 'session' => env('SESSION_DOMAIN'), 'sanctum' => env('SANCTUM_STATEFUL_DOMAINS'), 'app' => env('APP_URL')], 401);
+ if ($user) {
+ return response()->json([
+ 'isAuthenticated' => true,
+ 'user' => new UserResource($user),
+ ]);
}
+
+ return response()->json([
+ 'isAuthenticated' => false,
+ 'user' => null,
+ ]);
}
/**
diff --git a/resources/js/service/authAPI.ts b/resources/js/service/authAPI.ts
index b0e8c21b..4e46a359 100644
--- a/resources/js/service/authAPI.ts
+++ b/resources/js/service/authAPI.ts
@@ -1,4 +1,6 @@
import type { ChangeEmailRequest, ChangePasswordRequest, PasswordRequest } from '@/types/requests';
+import type { AxiosResponse } from 'axios';
+import type { UserResource } from '@/types/resources';
import { useQueryClient } from '@tanstack/vue-query';
import { queryClient } from '@/service/vue-query';
@@ -30,7 +32,7 @@ export const logout = async () => {
return Promise.resolve({ response: response.data });
};
-export const authenticate = async () => {
+export const authenticate = async (): Promise<AxiosResponse<{ user: UserResource | null; isAuthenticated: boolean }>> => {
return API.get('/auth', {
headers: {
'X-Skip-Toast': 'true',