Finished changes for sending correct number of arguments to superagent callback

Author: saraf

lib/api.js

@@ -47,6 +47,7 @@ function createHooks(reponame, url, secret, token, callback) {
     .set('User-Agent', 'StriderCD (http://stridercd.com)')
     .end(function (err, res) {
       if (err) return callback(err);
+
       if (res.statusCode !== 201) {
         var badStatusErr = new Error('Bad status code: ' + res.statusCode);
         badStatusErr.statusCode = res.statusCode;
@@ -73,7 +74,8 @@ function deleteHooks(reponame, url, token, callback) {
     .get(apiUrl)
     .set('Authorization', 'token ' + token)
     .set('User-Agent', 'StriderCD (http://stridercd.com)')
-    .end(function (res) { //CHECK: have a callback with the first param as err and process that err
+    .end(function (err, res) {
+      if(err) return callback(err);
       if (res.status > 300) {
         debug('Error getting hooks', res.status, res.text);
         return callback(res.status);
@@ -87,7 +89,8 @@ function deleteHooks(reponame, url, token, callback) {
             .del(hook.url)
             .set('Authorization', 'token ' + token)
             .set('User-Agent', 'StriderCD (http://stridercd.com)')
-            .end(function (res) { //CHECK: have a callback with the first param as err and process that err
+            .end(function (err, res) {
+              if(err) return next(new Error('Failed to delete webhook ' + hook.url + 'Error: ' + err));
               if (res.status !== 204) {
                 debug('bad status', res.status, hook.id, hook.url);
                 return next(new Error('Failed to delete a webhook: status for url ' + hook.url + ': ' + res.status));
@@ -127,7 +130,8 @@ function getFile(filename, ref, accessToken, owner, repo, done) {
   if (accessToken) {
     req = req.set('Authorization', 'token ' + accessToken);
   }
-  req.end(function (res) {  //CHECK: have a callback with the first param as err and process that err
+  req.end(function (err, res) {
+    if(err) return done(err, null);
     if (res.error) return done(res.error, null);
     if (!res.body.content) {
       return done();
@@ -176,11 +180,11 @@ var api_call = module.exports.api_call = function (path, access_token, callback,
   var url = GITHUB_API_ENDPOINT + path;
   debug('API CALL:', url, access_token);
   get_oauth2(url, {}, access_token, function (error, res) {
-    debug("We get an error from the API: " + error);
     if (!error && res.statusCode == 200) {
       var data = res.body;
       callback(null, res, data);
     } else {
+      debug("We get an error from the API: " + error);
       callback(error, res, null);
     }
   }, client);
@@ -245,7 +249,7 @@ var pageinated_api_call = module.exports.pageinated_api_call = function (path, a
   function loop(uri, page) {
     debug('PAGINATED API CALL URL:', uri);
     get_oauth2(uri, {per_page: 30, page: page}, access_token, function (error, res) {
-    debug("We get an error: " + error);
+
       if (!error && res.statusCode == 200) {
         var data;
         try {
@@ -389,27 +393,16 @@ function getRepos(token, username, callback) {
       });
       // For each Team with admin privs, test for membership
       var group = this.group();
-      debug("****************************************************************\nThis is: " + JSON.stringify(this, null, 4)); //CHECK: undefined
-      debug("****************************************************************\ngroup is: " + JSON.stringify(group, null, 4)); //CHECK: undefined
 
       var team_detail_requests = {};
       _.each(team_details, function (team_details) {
         if (team_details.permission != 'admin') {
           return;
         }
         team_detail_requests[team_details.id] = team_details;
-        var url = GITHUB_API_ENDPOINT + '/teams/' + team_details.id + '/members/' + username;
+        var url = '/teams/' + team_details.id + '/members/' + username;
         debug('TEAM DETAIL URL', url);
-        get_oauth2(url, {}, token, group()); //<------------------- this is a problem
-                                             //get_oauth sends this callback as it is to superagent
-                                             //superagent expects a callback that takes two arguments
-                                             //in the other places it works because we are sending group() as
-                                             //as a parameter to api_call or pageinated_api_call, and they are now correctly wrapping
-                                             //get_oauth, passing in a callback that expects two arguments
-                                             //if we were to replace this get_oauth2 call by a call to api_call,
-                                             //it would probably work as a hack, but the intention behind group()
-                                             //and this.group() is yet to be understood by me
-
+        api_call(url, token, group());
       });
       this.team_detail_requests = team_detail_requests;
     },