subscription routage & middleware

3 files changed, 21 insertions, 6 deletions

diff --git a/server/index.js b/server/index.js
index 53da448..2f6cb2d 100644
--- a/server/index.js
+++ b/server/index.js
@@ -151,10 +151,10 @@ site.route = function () {
 	app.post('/api/media/upload', middleware.ensureAuthenticated, api.media.upload)
 	app.delete('/api/media/destroy', middleware.ensureAuthenticated, api.media.destroy)
 
-	app.get('/api/subscription/sync', middleware.ensureAuthenticated, api.subscription.sync)
-	app.get('/api/subscription', middleware.ensureAuthenticated, api.subscription.show)
-	app.put('/api/subscription', middleware.ensureAuthenticated, api.subscription.update)
-	app.delete('/api/subscription', middleware.ensureAuthenticated, api.subscription.destroy)
+	app.get('/api/subscription/sync', middleware.ensureAuthenticated, api.subscription.middleware.ensureSubscription, api.subscription.sync)
+	app.get('/api/subscription', middleware.ensureAuthenticated, api.subscription.middleware.ensurePlans, api.subscription.middleware.ensureSubscription, api.subscription.show)
+	app.put('/api/subscription', middleware.ensureAuthenticated, api.subscription.middleware.ensureSubscription, api.subscription.update)
+	app.delete('/api/subscription', middleware.ensureAuthenticated, api.subscription.middleware.ensureSubscription, api.subscription.destroy)
 
 	app.get('/test/*', middleware.ensureAuthenticated, middleware.ensureIsStaff, views.modal)
 
diff --git a/server/lib/api/subscription.js b/server/lib/api/subscription.js
index e7cd8f4..9478d78 100644
--- a/server/lib/api/subscription.js
+++ b/server/lib/api/subscription.js
@@ -24,10 +24,17 @@ var subscription = module.exports = {
         next()
       })
     },
+    ensurePlans: function(req, res, next){
+      Plan.find({}).sort({ 'level': -1 }).exec(function (err, plans) {
+        res.locals.plans = (plans || [])
+        next()
+      })
+    },
   },
 
   // synchronise an account with recurly..
   // useful when testing locally (where webhooks cannot be received)
+  // parses the XML from the subscription API into something usable
   sync: function(req, res){
     var subscriber = req.subscription || new Subscription ()
     var user = req.user
@@ -84,7 +91,15 @@ var subscription = module.exports = {
   },
 
   show: function(req, res){
-    res.json(req.subscription || { error: "no subscription" })
+    if (req.subscription) {
+      res.json({
+        subscription: req.subscription,
+        plans: res.locals.plans
+      })
+    }
+    else {
+      res.json({ error: "no subscription" })
+    }
   },
   
   update: function(req, res){
diff --git a/server/lib/schemas/Subscription.js b/server/lib/schemas/Subscription.js
index 24c5096..44455a9 100644
--- a/server/lib/schemas/Subscription.js
+++ b/server/lib/schemas/Subscription.js
@@ -18,7 +18,7 @@ var SubscriptionSchema = new mongoose.Schema({
 	
 	history: [{
 	  action: { type: String },
-	  plan_id: { type: String },
+	  data: { type: String },
     created_at: { type: Date, default: Date.now },
 	}],