Merge pull request #18937 from eduardoj/refactoring/backend_api_source_project

Refactor project backend calls to use `Backend::Api`

Author: eduardoj

src/api/app/controllers/source_project_controller.rb

@@ -110,25 +110,25 @@ def delete
     render_ok
   end
 
-  # GET /source/:project/_pubkey and /_sslcert
+  # GET /source/:project/_pubkey
   def show_pubkey
-    # assemble path for backend
-    path = pubkey_path
-
-    # GET /source/:project/_pubkey
-    pass_to_backend(path)
+    render plain: Backend::Api::Sources::Project.pubkey(params[:project], { rev: params[:rev] }.compact)
   end
 
   # DELETE /source/:project/_pubkey
   def delete_pubkey
-    params[:user] = User.session.login
-    path = pubkey_path
+    backend_params = {
+      user: User.session.login,
+      meta: params[:meta],
+      comment: params[:comment]
+    }.compact
 
     # check for permissions
-    upper_project = @prj.name.gsub(/:[^:]*$/, '')
-    while upper_project != @prj.name && upper_project.present?
+    project_name = Project.get_by_name(params[:project]).name
+    upper_project = project_name.gsub(/:[^:]*$/, '')
+    while upper_project != project_name && upper_project.present?
       if Project.exists_by_name(upper_project) && User.session.can_modify?(Project.get_by_name(upper_project))
-        pass_to_backend(path)
+        render xml: Backend::Api::Sources::Project.delete_pubkey(params[:project], backend_params)
         return
       end
       break unless upper_project.include?(':')
@@ -137,18 +137,10 @@ def delete_pubkey
     end
 
     if User.admin_session?
-      pass_to_backend(path)
+      render xml: Backend::Api::Sources::Project.delete_pubkey(params[:project], backend_params)
     else
       raise DeleteProjectPubkeyNoPermission, "No permission to delete public key for project '#{params[:project]}'. " \
                                              'Either maintainer permissions by upper project or admin permissions is needed.'
     end
   end
-
-  private
-
-  def pubkey_path
-    # check for project
-    @prj = Project.get_by_name(params[:project])
-    request.path_info + build_query_from_hash(params, %i[user comment meta rev])
-  end
 end

src/api/app/lib/backend/api/sources/project.rb

@@ -59,6 +59,18 @@ def self.key_info(project_name)
           http_get(['/source/:project/_keyinfo', project_name], params: { withsslcert: 1, donotcreatecert: 1 })
         end
 
+        # Returns the pubkey file for the project
+        # @return [String]
+        def self.pubkey(project_name, options = {})
+          http_get(['/source/:project/_pubkey', project_name], params: options, accepted: %i[rev])
+        end
+
+        # Deletes the pubkey file for the project
+        # @return [String]
+        def self.delete_pubkey(project_name, options = {})
+          http_delete(['/source/:project/_pubkey', project_name], params: options, accepted: %i[user comment meta])
+        end
+
         # Returns the patchinfo for the project
         # @return [String]
         def self.patchinfo(project_name)