Merge pull request #877 from jbonnet/859-POST-licences-fails

Fixed user name to user id in finding licences, removed extra user va…

Author: jbonnet

son-gtkapi/helpers/common.rb

@@ -155,7 +155,8 @@ def validate_ownership_and_licence(element:, user_name:, kpi_method:, began_at:,
       return
     end
 
-    licenced_elements = LicenceManagerService.find({service_uuid: element[:uuid], user_uuid: user_name})
+    user_uuid = User.find_by_name(user_name)[:uuid]
+    licenced_elements = LicenceManagerService.find({service_uuid: element[:uuid], user_uuid: user_uuid})
     if licenced_elements[:items].empty?
       # there's no licence for this element for this username
       kpi_method.call(labels: {result: "forbidden", uuid: element[:uuid], elapsed_time: (Time.now.utc-began_at).to_s}) if kpi_method
@@ -200,7 +201,8 @@ def enhance_collection(collection:, user:, keys_to_delete:)
         next
       end
 
-      licenced_collection = LicenceManagerService.find({service_uuid: element[:uuid], user_uuid: user})
+      user_uuid = User.find_by_name(user)[:uuid]
+      licenced_collection = LicenceManagerService.find({service_uuid: element[:uuid], user_uuid: user_uuid})
       logger.debug(log_message) {"licenced_collection=#{licenced_collection}"}
 
 

son-gtkapi/models/licence_manager_service.rb

@@ -50,7 +50,7 @@ def self.valid?(params)
 
     method = LOG_MESSAGE + "##{__method__}"
     GtkApi.logger.debug(method) {"entered: params=#{params}"}
-    raise ArgumentError, 'User must be valid' unless User.valid? params[:user_uuid]
+    #raise ArgumentError, 'User must be valid' unless User.valid? params[:user_uuid]
     raise ArgumentError, 'Service must be valid' unless ServiceManagerService.valid? params[:service_uuid]
     GtkApi.logger.debug(method) {"Leaving with valid licence data service #{params[:service_uuid]} and user #{params[:user_uuid]}"}
     true