From 70a791396f4f88c058299e4f3a6974be52ef83db Mon Sep 17 00:00:00 2001 From: Youngchan Je Date: Wed, 28 Dec 2016 14:10:23 +0900 Subject: [PATCH] allowing to exclude secret on demand --- firebase.coffee | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/firebase.coffee b/firebase.coffee index 375e793..8006704 100644 --- a/firebase.coffee +++ b/firebase.coffee @@ -26,8 +26,9 @@ class exports.Firebase extends Framer.BaseClass @secret = @options.secret ?= null @debug = @options.debug ?= false @_status ?= "disconnected" - super + @secretEndPoint = if @secret then "?auth=#{@secret}" else "" + super console.log "Firebase: Connecting to Firebase Project '#{@projectID}' ... \n URL: 'https://#{@projectID}.firebaseio.com'" if @debug @.onChange "connection" @@ -35,7 +36,7 @@ class exports.Firebase extends Framer.BaseClass request = (project, secret, path, callback, method, data, parameters, debug) -> - url = "https://#{project}.firebaseio.com#{path}.json?auth=#{secret}" + url = "https://#{project}.firebaseio.com#{path}.json#{secret}" unless parameters is undefined @@ -87,11 +88,11 @@ class exports.Firebase extends Framer.BaseClass # Available methods - get: (path, callback, parameters) -> request(@projectID, @secret, path, callback, "GET", null, parameters, @debug) - put: (path, data, callback, parameters) -> request(@projectID, @secret, path, callback, "PUT", data, parameters, @debug) - post: (path, data, callback, parameters) -> request(@projectID, @secret, path, callback, "POST", data, parameters, @debug) - patch: (path, data, callback, parameters) -> request(@projectID, @secret, path, callback, "PATCH", data, parameters, @debug) - delete: (path, callback, parameters) -> request(@projectID, @secret, path, callback, "DELETE", null, parameters, @debug) + get: (path, callback, parameters) -> request(@projectID, @secretEndPoint, path, callback, "GET", null, parameters, @debug) + put: (path, data, callback, parameters) -> request(@projectID, @secretEndPoint, path, callback, "PUT", data, parameters, @debug) + post: (path, data, callback, parameters) -> request(@projectID, @secretEndPoint, path, callback, "POST", data, parameters, @debug) + patch: (path, data, callback, parameters) -> request(@projectID, @secretEndPoint, path, callback, "PATCH", data, parameters, @debug) + delete: (path, callback, parameters) -> request(@projectID, @secretEndPoint, path, callback, "DELETE", null, parameters, @debug) @@ -100,7 +101,7 @@ class exports.Firebase extends Framer.BaseClass if path is "connection" - url = "https://#{@projectID}.firebaseio.com/.json?auth=#{@secret}" + url = "https://#{@projectID}.firebaseio.com/.json#{@secretEndPoint}" currentStatus = "disconnected" source = new EventSource(url) @@ -121,7 +122,7 @@ class exports.Firebase extends Framer.BaseClass else - url = "https://#{@projectID}.firebaseio.com#{path}.json?auth=#{@secret}" + url = "https://#{@projectID}.firebaseio.com#{path}.json#{@secretEndPoint}" source = new EventSource(url) console.log "Firebase: Listening to changes made to '#{path}' \n URL: '#{url}'" if @debug