reject if async function returns < 0

implausible · johnhaley81 · commit 82cf59e2d59e · 2015-10-08T10:49:50.000-07:00
If the function that our async worker calls returns a value less than 0, then it is an error and should be treated as an error. Even if the error message is lost, it is necessary to return a general error, or otherwise systems that would otherwise reject, will resolve.
diff --git a/generate/templates/partials/async_function.cc b/generate/templates/partials/async_function.cc
@@ -139,6 +139,11 @@ void {{ cppClassName }}::{{ cppFunctionName }}Worker::HandleOKCallback() {
       if (baton->error->message)
         free((void *)baton->error->message);
       free((void *)baton->error);
+    } else if (baton->error_code < 0) {
+      Local<v8::Value> argv[1] = {
+        Nan::Error("A general error has occurred")
+      };
+      callback->Call(1, argv);
     } else {
       callback->Call(0, NULL);
     }
diff --git a/test/tests/remote.js b/test/tests/remote.js
@@ -241,6 +241,40 @@ describe("Remote", function() {
     });
   });
 
+  it("will reject if credentials promise rejects", function() {
+    this.timeout(5000);
+    var repo = this.repository;
+    var branch = "should-not-exist";
+    return Remote.lookup(repo, "origin")
+      .then(function(remote) {
+        var ref = "refs/heads/" + branch;
+        var refs = [ref + ":" + ref];
+        var options = {
+          callbacks: {
+            credentials: function(url, userName) {
+              return Promise.reject();
+            },
+            certificateCheck: function() {
+              return 1;
+            }
+          }
+        };
+        return remote.push(refs, options);
+      })
+      // takes care of windows bug, see the .catch for the proper pathway
+      // that this flow should take (cred cb doesn't run twice -> throws error)
+      .then(function() {
+        return Promise.reject(
+          new Error("should not be able to push to the repository"));
+      }, function(err) {
+        if (err.message === "A general error has occurred") {
+          return Promise.resolve();
+        } else {
+          throw err;
+        }
+      });
+  });
+
   it("cannot push to a repository with invalid credentials", function() {
     this.timeout(5000);
     var repo = this.repository;
@@ -249,19 +283,13 @@ describe("Remote", function() {
       .then(function(remote) {
         var ref = "refs/heads/" + branch;
         var refs = [ref + ":" + ref];
-        var firstPass = true;
         var options = {
           callbacks: {
             credentials: function(url, userName) {
-              if (firstPass) {
-                firstPass = false;
-                if (url.indexOf("https") === -1) {
-                  return NodeGit.Cred.sshKeyFromAgent(userName);
-                } else {
-                    return NodeGit.Cred.userpassPlaintextNew(userName, "");
-                }
+              if (url.indexOf("https") === -1) {
+                return NodeGit.Cred.sshKeyFromAgent(userName);
               } else {
-                return NodeGit.Cred.defaultNew();
+                return NodeGit.Cred.userpassPlaintextNew(userName, "");
               }
             },
             certificateCheck: function() {
