fix: assign invitation to a new registered user (#46)

Author: alfonsobries

src/Actions/CreateNewUser.php

@@ -6,6 +6,7 @@
 
 use ARKEcosystem\Fortify\Models;
 use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Validator as ValidationValidator;
@@ -25,9 +26,24 @@ class CreateNewUser implements CreatesNewUsers
      */
     public function create(array $input)
     {
-        $input = $this->buildValidator($input)->validate();
+        $input      = $this->buildValidator($input)->validate();
+        $invitation = null;
 
-        return Models::user()::create($this->getUserData($input));
+        if (array_key_exists('invitation', $input)) {
+            $invitationId = $input['invitation'];
+            unset($input['invitation']);
+            $invitation = Models::invitation()::findByUuid($invitationId);
+        }
+
+        return DB::transaction(function () use ($input, $invitation) {
+            $user = Models::user()::create($this->getUserData($input));
+
+            if ($invitation) {
+                $invitation->update(['user_id' => $user->id]);
+            }
+
+            return $user;
+        });
     }
 
     private function buildValidator(array $input): ValidationValidator
@@ -37,6 +53,7 @@ private function buildValidator(array $input): ValidationValidator
             Fortify::username() => $this->usernameRules(),
             'password'          => $this->passwordRules(),
             'terms'             => ['required', 'accepted'],
+            'invitation'        => ['sometimes', 'required', 'string'],
         ];
 
         if ($usernameAlt = Config::get('fortify.username_alt')) {

src/Components/RegisterForm.php

@@ -23,7 +23,7 @@ class RegisterForm extends Component
 
     public string $formUrl;
 
-    protected $invitation = null;
+    public ?string $invitationId = null;
 
     public function mount()
     {
@@ -36,9 +36,7 @@ public function mount()
 
         $this->formUrl = request()->fullUrl();
 
-        if (request()->has('invitation')) {
-            $this->invitation = Models::invitation()::findByUuid(request()->get('invitation'));
-        }
+        $this->invitationId = request()->get('invitation');
     }
 
     /**
@@ -49,7 +47,7 @@ public function mount()
     public function render()
     {
         return view('ark-fortify::auth.register-form', [
-            'invitation' => $this->invitation,
+            'invitation' => $this->invitationId ? Models::invitation()::findByUuid($this->invitationId) : null,
         ]);
     }
 }

tests/Actions/CreateNewUserTest.php

@@ -3,9 +3,13 @@
 declare(strict_types=1);
 
 use ARKEcosystem\Fortify\Actions\CreateNewUser;
+use ARKEcosystem\Fortify\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Hash;
-
+use Spatie\MediaLibrary\MediaCollections\Models\Concerns\HasUuid;
 use function Tests\expectValidationError;
 
 beforeEach(function () {
@@ -164,3 +168,55 @@
         'terms'                 => true,
     ]), 'password', 'The password must be at least 12 characters and contain at least one uppercase character, one number, and one special character.');
 });
+
+it('handles the invitation parameter', function () {
+    Config::set('fortify.models.user', \ARKEcosystem\Fortify\Models\User::class);
+    Config::set('fortify.models.invitation', CreateNewUserTest::class);
+
+    $user = (new CreateNewUser())->create([
+        'name'                  => 'John Doe',
+        'username'              => 'alfonsobries',
+        'email'                 => 'john@doe.com',
+        'password'              => $this->validPassword,
+        'password_confirmation' => $this->validPassword,
+        'terms'                 => true,
+        'invitation'            => 'uuid-uuid-uuid-uuid',
+    ]);
+
+    $invitation = Models::invitation()::findByUuid('uuid-uuid-uuid-uuid');
+
+    $this->assertSame($user->id, $invitation->user_id);
+});
+
+/**
+ * @coversNothing
+ */
+class CreateNewUserTest extends Model
+{
+    use HasUuid;
+
+    public ?string $uuid = null;
+
+    public ?int $user_id = null;
+
+    protected $guarded = [];
+
+    public static $model = null;
+
+    public static function findByUuid(string $uuid): ?Model
+    {
+        if (self::$model) {
+            return self::$model;
+        }
+
+        self::$model = new self(compact('uuid'));
+
+        return self::$model;
+    }
+
+    public function update(array $attributes = [], array $options = [])
+    {
+        $this->user_id = Arr::get($attributes, 'user_id', $this->user_id);
+        $this->uuid    = Arr::get($attributes, 'uuid', $this->uuid);
+    }
+}