Merge branch 'master' into MAP-78-deprecate-cmt-v1-calls

SkillsFundingAgency · Jun 23, 2022 · b65d04b · b65d04b
2 parents efc24b6 + 7dd34b8
commit b65d04b
Show file tree

Hide file tree

Showing 45 changed files with 327 additions and 493 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -20,7 +20,7 @@ resources:
   - repository: das-platform-building-blocks
     type: github
     name: SkillsFundingAgency/das-platform-building-blocks
-    ref: refs/tags/0.4.34
+    ref: refs/tags/0.4.61
     endpoint: SkillsFundingAgency
 
 steps:

diff --git a/src/SFA.DAS.EAS.Api/App_Start/WebApiConfig.cs b/src/SFA.DAS.EAS.Api/App_Start/WebApiConfig.cs
@@ -30,7 +30,6 @@ public static void Register(HttpConfiguration config)
                 c.AddRegistry<CommitmentsRegistry>();
                 c.AddRegistry<ConfigurationRegistry>();
                 c.AddRegistry<EventsRegistry>();
-                c.AddRegistry<ExecutionPoliciesRegistry>();
                 c.AddRegistry<HashingRegistry>();
                 c.AddRegistry<LoggerRegistry>();
                 c.AddRegistry<MapperRegistry>();
@@ -40,7 +39,6 @@ public static void Register(HttpConfiguration config)
                 c.AddRegistry<ReferenceDataRegistry>();
                 c.AddRegistry<RepositoriesRegistry>();
                 c.AddRegistry<TasksRegistry>();
-                c.AddRegistry<TokenServiceRegistry>();
                 c.AddRegistry<ValidationRegistry>();
                 c.AddRegistry<EmployerAccountsApiServiceRegistry>();
                 c.AddRegistry<DefaultRegistry>();

diff --git a/src/SFA.DAS.EAS.Support.Infrastructure/SFA.DAS.EAS.Support.Infrastructure.csproj b/src/SFA.DAS.EAS.Support.Infrastructure/SFA.DAS.EAS.Support.Infrastructure.csproj
@@ -67,10 +67,9 @@
     <Compile Include="Services\LevyTokenHttpClientMaker.cs" />
     <Compile Include="Settings\EmployerAccountsConfiguration.cs" />
     <Compile Include="Settings\HashingServiceConfig.cs" />
-    <Compile Include="Settings\HmrcApiBaseUrlConfig.cs" />
-    <Compile Include="Settings\IHmrcApiBaseUrlConfig.cs" />
+    <Compile Include="Settings\HmrcApiClientConfiguration.cs" />
+    <Compile Include="Settings\IHmrcApiClientConfiguration.cs" />
     <Compile Include="Settings\ILevySubmissionsSettings.cs" />
-    <Compile Include="Settings\LevySubmissionsApiConfiguration.cs" />
     <Compile Include="Settings\LevySubmissionsSettings.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -114,7 +113,7 @@
       <Version>1.2.1</Version>
     </PackageReference>
     <PackageReference Include="SFA.DAS.TokenService.Api.Client">
-      <Version>2.1.1</Version>
+      <Version>2.3.0</Version>
     </PackageReference>
     <PackageReference Include="StructureMap">
       <Version>4.7.1</Version>

