jive_add_ons 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13e47b87691cc2bc9975e9ba3fad3b9e822eb024
-  data.tar.gz: f3633fdfa5d727fd44998edbdd447ec874cc6b86
+  metadata.gz: 22e591672d206318b86d91a1b206b75a192f8171
+  data.tar.gz: 3922a65e5a1f5fbd894f3952373dd377df702358
 SHA512:
-  metadata.gz: 54917b006536a38d22c5bef5537bb88610b57b91e2d30f1b98d404a9783787da6336ef99b9d888e7f915c5c9d88b79199b9c97b205dab1e90b802071079a7ad4
-  data.tar.gz: ec0e569c357adc7dbec7e9a706a506393425c435ff2dc9661a3fd18202b06c74daa2009ee02f849c7f7d64da7196a68ce9d7d136c0575717a132bc4c1957ffa5
+  metadata.gz: 11f814ea8b47b956afb5cac7c97bd53d6ed5841692e818ef83d82e64f47dcab49eeb9aab6db6f98aeeb3d887335a181851a724bbc665cd068aba5d04a6e1dc1f
+  data.tar.gz: e72de89f2a879345812386e0407e52b3fda73b45aebd54139a493808f9b6a8acd94478393415dd94d993433d65a0622aea77895b7a8446ab3e219827c601f896

data/app/controllers/jive_add_ons/add_ons_controller.rb

@@ -11,10 +11,8 @@ end
 module JiveAddOns
 	class AddOnsController < ApplicationController
 		include Concerns::Controllers::AddOns
-		rescue_from ActionController::BadRequest, :with => :failure_403
 		rescue_from ActionController::UnknownController, :with => :failure_404
 
-		before_filter :validate_authenticity
 		before_filter :validate_add_on_name
 	end
 end

data/db/migrate/{20150718193211_create_jive_add_ons.rb → 20160102045039_add_jive_add_ons_0_1_0_migration.rb}

@@ -1,5 +1,5 @@
-class CreateJiveAddOns < ActiveRecord::Migration
-	def change
+class AddJiveAddOns010Migration < ActiveRecord::Migration
+	def self.up
 		create_table :jive_add_ons do |t|
 			t.string :name
 			t.string :tenant_id
@@ -8,10 +8,15 @@ class CreateJiveAddOns < ActiveRecord::Migration
 			t.string :jive_signature
 			t.string :jive_signature_url
 			t.string :jive_url
+			t.string :timestamp
 			t.boolean :uninstalled
 			t.integer :attempt
 
 			t.timestamps null: false
 		end
 	end
-end
+
+	def self.down
+		drop_table :jive_add_ons
+	end
+end

data/lib/jive_add_ons/concerns/controllers/add_ons.rb

@@ -5,19 +5,22 @@ module JiveAddOns
 				extend ActiveSupport::Concern
 
 				def create
-					@add_on = JiveAddOns::AddOn.new(register_params)
+					@add_on = Jive::AddOn::Model.new(register_params)
 					@add_on.name = params[:name]
 					@add_on.uninstalled = false
-					@add_on.save
 
-					render :nothing => true, :status => 204
+					render :nothing => true, :status => ((@add_on.save)? 204 : 403)
 				end
 
 				def destroy
-					@add_on = JiveAddOns::AddOn.where(unregister_params).first
-					@add_on.update_attributes(:uninstalled => true)
+					status = 403
 
-					render :nothing => true, :status => 204
+					@add_on = Jive::AddOn::Model.where(unregister_params).first
+					if @add_on && @add_on.update_attributes(:uninstalled => true)
+						status = 204
+					end
+
+					render :nothing => true, :status => status
 				end
 
 				protected
@@ -32,20 +35,10 @@ module JiveAddOns
 						end
 					end
 
-					def validate_authenticity
-						if !::Jive::SignedRequest.validate_registration(json_params)
-							raise ActionController::BadRequest
-						end
-					end
-
 					def failure_404
 						render :nothing => true, :status => 404
 					end
 
-					def failure_403
-						render :nothing => true, :status => 403
-					end
-
 				private
 					def json_params
 						ActionController::Parameters.new(JSON.parse(request.body.read))
@@ -73,13 +66,15 @@ module JiveAddOns
 							whitelisted[:jive_url] = whitelisted[:jiveUrl]
 							whitelisted[:jive_signature] = whitelisted[:jiveSignature]
 							whitelisted[:jive_signature_url] = whitelisted[:jiveSignatureURL]
+							whitelisted[:timestamp] = whitelisted[:timestamp]
 						}.permit(
 							:tenant_id,
 							:client_id,
 							:client_secret,
 							:jive_url,
 							:jive_signature,
-							:jive_signature_url
+							:jive_signature_url,
+							:timestamp
 						)
 					end
 			end

data/lib/jive_add_ons/version.rb

@@ -1,3 +1,3 @@
 module JiveAddOns
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/jive_add_ons.rb

@@ -1,4 +1,4 @@
-require "jive/signed_request"
+require "jive/add_on"
 require "jive_add_ons/engine"
 require "jive_add_ons/concerns/controllers/add_ons"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jive_add_ons
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Butch Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-01 00:00:00.000000000 Z
+date: 2016-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.2.0
 - !ruby/object:Gem::Dependency
-  name: jive-signed_request
+  name: jive-add_on
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -122,10 +122,9 @@ files:
 - app/controllers/jive_add_ons/add_ons_controller.rb
 - app/controllers/jive_add_ons/application_controller.rb
 - app/helpers/jive_add_ons/application_helper.rb
-- app/models/jive_add_ons/add_on.rb
 - app/views/layouts/jive_add_ons/application.html.erb
 - config/routes.rb
-- db/migrate/20150718193211_create_jive_add_ons.rb
+- db/migrate/20160102045039_add_jive_add_ons_0_1_0_migration.rb
 - lib/jive_add_ons.rb
 - lib/jive_add_ons/concerns/controllers/add_ons.rb
 - lib/jive_add_ons/engine.rb

data/app/models/jive_add_ons/add_on.rb

@@ -1,5 +0,0 @@
-module JiveAddOns
-	class AddOn < ActiveRecord::Base
-		self.table_name = "jive_add_ons"
-	end
-end