Merge and fix tests

src/server/api.coffee

@@ -30,7 +30,6 @@ auth = (req, res, next) ->
 
   query.fetch (err, user) ->
     return res.json err: err if err
-    user = user.at(0)
     req.user = user
     req.userObj = user.get()
     return res.json 401, NO_USER_FOUND if !req.userObj || _.isEmpty(req.userObj)
@@ -109,7 +108,7 @@ router.get '/users/:uid/calendar.ics', (req, res) ->
   query = model.query('users').withIdAndToken(uid, apiToken)
   query.fetch (err, result) ->
     return res.send(400, err) if err
-    tasks = result.at(0).get('tasks')
+    tasks = result.get('tasks')
     #      tasks = result[0].tasks
     tasksWithDates = _.filter tasks, (task) -> !!task.date
     return res.send(400, "No events found") if _.isEmpty(tasksWithDates)

src/server/private.coffee

@@ -12,13 +12,13 @@ module.exports.app = (appExports, model) ->
     token = (res) ->
       console.log(res);
       $.ajax({
-             type:"POST",
-             url:"/charge",
-             data:res
-             }).success ->
-                          window.location.href = "/"
-        .error (err) ->
-                 alert err.responseText
+         type: "POST",
+         url: "/charge",
+         data: res
+      }).success ->
+        window.location.href = "/"
+      .error (err) ->
+        alert err.responseText
 
     StripeCheckout.open
       key: model.get('_stripePubKey')

src/server/store.coffee

@@ -74,7 +74,7 @@ REST = (store) ->
   store.query.expose "users", "withIdAndToken", (uid, token) ->
     @byId(uid)
       .where('apiToken').equals(token)
-      .one
+      .findOne()
 
   store.queryAccess "users", "withIdAndToken", (uid, token, accept, err) ->
     return accept(true) if uid && token
@@ -101,6 +101,7 @@ partySystem = (store) ->
 
   store.query.expose "parties", "withId", (id) ->
     @where("id").equals(id)
+      .findOne()
   store.queryAccess "parties", "withId", (id, accept, err) ->
 #    return err(derbyAuth.SESSION_INVALIDATED_ERROR) if derbyAuth.bustedSession(@)
     return accept(false) if derbyAuth.bustedSession(@)