fanforce-plugin-factory 0.36.0 → 0.37.0

data/lib/fanforce/plugin_factory/config/helpers/fanforce.rb

@@ -8,9 +8,7 @@ module Sinatra::FanforceHelpers
   def ff
     return @ff if @ff.present?
     @ff = Fanforce::API.new(params)
-    #return @ff if !@ff.valid_fanforce_request? and !@ff.valid_fanforce_js_request?
-
-    @ff.auth Sinatra::FanforceHelpers.find_api_key(ff.params[:organization_id])
+    @ff.auth(Sinatra::FanforceHelpers.find_api_key(ff.params[:organization_id]))
     @ff
   end
 

data/lib/fanforce/plugin_factory/routes.rb

@@ -11,11 +11,14 @@ class FanforcePlugin::Sinatra
   # INSTALL ######################################################################
   def route_install(params)
     raise "This is not a valid plugin install request: #{env['HTTP_HOST']}" if !ff.valid_install_request?(params)
-    api_key = $Redis.get("installed:#{ff.params[:addon_type]}-#{ff.params[:addon_id]}:#{ff.params[:organization_id]}")
+    api_key = $Redis.get("installed:#{ff.params[:addon_type]}-#{ff.params[:addon_id]}:#{params[:organization_id]}")
 
-    #raise 'A different API key already exists for this addon. Please uninstall first.' if api_key.present? and ff.params[:api_key] != api_key
-    $Redis.set("installed:#{ff.params[:addon_type]}-#{ff.params[:addon_id]}:#{ff.params[:organization_id]}", ff.params[:api_key])
-    ff.auth(ff.params[:api_key])
+    if api_key.present? and api_key != params[:api_key]
+      is_valid_key = Fanforce::API.new.get("/api_auths/is_valid_key/#{params[:api_key]}", organization_id: params[:organization_id], plugin_id: params[:plugin_id])[:result]
+      raise 'A different API key already exists for this addon. Please uninstall first.' if !is_valid_key
+    end
+    $Redis.set("installed:#{ff.params[:addon_type]}-#{ff.params[:addon_id]}:#{params[:organization_id]}", params[:api_key])
+    ff.auth(params[:api_key])
 
     json status: 'finished-processing'
   end
@@ -24,10 +27,10 @@ class FanforcePlugin::Sinatra
   # UNINSTALL ####################################################################
   def route_uninstall(params)
     raise 'This is not a valid plugin uninstall request.' if !ff.valid_uninstall_request?(params)
-    api_key = $Redis.get("installed:#{ff.params[:addon_type]}-#{ff.params[:addon_id]}:#{ff.params[:organization_id]}")
+    api_key = $Redis.get("installed:#{ff.params[:addon_type]}-#{ff.params[:addon_id]}:#{params[:organization_id]}")
 
-    raise 'API keys must match before an addon can be uninstalled.' if api_key.present? and ff.params[:api_key] != api_key
-    $Redis.del("installed:#{ff.params[:addon_type]}-#{ff.params[:addon_id]}:#{ff.params[:organization_id]}")
+    raise 'API keys must match before an addon can be uninstalled.' if api_key.present? and params[:api_key] != api_key
+    $Redis.del("installed:#{ff.params[:addon_type]}-#{ff.params[:addon_id]}:#{params[:organization_id]}")
     json status: 'finished-processing'
   end
   any '/uninstall' do route_uninstall(params) end

data/lib/fanforce/plugin_factory/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   module PluginFactory
-    VERSION = '0.36.0'
+    VERSION = '0.37.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-plugin-factory
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.37.0
   prerelease: 
 platform: ruby
 authors: