Added API

app/Http/Controllers/UserFlightController.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Models\User;
-use App\Models\UserFlight;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Gate;
-
-class UserFlightController extends Controller
-{
-
-
-}

app/Http/Middleware/HandleInertiaRequests.php

@@ -37,6 +37,7 @@ class HandleInertiaRequests extends Middleware
                 'user' => $request->user(),
                 'roles' => $request->user()?->getRoleNames() ?? [],
                 'permissions' => $request->user()?->getAllPermissions()->pluck('name') ?? [],
+                'apiToken' => session('api_token'),
             ],
             'achievement_notifications' => fn() => $request->user()
                 ? $request->user()

app/Http/Middleware/SanctumOrTrustedOrigin.php

@@ -4,6 +4,7 @@ namespace App\Http\Middleware;
 
 use Closure;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Symfony\Component\HttpFoundation\Response;
 
 class SanctumOrTrustedOrigin
@@ -11,7 +12,8 @@ class SanctumOrTrustedOrigin
     public function handle(Request $request, Closure $next): Response
     {
         // Authenticated via Sanctum (cookie or token) — let it through, auth()->user() is set.
-        if ($request->user('sanctum')) {
+        if ($user = $request->user('sanctum')) {
+            Auth::setUser($user);
             return $next($request);
         }
 

app/Listeners/IssueApiToken.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Models\User;
+use Illuminate\Auth\Events\Login;
+
+class IssueApiToken
+{
+    public function handle(Login $event): void
+    {
+        /** @var User $user */
+        $user = $event->user;
+        $user->tokens()->where('name', 'frontend')->delete();
+        $token = $user->createToken(
+            'frontend',
+            ['*'],
+            now()->addHours(4)
+        )->plainTextToken;
+
+        session(['api_token' => $token]);
+    }
+}

app/Listeners/RevokeApiToken.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Listeners;
+
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Queue\InteractsWithQueue;
+
+namespace App\Listeners;
+
+use App\Models\User;
+use Illuminate\Auth\Events\Logout;
+
+class RevokeApiToken
+{
+    public function handle(Logout $event): void
+    {
+        /** @var User $user */
+        $user = $event->user;
+
+        $user?->tokens()->where('name', 'frontend')->delete();
+        session()->forget('api_token');
+    }
+}

app/Providers/AppServiceProvider.php

@@ -31,8 +31,8 @@ class AppServiceProvider extends ServiceProvider
         UserFlight::observe(FlightObserver::class);
         Airline::observe(AirlineObserver::class);
         RateLimiter::for('api', function (Request $request) {
-            return $request->user()
+            return $request->user('sanctum')
-                ? Limit::perMinute(60)->by($request->user()->id)
+                ? Limit::perMinute(60)->by($request->user('sanctum')->id)
                 : Limit::perMinute(10)->by($request->ip());
         });
 

bootstrap/app.php

@@ -1,6 +1,7 @@
 <?php
 
 use App\Http\Middleware\HandleInertiaRequests;
+use App\Http\Middleware\SanctumOrTrustedOrigin;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Application;
 use Illuminate\Foundation\Configuration\Exceptions;
@@ -32,6 +33,7 @@ return Application::configure(basePath: dirname(__DIR__))
             'role'               => RoleMiddleware::class,
             'permission'         => PermissionMiddleware::class,
             'role_or_permission' => RoleOrPermissionMiddleware::class,
+            'sanctum.or.trusted' => SanctumOrTrustedOrigin::class,
         ]);
         //
     })

resources/js/Composables/useApiResource.ts

@@ -0,0 +1,42 @@
+import { ref, onMounted, onUnmounted, type Ref } from 'vue'
+import axios from 'axios'
+import { api } from '@/api'
+
+interface UseApiResourceReturn<T> {
+    data: Ref<T | null>
+    loading: Ref<boolean>
+    error: Ref<string | null>
+    refresh: () => Promise<void>
+}
+
+export function useApiResource<T>(url: string, immediate = true): UseApiResourceReturn<T> {
+    const data = ref<T | null>(null) as Ref<T | null>
+    const loading = ref(true)
+    const error = ref<string | null>(null)
+
+    let controller = new AbortController()
+
+    async function refresh() {
+        controller.abort()
+        controller = new AbortController()
+        loading.value = true
+        error.value = null
+
+        try {
+            const response = await api.get<T>(url, { signal: controller.signal })
+            data.value = response.data
+        } catch (e) {
+            if (!axios.isCancel(e)) {
+                error.value = 'Failed to load data'
+                console.error(e)
+            }
+        } finally {
+            loading.value = false
+        }
+    }
+
+    if (immediate) onMounted(refresh)
+    onUnmounted(() => controller.abort())
+
+    return { data, loading, error, refresh }
+}

resources/js/Composables/useFlights.ts

@@ -1,21 +1,12 @@
-// useFlights.ts
+import { computed } from 'vue'
-import {onMounted, ref} from "vue";
+import { useApiResource } from '@/Composables/useApiResource'
-import {Flight} from "@/Types/types";
+import type { Flight } from '@/Types/types'
-import axios from "axios";
 
 export function useFlights(url: string, departedOnly: boolean = false) {
-    const flights = ref<Flight[]>([])
+    const requestUrl = departedOnly ? `${url}/departed` : url
-    const flightsLoading = ref(true)
+    const { data, loading, error } = useApiResource<Flight[]>(requestUrl)
 
-    onMounted(async () => {
+    const flights = computed(() => data.value ?? [])
-        try {
-            const requestUrl = departedOnly ? `${url}/departed` : url
-            const response = await axios.get(requestUrl)
-            flights.value = response.data
-        } finally {
-            flightsLoading.value = false
-        }
-    })
 
-    return { flights, flightsLoading }
+    return { flights, flightsLoading: loading, error }
 }

resources/js/Types/types.d.ts

@@ -97,6 +97,7 @@ export type SharedProps = import('@inertiajs/core').PageProps & {
         isLoggedIn: boolean
         roles: string[];
         permissions: string[];
+        apiToken: string | null;
     },
     logo_api_url: string
     achievement_notifications: Notification[]

resources/js/api.ts

@@ -0,0 +1,17 @@
+import axios from 'axios'
+import { usePage } from '@inertiajs/vue3'
+import {SharedProps} from "@/Types/types";
+
+export const api = axios.create({
+    baseURL: import.meta.env.VITE_API_URL,
+    withCredentials: true,
+    headers: { Accept: 'application/json' },
+})
+
+api.interceptors.request.use((config) => {
+    const token = usePage<SharedProps>().props.auth?.apiToken
+    if (token) {
+        config.headers.Authorization = `Bearer ${token}`
+    }
+    return config
+})

routes/api.php

@@ -12,9 +12,10 @@ Route::domain(config('app.api_domain'))->group(function () {
         return response()->json(['message' => 'Welcome to the FlightsGoneBy API']);
     });
 
-    Route::prefix('user')->controller(UserApiController::class)->group(function () {
+    Route::prefix('user')->controller(UserApiController::class)->middleware('sanctum.or.trusted')->group(function () {
         Route::get('{user}/flights', 'viewableFlights')->name('api.user.flights');
-        Route::get('{user}/flights/departed', 'viewableDepartedFlights')->name('api.user.flights');
+        Route::get('{user}/flights/departed', 'viewableDepartedFlights')->name('api.user.flights.departed');
+        Route::get('{user}/flights/upcoming', 'viewableUpcomingFlights')->name('api.user.flights.departed');
     });