counts

1 files changed, 19 insertions, 16 deletions

diff --git a/lib/okpush/index.js b/lib/okpush/index.js
index 2fe59932..df9c8265 100644
--- a/lib/okpush/index.js
+++ b/lib/okpush/index.js
@@ -50,37 +50,40 @@ function OKPush (options) {
   apn.init(config)
   db.init(config)
 
-  router.use('/admin/', passport.initialize())
+//   router.use('/admin/', passport.initialize())
   router.use('/public/', express.static(path.join(__dirname, './public')));
 
   // monkeypatch because of app.use(router) .. obnoxious
-  router.all('/admin/(:path*)?', function (req, res, next) {
-    req.newUrl = req.url
-    req.url = req.originalUrl
-    next()
-  })
-  router.all('/admin/(:path*)?', passport.authenticate('digest', {
-    session: false
-  }))
-  router.all('/admin/(:path*)?', function (req, res, next) {
-    req.url = req.newUrl
-    next()
-  })
+//   router.all('/admin/(:path*)?', function (req, res, next) {
+//     console.log(req.url)
+//     req.newUrl = req.url
+//     req.url = req.originalUrl
+//     next()
+//   })
+//   router.all('/admin/(:path*)?', passport.authenticate('digest', {
+//     session: false
+//   }))
+//   router.all('/admin/(:path*)?', function (req, res, next) {
+//     req.url = req.newUrl
+//     next()
+//   })
 
   // pass in admin middleware!
   router.get('/admin', function (req, res) {
-    // change this to get notification counts for each channel
     db.getNotifications(function(err, notes){
-      db.getDeviceCount(function(err, count){
+      var channels = Object.keys(config.notifications)
+      db.getDeviceCount(channels, function(count){
         var data = {
           meta: meta,
           notifications: config.notifications,
-          device_count: count,
         }
         notes.forEach(function(note){
           if (note.key in data.notifications) {
             data.notifications[ note.key ].last_push = note.last_push
           }
+          if (note.key in count) {
+            data.notifications[ note.key ].count = count[note.key]
+          }
         })
         templates['index'].render(data).then(function(rendered) {
           res.send(rendered);