From e77475e26a1d9e47b8b2bd8fc592e519a60eda30 Mon Sep 17 00:00:00 2001
From: Jasder <2053003901@@qq.com>
Date: Fri, 4 Sep 2020 17:35:29 +0800
Subject: [PATCH] ADD ci cloud account authenticate url

---
 app/controllers/ci/cloud_accounts_controller.rb | 1 +
 app/models/ci/cloud_account.rb                  | 4 ++++
 app/views/ci/projects/authorize.json.jbuilder   | 2 +-
 app/views/users/devops.json.jbuilder            | 3 +--
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/controllers/ci/cloud_accounts_controller.rb b/app/controllers/ci/cloud_accounts_controller.rb
index ffb4c9997..c8d361050 100644
--- a/app/controllers/ci/cloud_accounts_controller.rb
+++ b/app/controllers/ci/cloud_accounts_controller.rb
@@ -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
diff --git a/app/models/ci/cloud_account.rb b/app/models/ci/cloud_account.rb
index ca8524c9a..25fe81609 100644
--- a/app/models/ci/cloud_account.rb
+++ b/app/models/ci/cloud_account.rb
@@ -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
diff --git a/app/views/ci/projects/authorize.json.jbuilder b/app/views/ci/projects/authorize.json.jbuilder
index 39a20b1b3..13b77f289 100644
--- a/app/views/ci/projects/authorize.json.jbuilder
+++ b/app/views/ci/projects/authorize.json.jbuilder
@@ -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
diff --git a/app/views/users/devops.json.jbuilder b/app/views/users/devops.json.jbuilder
index 7ae5fa2c1..5830720e1 100644
--- a/app/views/users/devops.json.jbuilder
+++ b/app/views/users/devops.json.jbuilder
@@ -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