Merge pull request #181 from TechnologyEnhancedLearning/Develop/Fixes/TD-3734-Reverting-the-changes

AnjuJose011 · web-flow · commit 840154ccc513 · 2025-05-28T14:15:11.000+01:00
TD-3734: Reverting the changes
diff --git a/Auth/LearningHub.Nhs.Auth/Controllers/AccountController.cs b/Auth/LearningHub.Nhs.Auth/Controllers/AccountController.cs
@@ -5,7 +5,6 @@
     using System.Linq;
     using System.Net;
     using System.Threading.Tasks;
-    using Azure.Core;
     using elfhHub.Nhs.Models.Common;
     using elfhHub.Nhs.Models.Enums;
     using IdentityModel;
@@ -23,11 +22,9 @@
     using LearningHub.Nhs.Models.Common;
     using Microsoft.AspNetCore.Authentication;
     using Microsoft.AspNetCore.Authorization;
-    using Microsoft.AspNetCore.Http;
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Options;
-    using UAParser;
 
     /// <summary>
     /// Account Controller operations.
@@ -166,44 +163,34 @@ await this.interaction.GrantConsentAsync(
 
                 if (loginResult.IsAuthenticated)
                 {
-                    var uaParser = Parser.GetDefault();
-                    var clientInfo = uaParser.Parse(this.Request.Headers["User-Agent"]);
-                    var result = await this.UserService.CheckUserHasAnActiveSessionAsync(userId);
-                    if (result.Items.Count == 0 || result.Items[0].BrowserName == clientInfo.UA.Family)
-                    {
-                        await this.SignInUser(userId, model.Username.Trim(), model.RememberLogin, context.Parameters["ext_referer"]);
+                    await this.SignInUser(userId, model.Username.Trim(), model.RememberLogin, context.Parameters["ext_referer"]);
 
-                        if (context != null)
+                    if (context != null)
+                    {
+                        if (await this.ClientStore.IsPkceClientAsync(context.Client.ClientId))
                         {
-                            if (await this.ClientStore.IsPkceClientAsync(context.Client.ClientId))
-                            {
-                                // if the client is PKCE then we assume it's native, so this change in how to
-                                // return the response is for better UX for the end user.
-                                return this.View("Redirect", new RedirectViewModel { RedirectUrl = model.ReturnUrl });
-                            }
-
-                            // we can trust model.ReturnUrl since GetAuthorizationContextAsync returned non-null
-                            return this.Redirect(model.ReturnUrl);
+                            // if the client is PKCE then we assume it's native, so this change in how to
+                            // return the response is for better UX for the end user.
+                            return this.View("Redirect", new RedirectViewModel { RedirectUrl = model.ReturnUrl });
                         }
 
-                        // request for a local page
-                        if (this.Url.IsLocalUrl(model.ReturnUrl))
-                        {
-                            return this.Redirect(model.ReturnUrl);
-                        }
-                        else if (string.IsNullOrEmpty(model.ReturnUrl))
-                        {
-                            return this.Redirect("~/");
-                        }
-                        else
-                        {
-                            // user might have clicked on a malicious link - should be logged
-                            throw new Exception("invalid return URL");
-                        }
+                        // we can trust model.ReturnUrl since GetAuthorizationContextAsync returned non-null
+                        return this.Redirect(model.ReturnUrl);
+                    }
+
+                    // request for a local page
+                    if (this.Url.IsLocalUrl(model.ReturnUrl))
+                    {
+                        return this.Redirect(model.ReturnUrl);
+                    }
+                    else if (string.IsNullOrEmpty(model.ReturnUrl))
+                    {
+                        return this.Redirect("~/");
                     }
                     else
                     {
-                        return this.View("AlreadyActiveSession");
+                        // user might have clicked on a malicious link - should be logged
+                        throw new Exception("invalid return URL");
                     }
                 }
                 else if (userId > 0)
diff --git a/Auth/LearningHub.Nhs.Auth/Interfaces/IUserService.cs b/Auth/LearningHub.Nhs.Auth/Interfaces/IUserService.cs
@@ -114,13 +114,6 @@ public interface IUserService
         /// </returns>
         Task StoreUserHistoryAsync(UserHistoryViewModel userHistory);
 
-        /// <summary>
-        /// check user has an laredy active session.
-        /// </summary>
-        /// <param name="userId">The userId.</param>
-        /// <returns>The <see cref="Task"/>.</returns>
-        Task<PagedResultSet<UserHistoryViewModel>> CheckUserHasAnActiveSessionAsync(int userId);
-
         /// <summary>
         /// The store user history async.
         /// </summary>
diff --git a/Auth/LearningHub.Nhs.Auth/Services/UserService.cs b/Auth/LearningHub.Nhs.Auth/Services/UserService.cs
@@ -243,29 +243,5 @@ public async Task StoreUserHistoryAsync(UserHistoryViewModel userHistory)
                 }
             }
         }
