Merge pull request #181 from LBHackney-IT/DOC-1399

charli-wild · web-flow · commit 0a12ee7dfcb5 · 2023-02-06T14:48:32.000Z
DOC-1399 - Allow Access To Group_Id Endpoint
diff --git a/.env.example b/.env.example
@@ -5,4 +5,3 @@ S3_API_ENDPOINT=http://localhost:5555
 BUCKET_NAME=testBucketName
 AWS_ACCESS_KEY_ID=remote-identity
 AWS_SECRET_ACCESS_KEY=remote-credential
-GET_CLAIMS_ALLOWED_GOOGLE_GROUPS=allowed-google-groups
diff --git a/DocumentsApi.Tests/V1/Authorization/AuthorizeByGroupsTests.cs b/DocumentsApi.Tests/V1/Authorization/AuthorizeByGroupsTests.cs
diff --git a/DocumentsApi.Tests/V1/E2ETests/ClaimsTest.cs b/DocumentsApi.Tests/V1/E2ETests/ClaimsTest.cs
@@ -669,17 +669,5 @@ public async Task Returns400WhenUnableToDecodeBeforeToken()
 
             response.StatusCode.Should().Be(400);
         }
-
-        [Test]
-        public async Task Returns401WhenNotAuthorizedToGetClaimsByGroupId()
-        {
-            var groupId = "c585f2d3-69c8-4a5e-b74f-c0570665c2d8";
-
-            var uri = new Uri($"api/v1/claims?groupId={groupId}", UriKind.Relative);
-
-            var response = await Client.GetAsync(uri);
-
-            response.StatusCode.Should().Be(401);
-        }
     }
 }
diff --git a/DocumentsApi.Tests/compose.yml b/DocumentsApi.Tests/compose.yml
@@ -11,7 +11,6 @@ services:
       S3_API_ENDPOINT: http://s3-mock:80
       AWS_ACCESS_KEY_ID: remote-identity
       AWS_SECRET_ACCESS_KEY: remote-credential
-      GET_CLAIMS_ALLOWED_GOOGLE_GROUPS: e2e-testing
     depends_on:
       migrate:
         condition: service_completed_successfully
diff --git a/DocumentsApi/DocumentsApi.csproj b/DocumentsApi/DocumentsApi.csproj
@@ -22,8 +22,6 @@
     <PackageReference Include="AWSSDK.S3" Version="3.5.7.10" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.3" />
     <PackageReference Include="Hackney.Core.Enums" Version="1.77.0" />
-    <PackageReference Include="Hackney.Core.Http" Version="1.70.0" />
-    <PackageReference Include="Hackney.Core.JWT" Version="1.72.0" />
     <PackageReference Include="Jering.Javascript.NodeJS" Version="6.3.0" />
     <PackageReference Include="Microsoft.AspNetCore.HealthChecks" Version="1.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="4.1.1" />
diff --git a/DocumentsApi/ServiceConfigurator.cs b/DocumentsApi/ServiceConfigurator.cs
@@ -1,3 +1,4 @@
+using System;
 using Amazon;
 using Amazon.S3;
 using Jering.Javascript.NodeJS;
@@ -23,6 +24,8 @@ public static void ConfigureServices(IServiceCollection services)
             // var serviceProvider = services.BuildServiceProvider();
             // var nodeJSService = serviceProvider.GetRequiredService<INodeJSService>();
 
+            AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
+
             // Database Context
             services.AddDbContext<DocumentsContext>(
                 opt => opt.UseLazyLoadingProxies().UseNpgsql(options.DatabaseConnectionString));
diff --git a/DocumentsApi/Startup.cs b/DocumentsApi/Startup.cs
@@ -18,8 +18,6 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
-using Hackney.Core.Http;
-using Hackney.Core.JWT;
 
 namespace DocumentsApi
 {
@@ -126,9 +124,6 @@ public static void ConfigureServices(IServiceCollection services)
 
             AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
 
-            services.AddTokenFactory()
-                .AddHttpContextWrapper();
-
             ServiceConfigurator.ConfigureServices(services);
         }
 
diff --git a/DocumentsApi/V1/Authorization/AuthorizeByGroups.cs b/DocumentsApi/V1/Authorization/AuthorizeByGroups.cs
diff --git a/DocumentsApi/V1/Authorization/EnvironmentVariableNullException.cs b/DocumentsApi/V1/Authorization/EnvironmentVariableNullException.cs
diff --git a/DocumentsApi/V1/Controllers/ClaimsController.cs b/DocumentsApi/V1/Controllers/ClaimsController.cs
@@ -6,7 +6,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Amazon.S3;
 using System.Threading.Tasks;
