From b2f09f4df068f8b7bab2dda93938ca88501266e2 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Fri, 27 Feb 2026 23:11:03 +0100
Subject: [PATCH] fix(auth): resolve current team from Sanctum token for API
 requests

Add fallback to resolve team from Sanctum access token when session team
is unavailable, enabling proper team context for stateless API requests.
---
 app/Models/User.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/Models/User.php b/app/Models/User.php
index 4561cddb2..68ecc6b31 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -316,6 +316,11 @@ class User extends Authenticatable implements SendsEmail
     {
         $sessionTeamId = data_get(session('currentTeam'), 'id');
 
+        // Fallback for stateless API requests: resolve team from Sanctum token
+        if (is_null($sessionTeamId) && $this->currentAccessToken()) {
+            $sessionTeamId = data_get($this->currentAccessToken(), 'team_id');
+        }
+
         if (is_null($sessionTeamId)) {
             return null;
         }