Fix Multiauth (#58)

Author: DEATHB4DEFEAT

SS14.Launcher/Models/Connector.cs

@@ -326,16 +326,16 @@ private async Task LaunchClientWrap(
         if (info != null && info.AuthInformation.Mode != AuthMode.Disabled && _loginManager.ActiveAccount != null)
         {
             var account = _loginManager.Logins.Items.FirstOrDefault(l =>
-                info.AuthInformation.LoginUrls?.Contains(LoginManager.GetAuthServerById(l.Server, l.ServerUrl,
-                    LoginManager.TryGetAccountUrl(l.Server, l.ServerUrl)).AuthUrl.ToString()) ?? l.Server == ConfigConstants.FallbackAuthServer);
+                info.AuthInformation.LoginUrls?.Contains(l.ServerUrl) ?? l.Server == ConfigConstants.FallbackAuthServer);
             var authServers = info.AuthInformation.LoginUrls?.ToString() ??
                 "(Fallback) " + LoginManager.GetAuthServerById(ConfigConstants.FallbackAuthServer).AuthUrl;
             if (account == null)
             {
                 Log.Error("No logged in account found for any of the server's allowed auth providers: {AuthServers}", authServers);
                 return null;
             }
-            if (account != _loginManager.ActiveAccount)
+            if (account != _loginManager.ActiveAccount &&
+                !info.AuthInformation.LoginUrls?.Contains(_loginManager.ActiveAccount.ServerUrl) == true)
             {
                 Log.Warning("Using different account than the active one due to server requiring a different auth provider: {Server}", authServers);
                 _loginManager.ActiveAccount = account;
@@ -348,6 +348,7 @@ private async Task LaunchClientWrap(
             cVars.Add(("ROBUST_AUTH_USERID", account.LoginInfo.UserId.ToString()));
             cVars.Add(("ROBUST_AUTH_PUBKEY", info.AuthInformation.PublicKey));
             cVars.Add(("ROBUST_AUTH_SERVER", authServer));
+            cVars.Add(("ROBUST_AUTH_SERVERS", $"unset@{authServer}"));
             Log.Information($"Launching client with auth server {authServer} and account {account.Username}@{account.Server} ({account.UserId})");
         }
 

SS14.Launcher/Models/ServerStatus/ServerStatusCache.cs

@@ -149,7 +149,7 @@ public static void ApplyStatus(ServerStatusData data, ServerApi.ServerStatus sta
         var inferredTags = ServerTagInfer.InferTags(status);
 
         data.Tags = baseTags.Concat(inferredTags).ToArray();
-        data.Auths = status.AuthMethods ?? [ConfigConstants.FallbackAuthServer];
+        data.Auths = status.AuthMethods ?? [ConfigConstants.AuthUrls[ConfigConstants.FallbackAuthServer].AuthUrl.AbsoluteUri];
     }
 
     public static async void UpdateInfoForCore(ServerStatusData data, Func<CancellationToken, Task<ServerInfo?>> fetch)

SS14.Launcher/ViewModels/Login/LoginViewModel.cs

@@ -86,6 +86,7 @@ public static async Task<bool> DoLogin<T>(
         if (resp.IsSuccess)
         {
             var loginInfo = resp.LoginInfo;
+            loginInfo.ServerUrl ??= ConfigConstants.AuthUrls[ConfigConstants.FallbackAuthServer].AuthUrl.AbsoluteUri;
             var oldLogin = loginMgr.Logins.KeyValues.FirstOrDefault(a =>
                 a.Key == loginInfo.UserId && a.Value.Server == loginInfo.Server
                     && a.Value.ServerUrl == loginInfo.ServerUrl).Value;

SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs

@@ -68,8 +68,8 @@ public void Tick()
 
     public void ConnectPressed()
     {
-        // If there is only one supported auth method that matches the active account, connect
-        if (_cacheData.Auths.Length <= 1 && _cacheData.Auths.Contains(_loginManager.ActiveAccount?.Server))
+        // If we have an active account that matches the allowed auths, connect
+        if (_cacheData.Auths.Contains(_loginManager.ActiveAccount?.ServerUrl))
         {
             ConnectingViewModel.StartConnect(_windowVm, Address);
             return;

SS14.Launcher/Views/SelectAccountDialog.xaml.cs

@@ -17,7 +17,7 @@ public SelectAccountDialog(string[] authMethods, LoginManager loginManager)
         InitializeComponent();
 
         Accounts = loginManager.Logins.KeyValues
-            .Where(x => authMethods.Contains(x.Value.Server))
+            .Where(x => authMethods.FirstOrDefault(m => m == ConfigConstants.AuthUrls[x.Value.Server].AuthUrl.AbsoluteUri) != null)
             .Select(x => x.Value);
         Error = !Accounts.Any();
     }