This commit is contained in:
Daniel Saewitz
2013-02-21 20:38:12 -05:00
parent 08d57e32ff
commit b8d43fabcc
3 changed files with 41 additions and 11 deletions

View File

@@ -28,16 +28,28 @@ router.get '/user', (req, res) ->
query = model.query('users').withIdAndToken(uid, token) query = model.query('users').withIdAndToken(uid, token)
query.fetch (err, user) -> query.fetch (err, user) ->
throw err if err
console.log user.at(0).get()
self = user.get()
console.log self
return res.json 500, err: err if err return res.json 500, err: err if err
self = user.at(0).get()
console.log self
return res.json 500, NO_USER_FOUND if !self || _.isEmpty(self) return res.json 500, NO_USER_FOUND if !self || _.isEmpty(self)
return res.json self return res.json self
res.json {err: 'Something went wrong'} res.json {err: 'Something went wrong'}
router.post '/task', (req, res) ->
{ uid, token } = req.body
return res.json 500, NO_TOKEN_OR_UID unless uid || token
model = req.getModel()
query = model.query('users').withIdAndToken(uid, token)
query.fetch (err, user) ->
return res.json 500, err: err if err
self = user.at(0).get()
return res.json 500, NO_USER_FOUND if !self || _.isEmpty(self)
return res.json self
res.json {err: 'Something went wrong'}
router.get '/user/calendar.ics', (req, res) -> router.get '/user/calendar.ics', (req, res) ->
#return next() #disable for now #return next() #disable for now

View File

@@ -62,6 +62,8 @@ REST = (store) ->
return accept(true) if uid && token return accept(true) if uid && token
accept(false) # only user has id & token accept(false) # only user has id & token
#store.query.expose
### ###
Party permissions Party permissions

View File

@@ -110,11 +110,14 @@ describe 'API', ->
params = params =
uid: user.id uid: user.id
token: user.apiToken token: user.apiToken
setTimeout ->
done() done()
, 800
it '/api/v1/user', (done) -> ###
test '/api/v1/user', (done) ->
console.log "#{baseURL}/user?#{qs.stringify(params)}" console.log "#{baseURL}/user?#{qs.stringify(params)}"
_.defer ->
request.get("#{baseURL}/user") request.get("#{baseURL}/user")
.set('Accept', 'application/json') .set('Accept', 'application/json')
.query(params) .query(params)
@@ -122,8 +125,21 @@ describe 'API', ->
console.log 'err', err console.log 'err', err
) )
.end (res) -> .end (res) ->
console.log res.body
assert.ok !res.body.err assert.ok !res.body.err
assert.equal res.statusCode, 200 assert.equal res.statusCode, 200
assert.ok res.body assert.ok res.body.tasks
done()
###
it '/api/v1/task', (done) ->
request.post("#{baseURL}/task")
.set('Accept', 'application/json')
.send(params)
.on('error', (err) ->
console.log 'err', err
)
.end (res) ->
#console.log 'task', res.body
assert.ok !res.body.err
assert.equal res.statusCode, 200
assert.ok res.body.tasks
done() done()