issue #20614: cleaned up app route

diff --git a/node-datasource/main.js b/node-datasource/main.js
index b130ce6..07a63ef 100755 (executable)
--- a/node-datasource/main.js
+++ b/node-datasource/main.js
@@ -331,6 +331,7 @@ app.get('/', routes.loginForm);
 app.post('/login', routes.login);
 app.get('/login/scope', routes.scopeForm);
 app.post('/login/scopeSubmit', routes.scope);
+app.get('/logout', routes.logout);
 app.get('/:org/logout', routes.logout);
 app.get('/:org/app', routes.app);
 

diff --git a/node-datasource/routes/app.js b/node-datasource/routes/app.js
index 97925ff..9dd6dc9 100644 (file)
--- a/node-datasource/routes/app.js
+++ b/node-datasource/routes/app.js
@@ -49,10 +49,11 @@ var async = require("async"),
     }
     return versionSize;
   };
+
   /**
-    @name Extensions
-    @class Extensions
-    Returns a list of extensions associated with an organization.
+   Figures out what extensions the user is entitled to. Queries to determine
+   client code UUIDs for core and those extensions. Sends on to the app view
+   to render.
    */
   exports.serveApp = function (req, res) {
     if (!req.session.passport.user) {
@@ -60,12 +61,12 @@ var async = require("async"),
       return;
     }
 
-    var userCollection = new SYS.UserCollection(),
+    var user = new SYS.User(),
       fetchError = function (err) {
         X.log("Extension fetch error", err);
         res.send({isError: true, message: "Error fetching extensions"});
       },
-      fetchSuccess = function (collection, result) {
+      fetchSuccess = function (model, result) {
         var sendExtensions = function (res, extensions) {
           var uuids = _.map(extensions, function (ext) {
             var sortedModels = _.sortBy(ext.codeInfo, function (codeInfo) {
@@ -74,9 +75,15 @@ var async = require("async"),
             return sortedModels[0].uuid;
           });
           getCoreUuid('js', req.session.passport.user.organization, function (err, jsUuid) {
-            // TODO: handle error
+            if (err) {
+              res.send({isError: true, error: err});
+              return;
+            }
             getCoreUuid('css', req.session.passport.user.organization, function (err, cssUuid) {
-              // TODO: handle error
+              if (err) {
+                res.send({isError: true, error: err});
+                return;
+              }
               res.render('app', {
                 org: req.session.passport.user.organization,
                 coreJs: jsUuid,
@@ -104,9 +111,6 @@ var async = require("async"),
             }
           });
         };
-        var user = _.find(collection.models, function (obj) {
-          return obj.get("username") === req.session.passport.user.username;
-        });
         var extensions = _.map(user.get("grantedExtensions"), function (ext) {
           return ext.extension;
         });
@@ -140,10 +144,8 @@ var async = require("async"),
         }
       };
 
-    // Fetch under the authority of admin
-    // or else most users would not be able to load their own extensions.
-    // TODO: just fetch the model instead of the whole collection
-    userCollection.fetch({
+    user.fetch({
+      id: req.session.passport.user.username,
       success: fetchSuccess,
       error: fetchError,
       username: X.options.databaseServer.user,

diff --git a/node-datasource/routes/auth.js b/node-datasource/routes/auth.js
index f5ab28c..0f26db4 100644 (file)
--- a/node-datasource/routes/auth.js
+++ b/node-datasource/routes/auth.js
@@ -19,7 +19,7 @@ regexp:true, undef:true, strict:true, trailing:true, white:true */
   exports.login = [
     //passport.authenticate('local', { successReturnToOrRedirect: '/login/scope', failureRedirect: '/', failureFlash: 'Invalid username or password.' }),
     passport.authenticate('local', { failureRedirect: '/?login=fail' }),
-    function (/** @lends Auth# */req, res, next) {
+    function (req, res, next) {
 
       if (req && req.session && !req.session.oauth2 && req.session.passport && req.session.passport.user && req.session.passport.user.organization) {
         res.redirect("/" + req.session.passport.user.organization + '/app');