Merge pull request #1478 from TechnologyEnhancedLearning/Develop/Fixes/CataloguePermissionfix

Menu is not working in Moodle API

Author: AnjuJose011

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

@@ -172,7 +172,7 @@ private async Task<NavigationModel> AuthenticatedReadOnly(string controllerName,
         {
             return new NavigationModel()
             {
-                ShowMyContributions = await this.userGroupService.UserHasCatalogueContributionPermission(userId),
+                ShowMyContributions = await resourceService.HasPublishedResourcesAsync(userId),
                 ShowMyLearning = true,
                 ShowMyBookmarks = false,
                 ShowSearch = controllerName != "search" && controllerName != string.Empty,
@@ -196,7 +196,7 @@ private async Task<NavigationModel> AuthenticatedBasicUserOnly(int userId)
         {
             return new NavigationModel()
             {
-                ShowMyContributions = await this.userGroupService.UserHasCatalogueContributionPermission(userId),
+                ShowMyContributions = await resourceService.HasPublishedResourcesAsync(userId),
                 ShowMyLearning = true,
                 ShowMyBookmarks = false,
                 ShowSearch = true,

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

@@ -341,7 +341,7 @@ public async Task<List<Dictionary<string, object>>> GetLHUserNavigation()
             }
             else
             {
-                var userId = this.User.Identity.GetCurrentUserId();
+                var userId = this.CurrentUserId.GetValueOrDefault();
 
                 var (cacheExists, _) = await this.cacheService.TryGetAsync<string>($"{userId}:LoginWizard");