From 1d40c34204d0ef40ef58bfe4390d0658c57b8fbb Mon Sep 17 00:00:00 2001
From: Sergio Zharinov <zharinov@users.noreply.github.com>
Date: Mon, 24 Aug 2020 22:53:45 +0400
Subject: [PATCH] fix(composer): Support other hostRules keys in COMPOSER_AUTH
(#7084)
---
lib/manager/composer/artifacts.ts | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/lib/manager/composer/artifacts.ts b/lib/manager/composer/artifacts.ts
index 5428d9c40e..8b802b7921 100644
--- a/lib/manager/composer/artifacts.ts
+++ b/lib/manager/composer/artifacts.ts
@@ -57,13 +57,15 @@ function getAuthJson(): string | null {
hostRules
.findAll({ hostType: datasourcePackagist.id })
- ?.forEach(({ username, password, hostName, domainName }) => {
- const host = hostName || domainName;
- if (host && username && password) {
- authJson['http-basic'] = authJson['http-basic'] || {};
- authJson['http-basic'][host] = { username, password };
+ ?.forEach(
+ ({ username, password, hostName, domainName, endpoint, baseUrl }) => {
+ const host = hostName || domainName || endpoint || baseUrl;
+ if (host && username && password) {
+ authJson['http-basic'] = authJson['http-basic'] || {};
+ authJson['http-basic'][host] = { username, password };
+ }
}
- });
+ );
return is.emptyObject(authJson) ? null : JSON.stringify(authJson);
}
--
GitLab