From 4655b2fbc2b02661d7d45d78960914d5d173dc1a Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 19 Jul 2013 15:19:50 -0400
Subject: [PATCH] apiv2: remove some duplcation from api to apiv2

---
 src/server/api.coffee   |  2 ++
 src/server/apiv2.coffee | 29 +++--------------------------
 2 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index 48c812dbb2..2539a5bdbd 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -316,3 +316,5 @@ router.post '/user/tasks/:taskId/:direction', auth, scoreTask
 module.exports = router
 module.exports.auth = auth
 module.exports.scoreTask = scoreTask # export so deprecated can call it
+module.exports.NO_TOKEN_OR_UID = NO_TOKEN_OR_UID
+module.exports.NO_USER_FOUND = NO_USER_FOUND
diff --git a/src/server/apiv2.coffee b/src/server/apiv2.coffee
index 6138f78bc6..84ebd0de2d 100644
--- a/src/server/apiv2.coffee
+++ b/src/server/apiv2.coffee
@@ -9,13 +9,9 @@ validator = require 'derby-auth/node_modules/validator'
 check = validator.check
 sanitize = validator.sanitize
 misc = require '../app/misc'
+api = require './api'
 
-NO_TOKEN_OR_UID =
-  err: "You must include a token and uid (user id) in your request"
-NO_USER_FOUND =
-  err: "No user found."
-
-# ---------- /api/v1 API ------------
+# ---------- /api/v2 API ------------
 # Every url added beneath router is prefaced by /api/v2
 
 ###
@@ -24,29 +20,10 @@ NO_USER_FOUND =
 router.get '/status', (req, res) ->
   res.json status: 'up'
 
-###
-  beforeEach auth interceptor
-###
-auth = (req, res, next) ->
-  uid = req.headers['x-api-user']
-  token = req.headers['x-api-key']
-  return res.json 401, NO_TOKEN_OR_UID unless uid || token
-
-  model = req.getModel()
-
-  model.query('users').withIdAndToken(uid, token).fetch (err, user) ->
-    return res.json err: err if err
-    req.user = user
-    req.userObj = user.get()
-    return res.json 401, NO_USER_FOUND if !req.userObj || _.isEmpty(req.userObj)
-    req._isServer = true
-    model.ref('_user', user)
-    next()
-
 ###
 POST new actions
 ###
-router.post '/', auth, (req, res) ->
+router.post '/', api.auth, (req, res) ->
   model = req.getModel()
   user = req.user
   actions = req.body