From 7816810249d9d35d323adaa1e55556faed2d84a8 Mon Sep 17 00:00:00 2001 From: James Allen Date: Thu, 14 Aug 2014 10:12:01 +0100 Subject: [PATCH] Add in poll dropbox endpoint back into admin --- .../Features/ServerAdmin/AdminController.coffee | 7 ++++++- services/web/app/coffee/router.coffee | 1 + services/web/app/views/admin.jade | 12 +++++++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/services/web/app/coffee/Features/ServerAdmin/AdminController.coffee b/services/web/app/coffee/Features/ServerAdmin/AdminController.coffee index 8a1a22e00b..06c566f0aa 100755 --- a/services/web/app/coffee/Features/ServerAdmin/AdminController.coffee +++ b/services/web/app/coffee/Features/ServerAdmin/AdminController.coffee @@ -12,7 +12,7 @@ rclient.auth(Settings.redis.web.password) RecurlyWrapper = require('../Subscription/RecurlyWrapper') SubscriptionHandler = require('../Subscription/SubscriptionHandler') projectEntityHandler = require('../Project/ProjectEntityHandler') -TpdsPollingBackgroundTasks = require("../ThirdPartyDataStore/TpdsPollingBackgroundTasks") +TpdsUpdateSender = require("../ThirdPartyDataStore/TpdsUpdateSender") EditorRealTimeController = require("../Editor/EditorRealTimeController") SystemMessageManager = require("../SystemMessages/SystemMessageManager") @@ -73,6 +73,11 @@ module.exports = AdminController = flushProjectToTpds: (req, res)-> projectEntityHandler.flushProjectToThirdPartyDataStore req.body.project_id, (err)-> res.send 200 + + pollDropboxForUser: (req, res)-> + user_id = req.body.user_id + TpdsUpdateSender.pollDropboxForUser user_id, () -> + res.send 200 createMessage: (req, res, next) -> SystemMessageManager.createMessage req.body.content, (error) -> diff --git a/services/web/app/coffee/router.coffee b/services/web/app/coffee/router.coffee index 198b58c4cb..6379b96f61 100644 --- a/services/web/app/coffee/router.coffee +++ b/services/web/app/coffee/router.coffee @@ -169,6 +169,7 @@ module.exports = class Router app.post '/admin/dissconectAllUsers', SecurityManager.requestIsAdmin, AdminController.dissconectAllUsers app.post '/admin/syncUserToSubscription', SecurityManager.requestIsAdmin, AdminController.syncUserToSubscription app.post '/admin/flushProjectToTpds', SecurityManager.requestIsAdmin, AdminController.flushProjectToTpds + app.post '/admin/pollDropboxForUser', SecurityManager.requestIsAdmin, AdminController.pollDropboxForUser app.post '/admin/messages', SecurityManager.requestIsAdmin, AdminController.createMessage app.post '/admin/messages/clear', SecurityManager.requestIsAdmin, AdminController.clearMessages diff --git a/services/web/app/views/admin.jade b/services/web/app/views/admin.jade index aa5da2e608..8b03b60253 100644 --- a/services/web/app/views/admin.jade +++ b/services/web/app/views/admin.jade @@ -45,7 +45,7 @@ block content .form-group button.btn-primary.btn(type='submit') Link - tab(heading="TPDS Management") + tab(heading="TPDS/Dropbox Management") h3 Flush project to TPDS .row form.col-xs-6(enctype='multipart/form-data', method='post',action='/admin/flushProjectToTpds') @@ -55,6 +55,16 @@ block content input.form-control(type='text', name='project_id', placeholder='project_id', required) .form-group button.btn-primary.btn(type='submit') Flush + hr + h3 Poll Dropbox for user + .row + form.col-xs-6(enctype='multipart/form-data', method='post',action='/admin/pollDropboxForUser') + input(name="_csrf", type="hidden", value=csrfToken) + .form-group + label(for='user_id') user_id + input.form-control(type='text', name='user_id', placeholder='user_id', required) + .form-group + button.btn-primary.btn(type='submit') Poll tab(heading="System Messages") each message in systemMessages