fix: withIdentities/withGroups/withPermissions now work with first() (#1315)

Author: michalsn

src/Models/UserModel.php

@@ -143,6 +143,10 @@ protected function fetchIdentities(array $data): array
 
         $mappedUsers = $this->assignIdentities($data, $identities);
 
+        if ($data['singleton'] && ! isset($data['id'])) {
+            $data['id'] = $data['data']->id;
+        }
+
         $data['data'] = $data['singleton'] ? $mappedUsers[$data['id']] : $mappedUsers;
 
         return $data;
@@ -213,6 +217,10 @@ protected function fetchGroups(array $data): array
 
         $mappedUsers = $this->assignProperties($data, $groups, 'groups');
 
+        if ($data['singleton'] && ! isset($data['id'])) {
+            $data['id'] = $data['data']->id;
+        }
+
         $data['data'] = $data['singleton'] ? $mappedUsers[$data['id']] : $mappedUsers;
 
         return $data;
@@ -246,6 +254,10 @@ protected function fetchPermissions(array $data): array
 
         $mappedUsers = $this->assignProperties($data, $permissions, 'permissions');
 
+        if ($data['singleton'] && ! isset($data['id'])) {
+            $data['id'] = $data['data']->id;
+        }
+
         $data['data'] = $data['singleton'] ? $mappedUsers[$data['id']] : $mappedUsers;
 
         return $data;

tests/Unit/UserTest.php

@@ -332,6 +332,40 @@ public function testModelFindAllWithGroupsAndPermissions(): void
         );
     }
 
+    public function testModelFirstWithIdentities(): void
+    {
+        fake(UserIdentityModel::class, ['user_id' => $this->user->id, 'type' => 'password']);
+        fake(UserIdentityModel::class, ['user_id' => $this->user->id, 'type' => 'access_token']);
+
+        $user = model(UserModel::class)->where('active', 1)->withIdentities()->first();
+
+        $this->assertInstanceOf(User::class, $user);
+        $this->assertCount(2, $user->identities);
+    }
+
+    public function testModelFirstWithGroups(): void
+    {
+        fake(GroupModel::class, ['user_id' => $this->user->id, 'group' => 'superadmin']);
+        fake(GroupModel::class, ['user_id' => $this->user->id, 'group' => 'admin']);
+
+        $user = model(UserModel::class)->where('active', 1)->withGroups()->first();
+
+        $this->assertInstanceOf(User::class, $user);
+        $this->assertTrue($user->inGroup('admin'));
+    }
+
+    public function testModelFirstWithPermissions(): void
+    {
+        fake(PermissionModel::class, ['user_id' => $this->user->id, 'permission' => 'users.edit']);
+        fake(PermissionModel::class, ['user_id' => $this->user->id, 'permission' => 'users.delete']);
+
+        $user = model(UserModel::class)->where('active', 1)->withPermissions()->first();
+
+        $this->assertInstanceOf(User::class, $user);
+        $this->assertTrue($user->hasPermission('users.delete'));
+        $this->assertFalse($user->hasPermission('users.add'));
+    }
+
     public function testLastLogin(): void
     {
         fake(