Skip to content

Fix for #52 #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maikebing merged 1 commit into from
May 3, 2019
Merged

Fix for #52 #56

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/GitLab.VisualStudio/Services/Storage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ private void SaveUserToLocal(User user)
System.IO.File.WriteAllText(_path, Newtonsoft.Json.JsonConvert.SerializeObject(user));
user.PrivateToken = pt;
}
catch (Exception )
catch (Exception)
{

}
}

Expand Down Expand Up @@ -144,11 +144,13 @@ private User LoadUser()
try
{
var _path = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), $"{new Uri(Host).Host}.gitlab4vs");
if (System.IO.File.Exists(_path))
if (!System.IO.File.Exists(_path))
{
_user = Newtonsoft.Json.JsonConvert.DeserializeObject<User>(System.IO.File.ReadAllText(_path));
_user.PrivateToken = GetToken(_user.Host);
_path = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), $"{new Uri(Strings.DefaultHost).Host}.gitlab4vs");
}

_user = Newtonsoft.Json.JsonConvert.DeserializeObject<User>(System.IO.File.ReadAllText(_path));
_user.PrivateToken = GetToken(_user.Host);
}
catch (Exception ex)
{
Expand Down Expand Up @@ -222,11 +224,11 @@ public bool HaveHost(string host)
}
result = HostVersionInfo.ContainsKey(host);

if (!result && Uri.TryCreate(host, UriKind.Absolute, out Uri uri))
if (!result && Uri.TryCreate(host, UriKind.Absolute, out Uri uri))
{
result = HostVersionInfo.ContainsKey(uri.Host);
}

return result;
}

Expand Down