-
-        /// <inheritdoc/>
-        public async Task<PagedResultSet<UserHistoryViewModel>> CheckUserHasAnActiveSessionAsync(int userId)
-        {
-            PagedResultSet<UserHistoryViewModel> userHistoryViewModel = new PagedResultSet<UserHistoryViewModel>();
-
-            var client = this.UserApiHttpClient.GetClient();
-            var request = $"UserHistory/CheckUserHasActiveSession/{userId}";
-            var response = await client.GetAsync(request).ConfigureAwait(false);
-
-            if (response.IsSuccessStatusCode)
-            {
-                var result = await response.Content.ReadAsStringAsync();
-                userHistoryViewModel = JsonConvert.DeserializeObject<PagedResultSet<UserHistoryViewModel>>(result);
-            }
-            else if (response.StatusCode == HttpStatusCode.Unauthorized
-                        ||
-                     response.StatusCode == HttpStatusCode.Forbidden)
-            {
-                throw new Exception("AccessDenied");
-            }
-
-            return userHistoryViewModel;
-        }
     }
 }
diff --git a/Auth/LearningHub.Nhs.Auth/Views/Account/AlreadyActiveSession.cshtml b/Auth/LearningHub.Nhs.Auth/Views/Account/AlreadyActiveSession.cshtml
diff --git a/LearningHub.Nhs.UserApi.Repository.Interface/IUserHistoryRepository.cs b/LearningHub.Nhs.UserApi.Repository.Interface/IUserHistoryRepository.cs
@@ -59,12 +59,5 @@ public interface IUserHistoryRepository
         /// The <see cref="Task"/>.
         /// </returns>
         Task<UserHistoryStoredProcResults> GetPagedByUserIdAsync(int userId, int startPage, int pageSize);
-
-        /// <summary>
-        /// Check user has an active login session.
-        /// </summary>
-        /// <param name="userId">The userId.</param>
-        /// <returns>The <see cref="Task"/>.</returns>
-        Task<UserHistoryStoredProcResults> CheckUserHasActiveSessionAsync(int userId);
     }
 }
diff --git a/LearningHub.Nhs.UserApi.Repository/UserHistoryRepository.cs b/LearningHub.Nhs.UserApi.Repository/UserHistoryRepository.cs
@@ -9,7 +9,6 @@
     using LearningHub.Nhs.UserApi.Repository.Interface;
     using Microsoft.Data.SqlClient;
     using Microsoft.EntityFrameworkCore;
-    using Newtonsoft.Json.Linq;
 
     /// <summary>
     /// The user history repository.
@@ -67,13 +66,11 @@ public async Task CreateAsync(int userId, int tenantId, UserHistoryViewModel use
                     new SqlParameter("@LoginIP", SqlDbType.VarChar) { Value = userHistoryVM.LoginIP ?? (object)DBNull.Value },
                     new SqlParameter("@LoginSuccessFul", SqlDbType.Bit) { Value = userHistoryVM.LoginSuccessFul ?? (object)DBNull.Value },
                     new SqlParameter("@TenantId", SqlDbType.Int) { Value = tenantId },
-                    new SqlParameter("@SessionId", SqlDbType.VarChar) { Value = (userHistoryVM.UserHistoryTypeId == 0 && userHistoryVM.Detail == "User logged on. Source of auth: LearningHub.Nhs.Auth Account\\Login") ? userHistoryVM.SessionId : (object)DBNull.Value },
-                    new SqlParameter("@IsActive", SqlDbType.Bit) { Value = (userHistoryVM.UserHistoryTypeId == 0 && userHistoryVM.Detail == "User logged on. Source of auth: LearningHub.Nhs.Auth Account\\Login") ? userHistoryVM.IsActive : (object)DBNull.Value },
                     new SqlParameter("@AmendUserId", SqlDbType.Int) { Value = userId },
                     new SqlParameter("@AmendDate", SqlDbType.DateTimeOffset) { Value = DateTimeOffset.Now },
                 };
 
