diff --git a/lib/server/index.js b/lib/server/index.js index 539fcbe074..44754b7311 100644 --- a/lib/server/index.js +++ b/lib/server/index.js @@ -51,7 +51,7 @@ customMiddleware = function(that) { model = req.getModel(); model.set('_mobileDevice', /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(req.header('User-Agent'))); 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) { model.set('_userId', uidParam); model.session.userId = uidParam; diff --git a/package.json b/package.json index 998f971c12..331fd2b8b1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitrpg", "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", "dependencies": { "derby": "git://github.com/codeparty/derby#master", diff --git a/src/server/index.coffee b/src/server/index.coffee index ee3bffb836..fb36049879 100644 --- a/src/server/index.coffee +++ b/src/server/index.coffee @@ -38,7 +38,8 @@ customMiddleware = (that) -> uidParam = req.url.split('/')[1] # 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 ##FIXME why isn't this working? # model.fetch "users.#{uidParam}", (err, user) ->