CSP-1245 - Updated RoATP calls to use MI

src/SFA.DAS.ApplyService.Configuration/RoatpApiAuthentication.cs

@@ -2,18 +2,9 @@
 
 namespace SFA.DAS.ApplyService.Configuration
 {
-    public class RoatpApiAuthentication : IClientApiAuthentication
+    public class RoatpApiAuthentication
     {
-        [JsonRequired] public string Instance { get; set; }
-
-        [JsonRequired] public string TenantId { get; set; }
-
-        [JsonRequired] public string ClientId { get; set; }
-
-        [JsonRequired] public string ClientSecret { get; set; }
-
-        [JsonRequired] public string ResourceId { get; set; }
-
         [JsonRequired] public string ApiBaseAddress { get; set; }
+        [JsonRequired] public string Identifier { get; set; }
     }
 }

src/SFA.DAS.ApplyService.InternalApi.IntegrationTests/RoatpApiTests.cs

@@ -40,7 +40,7 @@ public void Before_each_test()
 
             _config.GetConfig().GetAwaiter().GetResult().RoatpApiAuthentication.ApiBaseAddress = RoatpApiBaseAddress;
 
-            _apiClient = new RoatpApiClient(httpClient, logger.Object, new RoatpTokenService(_config));
+            _apiClient = new RoatpApiClient(httpClient, logger.Object, new RoatpTokenService(hostingEnvironment.Object, _config));
         }
 
         [Ignore("Failed test")]