diff --git a/src/SFA.DAS.EAS.Support.Infrastructure/Services/LevyTokenHttpClientMaker.cs b/src/SFA.DAS.EAS.Support.Infrastructure/Services/LevyTokenHttpClientMaker.cs
@@ -1,31 +1,25 @@
 using HMRC.ESFA.Levy.Api.Client;
 using SFA.DAS.EAS.Support.Infrastructure.Settings;
 using SFA.DAS.TokenService.Api.Client;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace SFA.DAS.EAS.Support.Infrastructure.Services
 {
     public class LevyTokenHttpClientMaker: ILevyTokenHttpClientFactory
     {
-        private readonly IHmrcApiBaseUrlConfig _hmrcApiBaseUrlConfig;
-        private readonly ITokenServiceApiClientConfiguration _levySubmissionsApiConfiguration;
+        private readonly IHmrcApiClientConfiguration _hmrcApiBaseUrlConfig;
+        private readonly ITokenServiceApiClient _tokenServiceApiClient;
 
-        public LevyTokenHttpClientMaker(ITokenServiceApiClientConfiguration levySubmissionsApiConfiguration, IHmrcApiBaseUrlConfig hmrcApiBaseUrlConfig)
+        public LevyTokenHttpClientMaker(ITokenServiceApiClient tokenServiceApiClient, IHmrcApiClientConfiguration hmrcApiBaseUrlConfig)
         {
             _hmrcApiBaseUrlConfig = hmrcApiBaseUrlConfig;
-            _levySubmissionsApiConfiguration = levySubmissionsApiConfiguration;
+            _tokenServiceApiClient = tokenServiceApiClient;
         }
 
         public async  Task<IApprenticeshipLevyApiClient> GetLevyHttpClient()
         {
-            var tokenService = new TokenServiceApiClient(_levySubmissionsApiConfiguration);
-            var tokenResult = await tokenService.GetPrivilegedAccessTokenAsync();
-            var httpclient = ApprenticeshipLevyApiClient.CreateHttpClient(tokenResult.AccessCode, _hmrcApiBaseUrlConfig.HmrcApiBaseUrl);
+            var tokenResult = await _tokenServiceApiClient.GetPrivilegedAccessTokenAsync();
+            var httpclient = ApprenticeshipLevyApiClient.CreateHttpClient(tokenResult.AccessCode, _hmrcApiBaseUrlConfig.ApiBaseUrl);
 
             return new ApprenticeshipLevyApiClient(httpclient);
         }

diff --git a/src/SFA.DAS.EAS.Support.Infrastructure/Settings/HmrcApiBaseUrlConfig.cs b/src/SFA.DAS.EAS.Support.Infrastructure/Settings/HmrcApiBaseUrlConfig.cs
diff --git a/src/SFA.DAS.EAS.Support.Infrastructure/Settings/HmrcApiClientConfiguration.cs b/src/SFA.DAS.EAS.Support.Infrastructure/Settings/HmrcApiClientConfiguration.cs
@@ -0,0 +1,10 @@
+using Newtonsoft.Json;
+
+namespace SFA.DAS.EAS.Support.Infrastructure.Settings
+{
+    public class HmrcApiClientConfiguration : IHmrcApiClientConfiguration
+    {
+        [JsonRequired]
+        public string ApiBaseUrl { get; set; }
+    }
+}
diff --git a/src/SFA.DAS.EAS.Support.Infrastructure/Settings/IHmrcApiBaseUrlConfig.cs b/src/SFA.DAS.EAS.Support.Infrastructure/Settings/IHmrcApiBaseUrlConfig.cs
diff --git a/src/SFA.DAS.EAS.Support.Infrastructure/Settings/IHmrcApiClientConfiguration.cs b/src/SFA.DAS.EAS.Support.Infrastructure/Settings/IHmrcApiClientConfiguration.cs
@@ -0,0 +1,7 @@
+namespace SFA.DAS.EAS.Support.Infrastructure.Settings
+{
+    public interface IHmrcApiClientConfiguration
+    {
+         string ApiBaseUrl { get; set; }
+    }
+}
diff --git a/src/SFA.DAS.EAS.Support.Infrastructure/Settings/ILevySubmissionsSettings.cs b/src/SFA.DAS.EAS.Support.Infrastructure/Settings/ILevySubmissionsSettings.cs
@@ -1,16 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using SFA.DAS.TokenService.Api.Client;
 
 namespace SFA.DAS.EAS.Support.Infrastructure.Settings
 {
     public interface ILevySubmissionsSettings
     {
-        LevySubmissionsApiConfiguration LevySubmissionsApiConfig { get; set; }
+        TokenServiceApiClientConfiguration TokenServiceApi { get; set; }
 
-        HmrcApiBaseUrlConfig HmrcApiBaseUrlSetting { get; set; }
+        HmrcApiClientConfiguration HmrcApi { get; set; }
 
     }
 

diff --git a/src/SFA.DAS.EAS.Support.Infrastructure/Settings/LevySubmissionsApiConfiguration.cs b/src/SFA.DAS.EAS.Support.Infrastructure/Settings/LevySubmissionsApiConfiguration.cs
diff --git a/src/SFA.DAS.EAS.Support.Infrastructure/Settings/LevySubmissionsSettings.cs b/src/SFA.DAS.EAS.Support.Infrastructure/Settings/LevySubmissionsSettings.cs
@@ -1,17 +1,13 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using SFA.DAS.TokenService.Api.Client;
 
 namespace SFA.DAS.EAS.Support.Infrastructure.Settings
 {
-    public class LevySubmissionsSettings: ILevySubmissionsSettings
+    public class LevySubmissionsSettings : ILevySubmissionsSettings
     {
-        [JsonRequired] public LevySubmissionsApiConfiguration LevySubmissionsApiConfig { get; set; }
+        [JsonRequired] public TokenServiceApiClientConfiguration TokenServiceApi { get; set; }
 
-        [JsonRequired] public HmrcApiBaseUrlConfig HmrcApiBaseUrlSetting { get; set; }
+        [JsonRequired] public HmrcApiClientConfiguration HmrcApi { get; set; }
     }
 
 

diff --git a/src/SFA.DAS.EAS.Support.Web.Tests/Configuration/WebConfigurationTesting.cs b/src/SFA.DAS.EAS.Support.Web.Tests/Configuration/WebConfigurationTesting.cs
@@ -5,6 +5,7 @@
 using SFA.DAS.EAS.Support.Infrastructure.Settings;
 using SFA.DAS.EAS.Support.Web.Configuration;
 using SFA.DAS.Support.Shared.SiteConnection;
+using SFA.DAS.TokenService.Api.Client;
 using System;
 using System.IO;
 
@@ -35,18 +36,15 @@ public void Setup()
                 },
                 LevySubmission = new LevySubmissionsSettings
                 {
-                   HmrcApiBaseUrlSetting  = new HmrcApiBaseUrlConfig
-                   {
-                       HmrcApiBaseUrl ="--- configuration value goes here ---"
-                   },
-                    LevySubmissionsApiConfig = new LevySubmissionsApiConfiguration
+                    HmrcApi = new HmrcApiClientConfiguration
+                    {
+                        ApiBaseUrl = "--- configuration value goes here ---"
+                    },
+                    TokenServiceApi = new TokenServiceApiClientConfiguration
                     {
                         ApiBaseUrl = "",
-                        ClientId = "",
-                        ClientSecret = "",
-                        IdentifierUri = "",
-                        Tenant = ""
-                     }
+                        ClientSecret = ""
+                    }
                 },
                 HashingService = new HashingServiceConfig
                 {

diff --git a/src/SFA.DAS.EAS.Support.Web/DependencyResolution/DefaultRegistry.cs b/src/SFA.DAS.EAS.Support.Web/DependencyResolution/DefaultRegistry.cs
@@ -36,13 +36,12 @@ public class DefaultRegistry : Registry
 
         public DefaultRegistry()
         {
-            Scan(
-                scan =>
-                {
-                    scan.TheCallingAssembly();
-                    scan.WithDefaultConventions();
-					scan.With(new ControllerConvention());
-                });
+            Scan(s =>
+            {
+                s.TheCallingAssembly();
+                s.WithDefaultConventions();
+                s.With(new ControllerConvention());
+            });
 
             WebConfiguration configuration = GetConfiguration();
 

diff --git a/src/SFA.DAS.EAS.Support.Web/DependencyResolution/InfrastuctureRegistry.cs b/src/SFA.DAS.EAS.Support.Web/DependencyResolution/InfrastuctureRegistry.cs
@@ -1,6 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Web;
-using SFA.DAS.EAS.Account.Api.Client;
+using SFA.DAS.EAS.Account.Api.Client;
 using SFA.DAS.EAS.Support.Infrastructure.DependencyResolution;
 using SFA.DAS.EAS.Support.Infrastructure.Services;
 using SFA.DAS.EAS.Support.Infrastructure.Settings;
@@ -9,7 +7,8 @@
 using SFA.DAS.NLog.Logger;
 using SFA.DAS.TokenService.Api.Client;
 using StructureMap;
-using StructureMap.Configuration.DSL;
+using System.Diagnostics.CodeAnalysis;
+using System.Web;
 
 namespace SFA.DAS.EAS.Support.Web.DependencyResolution
 {
@@ -39,26 +38,22 @@ public InfrastuctureRegistry()
 
             For<ILevyTokenHttpClientFactory>().Use<LevyTokenHttpClientMaker>();
 
-            For<IHmrcApiBaseUrlConfig>().Use(string.Empty, (ctx) =>
+            For<IHmrcApiClientConfiguration>().Use(string.Empty, (ctx) =>
             {
-                return ctx.GetInstance<IWebConfiguration>().LevySubmission.HmrcApiBaseUrlSetting;
+                return ctx.GetInstance<IWebConfiguration>().LevySubmission.HmrcApi;
             });
 
+            For<ITokenServiceApiClient>().Use<TokenServiceApiClient>();
             For<ITokenServiceApiClientConfiguration>().Use(string.Empty, (ctx) =>
             {
-                return ctx.GetInstance<IWebConfiguration>().LevySubmission.LevySubmissionsApiConfig;
+                return ctx.GetInstance<IWebConfiguration>().LevySubmission.TokenServiceApi;
             });
 
-
             For<IHashingService>().Use(string.Empty, (ctx) =>
             {
                 var hashServiceconfig = ctx.GetInstance<IWebConfiguration>().HashingService;
                 return new HashingService.HashingService(hashServiceconfig.AllowedCharacters, hashServiceconfig.Hashstring);
             });
-
         }
-
-
-
     }
 }
diff --git a/src/SFA.DAS.EAS.Web/DependencyResolution/IoC.cs b/src/SFA.DAS.EAS.Web/DependencyResolution/IoC.cs
@@ -1,38 +1,36 @@
-using SFA.DAS.Activities.Client;
-using SFA.DAS.EAS.Application.DependencyResolution;
-using StructureMap;
+using SFA.DAS.Activities.Client;
+using SFA.DAS.EAS.Application.DependencyResolution;
+using StructureMap;
 using SFA.DAS.Authorization.DependencyResolution.StructureMap;
 
-namespace SFA.DAS.EAS.Web.DependencyResolution
-{
-    public static class IoC
-    {
-        public static IContainer Initialize()
-        {
-            return new Container(c =>
-            {
-                c.AddRegistry<ActivitiesClientRegistry>();
-                c.AddRegistry<AuditRegistry>();
-                c.AddRegistry<AuthorizationRegistry>();
-                c.AddRegistry<CachesRegistry>();
-                c.AddRegistry<CommitmentsRegistry>();
-                c.AddRegistry<ConfigurationRegistry>();
-                c.AddRegistry<DataRegistry>();
-                c.AddRegistry<EventsRegistry>();
-                c.AddRegistry<ExecutionPoliciesRegistry>();
-                c.AddRegistry<HashingRegistry>();
-                c.AddRegistry<LoggerRegistry>();
-                c.AddRegistry<MapperRegistry>();
-                c.AddRegistry<MediatorRegistry>();
-                c.AddRegistry<MessagePublisherRegistry>();
-                c.AddRegistry<NotificationsRegistry>();
-                c.AddRegistry<ReferenceDataRegistry>();
-                c.AddRegistry<RepositoriesRegistry>();
-                c.AddRegistry<TasksRegistry>();
-                c.AddRegistry<TokenServiceRegistry>();
-                c.AddRegistry<ValidationRegistry>();
-                c.AddRegistry<DefaultRegistry>();
-            });
-        }
-    }
+namespace SFA.DAS.EAS.Web.DependencyResolution
+{
+    public static class IoC
+    {
+        public static IContainer Initialize()
+        {
+            return new Container(c =>
+            {
+                c.AddRegistry<ActivitiesClientRegistry>();
+                c.AddRegistry<AuditRegistry>();
+                c.AddRegistry<AuthorizationRegistry>();
+                c.AddRegistry<CachesRegistry>();
+                c.AddRegistry<CommitmentsRegistry>();
+                c.AddRegistry<ConfigurationRegistry>();
+                c.AddRegistry<DataRegistry>();
+                c.AddRegistry<EventsRegistry>();
+                c.AddRegistry<HashingRegistry>();
+                c.AddRegistry<LoggerRegistry>();
+                c.AddRegistry<MapperRegistry>();
+                c.AddRegistry<MediatorRegistry>();
+                c.AddRegistry<MessagePublisherRegistry>();
+                c.AddRegistry<NotificationsRegistry>();
+                c.AddRegistry<ReferenceDataRegistry>();
+                c.AddRegistry<RepositoriesRegistry>();
+                c.AddRegistry<TasksRegistry>();
+                c.AddRegistry<ValidationRegistry>();
+                c.AddRegistry<DefaultRegistry>();
+            });
+        }
+    }
 }