summaryrefslogtreecommitdiff
path: root/lib/gitlab/gitlab_import/importer.rb
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-08-07 00:06:20 -0700
committerStan Hu <stanhu@gmail.com>2015-08-23 09:23:44 -0700
commited1d4fa477789659f9343593bf06d50e70750561 (patch)
treec7d208bd6be17632a314eb090456f1a30f42f13b /lib/gitlab/gitlab_import/importer.rb
parent97cc91d21d28a6482dc6ab040db31598a786f56c (diff)
downloadgitlab-ce-ed1d4fa477789659f9343593bf06d50e70750561.tar.gz
Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLab
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
Diffstat (limited to 'lib/gitlab/gitlab_import/importer.rb')
-rw-r--r--lib/gitlab/gitlab_import/importer.rb14
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/gitlab/gitlab_import/importer.rb b/lib/gitlab/gitlab_import/importer.rb
index c5304a0699b..50594d2b24f 100644
--- a/lib/gitlab/gitlab_import/importer.rb
+++ b/lib/gitlab/gitlab_import/importer.rb
@@ -5,7 +5,9 @@ module Gitlab
def initialize(project)
@project = project
- @client = Client.new(project.creator.gitlab_access_token)
+ import_data = project.import_data.try(:data)
+ gitlab_session = import_data["gitlab_session"] if import_data
+ @client = Client.new(gitlab_session["gitlab_access_token"])
@formatter = Gitlab::ImportFormatter.new
end
@@ -14,12 +16,12 @@ module Gitlab
#Issues && Comments
issues = client.issues(project_identifier)
-
+
issues.each do |issue|
body = @formatter.author_line(issue["author"]["name"], issue["description"])
-
+
comments = client.issue_comments(project_identifier, issue["id"])
-
+
if comments.any?
body += @formatter.comments_header
end
@@ -29,13 +31,13 @@ module Gitlab
end
project.issues.create!(
- description: body,
+ description: body,
title: issue["title"],
state: issue["state"],
author_id: gl_user_id(project, issue["author"]["id"])
)
end
-
+
true
end