add hg username to allow overriding default username of 'x' (#332)

sillsdev · Nov 9, 2023 · 4f55942 · 4f55942
1 parent 5defb68
commit 4f55942
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/LfMerge.Core/Actions/Infrastructure/ChorusHelper.cs b/src/LfMerge.Core/Actions/Infrastructure/ChorusHelper.cs
@@ -13,7 +13,7 @@ public class ChorusHelper
 	{
 		static ChorusHelper()
 		{
-			Username = "x";
+			Username = System.Environment.GetEnvironmentVariable(MagicStrings.EnvVar_HgUsername) ?? "x";
 			Password = System.Environment.GetEnvironmentVariable(MagicStrings.EnvVar_TrustToken) ?? "x";
 		}
 
@@ -24,7 +24,7 @@ public virtual string GetSyncUri(ILfProject project)
 				return settings.LanguageDepotRepoUri;
 
 			var uriBldr = new UriBuilder(project.LanguageDepotProjectUri) {
-				UserName = Username,
+				UserName = System.Environment.GetEnvironmentVariable(MagicStrings.EnvVar_HgUsername) ?? Username,
 				Password = System.Environment.GetEnvironmentVariable(MagicStrings.EnvVar_TrustToken) ?? Password,
 				Path = HttpUtility.UrlEncode(project.LanguageDepotProject.Identifier)
 			};

diff --git a/src/LfMerge.Core/MagicStrings.cs b/src/LfMerge.Core/MagicStrings.cs
@@ -28,6 +28,7 @@ static MagicStrings()
 		public const string EnvVar_LanguageDepotPrivateHostname = "LFMERGE_LANGUAGE_DEPOT_HG_PRIVATE_HOSTNAME";
 		public const string EnvVar_LanguageDepotUriProtocol = "LFMERGE_LANGUAGE_DEPOT_HG_PROTOCOL";
 		public const string EnvVar_TrustToken = "LANGUAGE_DEPOT_TRUST_TOKEN";
+		public const string EnvVar_HgUsername = "LANGUAGE_DEPOT_HG_USERNAME";
 
 		public static Dictionary<string, string> LcmOptionlistNames = new Dictionary<string, string>()
 		{

diff --git a/src/LfMerge/Program.cs b/src/LfMerge/Program.cs
@@ -33,7 +33,7 @@ public static int Main(string[] args)
 
 			// Username and Password will usually be "x" because it's dealt with on Language Forge site.
 			// However, when debugging LfMerge we want to be able to set it to a real name
-			ChorusHelper.Username = options.User;
+			ChorusHelper.Username = System.Environment.GetEnvironmentVariable(MagicStrings.EnvVar_HgUsername) ?? options.User;
 			ChorusHelper.Password = System.Environment.GetEnvironmentVariable(MagicStrings.EnvVar_TrustToken) ?? options.Password;
 			ExceptionLogging.Client.AddInfo(options.ProjectCode, MainClass.ModelVersion);