Sync user to discourse on edit of synced fields

app/Events/MemberDiscourseParamsChanged.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace BB\Events;
+
+use BB\Entities\User;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Broadcasting\InteractsWithSockets;
+
+class MemberDiscourseParamsChanged
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    /** @var User */
+    public $user;
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+}

app/Jobs/DiscourseSync.php

@@ -46,11 +46,11 @@ public function handle(Client $client)
 
     protected function sso_params()
     {
-        $this->user->isActive();
-
         return [
             'external_id' => $this->user->id,
 
+            // Make sure UserObserver@saved triggers MemberDiscourseParamsChanged for any field that are used here
+            // TODO: Flip dependency here to pull these from one centralised list on user? Or some intermediary class?
             'email' => $this->user->email,
             'username' => $this->user->name,
             'name' => $this->user->suppress_real_name ? $this->user->name : ($this->user->given_name . " " . $this->user->family_name),

app/Listeners/DiscourseSyncSubscriber.php

@@ -4,6 +4,7 @@
 
 use BB\Events\MemberBecameActive;
 use BB\Events\MemberBecameInactive;
+use BB\Events\MemberDiscourseParamsChanged;
 use BB\Jobs\DiscourseSync;
 use Illuminate\Auth\Events\Login as Login;
 
@@ -23,6 +24,10 @@ public function subscribe($events)
             MemberBecameInactive::class,
             [DiscourseSyncSubscriber::class, 'handleMembershipBecameInactive']
         );
+        $events->listen(
+            MemberDiscourseParamsChanged::class,
+            [DiscourseSyncSubscriber::class, 'handleMemberDiscourseParamsChanged']
+        );
     }
 
     public static function handleLogin(Login $event)
@@ -39,4 +44,8 @@ public static function handleMembershipBecameInactive(MemberBecameInactive $even
     {
         DiscourseSync::dispatch($event->user);
     }
+    public static function handleMemberDiscourseParamsChanged(MemberDiscourseParamsChanged $event)
+    {
+        DiscourseSync::dispatch($event->user);
+    }
 }

app/Observer/UserObserver.php

@@ -2,6 +2,7 @@
 
 use BB\Events\MemberBecameActive;
 use BB\Events\MemberBecameInactive;
+use BB\Events\MemberDiscourseParamsChanged;
 use BB\Mailer\UserMailer;
 use BB\Helpers\TelegramHelper;
 use Illuminate\Support\Facades\Log;
@@ -62,6 +63,20 @@ public function saved($user)
         if ($original['active'] === true && $user->active === false) {
             event(new MemberBecameInactive($user));
         }
+
+        // Make sure this list is in sync with the fields DiscourseSyncSubscriber uses
+        // TODO: Flip dependency here to pull these from one centralised list on user? Or some intermediary class?
+        $discourseFields = [
+            'email',
+            'name',
+            'suppress_real_name',
+            'given_name',
+            'family_name',
+            'banned',
+        ];        
+        if (!empty(array_intersect($discourseFields, array_keys($user->getDirty())))) {
+            event(new MemberDiscourseParamsChanged($user));
+        };
     }
 
     /**

tests/unit/Listeners/DiscourseSyncSubscriberTest.php

@@ -3,6 +3,7 @@
 use BB\Entities\User;
 use BB\Events\MemberBecameInactive;
 use BB\Events\MemberBecameActive;
+use BB\Events\MemberDiscourseParamsChanged;
 use BB\Jobs\DiscourseSync;
 use Illuminate\Auth\Events\Login;
 use Illuminate\Support\Facades\Bus;
@@ -60,4 +61,21 @@ public function testsMemberBecameInactive()
             return $job->user->display_name === 'Inactive Ivan';
         });
     }
+
+    public function testsMemberDiscourseParamsChanged()
+    {
+        Bus::fake();
+
+        $user = factory(User::class)->create([
+            'display_name' => 'Updated Ulysses'
+        ]);
+
+        Event::dispatch(
+            (new MemberDiscourseParamsChanged($user))
+        );
+
+        Bus::assertDispatched(DiscourseSync::class, function ($job) {
+            return $job->user->display_name === 'Updated Ulysses';
+        });
+    }
 }

tests/unit/Observer/UserObserverTest.php

@@ -3,6 +3,7 @@
 use BB\Entities\User;
 use BB\Events\MemberBecameActive;
 use BB\Events\MemberBecameInactive;
+use BB\Events\MemberDiscourseParamsChanged;
 use Illuminate\Support\Facades\Event;
 use Tests\TestCase;
 
@@ -45,4 +46,21 @@ public function testBroadcastsMemberBecameInactive()
             return $event->user->id === $user->id;
         });
     }
+
+    public function testBroadcastsMemberDiscourseParamsChanged()
+    {
+        Event::fake([MemberDiscourseParamsChanged::class]);
+
+        $user = factory(User::class)->create([
+            'given_name' => 'John',
+        ]);
+
+        $user->update([
+            'given_name' => 'Johnny',
+        ]);
+
+        Event::assertDispatched(MemberDiscourseParamsChanged::class, function ($event) use ($user) {
+            return $event->user->id === $user->id;
+        });
+    }
 }