ADD ci cloud account authenticate url
This commit is contained in:
parent
81ec264483
commit
e77475e26a
|
@ -16,6 +16,7 @@ class Ci::CloudAccountsController < Ci::BaseController
|
|||
raise ActiveRecord::Rollback
|
||||
else
|
||||
current_user.set_drone_step!(User::DEVOPS_UNVERIFIED)
|
||||
render_ok(redirect_url: @cloud_account.authenticate_url)
|
||||
end
|
||||
end
|
||||
rescue Exception => ex
|
||||
|
|
|
@ -22,4 +22,8 @@ class Ci::CloudAccount < Ci::LocalBase
|
|||
Base64.encode64(str.strip).gsub(/\n/, '')
|
||||
end
|
||||
|
||||
def authenticate_url
|
||||
[drone_url, '/login'].join
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
@ -5,7 +5,7 @@ json.cloud_account do
|
|||
json.account @cloud_account.account
|
||||
json.ip @cloud_account.drone_ip
|
||||
json.secret @cloud_account.visible_secret
|
||||
json.authenticate_url "#{@cloud_account.drone_url}/login" if @user.devops_unverified?
|
||||
json.authenticate_url @cloud_account.authenticate_url if @user.devops_unverified?
|
||||
else
|
||||
json.nil!
|
||||
end
|
||||
|
|
|
@ -4,8 +4,7 @@ json.cloud_account do
|
|||
json.account @cloud_account.account
|
||||
json.ip @cloud_account.drone_ip
|
||||
json.secret @cloud_account.visible_secret
|
||||
json.authenticate_url "#{@cloud_account.drone_url}/login" if @user.devops_unverified?
|
||||
json.get_drone_token_url "#{@cloud_account.drone_url}/account" if @user.devops_verified?
|
||||
json.authenticate_url @cloud_account.authenticate_url if @user.devops_unverified?
|
||||
else
|
||||
json.nil!
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue