#43 Login issue within new visual studio project

maikebing · maikebing · commit 58159004ea36 · 2019-02-10T14:38:33.000+08:00
diff --git a/src/GitLab.VisualStudio.Shared/Dialog.cs b/src/GitLab.VisualStudio.Shared/Dialog.cs
@@ -15,22 +15,22 @@ public void Close()
 
         public void Confirm(string message, Action<bool?> callback)
         {
-            MessageBox.Show(message, "确认", MessageBoxButton.YesNo, MessageBoxImage.Question);
+            MessageBox.Show(message, Strings.Confirm, MessageBoxButton.YesNo, MessageBoxImage.Question);
         }
 
         public void Error(string message)
         {
-            MessageBox.Show(message, "错误", MessageBoxButton.OK, MessageBoxImage.Error);
+            MessageBox.Show(message, Strings.Error, MessageBoxButton.OK, MessageBoxImage.Error);
         }
 
         public void Information(string message)
         {
-            MessageBox.Show(message, "消息", MessageBoxButton.OK, MessageBoxImage.Information);
+            MessageBox.Show(message, Strings.Information, MessageBoxButton.OK, MessageBoxImage.Information);
         }
 
         public void Warning(string message)
         {
-            MessageBox.Show(message, "报警", MessageBoxButton.OK, MessageBoxImage.Warning);
+            MessageBox.Show(message, Strings.Warning, MessageBoxButton.OK, MessageBoxImage.Warning);
         }
     }
 }
diff --git a/src/GitLab.VisualStudio.Shared/Strings.Designer.cs b/src/GitLab.VisualStudio.Shared/Strings.Designer.cs
diff --git a/src/GitLab.VisualStudio.Shared/Strings.de.resx b/src/GitLab.VisualStudio.Shared/Strings.de.resx
@@ -405,4 +405,19 @@
   <data name="Trying" xml:space="preserve">
     <value>Probieren</value>
   </data>
-</root>
+  <data name="Warning" xml:space="preserve">
+    <value>Achtung</value>
+  </data>
+  <data name="Error" xml:space="preserve">
+    <value>Fehler</value>
+  </data>
+  <data name="Confirm" xml:space="preserve">
+    <value>Bestätigen</value>
+  </data>
+  <data name="Information" xml:space="preserve">
+    <value>Information!</value>
+  </data>
+  <data name="PleaseCheckYourUsernameOrPassword" xml:space="preserve">
+    <value>Bitte überprüfen Sie Ihren Benutzernamen und Ihr Passwort.</value>
+  </data>
+</root>
diff --git a/src/GitLab.VisualStudio.Shared/Strings.fr.resx b/src/GitLab.VisualStudio.Shared/Strings.fr.resx
@@ -405,4 +405,19 @@
   <data name="Trying" xml:space="preserve">
     <value>Trying</value>
   </data>
+  <data name="Confirm" xml:space="preserve">
+    <value>Oui</value>
+  </data>
+  <data name="Information" xml:space="preserve">
+    <value>Informations</value>
+  </data>
+  <data name="Warning" xml:space="preserve">
+    <value>Avertissement</value>
+  </data>
+  <data name="Error" xml:space="preserve">
+    <value>Erreur</value>
+  </data>
+  <data name="PleaseCheckYourUsernameOrPassword" xml:space="preserve">
+    <value>Veuillez vérifier le nom d’utilisateur et le mot de passe.</value>
+  </data>
 </root>
diff --git a/src/GitLab.VisualStudio.Shared/Strings.it.resx b/src/GitLab.VisualStudio.Shared/Strings.it.resx
@@ -405,4 +405,19 @@
   <data name="Trying" xml:space="preserve">
     <value>Continua a provarci.</value>
   </data>
+  <data name="Confirm" xml:space="preserve">
+    <value>Conferma</value>
+  </data>
+  <data name="Information" xml:space="preserve">
+    <value>Informazione</value>
+  </data>
+  <data name="Warning" xml:space="preserve">
+    <value>Attenzione</value>
+  </data>
+  <data name="Error" xml:space="preserve">
+    <value>Errore</value>
+  </data>
+  <data name="PleaseCheckYourUsernameOrPassword" xml:space="preserve">
+    <value>Si prega di controllare il nome utente o la password !!</value>
+  </data>
 </root>
diff --git a/src/GitLab.VisualStudio.Shared/Strings.ja.resx b/src/GitLab.VisualStudio.Shared/Strings.ja.resx
@@ -405,4 +405,16 @@
   <data name="Trying" xml:space="preserve">
     <value>しよう</value>
   </data>
+  <data name="Confirm" xml:space="preserve">
+    <value>確認</value>
+  </data>
+  <data name="Warning" xml:space="preserve">
+    <value>警告</value>
+  </data>
+  <data name="PleaseCheckYourUsernameOrPassword" xml:space="preserve">
+    <value>ユーザー名またはパスワードを確認してください。</value>
+  </data>
+  <data name="Information" xml:space="preserve">
+    <value>情報</value>
+  </data>
 </root>
diff --git a/src/GitLab.VisualStudio.Shared/Strings.resx b/src/GitLab.VisualStudio.Shared/Strings.resx
@@ -407,4 +407,19 @@
   <data name="Trying" xml:space="preserve">
     <value>Trying:</value>
   </data>
+  <data name="Confirm" xml:space="preserve">
+    <value>Confirm</value>
+  </data>
+  <data name="Information" xml:space="preserve">
+    <value>Information</value>
+  </data>
+  <data name="Warning" xml:space="preserve">
+    <value>Warning</value>
+  </data>
+  <data name="Error" xml:space="preserve">
+    <value>Error</value>
+  </data>
+  <data name="PleaseCheckYourUsernameOrPassword" xml:space="preserve">
+    <value>Please check your username or password!</value>
+  </data>
 </root>
diff --git a/src/GitLab.VisualStudio.Shared/Strings.zh-Hans.resx b/src/GitLab.VisualStudio.Shared/Strings.zh-Hans.resx
@@ -407,4 +407,19 @@
   <data name="Trying" xml:space="preserve">
     <value>尝试</value>
   </data>
+  <data name="Confirm" xml:space="preserve">
+    <value>确认</value>
+  </data>
+  <data name="Information" xml:space="preserve">
+    <value>信息</value>
+  </data>
+  <data name="Warning" xml:space="preserve">
+    <value>警告</value>
+  </data>
+  <data name="Error" xml:space="preserve">
+    <value>错误</value>
+  </data>
+  <data name="PleaseCheckYourUsernameOrPassword" xml:space="preserve">
+    <value>请检查您的用户名或密码</value>
+  </data>
 </root>
diff --git a/src/GitLab.VisualStudio.Shared/Strings.zh-Hant.resx b/src/GitLab.VisualStudio.Shared/Strings.zh-Hant.resx
@@ -405,4 +405,19 @@
   <data name="Trying" xml:space="preserve">
     <value>嘗試:</value>
   </data>
+  <data name="Confirm" xml:space="preserve">
+    <value>確認</value>
+  </data>
+  <data name="Information" xml:space="preserve">
+    <value>信息</value>
+  </data>
+  <data name="Warning" xml:space="preserve">
+    <value>警告</value>
+  </data>
+  <data name="Error" xml:space="preserve">
+    <value>错误</value>
+  </data>
+  <data name="PleaseCheckYourUsernameOrPassword" xml:space="preserve">
+    <value>請檢查您的用戶名或密碼</value>
+  </data>
 </root>
diff --git a/src/GitLab.VisualStudio.UI/ViewModels/LoginViewModel.cs b/src/GitLab.VisualStudio.UI/ViewModels/LoginViewModel.cs
@@ -194,6 +194,7 @@ private void OnLogin()
             BusyContent = Strings.Common_Loading;
             var successed = false;
             Exception exlogin = null;
+            string logmsg = "";
             Task.Run(() =>
             {
                 bool ok = Enum.TryParse(SelectedApiVersion, true, out ApiVersion apiVersion);
@@ -216,6 +217,7 @@ private void OnLogin()
                         catch (Exception ex)
                         {
                             BusyContent = ex.Message;
+                            logmsg += apiv.ToString()+":"+ ex.Message+Environment.NewLine;
                         }
                     }
                 }
@@ -234,6 +236,7 @@ private void OnLogin()
                 catch (Exception ex)
                 {
                     exlogin = ex;
+                    logmsg +="Last try"+ apiVersion.ToString ()+":"+ ex.Message + Environment.NewLine;
                 }
             }).ContinueWith(task =>
             {
@@ -246,7 +249,7 @@ private void OnLogin()
                 }
                 else
                 {
-                    _dialog.Warning(Strings.Login_FailedToLogin + "\r\n" + exlogin.Message);
+                    _dialog.Warning(Strings.Login_FailedToLogin +Environment.NewLine + Strings.PleaseCheckYourUsernameOrPassword + Environment.NewLine + logmsg);
                 }
             }, TaskScheduler.FromCurrentSynchronizationContext()).Forget();
         }
diff --git a/src/GitLab.VisualStudio/Services/WebService.cs b/src/GitLab.VisualStudio/Services/WebService.cs
@@ -141,7 +141,9 @@ public User LoginAsync(bool enable2fa, string host, string email, string passwor
 
         private static NGitLab.Impl.Api.ApiVersion VsApiVersionToNgitLabversion(ApiVersion apiVersion)
         {
-            return (NGitLab.Impl.Api.ApiVersion)Enum.Parse(typeof(NGitLab.Impl.Api.ApiVersion), apiVersion.ToString());
+            var result = NGitLab.Impl.Api.ApiVersion.V4_Oauth;
+            Enum.TryParse(apiVersion.ToString(), out result);
+            return result;
         }
 
         public CreateProjectResult CreateProject(string name, string description, string VisibilityLevel)

Original file line number	Diff line number	Diff line change
`@@ -15,22 +15,22 @@ public void Close()`
`15`	`15`
`16`	`16`	`public void Confirm(string message, Action<bool?> callback)`
`17`	`17`	`{`
`18`		`- MessageBox.Show(message, "确认", MessageBoxButton.YesNo, MessageBoxImage.Question);`
	`18`	`+ MessageBox.Show(message, Strings.Confirm, MessageBoxButton.YesNo, MessageBoxImage.Question);`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`public void Error(string message)`
`22`	`22`	`{`
`23`		`- MessageBox.Show(message, "错误", MessageBoxButton.OK, MessageBoxImage.Error);`
	`23`	`+ MessageBox.Show(message, Strings.Error, MessageBoxButton.OK, MessageBoxImage.Error);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public void Information(string message)`
`27`	`27`	`{`
`28`		`- MessageBox.Show(message, "消息", MessageBoxButton.OK, MessageBoxImage.Information);`
	`28`	`+ MessageBox.Show(message, Strings.Information, MessageBoxButton.OK, MessageBoxImage.Information);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public void Warning(string message)`
`32`	`32`	`{`
`33`		`- MessageBox.Show(message, "报警", MessageBoxButton.OK, MessageBoxImage.Warning);`
	`33`	`+ MessageBox.Show(message, Strings.Warning, MessageBoxButton.OK, MessageBoxImage.Warning);`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -194,6 +194,7 @@ private void OnLogin()`
`194`	`194`	`BusyContent = Strings.Common_Loading;`
`195`	`195`	`var successed = false;`
`196`	`196`	`Exception exlogin = null;`
	`197`	`+ string logmsg = "";`
`197`	`198`	`Task.Run(() =>`
`198`	`199`	`{`
`199`	`200`	`bool ok = Enum.TryParse(SelectedApiVersion, true, out ApiVersion apiVersion);`
`@@ -216,6 +217,7 @@ private void OnLogin()`
`216`	`217`	`catch (Exception ex)`
`217`	`218`	`{`
`218`	`219`	`BusyContent = ex.Message;`
	`220`	`+ logmsg += apiv.ToString()+":"+ ex.Message+Environment.NewLine;`
`219`	`221`	`}`
`220`	`222`	`}`
`221`	`223`	`}`
`@@ -234,6 +236,7 @@ private void OnLogin()`
`234`	`236`	`catch (Exception ex)`
`235`	`237`	`{`
`236`	`238`	`exlogin = ex;`
	`239`	`+ logmsg +="Last try"+ apiVersion.ToString ()+":"+ ex.Message + Environment.NewLine;`
`237`	`240`	`}`
`238`	`241`	`}).ContinueWith(task =>`
`239`	`242`	`{`
`@@ -246,7 +249,7 @@ private void OnLogin()`
`246`	`249`	`}`
`247`	`250`	`else`
`248`	`251`	`{`
`249`		`- _dialog.Warning(Strings.Login_FailedToLogin + "\r\n" + exlogin.Message);`
	`252`	`+ _dialog.Warning(Strings.Login_FailedToLogin +Environment.NewLine + Strings.PleaseCheckYourUsernameOrPassword + Environment.NewLine + logmsg);`
`250`	`253`	`}`
`251`	`254`	`}, TaskScheduler.FromCurrentSynchronizationContext()).Forget();`
`252`	`255`	`}`