seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

allow multiple users to control same jb

This commit is contained in:
Seth Call 2017-01-29 21:41:33 -06:00
parent 1491e9026e
commit 063cbd27ee
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
web/app/controllers/api_jamblasters_controller.rb
View File

@ -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