Improve messages displayed on authentication failure

Author: dktapps

MCLauncher/MainWindow.xaml.cs

@@ -338,7 +338,7 @@ private void InvokeDownload(Version v) {
                         Debug.WriteLine("Authentication complete");
                     } catch (WUTokenHelper.WUTokenException e) {
                         Debug.WriteLine("Authentication failed:\n" + e.ToString());
-                        MessageBox.Show("Failed to authenticate because: " + e.Message + "\n\n" + e.ToString(), "Authentication failed");
+                        MessageBox.Show("Failed to authenticate because: " + e.Message, "Authentication failed");
                         v.StateChangeInfo = null;
                         return;
                     } catch (Exception e) {

MCLauncher/WUTokenHelper.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
+using Windows.Security.Authentication.Web.Core;
 
 namespace MCLauncher {
     class WUTokenHelper {
@@ -19,9 +20,13 @@ public static string GetWUToken() {
             }
         }
 
-        private const int WU_ERRORS_START = 0x7ffc0200;
-        private const int WU_NO_ACCOUNT = 0x7ffc0200;
-        private const int WU_ERRORS_END = 0x7ffc0200;
+        private const int WU_ERRORS_START = unchecked((int) 0x80040200);
+        private const int WU_NO_ACCOUNT = unchecked((int) 0x80040200);
+
+        private const int WU_TOKEN_FETCH_ERROR_BASE = unchecked((int) 0x80040300);
+        private const int WU_TOKEN_FETCH_ERROR_END = unchecked((int) 0x80040400);
+
+        private const int WU_ERRORS_END = unchecked((int) 0x80040400);
 
         [DllImport("WUTokenHelper.dll", CallingConvention = CallingConvention.StdCall)]
         private static extern int GetWUToken([MarshalAs(UnmanagedType.LPWStr)] out string token);
@@ -31,8 +36,33 @@ public WUTokenException(int exception) : base(GetExceptionText(exception)) {
                 HResult = exception;
             }
             private static String GetExceptionText(int e) {
+                if (e >= WU_TOKEN_FETCH_ERROR_BASE && e < WU_TOKEN_FETCH_ERROR_END)
+                {
+                    var actualCode = (byte) e & 0xff;
+
+                    if(!Enum.IsDefined(typeof(WebTokenRequestStatus), e))
+                    {
+                        return $"WUTokenHelper returned bogus HRESULT: {e} (THIS IS A BUG)";
+                    }
+                    var status = (WebTokenRequestStatus) Enum.ToObject(typeof(WebTokenRequestStatus), actualCode);
+                    switch (status)
+                    {
+                        case WebTokenRequestStatus.Success:
+                            return "Success (THIS IS A BUG)";
+                        case WebTokenRequestStatus.UserCancel:
+                            return "User cancelled token request (THIS IS A BUG)"; //TODO: should never happen?
+                        case WebTokenRequestStatus.AccountSwitch:
+                            return "User requested account switch (THIS IS A BUG)"; //TODO: should never happen?
+                        case WebTokenRequestStatus.UserInteractionRequired:
+                            return "User interaction required to complete token request (THIS IS A BUG)";
+                        case WebTokenRequestStatus.AccountProviderNotAvailable:
+                            return "Xbox Live account services are currently unavailable";
+                        case WebTokenRequestStatus.ProviderError:
+                            return "Unknown Xbox Live error";
+                    }
+                }
                 switch (e) {
-                    case WU_NO_ACCOUNT: return "No account";
+                    case WU_NO_ACCOUNT: return "No Microsoft account found";
                     default: return "Unknown " + e;
                 }
             }

WUTokenHelper/main.cpp

@@ -9,6 +9,7 @@ using namespace Windows::Internal::Security::Authentication::Web;
 using namespace Windows::Security::Cryptography;
 
 #define WU_NO_ACCOUNT MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x200)
+#define WU_TOKEN_FETCH_ERROR_BASE MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x400)
 
 extern "C" __declspec(dllexport) int  __stdcall GetWUToken(wchar_t** retToken) {
 	auto tokenBrokerStatics = get_activation_factory<TokenBrokerInternal, Windows::Foundation::IUnknown>();
@@ -24,6 +25,9 @@ extern "C" __declspec(dllexport) int  __stdcall GetWUToken(wchar_t** retToken) {
 	auto accountProvider = WebAuthenticationCoreManager::FindAccountProviderAsync(L"https://login.microsoft.com", L"consumers").get();
 	WebTokenRequest request(accountProvider, L"service::dcat.update.microsoft.com::MBI_SSL", L"{28520974-CE92-4F36-A219-3F255AF7E61E}");
 	auto result = WebAuthenticationCoreManager::GetTokenSilentlyAsync(request, accountInfo).get();
+	if (result.ResponseStatus() != WebTokenRequestStatus::Success) {
+		return WU_TOKEN_FETCH_ERROR_BASE | static_cast<int32_t>(result.ResponseStatus());
+	}
 	auto token = result.ResponseData().GetAt(0).Token();
 	wprintf(L"Token = %s\n", token.c_str());
 	auto tokenBinary = CryptographicBuffer::ConvertStringToBinary(token, BinaryStringEncoding::Utf16LE);