Merged config files to prevent failures (jamesmills#28)

Co-authored-by: Amandio Magalhaes <[email protected]>

Author: amandiobm

src/LaravelTimezoneServiceProvider.php

@@ -70,5 +70,10 @@ function ($expression) {
     public function register()
     {
         $this->app->bind('timezone', Timezone::class);
+
+        $this->mergeConfigFrom(
+            __DIR__ . '/config/timezone.php',
+            'timezone'
+        );
     }
 }

src/Listeners/Auth/UpdateUsersTimezone.php

@@ -18,9 +18,9 @@ public function handle(Login $event)
         $ip = $this->getFromLookup();
         $geoip_info = geoip()->getLocation($ip);
 
-        if (auth()->user()->timezone != $geoip_info['timezone']) {
-            if (config('timezone.overwrite') == true || auth()->user()->timezone == null) {
-                $user = auth()->user();
+        $user = auth()->user();
+        if ($user->timezone != $geoip_info['timezone']) {
+            if (config('timezone.overwrite') == true || $user->timezone == null) {
                 $user->timezone = $geoip_info['timezone'];
                 $user->save();
 
@@ -70,7 +70,7 @@ public function notify(\Torann\GeoIP\Location $geoip_info)
             return;
         }
     }
-     
+
     /**
     * @return mixed
     */