Merge pull request #1485 from TechnologyEnhancedLearning/Develop/Fixes/TD-6342-Issue-missing-the-'My-contributions'-link-on-Moodle-test-env-for-some-users

TD-6342: Created a new parameter to pass the current user id so to get the menu items for moodle header.

Author: swapnamol-abraham

OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/INavigationPermissionService.cs

@@ -15,8 +15,9 @@ public interface INavigationPermissionService
         /// <param name="user">User.</param>
         /// <param name="loginWizardComplete">Login wizard complete.</param>
         /// <param name="controllerName">Controller name.</param>
+        /// <param name="currentUserId">The current user id.</param>
         /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
-        Task<NavigationModel> GetNavigationModelAsync(IPrincipal user, bool loginWizardComplete, string controllerName);
+        Task<NavigationModel> GetNavigationModelAsync(IPrincipal user, bool loginWizardComplete, string controllerName, int currentUserId);
 
         /// <summary>
         /// The NotAuthenticated.

OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/NavigationPermissionService.cs

@@ -31,8 +31,9 @@ public NavigationPermissionService(IResourceService resourceService, IUserGroupS
         /// <param name="user">The user<see cref="IPrincipal"/>.</param>
         /// <param name="loginWizardComplete">The loginWizardComplete<see cref="bool"/>.</param>
         /// <param name="controllerName">The controller name.</param>
+        /// <param name="currentUserId">The current user id.</param>
         /// <returns>The <see cref="Task{NavigationModel}"/>.</returns>
-        public async Task<NavigationModel> GetNavigationModelAsync(IPrincipal user, bool loginWizardComplete, string controllerName)
+        public async Task<NavigationModel> GetNavigationModelAsync(IPrincipal user, bool loginWizardComplete, string controllerName, int currentUserId)
         {
             if (!loginWizardComplete && (user.IsInRole("Administrator") || user.IsInRole("ReadOnly") || user.IsInRole("BlueUser") || user.IsInRole("BasicUser")))
             {
@@ -48,15 +49,15 @@ public async Task<NavigationModel> GetNavigationModelAsync(IPrincipal user, bool
             }
             else if (user.IsInRole("ReadOnly"))
             {
-                return await AuthenticatedReadOnly(controllerName,user.Identity.GetCurrentUserId());
+                return await AuthenticatedReadOnly(controllerName, currentUserId);
             }
             else if (user.IsInRole("BasicUser"))
             {
-                return await AuthenticatedBasicUserOnly(user.Identity.GetCurrentUserId());
+                return await AuthenticatedBasicUserOnly(currentUserId);
             }
             else if (user.IsInRole("BlueUser"))
             {
-                return await AuthenticatedBlueUser(controllerName, user.Identity.GetCurrentUserId());
+                return await AuthenticatedBlueUser(controllerName, currentUserId);
             }
             else
             {

OpenAPI/LearningHub.Nhs.OpenApi/Controllers/UserController.cs

@@ -345,7 +345,7 @@ public async Task<List<Dictionary<string, object>>> GetLHUserNavigation()
 
                 var (cacheExists, _) = await this.cacheService.TryGetAsync<string>($"{userId}:LoginWizard");
 
-                model = await this.permissionService.GetNavigationModelAsync(this.User, !cacheExists, string.Empty);
+                model = await this.permissionService.GetNavigationModelAsync(this.User, !cacheExists, string.Empty, userId);
 
                 model.NotificationCount = await this.userNotificationService.GetUserUnreadNotificationCountAsync(userId);
             }