:drunk: AI trying to fix bugs

DysonNetwork.Pass/Features/Auth/Services/OpenId/OidcService.cs

@@ -1,6 +1,8 @@
 using System.IdentityModel.Tokens.Jwt;
 using System.Net.Http.Json;
+using System.Text.Json;
 using System.Text.Json.Serialization;
+using DysonNetwork.Common.Models;
 using DysonNetwork.Common.Services;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.IdentityModel.Tokens;
@@ -48,7 +50,7 @@ public abstract class OidcService(
     /// <summary>
     /// Process the callback from the OIDC provider
     /// </summary>
-    public abstract Task<OidcUserInfo> ProcessCallbackAsync(OidcCallbackData callbackData);
+    public abstract Task<DysonNetwork.Common.Models.OidcUserInfo> ProcessCallbackAsync(OidcCallbackData callbackData);
 
     /// <summary>
     /// Gets the provider configuration
@@ -145,7 +147,7 @@ public abstract class OidcService(
     /// <summary>
     /// Validates and extracts information from an ID token
     /// </summary>
-    protected virtual OidcUserInfo ValidateAndExtractIdToken(string idToken,
+    protected virtual DysonNetwork.Common.Models.OidcUserInfo ValidateAndExtractIdToken(string idToken,
         TokenValidationParameters validationParameters)
     {
         var handler = new JwtSecurityTokenHandler();
@@ -171,18 +173,24 @@ public abstract class OidcService(
             username = !string.IsNullOrEmpty(email) ? email.Split('@')[0] : null;
         }
 
-        return new OidcUserInfo
+        // Convert the user info to our model
+        var userInfo = new DysonNetwork.Common.Models.OidcUserInfo
         {
-            UserId = userId,
             Email = email,
             EmailVerified = emailVerified,
-            FirstName = givenName ?? "",
-            LastName = familyName ?? "",
-            DisplayName = name ?? $"{givenName} {familyName}".Trim(),
-            PreferredUsername = username ?? "",
-            ProfilePictureUrl = picture,
-            Provider = ProviderName
+            GivenName = givenName,
+            FamilyName = familyName,
+            Name = name,
+            UserId = userId,
+            Picture = picture,
+            AccessToken = "",
+            RefreshToken = "",
+            Provider = ProviderName,
+            ExpiresAt = null,
+            Claims = null
         };
+
+        return userInfo;
     }
 
     /// <summary>
@@ -190,7 +198,7 @@ public abstract class OidcService(
     /// Also creates or updates the account connection
     /// </summary>
     public async Task<Challenge> CreateChallengeForUserAsync(
-        OidcUserInfo userInfo,
+        DysonNetwork.Common.Models.OidcUserInfo userInfo,
         Models.Account account,
         HttpContext request,
         string deviceId
@@ -199,20 +207,22 @@ public abstract class OidcService(
         // Create or update the account connection
         var connection = await Db.AccountConnections
             .FirstOrDefaultAsync(c => c.Provider == ProviderName &&
-                                      c.ProvidedIdentifier == userInfo.UserId &&
-                                      c.AccountId == account.Id
+                                  c.ProvidedIdentifier == userInfo.UserId &&
+                                  c.AccountId == account.Id
             );
 
         if (connection is null)
         {
-            connection = new AccountConnection
+            connection = new DysonNetwork.Common.Models.AccountConnection
             {
                 Provider = ProviderName,
                 ProvidedIdentifier = userInfo.UserId ?? "",
                 AccessToken = userInfo.AccessToken,
                 RefreshToken = userInfo.RefreshToken,
                 LastUsedAt = SystemClock.Instance.GetCurrentInstant(),
-                AccountId = account.Id
+                AccountId = account.Id,
+                CreatedAt = SystemClock.Instance.GetCurrentInstant(),
+                ProfileData = userInfo.Claims != null ? JsonSerializer.SerializeToDocument(userInfo.Claims) : null
             };
             await Db.AccountConnections.AddAsync(connection);
         }