diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 5bc9579ad..6288d49ee 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -111,7 +111,7 @@ class PullRequestsController < ApplicationController if pull_issue.save! local_requests = PullRequest.new(local_params.merge(user_id: current_user.try(:id), project_id: @project.id, issue_id: pull_issue.id)) if local_requests.save - gitea_request = Gitea::PullRequest::CreateService.new(@project.owner, @repository.try(:identifier), requests_params).call + gitea_request = Gitea::PullRequest::CreateService.new(current_user.try(:gitea_token), @project.owner, @repository.try(:identifier), requests_params).call if gitea_request && local_requests.update_attributes(gpid: gitea_request["number"]) if params[:issue_tag_ids].present? params[:issue_tag_ids].each do |tag| diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index ea9cfb14e..557ed4729 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -90,7 +90,7 @@ class RepositoriesController < ApplicationController if pull_issue.save! local_requests = PullRequest.new(local_params.merge(user_id: current_user.try(:id), project_id: @project.id, issue_id: pull_issue.id)) if local_requests.save - gitea_request = Gitea::PullRequest::CreateService.new(current_user, @project.try(:identifier), requests_params).call + gitea_request = Gitea::PullRequest::CreateService.new(current_user.try(:gitea_token), @project.owner, @project.try(:identifier), requests_params).call if gitea_request && local_requests.update_attributes(gpid: gitea_request["number"]) local_requests.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create") end diff --git a/app/services/gitea/pull_request/create_service.rb b/app/services/gitea/pull_request/create_service.rb index 21e63a553..c3a83d1b9 100644 --- a/app/services/gitea/pull_request/create_service.rb +++ b/app/services/gitea/pull_request/create_service.rb @@ -1,6 +1,6 @@ class Gitea::PullRequest::CreateService < Gitea::ClientService - attr_reader :user, :repo, :params + attr_reader :token, :user, :repo, :params # params ex: # { @@ -11,7 +11,8 @@ class Gitea::PullRequest::CreateService < Gitea::ClientService # } # 以上列子说明从develop分支合并到master分支 # repo: 仓库名称 - def initialize(user, repo, params={}) + def initialize(token, user, repo, params={}) + @token = token @user = user @repo = repo @params = params @@ -30,6 +31,6 @@ class Gitea::PullRequest::CreateService < Gitea::ClientService end def request_params - Hash.new.merge(token: @user.gitea_token, data: @params) + Hash.new.merge(token: token, data: @params) end end