@@ -55,7 +55,7 @@ public void Client_retrieves_list_of_provider_types()
         public void Client_returns_reapply_status_for_existing_UKPRN_that_is_active()
         {
             var existingUKPRN = 10001123;
-            
+
             var reapplyStatus = _apiClient.GetOrganisationRegisterStatus(existingUKPRN.ToString()).GetAwaiter().GetResult();
 
             reapplyStatus.ProviderTypeId.Should().Be(ProviderType.MainProvider);
@@ -77,7 +77,7 @@ public void Client_returns_reapply_status_for_existing_UKPRN_that_was_removed()
         public void Matching_UKPRN_returns_single_result()
         {
             var ukprn = "10001724";
-            
+
             var result = _apiClient.GetUkrlpDetails(ukprn).GetAwaiter().GetResult();
 
             result.Should().NotBeNull();

src/SFA.DAS.ApplyService.InternalApi/Infrastructure/IRoatpTokenService.cs

@@ -1,9 +1,9 @@
-using System;
+using System.Threading.Tasks;
 
 namespace SFA.DAS.ApplyService.InternalApi.Infrastructure
 {
     public interface IRoatpTokenService
     {
-        string GetToken(Uri baseUri);
+        Task<string> GetToken();
     }
 }

src/SFA.DAS.ApplyService.InternalApi/Infrastructure/RoatpApiClient.cs

@@ -1,21 +1,20 @@
 namespace SFA.DAS.ApplyService.InternalApi.Infrastructure
 {
-    using Microsoft.Extensions.Logging;
     using System.Collections.Generic;
     using System.Net.Http;
     using System.Net.Http.Headers;
     using System.Threading.Tasks;
+    using Microsoft.Extensions.Logging;
     using SFA.DAS.ApplyService.Domain.Roatp;
+    using SFA.DAS.ApplyService.Infrastructure.ApiClients;
     using SFA.DAS.ApplyService.InternalApi.Models.Roatp;
     using SFA.DAS.ApplyService.InternalApi.Models.Ukrlp;
-    using SFA.DAS.ApplyService.Infrastructure.ApiClients;
-    using System;
 
     public class RoatpApiClient : ApiClientBase<RoatpApiClient>, IRoatpApiClient
     {
         public RoatpApiClient(HttpClient httpClient, ILogger<RoatpApiClient> logger, IRoatpTokenService tokenService) : base(httpClient, logger)
         {
-            _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokenService.GetToken(httpClient.BaseAddress));
+            _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokenService.GetToken().Result);
         }
 
         public async virtual Task<OrganisationRegisterStatus> GetOrganisationRegisterStatus(string ukprn)

src/SFA.DAS.ApplyService.InternalApi/Infrastructure/RoatpTokenService.cs

@@ -1,35 +1,34 @@
-using System;
+using System.Threading.Tasks;
 
 namespace SFA.DAS.ApplyService.InternalApi.Infrastructure
 {
     using Configuration;
-    using Microsoft.IdentityModel.Clients.ActiveDirectory;
+    using Microsoft.AspNetCore.Hosting;
+    using Microsoft.Azure.Services.AppAuthentication;
+    using Microsoft.Extensions.Hosting;
 
     public class RoatpTokenService : IRoatpTokenService
     {
-        private readonly IApplyConfig _configuration;
+        private readonly IWebHostEnvironment _hostingEnvironment;
+        private readonly IConfigurationService _configurationService;
 
-        public RoatpTokenService(IConfigurationService configurationService)
+        public RoatpTokenService(IWebHostEnvironment hostingEnvironment, IConfigurationService configurationService)
         {
-            _configuration = configurationService.GetConfig().Result;
+            _hostingEnvironment = hostingEnvironment;
+            _configurationService = configurationService;
         }
 
-        public string GetToken(Uri baseUri)
+        public async Task<string> GetToken()
         {
-            if (baseUri != null && baseUri.IsLoopback)
+            if (_hostingEnvironment.IsDevelopment())
                 return string.Empty;
 
-            var tenantId = _configuration.RoatpApiAuthentication.TenantId;
-            var clientId = _configuration.RoatpApiAuthentication.ClientId;
-            var appKey = _configuration.RoatpApiAuthentication.ClientSecret;
-            var resourceId = _configuration.RoatpApiAuthentication.ResourceId;
+            var configuration = await _configurationService.GetConfig();
 
-            var authority = $"https://login.microsoftonline.com/{tenantId}";
-            var clientCredential = new ClientCredential(clientId, appKey);
-            var context = new AuthenticationContext(authority, true);
-            var result = context.AcquireTokenAsync(resourceId, clientCredential).Result;
+            var azureServiceTokenProvider = new AzureServiceTokenProvider();
+            var generatedToken = await azureServiceTokenProvider.GetAccessTokenAsync(configuration.RoatpApiAuthentication.Identifier);
 
-            return result.AccessToken;
+            return generatedToken;
         }
     }
 }

src/SFA.DAS.ApplyService.Web/Views/Roatp/ConfirmChangeRoute.cshtml

@@ -7,7 +7,7 @@
     bool showErrors = Model.ErrorMessages != null && Model.ErrorMessages.Count > 0;
 }
 
-@if (Model.ApplicationId != null && Model.ApplicationId != Guid.Empty)
+@if (Model.ApplicationId != Guid.Empty)
 {
     @section Navigation
     {

src/SFA.DAS.ApplyService.Web/Views/Roatp/ConfirmLevyStatus.cshtml

@@ -7,7 +7,7 @@
     bool showErrors = Model.ErrorMessages != null && Model.ErrorMessages.Count > 0;
 }
 
-@if (Model.ApplicationId != null && Model.ApplicationId != Guid.Empty)
+@if (Model.ApplicationId != Guid.Empty)
 {
     @section Navigation
     {

src/SFA.DAS.ApplyService.Web/Views/Roatp/IneligibleNonLevy.cshtml

@@ -7,7 +7,7 @@
     bool showErrors = Model.ErrorMessages != null && Model.ErrorMessages.Count > 0;
 }
 
-@if (Model.ApplicationId != null && Model.ApplicationId != Guid.Empty)
+@if (Model.ApplicationId != Guid.Empty)
 {
     @section Navigation
     {

src/SFA.DAS.ApplyService.Web/Views/Roatp/ManagementHierarchy/ConfirmManagementHierarchy.cshtml

@@ -6,7 +6,6 @@
     Layout = "_Layout";
 
     bool showErrors = TempData["ShowErrors"] as bool? ?? false;
-    int numberOfTitles = 3;
 }
 
 @section Navigation

src/SFA.DAS.ApplyService.Web/Views/Roatp/SelectApplicationRoute.cshtml

@@ -10,13 +10,13 @@
 
     var submitAction = "ProcessRoute";
 
-    if (Model.ApplicationId != null && Model.ApplicationId != Guid.Empty)
+    if (Model.ApplicationId != Guid.Empty)
     {
         submitAction = "UpdateApplicationProviderRoute";
     }
 }
 
-@if (Model.ApplicationId != null && Model.ApplicationId != Guid.Empty)
+@if (Model.ApplicationId != Guid.Empty)
 {
     @section Navigation
     {