Bug fix - correcting wrong handling of login when multiple database records are found.

Author: PaulLinYao

api/CESMII.ProfileDesigner.Api/Controllers/AuthController.cs

@@ -105,7 +105,7 @@ public IActionResult QueryCurrentOrganization()
                 var listMatchEmailAddress = _dalUser.Where(x => x.EmailAddress.ToLower().Equals(userAAD.Email.ToLower()) && x.ObjectIdAAD == null, null).Data;
                 if (listMatchEmailAddress.Count == 0)
                 {
-                    // Here for (1) manually created users, or (2) users from marketplace self-service sign-up.
+                    // Here for (1) manually created users, or (2) users from profile designer or marketplace self-service sign-up.
                     um = new UserModel()
                     {
                         ObjectIdAAD = userAAD.ObjectIdAAD,
@@ -144,32 +144,41 @@ public IActionResult QueryCurrentOrganization()
                 {
                     // When more than 1 record, it means they have signed up (and then left) more than 
                     // once. This is okay, but we pick the most recent one.
-                    // listMatchEmailAddress.Sort((em1, em2) => DateTime?.Compare(em1.LastLogin, em2.LastLogin));
+                    // listMatchEmailAddress.Sort((em1, em2) => DateTime?.Compare(em1.Created, em2.Created));
                     listMatchEmailAddress.Sort((em1, em2) => 
                         { 
                             DateTime dt1 = new DateTime(em1.Created.Value.Ticks);
                             DateTime dt2 = new DateTime(em2.Created.Value.Ticks);
                             return DateTime.Compare(dt1, dt2);
                         });
 
+                    // We must have at least 2 records or this line gives an exception
                     int iItem = listMatchEmailAddress.Count - 1;
+
+                    // We use the most recent records that we have for this user.
                     um = listMatchEmailAddress[iItem];
-                    if (um.ObjectIdAAD == null)
-                    {
-                        um.ObjectIdAAD = userAAD.ObjectIdAAD;
-                        um.Email = userAAD.Email;
-                        um.DisplayName = userAAD.DisplayName;
-                        um.LastLogin = DateTime.UtcNow;
+                    um.ObjectIdAAD = userAAD.ObjectIdAAD;
+                    um.Email = userAAD.Email;
+                    um.DisplayName = userAAD.DisplayName;
+                    um.LastLogin = DateTime.UtcNow;
+
+                    bUpdateUser = true;         // Synch UserModel changes
+                    bCheckOrganization = true;  // Check the user's organization.
+
+                    // Note: If we want to automate the removal of duplicate records and logging of it,
+                    // we would do that here with code like the following:
+
+                    ////////for (int iDeleteMe = 0;  iDeleteMe < listMatchEmailAddress.Count - 1; iDeleteMe++)
+                    ////////{
+                    ////////    if (listMatchEmailAddress[iDeleteMe].ID != null)
+                    ////////    {
+                    ////////        string strWarning = $"InitLocalUser|| About to delete record {iDeleteMe} of {listMatchEmailAddress.Count} from public.user. Id: {listMatchEmailAddress[iDeleteMe].ID.Value} Email: {listMatchEmailAddress[iDeleteMe].Email}";
+                    ////////        _logger.LogWarning(strWarning);
+
+                    ////////        await _dalUser.DeleteAsync(listMatchEmailAddress[iDeleteMe].ID.Value, base.DalUserToken);
+                    ////////    }
+                    ////////}
 
-                        bUpdateUser = true;         // Synch UserModel changes
-                        bCheckOrganization = true;  // Check the user's organization.
-                    }
-                    else
-                    {
-                        bErrorCondition = true;
-                        strError = $"InitLocalUser||More than one Profile designer user record found with email {userAAD.Email}. {listMatchEmailAddress.Count} records found. Existing object id = {um.ObjectIdAAD}";
-                        _logger.LogWarning(strError);
-                    }
                 }
             }