-                string sql = "proc_UserHistoryInsert @UserId, @UserHistoryTypeId, @Detail, @UserAgent, @BrowserName, @BrowserVersion, @UrlReferer, @LoginIP, @LoginSuccessFul, @TenantId, @SessionId, @IsActive, @AmendUserId, @AmendDate";
+                string sql = "proc_UserHistoryInsert @UserId, @UserHistoryTypeId, @Detail, @UserAgent, @BrowserName, @BrowserVersion, @UrlReferer, @LoginIP, @LoginSuccessFul, @TenantId, @AmendUserId, @AmendDate";
 
                 await this.DbContext.Database.ExecuteSqlRawAsync(sql, sqlParams);
             }
@@ -101,24 +98,5 @@ public async Task<UserHistoryStoredProcResults> GetPagedByUserIdAsync(int userId
 
             return retVal;
         }
-
-        /// <inheritdoc/>
-        public async Task<UserHistoryStoredProcResults> CheckUserHasActiveSessionAsync(int userId)
-        {
-            try
-            {
-                var retVal = new UserHistoryStoredProcResults();
-                var param0 = new SqlParameter("@p0", SqlDbType.Int) { Value = userId };
-
-                var result = await this.DbContext.Set<UserHistoryStoredProcResult>().FromSqlRaw(
-                                 "dbo.proc_ActiveLearningHubUserbyId @p0", param0).AsNoTracking().ToListWithNoLockAsync();
-                retVal.Results = result;
-                return retVal;
-            }
-            catch (Exception ex)
-            {
-                return null;
-            }
-        }
     }
 }
diff --git a/LearningHub.Nhs.UserApi.Services.Interface/IUserHistoryService.cs b/LearningHub.Nhs.UserApi.Services.Interface/IUserHistoryService.cs
@@ -53,12 +53,5 @@ public interface IUserHistoryService
         /// The <see cref="Task"/>.
         /// </returns>
         Task<PagedResultSet<UserHistoryViewModel>> GetUserHistoryPageAsync(int page, int pageSize, string sortColumn = "", string sortDirection = "", string presetFilter = "", string filter = "");
-
-        /// <summary>
-        /// Check user has an active login session.
-        /// </summary>
-        /// <param name="userId">The userId.</param>
-        /// <returns>The <see cref="Task"/>.</returns>
-        Task<PagedResultSet<UserHistoryViewModel>> CheckUserHasActiveSessionAsync(int userId);
     }
 }
