Error handling tweaks

Author: willstott101

src/git.test.ts

@@ -15,7 +15,7 @@ const wrapCallback = (func: { (callback: any): void }) => {
 
 describe('git', () => {
   test('create, push to, and clone a repo', async () => {
-    expect.assertions(11);
+    expect.assertions(12);
 
     let lastCommit: string;
 
@@ -29,9 +29,11 @@ describe('git', () => {
     fs.mkdirSync(srcDir, '0700');
     fs.mkdirSync(dstDir, '0700');
 
-    const repos = new Git<number>(repoDir, {
+    const repos = new Git<string>(repoDir, {
       autoCreate: true,
-      authenticate: () => 42,
+      authenticate: (opts) => {
+        return 'my request context';
+      },
     });
     const port = Math.floor(Math.random() * ((1 << 16) - 1e4)) + 1e4;
     const server = http
@@ -43,7 +45,7 @@ describe('git', () => {
     process.chdir(srcDir);
 
     repos.on('push', (push) => {
-      expect(push.context).toBe(42);
+      expect(push.context).toBe('my request context');
 
       expect(push.repo).toBe('xyz/doom');
       expect(push.commit).toBe(lastCommit);
@@ -658,9 +660,9 @@ describe('git', () => {
 
     const repos = new Git(repoDir, {
       autoCreate: true,
-      authenticate: async ({ type, repo, user }) => {
+      authenticate: async ({ type, repo, getUser }) => {
         if (type === 'fetch' && repo === 'doom') {
-          const [username, password] = await user();
+          const [username, password] = await getUser();
           if (username == 'root' && password == 'root') {
             return;
           } else {
@@ -729,15 +731,15 @@ describe('git', () => {
 
     const repos = new Git<Context>(repoDir, {
       autoCreate: true,
-      authenticate: async ({ type, repo, user, headers }) => {
+      authenticate: async ({ type, repo, getUser, headers }) => {
         if (type === 'fetch' && repo === 'doom') {
           expect(headers['host']).toBeTruthy();
           expect(headers['user-agent']).toBeTruthy();
           expect(headers['accept']).toBeTruthy();
           expect(headers['pragma']).toBeTruthy();
           expect(headers['accept-encoding']).toBeTruthy();
 
-          const [username, password] = await user();
+          const [username, password] = await getUser();
           if (username == 'root' && password == 'root') {
             return {
               username: username,
@@ -802,20 +804,14 @@ describe('git', () => {
 
     const repos = new Git(repoDir, {
       autoCreate: true,
-      authenticate: ({ type, repo, user }) => {
-        return new Promise(function (resolve, reject) {
-          if (type === 'fetch' && repo === 'doom') {
-            user((username, password) => {
-              if (username == 'root' && password == 'root') {
-                return resolve(void 0);
-              } else {
-                return reject('that is not the correct password');
-              }
-            });
-          } else {
-            return reject('that is not the correct password');
+      authenticate: async ({ type, repo, getUser }) => {
+        if (type === 'fetch' && repo === 'doom') {
+          const [username, password] = await getUser();
+          if (username == 'root' && password == 'root') {
+            return;
           }
-        });
+        }
+        throw new Error('that is not the correct password');
       },
     });
     const port = Math.floor(Math.random() * ((1 << 16) - 1e4)) + 1e4;