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
50 lines
1.6 KiB
Ruby
50 lines
1.6 KiB
Ruby
module Gitlab
|
|
module GithubImport
|
|
class Importer
|
|
attr_reader :project, :client
|
|
|
|
def initialize(project)
|
|
@project = project
|
|
import_data = project.import_data.try(:data)
|
|
github_session = import_data["github_session"] if import_data
|
|
@client = Client.new(github_session["github_access_token"])
|
|
@formatter = Gitlab::ImportFormatter.new
|
|
end
|
|
|
|
def execute
|
|
#Issues && Comments
|
|
client.list_issues(project.import_source, state: :all,
|
|
sort: :created,
|
|
direction: :asc).each do |issue|
|
|
if issue.pull_request.nil?
|
|
|
|
body = @formatter.author_line(issue.user.login, issue.body)
|
|
|
|
if issue.comments > 0
|
|
body += @formatter.comments_header
|
|
|
|
client.issue_comments(project.import_source, issue.number).each do |c|
|
|
body += @formatter.comment(c.user.login, c.created_at, c.body)
|
|
end
|
|
end
|
|
|
|
project.issues.create!(
|
|
description: body,
|
|
title: issue.title,
|
|
state: issue.state == 'closed' ? 'closed' : 'opened',
|
|
author_id: gl_user_id(project, issue.user.id)
|
|
)
|
|
end
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def gl_user_id(project, github_id)
|
|
user = User.joins(:identities).
|
|
find_by("identities.extern_uid = ? AND identities.provider = 'github'", github_id.to_s)
|
|
(user && user.id) || project.creator_id
|
|
end
|
|
end
|
|
end
|
|
end
|