floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

FIX pwd bug

This commit is contained in:
Jasder 2020-10-15 19:40:50 +08:00
parent cfd285cbcd
commit 7b0f219a82
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/ci/cloud_accounts_controller.rb
View File

@ -84,14 +84,15 @@ class Ci::CloudAccountsController < Ci::BaseController
end end
def oauth_grant def oauth_grant
password = params[:password].to_s password = params[:password].strip.to_s
return render_error('你输入的密码不正确.') unless current_user.check_password?(password) return render_error('你输入的密码不正确.') unless current_user.check_password?(password)
oauth = current_user.oauths.last oauth = current_user.oauths.last
return render_error("服务器出小差了.") if oauth.blank? return render_error("服务器出小差了.") if oauth.blank?
result = gitea_oauth_grant!(password, oauth) result = gitea_oauth_grant!(password, oauth)
result === true ? render_ok : render_error('授权失败.') return render_error('授权失败.') unless result === true
current_user.set_drone_step!(User::DEVOPS_CERTIFICATION)
end end
private private

1
app/views/ci/cloud_accounts/oauth_grant.json.jbuilder Normal file
View File

@ -0,0 +1 @@
json.step current_user.devops_step