diff --git a/app/Http/Controllers/Api/RoomSongController.php b/app/Http/Controllers/Api/RoomSongController.php index 4fb3520..dad083f 100644 --- a/app/Http/Controllers/Api/RoomSongController.php +++ b/app/Http/Controllers/Api/RoomSongController.php @@ -109,7 +109,7 @@ class RoomSongController extends Controller $roomSession->room->branch->external_ip, "/api/room/sync-order-song", $validated, - Auth::user()->api_plain_token + $request->bearerToken() ))->forward(); } public function syncOrderSong(SyncOrderSongRequest $request) diff --git a/app/Http/Controllers/RoomControlController.php b/app/Http/Controllers/RoomControlController.php index ced1488..a9a33e4 100644 --- a/app/Http/Controllers/RoomControlController.php +++ b/app/Http/Controllers/RoomControlController.php @@ -180,7 +180,7 @@ class RoomControlController extends Controller $branch->external_ip, "/api/room/session", $validated, - Auth::user()->api_plain_token + $request->bearerToken() ))->forward(); return ApiResponse::success([ 'room' => $room->latestSession, @@ -274,7 +274,7 @@ class RoomControlController extends Controller $branch->external_ip ?? '', '/api/room/receiveSwitch', (new RoomResource($room->refresh()))->toArray(request()), - Auth::user()->api_plain_token + $request->bearerToken() ))->forward(); return ApiResponse::success([ 'data' => MachineStatus::create($validated), @@ -383,7 +383,7 @@ class RoomControlController extends Controller $branch->external_ip, "/api/room/receiveSwitch", (new RoomResource($room->refresh()))->toArray(request()), - Auth::user()->api_plain_token + $request->bearerToken() ))->forward(); return $validated['command']==='error' ? ApiResponse::error('機房控制失敗') : ApiResponse::success($room); } diff --git a/app/Services/MachineStatusForwarder.php b/app/Services/MachineStatusForwarder.php index a4dfac4..a8b8146 100644 --- a/app/Services/MachineStatusForwarder.php +++ b/app/Services/MachineStatusForwarder.php @@ -2,6 +2,7 @@ namespace App\Services; +use App\Models\User; use Illuminate\Support\Facades\Log; use Illuminate\Http\Client\Response; use App\Services\ApiClient; @@ -11,14 +12,14 @@ class MachineStatusForwarder protected string $externalUrl; protected string $endpoint; protected array $validated; - protected string $apiPlainToken; + protected ?string $apiPlainToken; - public function __construct(string $externalUrl, string $endpoint, array $validated, string $token=null) + public function __construct(string $externalUrl, string $endpoint, array $validated, ?string $token=null) { $this->externalUrl = $externalUrl; $this->endpoint = $endpoint; $this->validated = $validated; - $this->$apiPlainToken = $token; + $this->apiPlainToken = $token; } public function forward(): ?Response @@ -30,7 +31,7 @@ class MachineStatusForwarder $mainDomain = implode('.', array_slice($hostParts, 1)); $mainDomainUrl = "{$parsed['scheme']}://{$mainDomain}"; - $token = $this->api_plain_token ?? User::find(2)?->api_plain_token; + $token = $this->apiPlainToken ?? User::find(2)?->api_plain_token; if ($token) { $client = new ApiClient($mainDomainUrl, $token); $response = $client->post($this->endpoint, $this->validated);