#112 - fixed auth promise

app/server/components/repositories/teams.js

@@ -69,6 +69,7 @@ module.exports = {
 
     edit (username, repoId, permission) {
 
+        debug('editing user [' + username + '] permission on team for repo [' + repoId + '] to permission [' + permission + ']');
         // get permission map
         return permUtil.getPermissionMap().then(map => {
 

app/server/components/repositories/users.js

@@ -1,8 +1,7 @@
 'use strict';
 
 var userUtil = require('./util/users'),
-    Bluebird = require('bluebird'),
-    permUtil = require('./util/permissions');
+    Bluebird = require('bluebird');
 
 module.exports = {
 
@@ -14,8 +13,10 @@ module.exports = {
     },
 
     isOrgMember (username) {
-        return userUtil.isOrgMember(username).then(function (data) {
-            return "204 No Content" === data.meta.success;
+        return new Promise((resolve, reject) => {
+            userUtil.isOrgMember(username).then(function (data) {
+                resolve(data.meta.status === '204 No Content');
+            });
         });
     }
 };

app/server/components/repositories/util/users.js

@@ -28,7 +28,7 @@ module.exports = {
     isOrgMember(username) {
         return provider.github.isOrgMember({
             org: provider.github.config.org,
-            username: username
+            user: username
         });
     }
 };

app/server/middleware/authenticate.js

@@ -1,15 +1,37 @@
 'use strict';
 
-var users = require('../components/repositories/users');
+let users = require('../components/repositories/users'),
+    debug = require('debug')('app:middleware:authenticate');
 
 module.exports = {
     isAuthenticated (req, res, next) {
-        var authenticated = req.isAuthenticated();
 
-        if (authenticated && users.isOrgMember(req.session.passport.user.username)) {
-            next();
-        } else {
+        let authenticated = req.isAuthenticated();
+
+        function f401() {
             res.send(401);
         }
+
+        debug('session is authenticated: ' + authenticated);
+
+        if (authenticated) {
+
+            let username = req.session.passport.user.username;
+
+            debug('checking membership for ' + username);
+
+            users.isOrgMember(username).then((isMember) => {
+                debug('user [' + username + '] is org member: ' + isMember);
+                if (isMember) {
+                    next();
+                } else {
+                    f401();
+                }
+            }).catch(() => {
+                f401();
+            });
+        } else {
+            f401();
+        }
     }
 };