[XSD-294] Adding getUserAsAdmin method to expose user activity

Author: dexmans

src/Contracts/GitPlatformInterface.php

@@ -31,6 +31,8 @@ public function getUserList($onlyActive = true): array;
 
     public function getUser(string $idOrName): GitUserInterface;
 
+    public function getUserAsAdmin(string $idOrName): GitUserInterface;
+
     public function addUser(array $properties): GitUserInterface;
 
     public function getCurrentUser(): GitUserInterface;

src/Contracts/GitUserInterface.php

@@ -6,6 +6,8 @@
  * @property-read string $username
  * @property-read string $email
  * @property-read string $created_at
+ * @property-read string $last_sign_in_at
+ * @property-read string $last_activity_on
  */
 interface GitUserInterface extends GitOwnerInterface
 {

src/Models/GitLab/GitLabPlatform.php

@@ -143,6 +143,16 @@ public function getUser(string $idOrName): GitUserInterface
         return $this->client->getModelInstance(GitLabClient::TYPE_USERS, $idOrName, $this);
     }
 
+    public function getUserAsAdmin(string $idOrName): GitUserInterface
+    {
+        $this->client->sudo(data_get($this->client->users()->me(), 'id'));
+        try {
+            return $this->client->getModelInstance(GitLabClient::TYPE_USERS, $idOrName, $this);
+        } finally {
+            $this->client->sudo(null);
+        }
+    }
+
     public function addUser(array $properties): GitUserInterface
     {
         GitLabUser::validateAdd($properties);

src/Models/GitUser.php

@@ -18,7 +18,10 @@ abstract class GitUser extends AbstractGitModel implements GitUserInterface
         'email',
         'description',
         'created_at',
+        'last_sign_in_at',
+        'last_activity_on',
     ];
+
     /**
      * @var bool[]
      */
@@ -28,6 +31,7 @@ abstract class GitUser extends AbstractGitModel implements GitUserInterface
         'email' => true,
         'description' => false,
     ];
+
     /**
      * @var GitPlatformInterface|GitPlatform
      */

src/Models/Gitea/GiteaPlatform.php

@@ -69,6 +69,15 @@ public function getUser(string $idOrName): GitUserInterface
         }
     }
 
+    public function getUserAsAdmin(string $idOrName): GitUserInterface
+    {
+        if (is_numeric($idOrName)) {
+            return $this->client->getFirst(GiteaUser::class, "/users/search?uid={$idOrName}", $this);
+        } else {
+            return $this->client->get(GiteaUser::class, "/users/{$idOrName}", $this);
+        }
+    }
+
     public function addUser(array $properties): GitUserInterface
     {
         return $this->client->post(GiteaUser::class, "/admin/users", $this, $properties);

src/Models/Gitea/GiteaUser.php

@@ -17,6 +17,9 @@ protected function mapProperties(array $properties)
     {
         $properties['name'] = $properties['full_name'] ?: $properties['login'];
         $properties['username'] = $properties['login'];
+        $properties['last_sign_in_at'] = $properties['last_login'];
+        $properties['last_activity_on'] = $properties['last_login'];
+
         return $properties;
     }