Removed API calls from LH navigation

Author: OluwatobiAwe

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

@@ -263,67 +263,30 @@ public async Task<IActionResult> ValidateEmailChangeTokenAsync(string token, str
         /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
         [HttpGet]
         [AllowAnonymous]
-        [Route("GetLHUserNavigation/{userId}")]
-        public async Task<List<Dictionary<string, object>>> GetLHUserNavigation(string userId = "")
+        [Route("GetLHUserNavigation")]
+        public async Task<List<Dictionary<string, object>>> GetLHUserNavigation()
         {
             NavigationModel model;
 
-            if (!int.TryParse(userId, out int validUserId) || validUserId <= 0)
+            if (!this.User.Identity.IsAuthenticated)
             {
                 model = this.permissionService.NotAuthenticated();
-                return this.MenuItems(model);
-            }
-
-            IPrincipal userPrincipal;
-
-            // Use current user if already authenticated
-            if (this.User?.Identity?.IsAuthenticated == true)
-            {
-                userPrincipal = this.User;
-                validUserId = this.User.Identity.GetCurrentUserId();
             }
             else
             {
-                var basicDetails = await this.userService.GetByIdAsync(validUserId);
-                if (basicDetails == null || string.IsNullOrWhiteSpace(basicDetails.UserName))
-                {
-                    model = this.permissionService.NotAuthenticated();
-                    return this.MenuItems(model);
-                }
-
-                var user = await this.userService.GetByUsernameAsync(basicDetails.UserName);
-                if (user == null || user.AssignedRoles == null)
-                {
-                    model = this.permissionService.NotAuthenticated();
-                    return this.MenuItems(model);
-                }
+                var userId = this.User.Identity.GetCurrentUserId();
 
-                var claims = new List<Claim>
-                {
-                    new Claim(ClaimTypes.NameIdentifier, validUserId.ToString()),
-                    new Claim(ClaimTypes.Name, user.UserName),
-                };
+                var (cacheExists, _) = await this.cacheService.TryGetAsync<string>($"{userId}:LoginWizard");
 
-                foreach (var role in user.AssignedRoles)
-                {
-                    if (!string.IsNullOrWhiteSpace(role?.Name))
-                    {
-                        claims.Add(new Claim(ClaimTypes.Role, role.Name));
-                    }
-                }
+                model = await this.permissionService.GetNavigationModelAsync(this.User, !cacheExists, string.Empty);
 
-                var identity = new ClaimsIdentity(claims, "Impersonated");
-                userPrincipal = new ClaimsPrincipal(identity);
+                model.NotificationCount = await this.userNotificationService.GetUserUnreadNotificationCountAsync(userId);
             }
 
-            var (cacheExists, _) = await this.cacheService.TryGetAsync<string>($"{validUserId}:LoginWizard");
-
-            model = await this.permissionService.GetNavigationModelAsync(userPrincipal, !cacheExists, string.Empty);
-            model.NotificationCount = await this.userNotificationService.GetUserUnreadNotificationCountAsync(validUserId);
-
             return this.MenuItems(model);
         }
 
+
         private List<Dictionary<string, object>> MenuItems(NavigationModel model)
         {
             var menu = new List<Dictionary<string, object>>

OpenAPI/LearningHub.Nhs.OpenApi/Startup.cs

@@ -4,9 +4,13 @@
 
 namespace LearningHub.NHS.OpenAPI
 {
+    using System;
     using System.Collections.Generic;
     using System.IO;
     using AspNetCore.Authentication.ApiKey;
+    using LearningHub.Nhs.Caching;
+    using LearningHub.Nhs.Models.Enums;
+    using LearningHub.Nhs.Models.Extensions;
     using LearningHub.NHS.OpenAPI.Auth;
     using LearningHub.NHS.OpenAPI.Configuration;
     using LearningHub.NHS.OpenAPI.Middleware;
@@ -25,11 +29,6 @@ namespace LearningHub.NHS.OpenAPI
     using Microsoft.Extensions.Hosting;
     using Microsoft.IdentityModel.Tokens;
     using Microsoft.OpenApi.Models;
-    using LearningHub.Nhs.Caching;
-    using LearningHub.Nhs.Models.Enums;
-    using System.Configuration;
-    using System;
-    using LearningHub.Nhs.Models.Extensions;
 
     /// <summary>
     /// The Startup class.
@@ -67,7 +66,7 @@ public void ConfigureServices(IServiceCollection services)
                 options.TokenValidationParameters = new TokenValidationParameters()
                 {
                     NameClaimType = "given_name",
-                    RoleClaimType = "role",
+                    RoleClaimType = "http://schemas.microsoft.com/ws/2008/06/identity/claims/role",
                     ValidateAudience = true,
                     ValidAudiences = new List<string> { "learninghubopenapi", "learninghubapi" },
                 };
@@ -84,8 +83,6 @@ public void ConfigureServices(IServiceCollection services)
             services.AddApplicationInsightsTelemetry();
             services.AddControllers(options => options.Filters.Add(new HttpResponseExceptionFilter()));
             services.AddControllers(opt => { opt.Filters.Add(new AuthorizeFilter()); })
-
-            // .AddNewtonsoftJson(options => options.SerializerSettings.ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore);
             .AddJsonOptions(options =>
             {
                 options.JsonSerializerOptions.ReferenceHandler = System.Text.Json.Serialization.ReferenceHandler.IgnoreCycles;
@@ -133,6 +130,7 @@ public void ConfigureServices(IServiceCollection services)
                                     Scopes = new Dictionary<string, string>
                                     {
                                         { "learninghubapi", string.Empty },
+
                                     },
                                 },
                             },

OpenAPI/LearningHub.Nhs.OpenApi/SwaggerDefinitions/v1.3.0.json

@@ -6084,22 +6084,11 @@
         }
       }
     },
-    "/User/GetLHUserNavigation/{userId}": {
+    "/User/GetLHUserNavigation": {
       "get": {
         "tags": [
           "User"
         ],
-        "parameters": [
-          {
-            "name": "userId",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "type": "string",
-              "default": ""
-            }
-          }
-        ],
         "responses": {
           "200": {
             "description": "OK",