WIP - starting refactoring import/export to use services

1 files changed, 21 insertions, 4 deletions

diff --git a/app/controllers/import/gitlab_projects_controller.rb b/app/controllers/import/gitlab_projects_controller.rb
index a4ac55cd2a4..90b4ff8b2ca 100644
--- a/app/controllers/import/gitlab_projects_controller.rb
+++ b/app/controllers/import/gitlab_projects_controller.rb
@@ -2,24 +2,41 @@ class Import::GitlabProjectsController < Import::BaseController
   before_action :verify_gitlab_project_import_enabled
   before_action :verify_project_and_namespace_access
 
-  rescue_from OAuth::Error, with: :gitlab_project_unauthorized
-
   def new
     @namespace_id = project_params[:namespace_id]
     @path = project_params[:path]
   end
 
   def create
+    unless file_is_valid?
+      return redirect_back_or_default(options: { alert: "You need to upload a GitLab project export archive." })
+    end
+
     @project = Project.create_from_import_job(current_user_id: current_user.id,
                                               tmp_file: File.expand_path(params[:file].path),
                                               namespace_id: project_params[:namespace_id],
                                               project_path: project_params[:path])
 
-    redirect_to dashboard_projects_path
+    @project = Gitlab::GitlabImport::ProjectCreator.new(repo, namespace, current_user, access_params).execute
+
+    flash[:notice] = "The project import has been started."
+
+    if @project.saved?
+      redirect_to(
+        project_path(@project),
+        notice: "Project '#{@project.name}' is being imported."
+      )
+    else
+      render 'new'
+    end
   end
 
   private
 
+  def file_is_valid?
+    params[:file].respond_to?(:read) && params[:file].content_type == 'application/x-gzip'
+  end
+
   def verify_project_and_namespace_access
     unless namespace_access?
       render_403
@@ -27,7 +44,7 @@ class Import::GitlabProjectsController < Import::BaseController
   end
 
   def namespace_access?
-    current_user.can?(:create_projects, Namespace.find(project_params[:namespace_id]))
+    can?(current_user, :create_projects, Namespace.find(project_params[:namespace_id]))
   end
 
   def verify_gitlab_project_import_enabled