ed1d4fa477
and request them each session. Pass these tokens to the project import data. This prevents the need to encrypt these tokens and clear them in case they expire or get revoked. For example, if you deleted and re-created OAuth2 keys for Bitbucket, you would get an Error 500 with no way to recover: ``` Started GET "/import/bitbucket/status" for x.x.x.x at 2015-08-07 05:24:10 +0000 Processing by Import::BitbucketController#status as HTML Completed 500 Internal Server Error in 607ms (ActiveRecord: 2.3ms) NameError (uninitialized constant Import::BitbucketController::Unauthorized): app/controllers/import/bitbucket_controller.rb:77:in `rescue in go_to_bitbucket_for_permissions' app/controllers/import/bitbucket_controller.rb:74:in `go_to_bitbucket_for_permissions' app/controllers/import/bitbucket_controller.rb:86:in `bitbucket_unauthorized' ``` Closes #1871
72 lines
1.9 KiB
Ruby
72 lines
1.9 KiB
Ruby
class Import::GithubController < Import::BaseController
|
|
before_action :verify_github_import_enabled
|
|
before_action :github_auth, except: :callback
|
|
|
|
rescue_from Octokit::Unauthorized, with: :github_unauthorized
|
|
|
|
def callback
|
|
session[:github_access_token] = client.get_token(params[:code])
|
|
redirect_to status_import_github_url
|
|
end
|
|
|
|
def status
|
|
@repos = client.repos
|
|
client.orgs.each do |org|
|
|
@repos += client.org_repos(org.login)
|
|
end
|
|
|
|
@already_added_projects = current_user.created_projects.where(import_type: "github")
|
|
already_added_projects_names = @already_added_projects.pluck(:import_source)
|
|
|
|
@repos.reject!{ |repo| already_added_projects_names.include? repo.full_name }
|
|
end
|
|
|
|
def jobs
|
|
jobs = current_user.created_projects.where(import_type: "github").to_json(only: [:id, :import_status])
|
|
render json: jobs
|
|
end
|
|
|
|
def create
|
|
@repo_id = params[:repo_id].to_i
|
|
repo = client.repo(@repo_id)
|
|
@project_name = repo.name
|
|
|
|
repo_owner = repo.owner.login
|
|
repo_owner = current_user.username if repo_owner == client.user.login
|
|
@target_namespace = params[:new_namespace].presence || repo_owner
|
|
|
|
namespace = get_or_create_namespace || (render and return)
|
|
|
|
@project = Gitlab::GithubImport::ProjectCreator.new(repo, namespace, current_user, access_params).execute
|
|
end
|
|
|
|
private
|
|
|
|
def client
|
|
@client ||= Gitlab::GithubImport::Client.new(session[:github_access_token])
|
|
end
|
|
|
|
def verify_github_import_enabled
|
|
not_found! unless github_import_enabled?
|
|
end
|
|
|
|
def github_auth
|
|
if session[:github_access_token].blank?
|
|
go_to_github_for_permissions
|
|
end
|
|
end
|
|
|
|
def go_to_github_for_permissions
|
|
redirect_to client.authorize_url(callback_import_github_url)
|
|
end
|
|
|
|
def github_unauthorized
|
|
go_to_github_for_permissions
|
|
end
|
|
|
|
private
|
|
|
|
def access_params
|
|
{ github_access_token: session[:github_access_token] }
|
|
end
|
|
end
|