Improved user/get-by-authclient endpoint to support additional auth…

…entication clients.

Events.php

@@ -65,7 +65,6 @@ public static function onBeforeRequest($event)
             ['pattern' => 'user/get-by-username', 'route' => 'rest/user/user/get-by-username', 'verb' => ['GET', 'HEAD']],
             ['pattern' => 'user/get-by-email', 'route' => 'rest/user/user/get-by-email', 'verb' => ['GET', 'HEAD']],
             ['pattern' => 'user/get-by-authclient', 'route' => 'rest/user/user/get-by-authclient', 'verb' => ['GET', 'HEAD']],
-            ['pattern' => 'user/get-by-source', 'route' => 'rest/user/user/get-by-source', 'verb' => ['GET', 'HEAD']],
             ['pattern' => 'user/<id:\d+>', 'route' => 'rest/user/user/view', 'verb' => ['GET', 'HEAD']],
             ['pattern' => 'user/<id:\d+>', 'route' => 'rest/user/user/update', 'verb' => ['PUT', 'PATCH']],
             ['pattern' => 'user/<id:\d+>', 'route' => 'rest/user/user/delete', 'verb' => ['DELETE']],

controllers/user/UserController.php

@@ -14,7 +14,6 @@
 use humhub\modules\user\models\Password;
 use humhub\modules\user\models\Profile;
 use humhub\modules\user\models\User;
-use humhub\modules\user\models\Auth as UserAuth;
 use Yii;
 use yii\web\HttpException;
 
@@ -94,7 +93,12 @@ public function actionGetByEmail($email)
      */
     public function actionGetByAuthclient($name, $id)
     {
-        $user = User::findOne(['auth_mode' => $name, 'authclient_id' => $id]);
+        $user = User::find()
+            ->alias('u')
+            ->joinWith('auths a', false)
+            ->where(['u.auth_mode' => $name, 'u.authclient_id' => $id])
+            ->orWhere(['a.source' => $name, 'a.source_id' => $id])
+            ->one();
 
         if ($user === null) {
             return $this->returnError(404, 'User not found!');
@@ -103,17 +107,6 @@ public function actionGetByAuthclient($name, $id)
         return $this->actionView($user->id);
     }
 
-    public function actionGetBySource($source, $id)
-    {
-        $auth = UserAuth::findOne(['source' => $source, 'source_id' => $id]);
-
-        if (empty($auth->user)) {
-            return $this->returnError(404, 'User not found!');
-        }
-
-        return $this->actionView($auth->user->id);
-    }
-
     public function actionView($id)
     {
         $user = User::findOne(['id' => $id]);

docs/CHANGELOG.md

@@ -3,7 +3,7 @@ Changelog
 
 0.10.4 (Unreleased)
 ---------------------------
-- Enh #180: Added new `user/get-by-source` endpoint to get user by source
+- Enh #180: Improved `user/get-by-authclient` endpoint to support additional authentication clients.
 
 0.10.3 (September 13, 2024)
 ---------------------------