Move some routing logic into App.

Author: plietar

coder-apps/common/coderlib/app/app.js

@@ -42,6 +42,63 @@ App.prototype._load = function(data) {
     }
 }
 
+App.prototype.exec = function (req, res, path) {
+    var self = this;
+    res.locals["app_name"]    = this.name;
+    res.locals["app_url"]     = this.appURL;
+    res.locals["static_url"]  = this.staticURL;
+    res.locals["device_name"] = coderlib.device.name;
+    res.locals["coder_owner"] = coderlib.device.owner;
+    res.locals["coder_color"] = coderlib.device.color;
+
+
+    //Redirect to sign-in for unauthenticated users
+    var user = coderlib.auth.isAuthenticated(req, res);
+    if ( !user && !this.metadata.public) {
+        util.log( "redirect: " + '/app/auth' );
+        res.redirect('/app/auth');
+        return;
+    }
+
+    this.require(function(err, userapp) {
+        if (err) {
+            res.send(500);
+            return;
+        }
+
+        var routes = [];
+        if ( req.route.method === 'get' ) {
+            routes = userapp.get_routes;
+        } else if ( req.route.method === 'post' ) {
+            routes = userapp.post_routes;
+        }
+
+        if ( routes ) {
+            var found = false;
+            for ( var i in routes ) {
+                route = routes[i];
+                if ( route['path'] instanceof RegExp ) {
+                    var match = route['path'].exec( path );
+                    if ( match ) {
+                        userapp[route['handler']]( self, req, res, match );
+                        found = true;
+                        break;
+                    }
+
+                } else if ( route['path'] === path ) {
+                    userapp[route['handler']]( self, req, res );
+                    found = true;
+                    break;
+                }
+            }
+
+            if ( !found ) {
+                res.send(404);
+            }
+        }
+    });
+}
+
 var LocalApp = exports.LocalApp = function(name) {
     LocalApp.super_.call(this, name);
 

coder-apps/common/coderlib/app/index.js

@@ -51,6 +51,8 @@ exports.app       = app.LocalApp.find;
 exports.listApps  = app.LocalApp.list;
 exports.createApp = app.LocalApp.create;
 
+exports.auth      = require('../../auth/app/index');
+
 
 exports.device = function() {
     var devicefile = process.cwd() + "/device.json";

coder-base/server.js

@@ -60,62 +60,7 @@ var apphandler = function( req, res, appdir ) {
             return;
         }
 
-        res.locals["app_name"]    = appname;
-        res.locals["app_url"]     = "/app/" + appname;
-        res.locals["static_url"]  = "/static/apps/" + appname;
-        res.locals["device_name"] = coderlib.device.name;
-        res.locals["coder_owner"] = coderlib.device.owner;
-        res.locals["coder_color"] = coderlib.device.color;
-
-        //Redirect to sign-in for unauthenticated users
-        user = auth.isAuthenticated(req, res);
-        if ( !user && !app.metadata.public) {
-            util.log( "redirect: " + '/app/auth' );
-            res.redirect('/app/auth');
-            return;
-        }
-
-        app.require(function(err, userapp) {
-            if (err) {
-                res.send(500);
-                return;
-            }
-
-            var routes = [];
-            if ( req.route.method === 'get' ) {
-                routes = userapp.get_routes;
-            } else if ( req.route.method === 'post' ) {
-                routes = userapp.post_routes;
-            }
-
-            if ( routes ) {
-                var found = false;
-                for ( var i in routes ) {
-                    route = routes[i];
-                    if ( route['path'] instanceof RegExp ) {
-                        var m = route['path'].exec( apppath );
-                        if ( m ) {
-                            userapp[route['handler']]( app, req, res, m );
-                            found = true;
-                            break;
-                        }
-
-                    } else if ( route['path'] === apppath ) {
-                        userapp[route['handler']]( app, req, res );
-                        found = true;
-                        break;
-                    }
-
-                }
-
-                if ( !found ) {
-                    res.status( 404 );
-                    res.render('404', {
-                        title: 'error'
-                    });
-                }
-            }
-        });
+        app.exec(req, res, apppath);
     });
 };