nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-17 19:18:16 -05:00
Code

TryCreate on each uri

Browse Source
This commit is contained in:
Kyle Spearrin 2018-07-02 10:50:48 -04:00
parent 37375d8653
commit 90df2f21e5
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Icons/Services/IconFetchingService.cs
View File

@ -50,22 +50,25 @@ namespace Bit.Icons.Services
public async Task<IconResult> GetIconAsync(string domain) public async Task<IconResult> GetIconAsync(string domain)
{ {
if(!Uri.TryCreate($"https://{domain}", UriKind.Absolute, out var parsedUri)) if(!Uri.TryCreate($"https://{domain}", UriKind.Absolute, out var parsedHttpsUri))
{ {
return null; return null;
} }
var uri = parsedUri; var uri = parsedHttpsUri;
var response = await GetAndFollowAsync(uri, 2); var response = await GetAndFollowAsync(uri, 2);
if(response == null || !response.IsSuccessStatusCode) if((response == null || !response.IsSuccessStatusCode) &&
Uri.TryCreate($"http://{parsedHttpsUri.Host}", UriKind.Absolute, out var parsedHttpUri))
{ {
Cleanup(response); Cleanup(response);
uri = new Uri($"http://{parsedUri.Host}"); uri = parsedHttpUri;
response = await GetAndFollowAsync(uri, 2); response = await GetAndFollowAsync(uri, 2);
if(response == null || !response.IsSuccessStatusCode)
if((response == null || !response.IsSuccessStatusCode) &&
Uri.TryCreate($"https://www.{parsedHttpsUri.Host}", UriKind.Absolute, out var parsedWwwUri))
{ {
Cleanup(response); Cleanup(response);
uri = new Uri($"https://www.{parsedUri.Host}"); uri = parsedWwwUri;
response = await GetAndFollowAsync(uri, 2); response = await GetAndFollowAsync(uri, 2);
} }
} }