forked from Gitlink/forgeplus
fix issue #43166
This commit is contained in:
parent
1420a47a5c
commit
da9d268e04
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue