ADD ci cloud account authenticate url

This commit is contained in:
Jasder 2020-09-04 17:35:29 +08:00
parent 81ec264483
commit e77475e26a
4 changed files with 7 additions and 3 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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