refactored a bunch of stuff based on MR feedback

3 files changed, 8 insertions, 13 deletions

diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb
index 515fd4720d5..d478d3b5398 100644
--- a/lib/gitlab/github_import/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
@@ -7,8 +7,8 @@ module Gitlab
 
       def initialize(project)
         @project = project
-        github_session = project.import_data.credentials if import_data
-        @client = Client.new(github_session["github_access_token"])
+        credentials = project.import_data.credentials if import_data
+        @client = Client.new(credentials["github_access_token"])
         @formatter = Gitlab::ImportFormatter.new
       end
 
diff --git a/lib/gitlab/github_import/project_creator.rb b/lib/gitlab/github_import/project_creator.rb
index b5ed32e5b1e..52aba93a51d 100644
--- a/lib/gitlab/github_import/project_creator.rb
+++ b/lib/gitlab/github_import/project_creator.rb
@@ -32,8 +32,7 @@ module Gitlab
 
       def create_import_data(project)
         project.create_import_data(
-          credentials: { github_access_token: session_data.delete(:github_access_token) },
-          data: { github_session: session_data })
+          credentials: { github_access_token: session_data.delete(:github_access_token) })
       end
     end
   end
diff --git a/lib/gitlab/import_url_exposer.rb b/lib/gitlab/import_url_exposer.rb
index f1919dffa8a..bf03f5a6daf 100644
--- a/lib/gitlab/import_url_exposer.rb
+++ b/lib/gitlab/import_url_exposer.rb
@@ -2,16 +2,12 @@ module Gitlab
   # Exposes an import URL that includes the credentials unencrypted.
   # Extracted to its own class to prevent unintended use.
   module ImportUrlExposer
-    extend self
 
-    def expose(import_url:, credentials: )
-      import_url.sub("//", "//#{parsed_credentials(credentials)}@")
-    end
-
-    private
-
-    def parsed_credentials(credentials)
-      credentials.values.join(":")
+    def self.expose(import_url:, credentials: )
+      uri = URI.parse(import_url)
+      uri.user = credentials[:user]
+      uri.password = credentials[:password]
+      uri
     end
   end
 end