SSL option + refactor

Author: pascalbaljet

composer.json

@@ -30,6 +30,7 @@
     },
     "require-dev": {
         "orchestra/testbench": "^4.0 || ^5.0",
+        "mockery/mockery": "^1.3",
         "phpunit/phpunit": "^8.3"
     },
     "autoload": {

config/config.php

@@ -8,6 +8,8 @@
     // set to null to disable
     'http_uri' => 'gaid',
 
+    'use_ssl' => true,
+
     'anonymize_ip' => true,
 
     'send_user_id' => true,

src/ServiceProvider.php

@@ -53,37 +53,53 @@ public function register()
         );
 
         $this->app->singleton(EventBroadcaster::class, BroadcastEvent::class);
+
+        $this->registerClientId();
+        $this->registerAnalytics();
+        $this->registerRoute();
+    }
+
+    private function registerClientId()
+    {
         $this->app->singleton(ClientIdRepostory::class, ClientIdSession::class);
 
         $this->app->bind('analytics-event-tracking-client-id', function () {
-            return app(ClientIdSession::class)->get();
+            return $this->app->make(ClientIdSession::class)->get();
         });
 
         $this->app->singleton(ClientIdSession::class, function () {
             return new ClientIdSession(
-                app('session.store'),
+                $this->app->make('session.store'),
                 config('analytics-event-tracking.client_id_session_key')
             );
         });
+    }
 
+    private function registerAnalytics()
+    {
         $this->app->bind(Analytics::class, function () {
-            return tap(new Analytics(true), function (Analytics $analytics) {
+            return tap(new Analytics(config('analytics-event-tracking.use_ssl')), function (Analytics $analytics) {
+                $analytics->setTrackingId(
+                    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);
                 }
-
-                $analytics->setTrackingId(
-                    config('analytics-event-tracking.tracking_id')
-                );
             });
         });
+    }
 
-        if ($httpUri = config('analytics-event-tracking.http_uri')) {
-            Route::post($httpUri, StoreClientIdInSession::class);
+    private function registerRoute()
+    {
+        if (!$httpUri = config('analytics-event-tracking.http_uri')) {
+            return;
         }
+
+        Route::post($httpUri, StoreClientIdInSession::class);
     }
 }

tests/ServiceProviderTest.php

@@ -14,6 +14,18 @@ public function it_sets_the_tracking_id_from_the_configuration()
         $this->assertStringContainsString('tid=UA-11111111-11', app(Analytics::class)->getUrl());
     }
 
+    /** @test */
+    public function it_can_disable_ssl()
+    {
+        config(['analytics-event-tracking.use_ssl' => true]);
+
+        $this->assertStringContainsString('https://', app(Analytics::class)->getUrl());
+
+        config(['analytics-event-tracking.use_ssl' => false]);
+
+        $this->assertStringContainsString('http://', app(Analytics::class)->getUrl());
+    }
+
     private function authenticateUser()
     {
         Auth::login(