Refactor: Replace RoomAuthService with Laravel Context

app/Http/Controllers/api/v1/RoomController.php

@@ -25,7 +25,6 @@
 use App\Models\RoomType;
 use App\Models\User;
 use App\Prometheus\Counter;
-use App\Services\RoomAuthService;
 use App\Services\RoomService;
 use App\Settings\GeneralSettings;
 use Illuminate\Auth\Access\AuthorizationException;
@@ -201,7 +200,7 @@ public function store(CreateRoom $request)
      *
      * @return \App\Http\Resources\Room
      */
-    public function show(Room $room, RoomAuthService $roomAuthService)
+    public function show(Room $room)
     {
         return (new \App\Http\Resources\Room($room))->withDetails();
     }

app/Http/Middleware/RoomAuthenticate.php

@@ -8,22 +8,15 @@
 use App\Models\Room;
 use App\Models\RoomAuthToken;
 use App\Prometheus\Counter;
-use App\Services\RoomAuthService;
 use Closure;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Context;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
 
 class RoomAuthenticate
 {
-    protected RoomAuthService $roomAuthService;
-
-    public function __construct(RoomAuthService $roomAuthService)
-    {
-        $this->roomAuthService = $roomAuthService;
-    }
-
     /**
      * Handle requests to room routes and determine room unauthenticated status
      *
@@ -145,8 +138,8 @@ public function handle($request, Closure $next, $allowUnAuthenticated = false)
         }
 
         // make authentication status and personalized link available to other parts of the application
-        $this->roomAuthService->setAuthenticated($room, $authenticated);
-        $this->roomAuthService->setRoomPersonalizedLink($room, $personalizedLink);
+        Context::addHidden("room.{$room->id}.authenticated", $authenticated);
+        Context::addHidden("room.{$room->id}.personalized_link", $personalizedLink);
 
         return $next($request);
     }

app/Http/Requests/JoinMeeting.php

@@ -3,23 +3,17 @@
 namespace App\Http\Requests;
 
 use App\Rules\ValidName;
-use App\Services\RoomAuthService;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Context;
 
 class JoinMeeting extends FormRequest
 {
-    protected RoomAuthService $roomAuthService;
-
-    public function __construct(RoomAuthService $roomAuthService)
-    {
-        parent::__construct();
-        $this->roomAuthService = $roomAuthService;
-    }
-
     public function rules(): array
     {
+        $personalizedLink = Context::getHidden("room.{$this->room->id}.personalized_link");
+
         $rules = [
-            'name' => auth()->check() || $this->roomAuthService->getRoomPersonalizedLink($this->room) ? [] : ['required', 'min:2', 'max:50',  new ValidName],
+            'name' => auth()->check() || $personalizedLink ? [] : ['required', 'min:2', 'max:50',  new ValidName],
             'dark_mode' => ['sometimes', 'boolean'],
         ];
 

app/Http/Requests/StartMeeting.php

@@ -3,23 +3,17 @@
 namespace App\Http\Requests;
 
 use App\Rules\ValidName;
-use App\Services\RoomAuthService;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Context;
 
 class StartMeeting extends FormRequest
 {
-    protected RoomAuthService $roomAuthService;
-
-    public function __construct(RoomAuthService $roomAuthService)
-    {
-        parent::__construct();
-        $this->roomAuthService = $roomAuthService;
-    }
-
     public function rules(): array
     {
+        $personalizedLink = Context::getHidden("room.{$this->room->id}.personalized_link");
+
         $rules = [
-            'name' => auth()->check() || $this->roomAuthService->getRoomPersonalizedLink($this->room) ? [] : ['required', 'min:2', 'max:50',  new ValidName],
+            'name' => auth()->check() || $personalizedLink ? [] : ['required', 'min:2', 'max:50',  new ValidName],
             'dark_mode' => ['sometimes', 'boolean'],
         ];
 

app/Http/Resources/Room.php

@@ -4,9 +4,9 @@
 
 use App\Http\Resources\User as UserResource;
 use App\Models\RoomPersonalizedLink;
-use App\Services\RoomAuthService;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Context;
 use Illuminate\Support\Facades\Gate;
 
 class Room extends JsonResource
@@ -41,9 +41,8 @@ public function __construct($resource)
     {
         parent::__construct($resource);
 
-        $roomAuthService = app()->make(RoomAuthService::class);
-        $this->personalizedLink = $roomAuthService->getRoomPersonalizedLink($resource);
-        $this->authenticated = $roomAuthService->isAuthenticated($resource);
+        $this->personalizedLink = Context::getHidden("room.{$resource->id}.personalized_link");
+        $this->authenticated = Context::getHidden("room.{$resource->id}.authenticated") === true;
     }
 
     public function getDetails($latestMeeting)

app/Models/Room.php

@@ -6,13 +6,13 @@
 use App\Enums\RoomUserRole;
 use App\Enums\RoomVisibility;
 use App\Observers\RoomObserver;
-use App\Services\RoomAuthService;
 use App\Settings\GeneralSettings;
 use App\Traits\AddsModelNameTrait;
 use Illuminate\Database\Eloquent\Attributes\ObservedBy;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasOne;
+use Illuminate\Support\Facades\Context;
 use Illuminate\Validation\Rule;
 
 #[ObservedBy([RoomObserver::class])]
@@ -273,8 +273,7 @@ public function personalizedLinks()
      */
     public function isModerator(?User $user): bool
     {
-        $roomAuthService = app()->make(RoomAuthService::class);
-        $personalizedLink = $roomAuthService->getRoomPersonalizedLink($this);
+        $personalizedLink = Context::getHidden("room.{$this->id}.personalized_link");
 
         if ($user == null && $personalizedLink != null) {
             return $personalizedLink->room->is($this) && $personalizedLink->role == RoomUserRole::MODERATOR;
@@ -295,8 +294,7 @@ public function isCoOwner(?User $user): bool
      */
     public function isMember(?User $user): bool
     {
-        $roomAuthService = app()->make(RoomAuthService::class);
-        $personalizedLink = $roomAuthService->getRoomPersonalizedLink($this);
+        $personalizedLink = Context::getHidden("room.{$this->id}.personalized_link");
 
         if ($user == null && $personalizedLink != null) {
             return $personalizedLink->room->is($this) && ($personalizedLink->role == RoomUserRole::USER || $personalizedLink->role == RoomUserRole::MODERATOR);

app/Providers/AppServiceProvider.php

@@ -4,7 +4,6 @@
 
 use App\Pulse\Users;
 use App\Services\LocaleService;
-use App\Services\RoomAuthService;
 use App\Services\StreamingServiceFactory;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Pagination\Paginator;
@@ -31,10 +30,6 @@ public function register(): void
 
         $this->app->singleton(ResolvesUsers::class, Users::class);
 
-        $this->app->singleton(RoomAuthService::class, function () {
-            return new RoomAuthService;
-        });
-
         $this->app->register(\Laravel\Telescope\TelescopeServiceProvider::class);
         $this->app->register(TelescopeServiceProvider::class);
 

app/Services/MeetingService.php

@@ -9,7 +9,6 @@
 use App\Http\Requests\StartMeeting;
 use App\Models\Meeting;
 use App\Models\MeetingAttendee;
-use App\Models\Room;
 use App\Models\User;
 use App\Settings\BigBlueButtonSettings;
 use BigBlueButton\Enum\Feature;
@@ -20,6 +19,7 @@
 use BigBlueButton\Parameters\JoinMeetingParameters;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Context;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\URL;
@@ -633,8 +633,7 @@ private function mapAttendanceSessions($sessions): mixed
      */
     public function getJoinUrl(JoinMeeting|StartMeeting $request): string
     {
-        $roomAuthService = app()->make(RoomAuthService::class);
-        $personalizedLink = $roomAuthService->getRoomPersonalizedLink($this->meeting->room);
+        $personalizedLink = Context::getHidden("room.{$this->meeting->room->id}.personalized_link");
 
         if (Auth::guest()) {
             if ($personalizedLink) {

tests/Backend/Unit/MeetingTest.php

@@ -11,12 +11,12 @@
 use App\Models\Server;
 use App\Models\User;
 use App\Services\MeetingService;
-use App\Services\RoomAuthService;
 use App\Services\ServerService;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Foundation\Testing\WithFaker;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Context;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
@@ -337,11 +337,10 @@ public function test_join_parameters_authenticated_user()
 
         $serverService = new ServerService($server);
         $meetingService = new MeetingService($meeting);
-        $roomAuthService = app()->make(RoomAuthService::class);
-        $roomAuthService->setAuthenticated($meeting->room, true);
+        Context::addHidden("room.{$meeting->room->id}.authenticated", true);
         Auth::login($user);
 
-        $request = new JoinMeeting($roomAuthService);
+        $request = new JoinMeeting;
         $parameters = [];
         parse_str(parse_url($meetingService->setServerService($serverService)->getJoinUrl($request), PHP_URL_QUERY), $parameters);
 
@@ -413,10 +412,9 @@ public function test_join_parameters_guest()
 
         $serverService = new ServerService($server);
         $meetingService = new MeetingService($meeting);
-        $roomAuthService = app()->make(RoomAuthService::class);
-        $roomAuthService->setAuthenticated($meeting->room, false);
+        Context::addHidden("room.{$meeting->room->id}.authenticated", false);
 
-        $request = new JoinMeeting($roomAuthService);
+        $request = new JoinMeeting;
         $request->replace([
             'name' => 'John Doe',
         ]);
@@ -460,11 +458,10 @@ public function test_join_parameters_guest_with_personalized_link()
 
         $serverService = new ServerService($server);
         $meetingService = new MeetingService($meeting);
-        $roomAuthService = app()->make(RoomAuthService::class);
-        $roomAuthService->setAuthenticated($meeting->room, false);
-        $roomAuthService->setRoomPersonalizedLink($meeting->room, $link);
+        Context::addHidden("room.{$meeting->room->id}.authenticated", false);
+        Context::addHidden("room.{$meeting->room->id}.personalized_link", $link);
 
-        $request = new JoinMeeting($roomAuthService);
+        $request = new JoinMeeting;
 
         $parameters = [];
         parse_str(parse_url($meetingService->setServerService($serverService)->getJoinUrl($request), PHP_URL_QUERY), $parameters);
@@ -506,16 +503,15 @@ public function test_join_parameters_with_custom_join_parameters()
 
         $serverService = new ServerService($server);
         $meetingService = new MeetingService($meeting);
-        $roomAuthService = app()->make(RoomAuthService::class);
-        $roomAuthService->setAuthenticated($meeting->room, false);
+        Context::addHidden("room.{$meeting->room->id}.authenticated", false);
 
         Auth::login($meeting->room->owner);
 
         // Check with valid join parameters
         $roomType = $this->meeting->room->roomType;
         $roomType->join_parameters = "enforceLayout=PRESENTATION_ONLY\nwebcamBackgroundURL=https://example.com/background.png\nexcludeFromDashboard=true\nredirect=false\nuserdata-bbb_hide_presentation_on_join=true";
         $roomType->save();
-        $request = new JoinMeeting($roomAuthService);
+        $request = new JoinMeeting;
         $parameters = [];
         parse_str(parse_url($meetingService->setServerService($serverService)->getJoinUrl($request), PHP_URL_QUERY), $parameters);
 
@@ -535,7 +531,7 @@ public function test_join_parameters_with_custom_join_parameters()
         $roomType->join_parameters = "enforceLayout=INVALID_LAYOUT\nexcludeFromDashboard=invalid\nuserdata-bbb_hide_presentation_on_join=true";
         $roomType->save();
 
-        $request = new JoinMeeting($roomAuthService);
+        $request = new JoinMeeting;
         $parameters = [];
         parse_str(parse_url($meetingService->setServerService($serverService)->getJoinUrl($request), PHP_URL_QUERY), $parameters);