krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

guid bug

Browse Source
This commit is contained in:
Tyler Renelle
2012-08-02 17:49:31 -04:00
parent 0b1b3bb411
commit 9d0ddd08fb
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/server/index.js
View File

@@ -51,7 +51,7 @@ customMiddleware = function(that) {
model = req.getModel(); model = req.getModel();
model.set('_mobileDevice', /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(req.header('User-Agent'))); model.set('_mobileDevice', /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(req.header('User-Agent')));
uidParam = req.url.split('/')[1]; uidParam = req.url.split('/')[1];
acceptableUid = require('Guid').isGuid(uidParam) || (uidParam === '3' || uidParam === '4' || uidParam === '9'); acceptableUid = require('guid').isGuid(uidParam) || (uidParam === '3' || uidParam === '4' || uidParam === '9');
if (acceptableUid && model.session.userId !== uidParam) { if (acceptableUid && model.session.userId !== uidParam) {
model.set('_userId', uidParam); model.set('_userId', uidParam);
model.session.userId = uidParam; model.session.userId = uidParam;

2
package.json
View File

@@ -1,7 +1,7 @@
{ {
"name": "habitrpg", "name": "habitrpg",
"description": "A habit tracker app which treats your goals like a Role Playing Game.", "description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "0.0.0-94", "version": "0.0.0-95",
"main": "./server.js", "main": "./server.js",
"dependencies": { "dependencies": {
"derby": "git://github.com/codeparty/derby#master", "derby": "git://github.com/codeparty/derby#master",

3
src/server/index.coffee
View File

@@ -38,7 +38,8 @@ customMiddleware = (that) ->
uidParam = req.url.split('/')[1] uidParam = req.url.split('/')[1]
# PURL pseudo-auth: Previously saved session (eg, http://localhost/{guid}) (temporary solution until authentication built) # PURL pseudo-auth: Previously saved session (eg, http://localhost/{guid}) (temporary solution until authentication built)
acceptableUid = require('Guid').isGuid(uidParam) or (uidParam in ['3','4','9']) #TODO use racer's uuid dependency to validate guid instead of Guid here, to reduce deps
acceptableUid = require('guid').isGuid(uidParam) or (uidParam in ['3','4','9'])
if acceptableUid and model.session.userId!=uidParam if acceptableUid and model.session.userId!=uidParam
##FIXME why isn't this working? ##FIXME why isn't this working?
# model.fetch "users.#{uidParam}", (err, user) -> # model.fetch "users.#{uidParam}", (err, user) ->