codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-03-31 07:12:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handling merge conflict.

Browse source
This commit is contained in:
Scott Erickson 2014-07-14 15:18:23 -07:00
commit 0d78281db2
1 changed files with 6 additions and 3 deletions

9
server/routes/auth.coffee
View file

@ -157,10 +157,12 @@ module.exports.setup = (app) ->
res.send msg + '<p><a href="/account/settings">Account settings</a></p>'
res.end()
app.get '/auth/name*', (req, res) ->
app.get '/auth/name/?*', (req, res) ->
parts = req.path.split '/'
originalName = decodeURI parts[3]
return errors.badInput res, 'No name provided.' unless parts.length > 3 and originalName? and originalName isnt ''
console.log parts
originalName = parts[3]
return errors.badInput res, 'No name provided.' unless originalName and originalName isnt ''
return errors.notFound res if parts.length isnt 4
User.unconflictName originalName, (err, name) ->
@ -171,6 +173,7 @@ module.exports.setup = (app) ->
else
errors.conflict res, response
module.exports.loginUser = loginUser = (req, res, user, send=true, next=null) ->
user.save((err) ->
return errors.serverError res, err if err?