Browse Source

ADD ci cloud account authenticate url

tags/v1.0.0
Jasder 5 years ago
parent
commit
e77475e26a
4 changed files with 7 additions and 3 deletions
  1. +1
    -0
      app/controllers/ci/cloud_accounts_controller.rb
  2. +4
    -0
      app/models/ci/cloud_account.rb
  3. +1
    -1
      app/views/ci/projects/authorize.json.jbuilder
  4. +1
    -2
      app/views/users/devops.json.jbuilder

+ 1
- 0
app/controllers/ci/cloud_accounts_controller.rb 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


+ 4
- 0
app/models/ci/cloud_account.rb 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

+ 1
- 1
app/views/ci/projects/authorize.json.jbuilder 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


+ 1
- 2
app/views/users/devops.json.jbuilder 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


Loading…
Cancel
Save