Merge branch 'release/0.2.0'

H2020-IPM-Decisions · Jan 27, 2021 · aed7ed5 · aed7ed5
2 parents a9966bc + 501cc48
commit aed7ed5
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 20 deletions.
diff --git a/H2020.IPMDecisions.IDP.API/H2020.IPMDecisions.IDP.API.csproj b/H2020.IPMDecisions.IDP.API/H2020.IPMDecisions.IDP.API.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>0.1.1.0</Version>
-    <AssemblyVersion>0.1.1.0</AssemblyVersion>
-    <FileVersion>0.1.1.0</FileVersion>
+    <Version>0.2.0.0</Version>
+    <AssemblyVersion>0.2.0.0</AssemblyVersion>
+    <FileVersion>0.2.0.0</FileVersion>
     <Authors>ADAS Modelling and Informatics Team</Authors>
     <Company>RSK ADAS Ltd</Company>
     <Product>H2020 IPM Decisions Identity Provider Service</Product>

diff --git a/H2020.IPMDecisions.IDP.API/Properties/launchSettings.json b/H2020.IPMDecisions.IDP.API/Properties/launchSettings.json
@@ -19,7 +19,7 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "applicationUrl": "https://0.0.0.0:5001;http://0.0.0.0:5000"
+      "applicationUrl": "https://0.0.0.0:5003;http://0.0.0.0:5002"
     }    ,
     "H2020.IPMDecisions.IDP.API_Staging": {
       "commandName": "Project",

diff --git a/H2020.IPMDecisions.IDP.API/Startup.cs b/H2020.IPMDecisions.IDP.API/Startup.cs
@@ -110,10 +110,16 @@ public void Configure(
                 endpoints.MapControllers();
             });
 
-            app.UseSwagger();
+            var swaggerBasePath = Configuration["MicroserviceInternalCommunication:IdentityProviderMicroservice"];
+
+            app.UseSwagger(c =>
+            {
+                c.RouteTemplate = swaggerBasePath+ "swagger/{documentName}/swagger.json";
+            });
             app.UseSwaggerUI(c =>
             {
-                c.SwaggerEndpoint("/swagger/v1/swagger.json", "H2020 IPM Decisions - Identity Provider API");
+                c.SwaggerEndpoint($"/{swaggerBasePath}swagger/v1/swagger.json", "H2020 IPM Decisions - Identity Provider API");
+                c.RoutePrefix = $"{swaggerBasePath}swagger";
             });
 
             applicationLifetime.ApplicationStopping.Register(OnShutdown);

diff --git a/H2020.IPMDecisions.IDP.API/appsettingsTemplate.json b/H2020.IPMDecisions.IDP.API/appsettingsTemplate.json
@@ -30,8 +30,9 @@
   },
   "MicroserviceInternalCommunication": {
     "ApiGatewayAddress": "whereApiGatewayIsHosted/",
-    "EmailMicroservice": "eml/api/",
+    "EmailMicroservice": "api/eml/",
     "UserProvisionMicroservice": "api/upr/",
+    "IdentityProviderMicroservice": "api/idp/",
     "ContentTypeHeader": "application/vnd.h2020ipmdecisions.internal+json",
     "SecurityTokenCustomHeader": "ipm-internal-auth",
     "SecurityToken": "1234"

diff --git a/H2020.IPMDecisions.IDP.BLL/H2020.IPMDecisions.IDP.BLL.csproj b/H2020.IPMDecisions.IDP.BLL/H2020.IPMDecisions.IDP.BLL.csproj
@@ -11,9 +11,9 @@
   </ItemGroup>
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <Version>0.1.1.0</Version>
-    <AssemblyVersion>0.1.1.0</AssemblyVersion>
-    <FileVersion>0.1.1.0</FileVersion>
+    <Version>0.2.0.0</Version>
+    <AssemblyVersion>0.2.0.0</AssemblyVersion>
+    <FileVersion>0.2.0.0</FileVersion>
     <Authors>ADAS Modelling and Informatics Team</Authors>
     <Company>RSK ADAS Ltd</Company>
     <Product>H2020 IPM Decisions Identity Provider Service</Product>

diff --git a/H2020.IPMDecisions.IDP.Core/H2020.IPMDecisions.IDP.Core.csproj b/H2020.IPMDecisions.IDP.Core/H2020.IPMDecisions.IDP.Core.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <Version>0.1.1.0</Version>
-    <AssemblyVersion>0.1.1.0</AssemblyVersion>
-    <FileVersion>0.1.1.0</FileVersion>
+    <Version>0.2.0.0</Version>
+    <AssemblyVersion>0.2.0.0</AssemblyVersion>
+    <FileVersion>0.2.0.0</FileVersion>
     <Authors>ADAS Modelling and Informatics Team</Authors>
     <Company>RSK ADAS Ltd</Company>
     <Product>H2020 IPM Decisions Identity Provider Service</Product>

diff --git a/H2020.IPMDecisions.IDP.Data/H2020.IPMDecisions.IDP.Data.csproj b/H2020.IPMDecisions.IDP.Data/H2020.IPMDecisions.IDP.Data.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <Version>0.1.1.0</Version>
-    <AssemblyVersion>0.1.1.0</AssemblyVersion>
-    <FileVersion>0.1.1.0</FileVersion>
+    <Version>0.2.0.0</Version>
+    <AssemblyVersion>0.2.0.0</AssemblyVersion>
+    <FileVersion>0.2.0.0</FileVersion>
     <Authors>ADAS Modelling and Informatics Team</Authors>
     <Company>RSK ADAS Ltd</Company>
     <Product>H2020 IPM Decisions Identity Provider Service</Product>

diff --git a/H2020.IPMDecisions.IDP.Tests/H2020.IPMDecisions.IDP.Tests.csproj b/H2020.IPMDecisions.IDP.Tests/H2020.IPMDecisions.IDP.Tests.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>0.1.0.0</Version>
-    <AssemblyVersion>0.1.0.0</AssemblyVersion>
-    <FileVersion>0.1.0.0</FileVersion>
+    <Version>0.2.0.0</Version>
+    <AssemblyVersion>0.2.0.0</AssemblyVersion>
+    <FileVersion>0.2.0.0</FileVersion>
     <Authors>ADAS Modelling and Informatics Team</Authors>
     <Company>RSK ADAS Ltd</Company>
     <IsPackable>false</IsPackable>

diff --git a/H2020.IPMDecisions.IDP.Tests/appsettings.Test.json b/H2020.IPMDecisions.IDP.Tests/appsettings.Test.json
@@ -23,7 +23,7 @@
     "DisableStringReuse": true
   },
   "MicroserviceInternalCommunication": {
-    "ApiGatewayAddress": "http://localhost:5003/",
+    "ApiGatewayAddress": "http://localhost:5000/",
     "EmailMicroservice": "api/eml/",
     "UserProvisionMicroservice": "api/upr/",
     "ContentTypeHeader": "application/vnd.h2020ipmdecisions.internal+json",