Moved user ID logic

Author: pascalbaljet

src/Analytics/BroadcastEvent.php

@@ -2,7 +2,6 @@
 
 namespace ProtoneMedia\AnalyticsEventTracking\Analytics;
 
-use ProtoneMedia\AnalyticsEventTracking\ShouldBroadcastToAnalytics;
 use TheIconic\Tracking\GoogleAnalytics\Analytics;
 
 class BroadcastEvent implements EventBroadcaster
@@ -29,7 +28,7 @@ public function withAnalytics(callable $callback): self
      * on the events if it exists and then sends the event
      * to Google Analytics.
      */
-    public function handle(ShouldBroadcastToAnalytics $event): void
+    public function handle($event): void
     {
         $eventAction = method_exists($event, 'broadcastAnalyticsActionAs')
             ? $event->broadcastAnalyticsActionAs($this->analytics)

src/Listeners/DispatchAnalyticsJob.php

@@ -3,6 +3,7 @@
 namespace ProtoneMedia\AnalyticsEventTracking\Listeners;
 
 use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Support\Facades\Auth;
 use ProtoneMedia\AnalyticsEventTracking\Http\ClientIdRepostory;
 use ProtoneMedia\AnalyticsEventTracking\Jobs\SendEventToAnalytics;
 
@@ -22,12 +23,25 @@ public function __construct(ClientIdRepostory $clientIdRepository)
      */
     public function handle($event): void
     {
-        $job = new SendEventToAnalytics($event, $this->clientIdRepository->get());
+        $job = new SendEventToAnalytics($event, $this->clientIdRepository->get(), $this->userId());
 
         if ($queueName = config('analytics-event-tracking.queue_name')) {
             $job->onQueue($queueName);
         }
 
         dispatch($job);
     }
+
+    private function userId(): ?string
+    {
+        if (!config('analytics-event-tracking.send_user_id')) {
+            return null;
+        }
+
+        if (!Auth::check()) {
+            return null;
+        }
+
+        return Auth::id();
+    }
 }

src/ServiceProvider.php

@@ -2,7 +2,6 @@
 
 namespace ProtoneMedia\AnalyticsEventTracking;
 
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Route;
@@ -82,10 +81,6 @@ private function registerAnalytics()
                     config('analytics-event-tracking.tracking_id')
                 );
 
-                if (config('analytics-event-tracking.send_user_id') && Auth::check()) {
-                    $analytics->setUserId(Auth::id());
-                }
-
                 if (config('analytics-event-tracking.anonymize_ip')) {
                     $analytics->setAnonymizeIp(1);
                 }