Laravel Passport support (jamesmills#29)

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

Author: amandiobm

src/LaravelTimezoneServiceProvider.php

@@ -36,7 +36,7 @@ public function boot()
         AliasLoader::getInstance()->alias('Timezone', \JamesMills\LaravelTimezone\Facades\Timezone::class);
 
         // Register an event listener
-        Event::listen(\Illuminate\Auth\Events\Login::class, UpdateUsersTimezone::class);
+        $this->registerEventListener();
 
         // Allow config publish
         $this->publishes([
@@ -76,4 +76,17 @@ public function register()
             'timezone'
         );
     }
+
+    /**
+     *
+     */
+    private function registerEventListener(): void
+    {
+        $events = [
+            \Illuminate\Auth\Events\Login::class,
+            \Laravel\Passport\Events\AccessTokenCreated::class,
+        ];
+
+        Event::listen($events, UpdateUsersTimezone::class);
+    }
 }

src/Listeners/Auth/UpdateUsersTimezone.php

@@ -3,22 +3,53 @@
 namespace JamesMills\LaravelTimezone\Listeners\Auth;
 
 use Illuminate\Auth\Events\Login;
+use Illuminate\Support\Facades\Auth;
+use Laravel\Passport\Events\AccessTokenCreated;
+use Torann\GeoIP\Location;
 
 class UpdateUsersTimezone
 {
 
     /**
      * Handle the event.
      *
-     * @param  Login $event
      * @return void
      */
-    public function handle(Login $event)
+    public function handle($event)
     {
+        $user = null;
+
+        /**
+         * If the event is AccessTokenCreated,
+         * we logged the user and return,
+         * stopping the execution.
+         *
+         * The Auth::loginUsingId dispatches a Login event,
+         * making this listener be called again.
+         */
+        if ($event instanceof AccessTokenCreated) {
+            Auth::loginUsingId($event->userId);
+
+            return;
+        }
+
+        /**
+         * If the event is Login, we get the user from the web guard.
+         */
+        if ($event instanceof Login) {
+            $user = Auth::user();
+        }
+
+        /**
+         * If no user is found, we just return. Nothing to do here.
+         */
+        if (is_null($user)) {
+            return;
+        }
+
         $ip = $this->getFromLookup();
         $geoip_info = geoip()->getLocation($ip);
 
-        $user = auth()->user();
         if ($user->timezone != $geoip_info['timezone']) {
             if (config('timezone.overwrite') == true || $user->timezone == null) {
                 $user->timezone = $geoip_info['timezone'];
@@ -30,9 +61,9 @@ public function handle(Login $event)
     }
 
     /**
-     * @param  \Torann\GeoIP\Location  $geoip_info
+     * @param  Location  $geoip_info
      */
-    public function notify(\Torann\GeoIP\Location $geoip_info)
+    private function notify(Location $geoip_info)
     {
         if (config('timezone.flash') == 'off') {
             return;
@@ -74,7 +105,7 @@ public function notify(\Torann\GeoIP\Location $geoip_info)
     /**
     * @return mixed
     */
-    public function getFromLookup()
+    private function getFromLookup()
     {
         $result = null;
 
@@ -98,7 +129,7 @@ public function getFromLookup()
      * @param $keys
      * @return string|null
      */
-    public function lookup($type, $keys)
+    private function lookup($type, $keys)
     {
         $value = null;
 

src/Timezone.php

@@ -48,7 +48,7 @@ public function convertFromLocal($date) : Carbon
      * @param  Carbon  $date
      * @return string
      */
-    public function formatTimezone(Carbon $date) : string
+    private function formatTimezone(Carbon $date) : string
     {
         $timezone = $date->format('e');
         $parts = explode('/', $timezone);