Login and account switching fixes

Author: CorruptComputer

Alidade.Osm/Models/Api/Auth/OsmUserInfo.cs

@@ -4,6 +4,5 @@ namespace Alidade.Osm.Models.Api.Auth;
 ///   Basic profile information returned by the OSM API after a successful login.
 /// </summary>
 /// <param name="UserName">The user's OSM display name.</param>
-/// <param name="AvatarUrl">The URL of the user's avatar image, if set.</param>
 /// <param name="UserId">The numeric OSM user ID.</param>
-public record OsmUserInfo(string UserName, string? AvatarUrl, long UserId);
+public record OsmUserInfo(string UserName, long UserId);

Alidade.Osm/Models/Api/Auth/StoredAccount.cs

@@ -6,6 +6,5 @@ namespace Alidade.Osm.Models.Api.Auth;
 /// </summary>
 /// <param name="Username">The user's OSM display name.</param>
 /// <param name="UserId">The numeric OSM user ID.</param>
-/// <param name="AvatarUrl">The URL of the user's avatar image, if set.</param>
 /// <param name="Token">The OAuth 2.0 bearer token for this account.</param>
-public record StoredAccount(string Username, long UserId, string? AvatarUrl, string Token);
+public record StoredAccount(string Username, long UserId, string Token);

Alidade.Osm/Services/OsmOAuthClient.cs

@@ -76,9 +76,6 @@ public async Task<string> ExchangeCodeAsync(string tokenEndpoint, string clientI
 
         return new OsmUserInfo(
             user.GetProperty("display_name").GetString() ?? string.Empty,
-            user.TryGetProperty("img", out JsonElement img)
-                ? img.GetProperty("href").GetString()
-                : null,
             user.GetProperty("id").GetInt64());
     }
 

Alidade/Components/Dialogs/SelectAccountDialog.razor

@@ -8,24 +8,10 @@
                 {
                     bool isActive = authState.State.User?.UserId == account.UserId;
                     <button class="account-row @(isActive ? "account-row-active" : null)"
-                            @onclick="() => Select(account)"
-                            disabled="@isActive">
-                        @if (account.AvatarUrl is not null)
-                        {
-                            <img class="account-avatar" src="@account.AvatarUrl" alt="" />
-                        }
-                        else
-                        {
-                            <div class="account-avatar account-avatar-placeholder">
-                                @account.Username[0]
-                            </div>
-                        }
+                            @onclick="() => Select(account)" disabled="@isActive">
                         <span class="account-name">@account.Username</span>
-                        @if (isActive)
-                        {
-                            <span class="account-active-badge">Active</span>
-                        }
                     </button>
+                    <br />
                 }
             </div>
         </ChildContent>

Alidade/Components/Panels/SettingsPanel.razor

@@ -20,18 +20,14 @@
                         </option>
                     }
                 </select>
-                <button class="account-switcher-btn" @onclick="OpenAccountSwitcher" title="Switch account">
+                <button class="account-switcher-btn" @onclick="OnAccountButtonClicked">
                     @if (authState.State.IsLoggedIn)
                     {
-                        @if (authState.State.User!.AvatarUrl is string avatarUrl)
-                        {
-                            <img class="account-switcher-avatar" src="@avatarUrl" alt="" />
-                        }
-                        <span>@authState.State.User!.UserName</span>
+                        <span>Switch account</span>
                     }
                     else
                     {
-                        <span>Login</span>
+                        <span>Log in</span>
                     }
                 </button>
             </div>

Alidade/Components/Panels/SettingsPanel.razor.cs

@@ -60,8 +60,17 @@ private void OnEndpointChanged(ChangeEventArgs e)
         }
     }
 
-    private void OpenAccountSwitcher()
-        => _ = mediator.Send(new OpenAccountSwitcher.Command());
+    private void OnAccountButtonClicked()
+    {
+        if (authState.State.IsLoggedIn)
+        {
+            _ = mediator.Send(new OpenAccountSwitcher.Command());
+        }
+        else
+        {
+            _ = mediator.Send(new BeginLogin.Command());
+        }
+    }
 
     #endregion
 

Alidade/Services/AuthService.cs

@@ -128,7 +128,7 @@ public async Task OnOAuthCallbackAsync(string code, string verifier)
             }
 
             OsmUserInfo user = authState.State.User!;
-            StoredAccount newAccount = new(user.UserName, user.UserId, user.AvatarUrl, token);
+            StoredAccount newAccount = new(user.UserName, user.UserId, token);
 
             List<StoredAccount> accounts = await storage.GetStoredAccountsAsync(endpoint);
             accounts.RemoveAll(a => a.UserId == newAccount.UserId);