From da9d268e049e2fd1c0c0e51e9fcf60934a2111a6 Mon Sep 17 00:00:00 2001
From: nigel007 <609441862@qq.com>
Date: Tue, 29 Dec 2020 12:45:31 +0800
Subject: [PATCH] fix issue #43166

---
 app/controllers/accounts_controller.rb | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index afa35a6ac..f9f7f76c2 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -151,8 +151,18 @@ class AccountsController < ApplicationController
       if interactor.success?
         gitea_user = interactor.result
         result = Gitea::User::GenerateTokenService.new(login, params[:password]).call
-        @user.gitea_token = result['sha1']
-        @user.gitea_uid = gitea_user['id']
+        if !result['sha1'].nil?''
+          @user.gitea_token = result['sha1']
+        else
+          @user.gitea_token = JSON.parse(result.body)['sha1'] # 出现了返回结果为body字段json格式的情况
+        end
+
+        if !gitea_user['id'].nil?
+          @user.gitea_uid = gitea_user['id']
+        else
+          @user.gitea_uid = JSON.parse(gitea_user.body)['id']
+        end
+
         if @user.save!
           UserExtension.create!(user_id: @user.id)
           successful_authentication(@user)