Add auth awareness to ui

red/api/auth/index.js

@@ -18,6 +18,7 @@ var passport = require("passport");
 var oauth2orize = require("oauth2orize");
 
 var strategies = require("./strategies");
+var tokens = require("./tokens");
 
 var settings = require("../../settings");
 
@@ -62,11 +63,19 @@ function login(req,res) {
     res.json(response);
 }
 
+function revoke(req,res) {
+    var token = req.body.token;
+    tokens.revoke(token).then(function() {
+        res.send(200);
+    });
+}
+
 module.exports = {
     authenticate: authenticate,
     ensureClientSecret: ensureClientSecret,
     authenticateClient: authenticateClient,
     getToken: getToken,
     errorHandler: server.errorHandler(),
-    login: login
+    login: login,
+    revoke: revoke
 }

red/api/auth/tokens.js

@@ -35,6 +35,10 @@ module.exports = {
         var token = generateToken(256);
         tokens[token] = {user:user,client:client,scope:scope};
         return when.resolve(token);
+    },
+    revoke: function(token) {
+        delete tokens[token];
+        return when.resolve();
     }
     
 };

red/api/index.js

@@ -35,55 +35,56 @@ var errorHandler = function(err,req,res,next) {
 
 function init(adminApp) {
     
-    var apiApp = express();
     
+    // Editor
+    if (!settings.disableEditor) {
+        var editorApp = express();
+        editorApp.get("/",ui.ensureSlash);
+        editorApp.get("/icons/:icon",ui.icon);
+        editorApp.use("/",ui.editor);
+        adminApp.use(editorApp);
+    }
+
     adminApp.use(express.json());
     adminApp.use(express.urlencoded());
     
     //TODO: all passport references ought to be in ./auth
-    apiApp.use(passport.initialize());
+    adminApp.use(passport.initialize());
     
-    apiApp.use(auth.authenticate);
-    apiApp.post("/auth/token",
+    adminApp.use(auth.authenticate);
+    adminApp.post("/auth/token",
         auth.ensureClientSecret,
         auth.authenticateClient,
         auth.getToken,
         auth.errorHandler
     );
-    apiApp.get("/auth/login",auth.login);
+    adminApp.get("/auth/login",auth.login);
+    adminApp.post("/auth/revoke",auth.revoke);
+    
 
     // Flows
-    apiApp.get("/flows",flows.get);
-    apiApp.post("/flows",flows.post);
+    adminApp.get("/flows",flows.get);
+    adminApp.post("/flows",flows.post);
     
     // Nodes
-    apiApp.get("/nodes",nodes.getAll);
-    apiApp.post("/nodes",nodes.post);
+    adminApp.get("/nodes",nodes.getAll);
+    adminApp.post("/nodes",nodes.post);
 
-    apiApp.get("/nodes/:mod",nodes.getModule);
-    apiApp.put("/nodes/:mod",nodes.putModule);
-    apiApp.delete("/nodes/:mod",nodes.delete);
+    adminApp.get("/nodes/:mod",nodes.getModule);
+    adminApp.put("/nodes/:mod",nodes.putModule);
+    adminApp.delete("/nodes/:mod",nodes.delete);
     
-    apiApp.get("/nodes/:mod/:set",nodes.getSet);
-    apiApp.put("/nodes/:mod/:set",nodes.putSet);
+    adminApp.get("/nodes/:mod/:set",nodes.getSet);
+    adminApp.put("/nodes/:mod/:set",nodes.putSet);
 
     // Library
-    library.init(apiApp);
-    apiApp.post(new RegExp("/library/flows\/(.*)"),library.post);
-    apiApp.get("/library/flows",library.getAll);
-    apiApp.get(new RegExp("/library/flows\/(.*)"),library.get);
+    library.init(adminApp);
+    adminApp.post(new RegExp("/library/flows\/(.*)"),library.post);
+    adminApp.get("/library/flows",library.getAll);
+    adminApp.get(new RegExp("/library/flows\/(.*)"),library.get);
     
     // Settings
-    apiApp.get("/settings",info.settings);
-    
-    // Editor
-    if (!settings.disableEditor) {
-        adminApp.get("/",ui.ensureSlash);
-        adminApp.get("/icons/:icon",ui.icon);
-        adminApp.use("/",ui.editor);
-    }
-    
-    adminApp.use(apiApp);
+    adminApp.get("/settings",info.settings);
     
     // Error Handler
     adminApp.use(errorHandler);