From 38ca183bcd663e1940a04ff923aef861f5aade68 Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Thu, 15 Oct 2020 16:04:32 +0800 Subject: [PATCH] FIX code review --- app/controllers/concerns/ci/cloud_account_manageable.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/concerns/ci/cloud_account_manageable.rb b/app/controllers/concerns/ci/cloud_account_manageable.rb index f81ee9ceb..f27267023 100644 --- a/app/controllers/concerns/ci/cloud_account_manageable.rb +++ b/app/controllers/concerns/ci/cloud_account_manageable.rb @@ -94,8 +94,8 @@ module Ci::CloudAccountManageable # redirect_uri eg: # https://localhost:3000/login/oauth/authorize?client_id=94976481-ad0e-4ed4-9247-7eef106007a2&redirect_uri=http%3A%2F%2F121.69.81.11%3A80%2Flogin&response_type=code&state=9cab990b9cfb1805 - redirect_uri = CGI.escape("#{drone_url}/") + "login&response_type=code&state=#{state}" - grant_url = "#{Gitea.gitea_config[:domain]}/login/oauth/authorize?client_id=#{client_id}&redirect_uri=#{redirect_uri}" + redirect_uri = CGI.escape("#{drone_url}/login") + grant_url = "#{Gitea.gitea_config[:domain]}/login/oauth/authorize?client_id=#{client_id}&redirect_uri=#{redirect_uri}&response_type=code&state=#{state}" logger.info "[gitea] grant_url: #{grant_url}" conn = Faraday.new(url: grant_url) do |req| @@ -115,7 +115,7 @@ module Ci::CloudAccountManageable conn = Faraday.new(url: url) do |req| req.request :url_encoded req.adapter Faraday.default_adapter - req.headers["cookie"] = "_session_=#{SecureRandom.hex(32)}; _oauth_state_=#{state}" + req.headers["cookie"] = "_session_=#{SecureRandom.hex(28)}; _oauth_state_=#{state}" end response = conn.get