From b50a22894d4503cf99cecb8162696f854e1b3f85 Mon Sep 17 00:00:00 2001
From: Michael Kozono <mkozono@gmail.com>
Date: Tue, 23 May 2017 11:34:58 -0700
Subject: Refactor construction of response

---
 lib/api/helpers/internal_helpers.rb | 16 ++++++++++++++++
 lib/api/internal.rb                 | 20 ++++++--------------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/lib/api/helpers/internal_helpers.rb b/lib/api/helpers/internal_helpers.rb
index 264df7271a3..d3732d67622 100644
--- a/lib/api/helpers/internal_helpers.rb
+++ b/lib/api/helpers/internal_helpers.rb
@@ -42,6 +42,22 @@ module API
           @project, @wiki = Gitlab::RepoPath.parse(params[:project])
         end
       end
+
+      # Project id to pass between components that don't share/don't have
+      # access to the same filesystem mounts
+      def gl_repository
+        Gitlab::GlRepository.gl_repository(project, wiki?)
+      end
+
+      # Return the repository full path so that gitlab-shell has it when
+      # handling ssh commands
+      def repository_path
+        if wiki?
+          project.wiki.repository.path_to_repo
+        else
+          project.repository.path_to_repo
+        end
+      end
     end
   end
 end
diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index 3d60d1da114..f2d41754afd 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -37,26 +37,18 @@ module API
           .new(actor, project, protocol, authentication_abilities: ssh_authentication_abilities)
 
         begin
-          access_status = access_checker.check(params[:action], params[:changes])
-          response = { status: access_status.status, message: access_status.message }
+          access_checker.check(params[:action], params[:changes])
         rescue Gitlab::GitAccess::UnauthorizedError, Gitlab::GitAccess::NotFoundError => e
           return { status: false, message: e.message }
         end
 
         log_user_activity(actor)
 
-        # Project id to pass between components that don't share/don't have
-        # access to the same filesystem mounts
-        response[:gl_repository] = Gitlab::GlRepository.gl_repository(project, wiki?)
-
-        # Return the repository full path so that gitlab-shell has it when
-        # handling ssh commands
-        response[:repository_path] =
-          if wiki?
-            project.wiki.repository.path_to_repo
-          else
-            project.repository.path_to_repo
-          end
+        response = {
+          status: true,
+          gl_repository: gl_repository,
+          repository_path: repository_path
+        }
 
         response
       end
-- 
cgit v1.2.1