From 063cbd27ee94efa136c2b625ce4e459e6fcd1b40 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sun, 29 Jan 2017 21:41:33 -0600 Subject: [PATCH] allow multiple users to control same jb --- .../controllers/api_jamblasters_controller.rb | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/web/app/controllers/api_jamblasters_controller.rb b/web/app/controllers/api_jamblasters_controller.rb index 69b6d7b91..b1d7d9190 100644 --- a/web/app/controllers/api_jamblasters_controller.rb +++ b/web/app/controllers/api_jamblasters_controller.rb @@ -80,16 +80,18 @@ class ApiJamblastersController < ApiController def start_pairing jamblaster = Jamblaster.find_by_client_id(params[:jbid]) - if jamblaster && jamblaster.users.length > 0 && !current_user.jamblasters.include?(jamblaster) - render :json => {reason: "jamblaster_access", message: "current user does not have access to jamblaster #{jamblaster.id}"}, status: 403 - return - end + # allow multiple users to own a single jb + #if jamblaster && jamblaster.users.length > 0 && !current_user.jamblasters.include?(jamblaster) + # render :json => {reason: "jamblaster_access", message: "current user does not have access to jamblaster #{jamblaster.id}"}, status: 403 + # return + #end @pairing = JamblasterPairingRequest.new @pairing.user = current_user @pairing.jamblaster_client_id = params[:jbid] @pairing.jamblaster = jamblaster @pairing.vtoken = params[:vtoken] + puts "@PAIRING #{@pairing.inspect}" if !@pairing.save respond_with_model(@pairing) else @@ -165,10 +167,11 @@ class ApiJamblastersController < ApiController return end - if jamblaster.users.length > 0 && !pairing_request.user.jamblasters.include?(jamblaster) - render :json => {reason: "jamblaster_access", message: "current user does not have access to jamblaster #{jamblaster.id} with vtoken #{vtoken}"}, status: 403 - return - end + # allow multiples users to control a single jamblaster + #if jamblaster.users.length > 0 && !pairing_request.user.jamblasters.include?(jamblaster) + # render :json => {reason: "jamblaster_access", message: "current user does not have access to jamblaster #{jamblaster.id} with vtoken #{vtoken}"}, status: 403 + # return + #end if !jamblaster.users.include?(pairing_request.user) jamblaster.users << pairing_request.user