-using DocumentsApi.V1.Authorization;
 
 namespace DocumentsApi.V1.Controllers
 {
@@ -193,7 +192,6 @@ public IActionResult GeneratePreSignedDownloadUrl([FromRoute] Guid claimId)
         /// <response code="400">Request contains invalid parameters</response>
         /// <response code="401">Request lacks valid API token</response>
         [HttpGet]
-        [AuthorizeByGroups("GET_CLAIMS_ALLOWED_GOOGLE_GROUPS")]
         public IActionResult GetClaimsByGroupId([FromQuery] PaginatedClaimRequest request)
         {
             try
diff --git a/DocumentsApi/serverless.yml b/DocumentsApi/serverless.yml
@@ -17,7 +17,6 @@ provider:
   environment:
     CONNECTION_STRING: Host=${ssm:/documents-api/${self:provider.stage}/postgres-hostname};Port=${ssm:/documents-api/${self:provider.stage}/postgres-port};Database=${ssm:/documents-api/${self:provider.stage}/postgres-database};Username=${ssm:/documents-api/${self:provider.stage}/postgres-username};Password=${ssm:/documents-api/${self:provider.stage}/postgres-password}
     BUCKET_NAME: document-evidence-store-${self:provider.stage}-bucket
-    GET_CLAIMS_ALLOWED_GOOGLE_GROUPS: ${ssm:/documents-api/${self:provider.stage}/get/claims/allowed-google-groups}
   s3:
     documentsBucket:
       accessControl: Private
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 .PHONY: build-test
 build-test:
 	docker-compose -f DocumentsApi.Tests/compose.yml build
-	
+
 .PHONY: serve-test
 serve-test:
 	make build-test && make start-test
@@ -15,7 +15,7 @@ start-test:
 .PHONY: build-local
 build-local:
 	docker-compose -f DocumentsApi/compose.yml build
-	
+
 .PHONY: serve-local
 serve-local:
 	make build-local && make start-local
@@ -24,7 +24,7 @@ serve-local:
 start-local:
 	docker compose -f DocumentsApi/compose.yml stop
 	docker compose -f DocumentsApi/compose.yml up -d
-	
+
 .PHONY: stop-local
 stop-local:
 	docker compose -f DocumentsApi/compose.yml stop
diff --git a/NuGet.Config b/NuGet.Config
@@ -1,19 +1,15 @@
 <configuration>
-
-  <packageSources>
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-    <add key="github-hackney" value="https://nuget.pkg.github.com/LBHackney-IT/index.json" />
-  </packageSources>
-
-  <packageSourceCredentials>
-    <github-hackney>
-      <add key="Username" value="PublicToken" />
-      <add key="ClearTextPassword" value= "%LBHPACKAGESTOKEN%" />
-    </github-hackney>
-  </packageSourceCredentials>
-
-  <activePackageSource>
-    <add key="All" value="(Aggregate source)" />
-  </activePackageSource>
-
-</configuration>
+    <packageSources>
+        <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+        <add key="github-hackney" value="https://nuget.pkg.github.com/LBHackney-IT/index.json" />
+    </packageSources>
+    <packageSourceCredentials>
+        <github-hackney>
+            <add key="Username" value="PublicToken" />
+            <add key="ClearTextPassword" value= "%LBHPACKAGESTOKEN%" />
+        </github-hackney>
+    </packageSourceCredentials>
+    <activePackageSource>
+        <add key="All" value="(Aggregate source)" />
+    </activePackageSource>
+</configuration>

Original file line number	Diff line number	Diff line change
`@@ -669,17 +669,5 @@ public async Task Returns400WhenUnableToDecodeBeforeToken()`
`669`	`669`
`670`	`670`	`response.StatusCode.Should().Be(400);`
`671`	`671`	`}`
`672`		`-`
`673`		`- [Test]`
`674`		`- public async Task Returns401WhenNotAuthorizedToGetClaimsByGroupId()`
`675`		`- {`
`676`		`- var groupId = "c585f2d3-69c8-4a5e-b74f-c0570665c2d8";`
`677`		`-`
`678`		`- var uri = new Uri($"api/v1/claims?groupId={groupId}", UriKind.Relative);`
`679`		`-`
`680`		`- var response = await Client.GetAsync(uri);`
`681`		`-`
`682`		`- response.StatusCode.Should().Be(401);`
`683`		`- }`
`684`	`672`	`}`
`685`	`673`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@`
`18`	`18`	`using Microsoft.Extensions.Hosting;`
`19`	`19`	`using Microsoft.OpenApi.Models;`
`20`	`20`	`using Swashbuckle.AspNetCore.SwaggerGen;`
`21`		`-using Hackney.Core.Http;`
`22`		`-using Hackney.Core.JWT;`
`23`	`21`
`24`	`22`	`namespace DocumentsApi`
`25`	`23`	`{`
`@@ -126,9 +124,6 @@ public static void ConfigureServices(IServiceCollection services)`
`126`	`124`
`127`	`125`	`AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);`
`128`	`126`
`129`		`- services.AddTokenFactory()`
`130`		`- .AddHttpContextWrapper();`
`131`		`-`
`132`	`127`	`ServiceConfigurator.ConfigureServices(services);`
`133`	`128`	`}`
`134`	`129`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`using Microsoft.AspNetCore.Mvc;`
`7`	`7`	`using Amazon.S3;`
`8`	`8`	`using System.Threading.Tasks;`
`9`		`-using DocumentsApi.V1.Authorization;`
`10`	`9`
`11`	`10`	`namespace DocumentsApi.V1.Controllers`
`12`	`11`	`{`
`@@ -193,7 +192,6 @@ public IActionResult GeneratePreSignedDownloadUrl([FromRoute] Guid claimId)`
`193`	`192`	`/// <response code="400">Request contains invalid parameters</response>`
`194`	`193`	`/// <response code="401">Request lacks valid API token</response>`
`195`	`194`	`[HttpGet]`
`196`		`- [AuthorizeByGroups("GET_CLAIMS_ALLOWED_GOOGLE_GROUPS")]`
`197`	`195`	`public IActionResult GetClaimsByGroupId([FromQuery] PaginatedClaimRequest request)`
`198`	`196`	`{`
`199`	`197`	`try`