yystopf
/
forgeplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix issue #43166

This commit is contained in:
nigel007 2020-12-29 12:45:31 +08:00
parent 1420a47a5c
commit da9d268e04
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/accounts_controller.rb
View File

@ -151,8 +151,18 @@ class AccountsController < ApplicationController
if interactor.success? if interactor.success?
gitea_user = interactor.result gitea_user = interactor.result
result = Gitea::User::GenerateTokenService.new(login, params[:password]).call result = Gitea::User::GenerateTokenService.new(login, params[:password]).call
if !result['sha1'].nil?''
@user.gitea_token = result['sha1'] @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'] @user.gitea_uid = gitea_user['id']
else
@user.gitea_uid = JSON.parse(gitea_user.body)['id']
end
if @user.save! if @user.save!
UserExtension.create!(user_id: @user.id) UserExtension.create!(user_id: @user.id)
successful_authentication(@user) successful_authentication(@user)