Rename OneLoginUser.Email to EmailAddress (#2684)

Keeps it consistent with other email address fields.

Author: gunndabad

TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Controllers/OAuth2Controller.cs

@@ -157,7 +157,7 @@ public async Task<IActionResult> UserInfoAsync()
 
         if (User.HasScope(Scopes.Email))
         {
-            claims.Add(ClaimTypes.Email, oneLoginUser.Email!);
+            claims.Add(ClaimTypes.Email, oneLoginUser.EmailAddress!);
         }
 
         if (oneLoginUser.VerificationRoute == OneLoginUserVerificationRoute.OneLogin)

TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/SignInJourneyHelper.cs

@@ -84,7 +84,7 @@ public async Task OnUserAuthenticatedAsync(JourneyInstance<SignInJourneyState> j
             oneLoginUser = new()
             {
                 Subject = sub,
-                Email = email,
+                EmailAddress = email,
                 FirstOneLoginSignIn = clock.UtcNow,
                 LastOneLoginSignIn = clock.UtcNow
             };
@@ -97,7 +97,7 @@ public async Task OnUserAuthenticatedAsync(JourneyInstance<SignInJourneyState> j
 
             // Email may have changed since the last sign in or we may have never had it (e.g. if we got the user ID over our API).
             // TODO Should we emit an event if it has changed?
-            oneLoginUser.Email = email;
+            oneLoginUser.EmailAddress = email;
 
             if (oneLoginUser.PersonId is not null)
             {
@@ -224,7 +224,7 @@ await journeyInstance.UpdateStateAsync(state =>
             if (getAnIdentityPerson is null)
             {
                 var identityUser = await idDbContext.Users.SingleOrDefaultAsync(
-                    u => u.EmailAddress == oneLoginUser.Email
+                    u => u.EmailAddress == oneLoginUser.EmailAddress
                         && u.Trn != null
                         && u.IsDeleted == false
                         && (u.TrnVerificationLevel == TrnVerificationLevel.Medium
@@ -334,11 +334,11 @@ public async Task<bool> TryMatchToTeachingRecordAsync(JourneyInstance<SignInJour
 
     private async Task<TryMatchToTrnRequestResult?> TryMatchToTrnRequestAsync(OneLoginUser oneLoginUser)
     {
-        Debug.Assert(oneLoginUser.Email is not null);
+        Debug.Assert(oneLoginUser.EmailAddress is not null);
 
         var requestAndResolvedPerson = await dbContext.TrnRequestMetadata
             .Join(dbContext.Persons, r => r.ResolvedPersonId, p => p.PersonId, (m, p) => new { TrnRequestMetadata = m, ResolvedPerson = p })
-            .Where(m => m.TrnRequestMetadata.OneLoginUserSubject == oneLoginUser.Subject || m.TrnRequestMetadata.EmailAddress == oneLoginUser.Email)
+            .Where(m => m.TrnRequestMetadata.OneLoginUserSubject == oneLoginUser.Subject || m.TrnRequestMetadata.EmailAddress == oneLoginUser.EmailAddress)
             .ToArrayAsync();
 
         if (requestAndResolvedPerson is not [{ TrnRequestMetadata: var trnRequestMetadata, ResolvedPerson: var resolvedPerson }])

TeachingRecordSystem/src/TeachingRecordSystem.Core/DataStore/Postgres/Mappings/OneLoginUserMapping.cs

@@ -12,7 +12,7 @@ public void Configure(EntityTypeBuilder<OneLoginUser> builder)
     {
         builder.HasKey(o => o.Subject);
         builder.Property(o => o.Subject).HasMaxLength(255);
-        builder.Property(o => o.Email).HasMaxLength(200);
+        builder.Property(o => o.EmailAddress).HasMaxLength(200);
         builder.HasOne(o => o.Person).WithOne().HasForeignKey<OneLoginUser>(o => o.PersonId);
         builder.Property(o => o.VerifiedNames).HasColumnType("jsonb").HasConversion(
             v => JsonSerializer.Serialize(v, (JsonSerializerOptions?)null),