diff --git a/LearningHub.Nhs.UserApi.Services/UserHistoryService.cs b/LearningHub.Nhs.UserApi.Services/UserHistoryService.cs
@@ -1,6 +1,5 @@
 ﻿namespace LearningHub.Nhs.UserApi.Services
 {
-    using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
@@ -57,8 +56,6 @@ public async Task<LearningHubValidationResult> CreateAsync(UserHistoryViewModel
 
             if (retVal.IsValid)
             {
-                userHistoryVM.SessionId = Guid.NewGuid().ToString();
-                userHistoryVM.IsActive = true;
                 await this.userHistoryRepository.CreateAsync(userHistoryVM.UserId, this.settings.LearningHubTenantId, userHistoryVM);
             }
 
@@ -102,16 +99,6 @@ public async Task<PagedResultSet<UserHistoryViewModel>> GetUserHistoryPageAsync(
             return result;
         }
 
-        /// <inheritdoc/>
-        public async Task<PagedResultSet<UserHistoryViewModel>> CheckUserHasActiveSessionAsync(int userId)
-        {
-            PagedResultSet<UserHistoryViewModel> result = new PagedResultSet<UserHistoryViewModel>();
-            var userHistory = await this.userHistoryRepository.CheckUserHasActiveSessionAsync(userId);
-            userHistory.Results.ForEach(x => x.UserAgent = this.ParseUserAgentString(x.UserAgent));
-            result.Items = this.mapper.Map<List<UserHistoryViewModel>>(userHistory.Results);
-            return result;
-        }
-
         private string ParseUserAgentString(string userAgent)
         {
             string retVal = string.Empty;
diff --git a/LearningHub.Nhs.UserApi/Controllers/UserHistoryController.cs b/LearningHub.Nhs.UserApi/Controllers/UserHistoryController.cs
@@ -100,19 +100,6 @@ public async Task<IActionResult> GetUserHistoryPageAsync(int page, int pageSize,
             return this.Ok(pagedResultSet);
         }
 
-        /// <summary>
-        /// Check the user has an active login session.
-        /// </summary>
-        /// <param name="userId">The UserId.</param>
-        /// <returns>The <see cref="Task"/>.</returns>
-        [HttpGet]
-        [Route("CheckUserHasActiveSession/{userId}")]
-        public async Task<IActionResult> CheckUserHasActiveSessionAsync(int userId)
-        {
-            PagedResultSet<UserHistoryViewModel> pagedResultSet = await this.userHistoryService.CheckUserHasActiveSessionAsync(userId);
-            return this.Ok(pagedResultSet);
-        }
-
         /// <summary>
         /// Create a UserHistory.
         /// </summary>

Original file line number	Diff line number	Diff line change
`@@ -59,12 +59,5 @@ public interface IUserHistoryRepository`
`59`	`59`	`/// The <see cref="Task"/>.`
`60`	`60`	`/// </returns>`
`61`	`61`	`Task<UserHistoryStoredProcResults> GetPagedByUserIdAsync(int userId, int startPage, int pageSize);`
`62`		`-`
`63`		`- /// <summary>`
`64`		`- /// Check user has an active login session.`
`65`		`- /// </summary>`
`66`		`- /// <param name="userId">The userId.</param>`
`67`		`- /// <returns>The <see cref="Task"/>.</returns>`
`68`		`- Task<UserHistoryStoredProcResults> CheckUserHasActiveSessionAsync(int userId);`
`69`	`62`	`}`
`70`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,12 +53,5 @@ public interface IUserHistoryService`
`53`	`53`	`/// The <see cref="Task"/>.`
`54`	`54`	`/// </returns>`
`55`	`55`	`Task<PagedResultSet<UserHistoryViewModel>> GetUserHistoryPageAsync(int page, int pageSize, string sortColumn = "", string sortDirection = "", string presetFilter = "", string filter = "");`
`56`		`-`
`57`		`- /// <summary>`
`58`		`- /// Check user has an active login session.`
`59`		`- /// </summary>`
`60`		`- /// <param name="userId">The userId.</param>`
`61`		`- /// <returns>The <see cref="Task"/>.</returns>`
`62`		`- Task<PagedResultSet<UserHistoryViewModel>> CheckUserHasActiveSessionAsync(int userId);`
`63`	`56`	`}`
`64`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`namespace LearningHub.Nhs.UserApi.Services`
`2`	`2`	`{`
`3`		`- using System;`
`4`	`3`	`using System.Collections.Generic;`
`5`	`4`	`using System.Linq;`
`6`	`5`	`using System.Threading.Tasks;`
`@@ -57,8 +56,6 @@ public async Task<LearningHubValidationResult> CreateAsync(UserHistoryViewModel`
`57`	`56`
`58`	`57`	`if (retVal.IsValid)`
`59`	`58`	`{`
`60`		`- userHistoryVM.SessionId = Guid.NewGuid().ToString();`
`61`		`- userHistoryVM.IsActive = true;`
`62`	`59`	`await this.userHistoryRepository.CreateAsync(userHistoryVM.UserId, this.settings.LearningHubTenantId, userHistoryVM);`
`63`	`60`	`}`
`64`	`61`
`@@ -102,16 +99,6 @@ public async Task<PagedResultSet<UserHistoryViewModel>> GetUserHistoryPageAsync(`
`102`	`99`	`return result;`
`103`	`100`	`}`
`104`	`101`
`105`		`- /// <inheritdoc/>`
`106`		`- public async Task<PagedResultSet<UserHistoryViewModel>> CheckUserHasActiveSessionAsync(int userId)`
`107`		`- {`
`108`		`- PagedResultSet<UserHistoryViewModel> result = new PagedResultSet<UserHistoryViewModel>();`
`109`		`- var userHistory = await this.userHistoryRepository.CheckUserHasActiveSessionAsync(userId);`
`110`		`- userHistory.Results.ForEach(x => x.UserAgent = this.ParseUserAgentString(x.UserAgent));`
`111`		`- result.Items = this.mapper.Map<List<UserHistoryViewModel>>(userHistory.Results);`
`112`		`- return result;`
`113`		`- }`
`114`		`-`
`115`	`102`	`private string ParseUserAgentString(string userAgent)`
`116`	`103`	`{`
`117`	`104`	`string retVal = string.Empty;`