From f3692f0da594492d123b1dd0e8fe8b513750fff5 Mon Sep 17 00:00:00 2001
From: Szymon Nowak <szimek@gmail.com>
Date: Tue, 23 Dec 2014 22:31:55 +0100
Subject: [PATCH] Update Firebase frontend lib and backend libs

---
 app/index.html     |  2 +-
 app/scripts/app.js |  2 +-
 app/server.js      |  6 +++---
 package.json       | 14 +++++++-------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/index.html b/app/index.html
index a63cf27..52dfea8 100644
--- a/app/index.html
+++ b/app/index.html
@@ -42,7 +42,7 @@
   <script src="//cdn.jsdelivr.net/g/jquery@2.1.1,handlebarsjs@1.3.0,emberjs@1.6.1,bootstrap@3.2.0"></script>
   <!-- @endif -->
 
-  <script src="//cdn.firebase.com/js/client/1.0.17/firebase.js"></script>
+  <script src="//cdn.firebase.com/js/client/2.0.6/firebase.js"></script>
   <script src="//login.persona.org/include.js"></script>
 
   <!-- build:js(app) /scripts/vendor.js -->
diff --git a/app/scripts/app.js b/app/scripts/app.js
index 0ae6044..a1ffbe4 100644
--- a/app/scripts/app.js
+++ b/app/scripts/app.js
@@ -50,7 +50,7 @@ ShareDrop.App.deferReadiness();
                 ShareDrop.App.userId = data.id;
                 ShareDrop.App.publicIp = data.public_ip;
 
-                ref.auth(data.token, function (error) {
+                ref.authWithCustomToken(data.token, function (error) {
                     error ? reject(error) : resolve();
                 });
             });
diff --git a/app/server.js b/app/server.js
index 7424b45..d9dd41c 100644
--- a/app/server.js
+++ b/app/server.js
@@ -74,13 +74,13 @@ module.exports.server = function (options) {
 
     app.get('/auth', function (req, res) {
         var ip = req.headers['cf-connecting-ip'] || req.ip,
-            id = uuid.v1(),
+            uid = uuid.v1(),
             token = firebaseTokenGenerator.createToken(
-                {id: id}, // will be available in Firebase security rules as 'auth'
+                {uid: uid, id: uid}, // will be available in Firebase security rules as 'auth'
                 {expires: 32503680000} // 01.01.3000 00:00
             );
 
-        res.json({id: id, token: token, public_ip: ip});
+        res.json({id: uid, token: token, public_ip: ip});
     });
 
     return http.createServer(app);
diff --git a/package.json b/package.json
index c774454..315e2d1 100644
--- a/package.json
+++ b/package.json
@@ -13,11 +13,11 @@
   "author": "Szymon Nowak",
   "license": "MIT",
   "dependencies": {
-    "express": "~3.4.7",
-    "express-persona": "~0.1.1",
-    "node-uuid": "~1.4.1",
-    "firebase-token-generator": "^0.1.4",
-    "newrelic": "^1.4.0",
+    "express": "~3.18.6",
+    "express-persona": "~0.1.2",
+    "node-uuid": "~1.4.2",
+    "firebase-token-generator": "~2.0.0",
+    "newrelic": "~1.14.3",
 
     "grunt": "~0.4.2",
     "grunt-cli": "~0.1.9",
@@ -29,13 +29,13 @@
     "grunt-contrib-uglify": "~0.3.2",
     "grunt-contrib-copy": "~0.5.0",
     "grunt-contrib-cssmin": "~0.7.0",
-    "grunt-ember-templates": "~0.4.18",
     "grunt-usemin": "~2.0.2",
     "grunt-concurrent": "~0.4.3",
     "grunt-contrib-compass": "~0.7.1",
     "grunt-env": "~0.4.1",
     "grunt-preprocess": "^4.0.0",
-    "grunt-rev": "^0.1.0"
+    "grunt-rev": "^0.1.0",
+    "grunt-ember-templates": "~0.4.23"
   },
   "engines": {
     "node": "~0.10.0"