From b8d43fabcc2e863dc8a2f81a16400b0ebce4773c Mon Sep 17 00:00:00 2001 From: Daniel Saewitz Date: Thu, 21 Feb 2013 20:38:12 -0500 Subject: [PATCH] wip --- src/server/api.coffee | 20 ++++++++++++++++---- src/server/store.coffee | 2 ++ test/api.mocha.coffee | 30 +++++++++++++++++++++++------- 3 files changed, 41 insertions(+), 11 deletions(-) diff --git a/src/server/api.coffee b/src/server/api.coffee index 808c25f32d..c2a227d346 100644 --- a/src/server/api.coffee +++ b/src/server/api.coffee @@ -28,16 +28,28 @@ router.get '/user', (req, res) -> query = model.query('users').withIdAndToken(uid, token) 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 + self = user.at(0).get() + console.log self return res.json 500, NO_USER_FOUND if !self || _.isEmpty(self) return res.json self 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) -> #return next() #disable for now diff --git a/src/server/store.coffee b/src/server/store.coffee index 41ec5dd9ad..0dc2af090e 100644 --- a/src/server/store.coffee +++ b/src/server/store.coffee @@ -62,6 +62,8 @@ REST = (store) -> return accept(true) if uid && token accept(false) # only user has id & token + #store.query.expose + ### Party permissions diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index 4e73aeb3f6..7a0b769529 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -110,20 +110,36 @@ describe 'API', -> params = uid: user.id token: user.apiToken + setTimeout -> + done() + , 800 - done() - - it '/api/v1/user', (done) -> + ### + test '/api/v1/user', (done) -> console.log "#{baseURL}/user?#{qs.stringify(params)}" - request.get("#{baseURL}/user") + _.defer -> + request.get("#{baseURL}/user") + .set('Accept', 'application/json') + .query(params) + .on('error', (err) -> + console.log 'err', err + ) + .end (res) -> + assert.ok !res.body.err + assert.equal res.statusCode, 200 + assert.ok res.body.tasks + done() + ### + it '/api/v1/task', (done) -> + request.post("#{baseURL}/task") .set('Accept', 'application/json') - .query(params) + .send(params) .on('error', (err) -> console.log 'err', err ) .end (res) -> - console.log res.body + #console.log 'task', res.body assert.ok !res.body.err assert.equal res.statusCode, 200 - assert.ok res.body + assert.ok res.body.tasks done()