fix(desktop): Include port in credential name if not using the default

VMelnalksnis · Feb 24, 2024 · 8810ac5 · 8810ac5
1 parent 2a06ee6
commit 8810ac5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/docs/changelog.html b/docs/changelog.html
@@ -76,6 +76,10 @@ <h3>Changed</h3>
 					Split current loans in named loans and loan payments in
 					<a href="https://github.com/VMelnalksnis/Gnomeshade/pull/1104">#1104</a>
 				</li>
+				<li>
+					Include non-default port in stored credential name in
+					<a href="https://github.com/VMelnalksnis/Gnomeshade/pull/1113">#1113</a>
+				</li>
 			</ul>
 		</section>
 

diff --git a/source/Gnomeshade.Desktop/Authentication/WindowsCredentialStorageService.cs b/source/Gnomeshade.Desktop/Authentication/WindowsCredentialStorageService.cs
@@ -122,10 +122,14 @@ private bool TryGetCredential([NotNullWhen(true)] out ICredential? credential)
 	private string GetCredentialName()
 	{
 		const string credentialName = "Gnomeshade";
-		var serverHost = _optionsMonitor.CurrentValue.BaseAddress?.Host;
+		var baseUri = _optionsMonitor.CurrentValue.BaseAddress;
+		if (baseUri is null)
+		{
+			return credentialName;
+		}
 
-		return string.IsNullOrWhiteSpace(serverHost)
-			? credentialName
-			: $"{credentialName}:{serverHost}";
+		return baseUri.IsDefaultPort
+			? $"{credentialName}:{baseUri.Host}"
+			: $"{credentialName}:{baseUri.Host}:{baseUri.Port}";
 	}
 }