CodeCow/sharedrop
1
0
Fork 0
mirror of https://github.com/szimek/sharedrop.git synced 2026-06-13 21:03:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into libsass

Browse Source 
Conflicts:
	package.json
This commit is contained in:
Szymon Nowak 2014-12-26 19:26:38 +01:00
commit 42e24533fa
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/index.html
View File

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

2
app/scripts/app.js
View File

@ -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();
});
});

6
app/server.js
View File

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