From 35a427a3bd37f2dcb0ae416b8003a1fdec6afccd Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 21 Dec 2023 19:48:35 +0800
Subject: [PATCH] * Adjust bind user rule for gitea.

---
 module/gitea/control.php       | 1 +
 module/gitea/js/binduser.ui.js | 2 +-
 module/gitea/model.php         | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/module/gitea/control.php b/module/gitea/control.php
index e8115c90f9..76dcb0f9a5 100644
--- a/module/gitea/control.php
+++ b/module/gitea/control.php
@@ -198,6 +198,7 @@ class gitea extends control
             $user->status          = 'notBind';
             $user->giteaID         = $giteaUser->id;
             $user->giteaEmail      = $giteaUser->email;
+            $user->giteaAccount    = $giteaUser->account;
             $user->giteaUser       = $giteaUser->realname . '@' . $giteaUser->account;
             $user->giteaUserAvatar = $giteaUser->avatar;
 
diff --git a/module/gitea/js/binduser.ui.js b/module/gitea/js/binduser.ui.js
index 48e4d20828..9f453f06ac 100644
--- a/module/gitea/js/binduser.ui.js
+++ b/module/gitea/js/binduser.ui.js
@@ -25,7 +25,7 @@ window.bindUser = function(e)
     postData['giteaUserNames[]'] = [];
     for(i in bindData)
     {
-        postData['giteaUserNames[' + bindData[i].giteaID + ']'] = bindData[i].giteaUser;
+        postData['giteaUserNames[' + bindData[i].giteaID + ']'] = bindData[i].giteaAccount;
         postData['zentaoUsers[' + bindData[i].giteaID + ']'] = formData['zentaoUsers[' + bindData[i].giteaID + ']'];
     }
 
diff --git a/module/gitea/model.php b/module/gitea/model.php
index 2d536b6fe0..32baff0b50 100644
--- a/module/gitea/model.php
+++ b/module/gitea/model.php
@@ -90,7 +90,7 @@ class giteaModel extends model
             $user->providerID   = $giteaID;
             $user->providerType = 'gitea';
             $user->account      = $account;
-            $user->openID       = $openID;
+            $user->openID       = $giteaNames[$openID];
             $this->dao->insert(TABLE_OAUTH)->data($user)->exec();
             $this->action->create('giteauser', $giteaID, 'bind', '', $giteaNames[$openID]);
         }
@@ -273,7 +273,7 @@ class giteaModel extends model
         $userList = array();
         foreach($users as $giteaUser)
         {
-            if($onlyLinked && !isset($linkedUsers[$giteaUser->id])) continue;
+            if($onlyLinked && !isset($linkedUsers[$giteaUser->username])) continue;
 
             $user = new stdclass();
             $user->id             = $giteaUser->id;