Browse Source

FIX pwd bug

tags/v1.0.0
Jasder 5 years ago
parent
commit
7b0f219a82
2 changed files with 4 additions and 2 deletions
  1. +3
    -2
      app/controllers/ci/cloud_accounts_controller.rb
  2. +1
    -0
      app/views/ci/cloud_accounts/oauth_grant.json.jbuilder

+ 3
- 2
app/controllers/ci/cloud_accounts_controller.rb View File

@@ -84,14 +84,15 @@ class Ci::CloudAccountsController < Ci::BaseController
end

def oauth_grant
password = params[:password].to_s
password = params[:password].strip.to_s
return render_error('你输入的密码不正确.') unless current_user.check_password?(password)

oauth = current_user.oauths.last
return render_error("服务器出小差了.") if oauth.blank?

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

private


+ 1
- 0
app/views/ci/cloud_accounts/oauth_grant.json.jbuilder View File

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

Loading…
Cancel
Save