isomorphic-git 1.38.2 → 1.38.4

package/index.cjs

@@ -402,7 +402,7 @@ class InternalError extends BaseError {
    */
   constructor(message) {
     super(
-      `An internal error caused this command to fail.\n\nIf you're not a developer, report the bug to the developers of the application you're using. If this is a bug in isomorphic-git then you should create a proper bug yourselves. The bug should include a minimal reproduction and details about the version and environment.\n\nPlease file a bug report at https://github.com/isomorphic-git/isomorphic-git/issues with this error message: ${message}`
+      `An internal error caused this command to fail.\n\nIf you're using an application that depends on isomorphic-git, please report this error to that application's developers.\n\nIf you're a developer and you believe this is a bug in isomorphic-git, please file an issue at https://github.com/isomorphic-git/isomorphic-git/issues with a minimal reproduction, version and environment details, and this error message: ${message}`
     );
     this.code = this.name = InternalError.code;
     this.data = { message };
@@ -9331,6 +9331,16 @@ async function hasObject({
   return result
 }
 
+function addCredentialUsername({ config, onAuth }) {
+  if (!onAuth) return onAuth
+
+  return async (url, auth) => {
+    const username =
+      auth.username || (await config.get(`credential.${url}.username`));
+    return onAuth(url, username ? { ...auth, username } : auth)
+  }
+}
+
 // TODO: make a function that just returns obCount. then emptyPackfile = () => sizePack(pack) === 0
 function emptyPackfile(pack) {
   const pheader = '5041434b';
@@ -9350,8 +9360,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.38.2',
-  agent: 'git/isomorphic-git@1.38.2',
+  version: '1.38.4',
+  agent: 'git/isomorphic-git@1.38.4',
 };
 
 class FIFO {
@@ -9765,9 +9775,9 @@ async function _fetch({
   const GitRemoteHTTP = GitRemoteManager.getRemoteHelperFor({ url });
   const remoteHTTP = await GitRemoteHTTP.discover({
     http,
-    onAuth,
+    onAuth: addCredentialUsername({ config, onAuth }),
     onAuthSuccess,
-    onAuthFailure,
+    onAuthFailure: addCredentialUsername({ config, onAuth: onAuthFailure }),
     corsProxy,
     service: 'git-upload-pack',
     url,
@@ -13886,9 +13896,9 @@ async function _push({
   const GitRemoteHTTP = GitRemoteManager.getRemoteHelperFor({ url });
   const httpRemote = await GitRemoteHTTP.discover({
     http,
-    onAuth,
+    onAuth: addCredentialUsername({ config, onAuth }),
     onAuthSuccess,
-    onAuthFailure,
+    onAuthFailure: addCredentialUsername({ config, onAuth: onAuthFailure }),
     corsProxy,
     service: 'git-receive-pack',
     url,

package/index.js

@@ -395,7 +395,7 @@ class InternalError extends BaseError {
    */
   constructor(message) {
     super(
-      `An internal error caused this command to fail.\n\nIf you're not a developer, report the bug to the developers of the application you're using. If this is a bug in isomorphic-git then you should create a proper bug yourselves. The bug should include a minimal reproduction and details about the version and environment.\n\nPlease file a bug report at https://github.com/isomorphic-git/isomorphic-git/issues with this error message: ${message}`
+      `An internal error caused this command to fail.\n\nIf you're using an application that depends on isomorphic-git, please report this error to that application's developers.\n\nIf you're a developer and you believe this is a bug in isomorphic-git, please file an issue at https://github.com/isomorphic-git/isomorphic-git/issues with a minimal reproduction, version and environment details, and this error message: ${message}`
     );
     this.code = this.name = InternalError.code;
     this.data = { message };
@@ -9318,6 +9318,16 @@ async function hasObject({
   return result
 }
 
+function addCredentialUsername({ config, onAuth }) {
+  if (!onAuth) return onAuth
+
+  return async (url, auth) => {
+    const username =
+      auth.username || (await config.get(`credential.${url}.username`));
+    return onAuth(url, username ? { ...auth, username } : auth)
+  }
+}
+
 // TODO: make a function that just returns obCount. then emptyPackfile = () => sizePack(pack) === 0
 function emptyPackfile(pack) {
   const pheader = '5041434b';
@@ -9337,8 +9347,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.38.2',
-  agent: 'git/isomorphic-git@1.38.2',
+  version: '1.38.4',
+  agent: 'git/isomorphic-git@1.38.4',
 };
 
 class FIFO {
@@ -9752,9 +9762,9 @@ async function _fetch({
   const GitRemoteHTTP = GitRemoteManager.getRemoteHelperFor({ url });
   const remoteHTTP = await GitRemoteHTTP.discover({
     http,
-    onAuth,
+    onAuth: addCredentialUsername({ config, onAuth }),
     onAuthSuccess,
-    onAuthFailure,
+    onAuthFailure: addCredentialUsername({ config, onAuth: onAuthFailure }),
     corsProxy,
     service: 'git-upload-pack',
     url,
@@ -13873,9 +13883,9 @@ async function _push({
   const GitRemoteHTTP = GitRemoteManager.getRemoteHelperFor({ url });
   const httpRemote = await GitRemoteHTTP.discover({
     http,
-    onAuth,
+    onAuth: addCredentialUsername({ config, onAuth }),
     onAuthSuccess,
-    onAuthFailure,
+    onAuthFailure: addCredentialUsername({ config, onAuth: onAuthFailure }),
     corsProxy,
     service: 'git-receive-pack',
     url,