lib/fanforce/api/utils.rb in fanforce-api-0.23.0 vs lib/fanforce/api/utils.rb in fanforce-api-0.30.0

@@ -12,53 +12,40 @@
   end
 
   def valid_fanforce_request?(params=@params)
     return false if !params.is_a?(Hash)
     return false if is_blank?(params[:organization_id])
-    return false if is_blank?(params[:app_id]) and is_blank?(params[:behavior_plugin_id]) and is_blank?(params[:plugin_id]) and is_blank?(params[:widget_id])
+    return false if is_blank?(params[:app_id])
     return true
   end
 
   def valid_install_request?(params=@params)
     return false if !params.is_a?(Hash)
     return false if is_blank?(params[:organization_id])
-    return false if is_blank?(params[:app_id]) and is_blank?(params[:behavior_plugin_id]) and is_blank?(params[:plugin_id]) and is_blank?(params[:widget_id])
+    return false if is_blank?(params[:app_id])
     return false if is_blank?(params[:api_key])
     return true
   end
 
   def valid_uninstall_request?(params=@params)
     return false if !params.is_a?(Hash)
     return false if is_blank?(params[:organization_id])
-    return false if is_blank?(params[:app_id]) and is_blank?(params[:behavior_plugin_id]) and is_blank?(params[:plugin_id]) and is_blank?(params[:widget_id])
+    return false if is_blank?(params[:app_id])
     return false if is_blank?(params[:api_key])
     return true
   end
 
   def remove_nil_values(hash)
     hash.clone.delete_if {|k,v| v.nil? }
   end
 
   def collect_known_params(params)
     params = symbolize_keys(params)
-    if is_present?(params[:app_id])
-      addon_type = :app
-      addon_id = params[:app_id]
-    elsif is_present?(params[:behavior_plugin_id])
-      addon_type = :plugin
-      addon_id = params[:behavior_plugin_id]
-    elsif is_present?(params[:plugin_id])
-      addon_type = :plugin
-      addon_id = params[:plugin_id]
-    elsif is_present?(params[:widget_id])
-      addon_type = :widget
-      addon_id = params[:widget_id]
-    end
-    remove_nil_values(:"#{addon_type}_id" => params[:"#{addon_type}_id"], addon_type: addon_type, addon_id: addon_id, organization_id: params[:organization_id], organization_slug: params[:organization_slug], api_key: params[:api_key], session_id: params[:session_id])
+    remove_nil_values(app_id: params[:app_id], organization_id: params[:organization_id], organization_slug: params[:organization_slug], api_key: params[:api_key], session_id: params[:session_id])
   end
 
   def remove_internal_params(params)
-    params.clone.delete_if { |k,v| [:app_id, :behavior_plugin_id, :plugin_id, :widget_id, :addon_type, :addon_id, :organization_id, :organization_slug, :api_key].include? k }
+    params.clone.delete_if { |k,v| [:app_id, :organization_id, :organization_slug, :api_key].include? k }
   end
 
   def remove_sensitive_params(params)
     params.clone.delete_if { |k,v| [:api_key].include? k }
   end