Merge pull request #622 from Laixer/develop

v3.4.2

.github/workflows/dotnet-core-package-outdated.yml

@@ -6,7 +6,8 @@ on:
       - master
 
 env:
-  DOTNET_VERSION: '5.0'
+  DOTNET_VERSION: '6.0'
+  DOTNET_VERSION_INCLUDE_PRERELEASE: true
 
 jobs:
   build:
@@ -21,6 +22,7 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: ${{ env.DOTNET_VERSION }}
+        include-prerelease: ${{ env.DOTNET_VERSION_INCLUDE_PRERELEASE }}
 
     - name: Install dependencies
       run: dotnet restore --no-cache --force-evaluate

.github/workflows/dotnet-core.yml

@@ -12,7 +12,7 @@ on:
       - develop
 
 env:
-  DOTNET_VERSION: '5.0'
+  DOTNET_VERSION: '6.0'
   BUILD_CONFIG: Release
 
 jobs:
@@ -45,7 +45,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: ${{ env.DOTNET_VERSION }} 
+        dotnet-version: ${{ env.DOTNET_VERSION }}
 
     - name: Install dependencies
       run: dotnet restore

API_TEST

@@ -0,0 +1,3 @@
+curl -X POST -H 'Content-Type: application/json' -d '{"email":"[email protected]","password":"fundermaps"}' https://ws.fundermaps.com/api/auth/signin | jq
+curl -H 'Content-Type: application/json' -H "Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1laWRlbnRpZmllciI6ImFkY2RmN2FlLTk3NTctNGE1Ny04N2ExLTFjNmNkMDMwNmYwZCIsImh0dHA6Ly9zY2hlbWFzLm1pY3Jvc29mdC5jb20vd3MvMjAwOC8wNi9pZGVudGl0eS9jbGFpbXMvcm9sZSI6IlVzZXIiLCJjZm8iOiJkOGMxOTQxOC1jODMyLTRjOTEtODk5My04NGI4ZWQ2NDE0NDgiLCJjZm9yIjoiU3VwZXJ1c2VyIiwianRpIjoiODMzOTcyMzQtZjk3Zi00YmZjLWE0NzYtYzkwZjUzNGVjMTEzIiwibmJmIjoxNjMzMTgyNTQ2LCJleHAiOjE2MzMxODk3NDYsImlzcyI6IkZ1bmRlck1hcHMiLCJhdWQiOiJGdW5kZXJNYXBzIn0.wHfh7R-Xw8k7fNPw4tNzfQqiEkCCh0sKM8TLJsdViMo" https://ws.fundermaps.com/api/v2/product/analysis?id=gfm-5c23684f5f3346f29cfec5b978251e13 | jq
+

Dockerfile

@@ -1,7 +1,7 @@
 # FunderMaps Ecosystem
 
 # Build application solution
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
 WORKDIR /source
 
 # The subtool must be defined. The build container will only build the
@@ -29,7 +29,7 @@ RUN dotnet publish -c release -o /app \
     && cp /source/contrib/etc/_appsettings.Staging.json /app/appsettings.Staging.json
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/aspnet:5.0
+FROM mcr.microsoft.com/dotnet/aspnet:6.0
 ENV DOTNET_PRINT_TELEMETRY_MESSAGE=false
 WORKDIR /app
 COPY --from=build /app .

README.md

@@ -6,7 +6,7 @@ Foundation issues occur and are actively investigated by local government. Gaini
 
 ## Requirements
 
-* .NET 5 Runtime and SDK
+* .NET 6 LTS Runtime and SDK
 * Docker
 
 ## Running the application on localhost

database/data/seed_application.sql

@@ -87,10 +87,10 @@ ab403d16-e428-4a75-9eec-3dd08b294988	05203318-6c55-43c1-a6a6-bb8c83f930c3	reader
 
 
 --
--- Data for Name: product_telemetry; Type: TABLE DATA; Schema: application; Owner: fundermaps
+-- Data for Name: product_tracker; Type: TABLE DATA; Schema: application; Owner: fundermaps
 --
 
-COPY application.product_telemetry (user_id, organization_id, product, count, meta) FROM stdin;
+COPY application.product_tracker (organization_id, product, building_id, create_date) FROM stdin;
 \.
 
 

database/fundermaps_base.sql

@@ -2669,21 +2669,6 @@ ALTER TABLE application.organization_user OWNER TO fundermaps;
 COMMENT ON TABLE application.organization_user IS 'Linking table between organizations and their users.';
 
 
---
--- Name: product_telemetry; Type: TABLE; Schema: application; Owner: fundermaps
---
-
-CREATE TABLE application.product_telemetry (
-    user_id application.user_id,
-    organization_id application.organization_id NOT NULL,
-    product text NOT NULL,
-    count bigint DEFAULT 0 NOT NULL,
-    meta jsonb
-);
-
-
-ALTER TABLE application.product_telemetry OWNER TO fundermaps;
-
 --
 -- Name: product_tracker; Type: TABLE; Schema: application; Owner: fundermaps
 --
@@ -4406,14 +4391,6 @@ ALTER TABLE ONLY application.organization_user
     ADD CONSTRAINT organization_user_pkey PRIMARY KEY (user_id, organization_id);
 
 
---
--- Name: product_telemetry product_telemetry_pkey; Type: CONSTRAINT; Schema: application; Owner: fundermaps
---
-
-ALTER TABLE ONLY application.product_telemetry
-    ADD CONSTRAINT product_telemetry_pkey PRIMARY KEY (organization_id, product);
-
-
 --
 -- Name: user user_pkey; Type: CONSTRAINT; Schema: application; Owner: fundermaps
 --
@@ -5070,22 +5047,6 @@ ALTER TABLE ONLY application.organization_user
     ADD CONSTRAINT organization_user_user_id_fkey FOREIGN KEY (user_id) REFERENCES application."user"(id) ON DELETE CASCADE;
 
 
---
--- Name: product_telemetry product_telemetry_organization_id_fkey; Type: FK CONSTRAINT; Schema: application; Owner: fundermaps
---
-
-ALTER TABLE ONLY application.product_telemetry
-    ADD CONSTRAINT product_telemetry_organization_id_fkey FOREIGN KEY (organization_id) REFERENCES application.organization(id) ON UPDATE CASCADE ON DELETE CASCADE;
-
-
---
--- Name: product_telemetry product_telemetry_user_id_fkey; Type: FK CONSTRAINT; Schema: application; Owner: fundermaps
---
-
-ALTER TABLE ONLY application.product_telemetry
-    ADD CONSTRAINT product_telemetry_user_id_fkey FOREIGN KEY (user_id) REFERENCES application."user"(id) ON UPDATE CASCADE ON DELETE SET NULL;
-
-
 --
 -- Name: product_tracker product_tracker_building_id_fkey; Type: FK CONSTRAINT; Schema: application; Owner: fundermaps
 --
@@ -5831,16 +5792,6 @@ GRANT SELECT ON TABLE application.organization_user TO fundermaps_batch;
 GRANT SELECT ON TABLE application.organization_user TO fundermaps_portal;
 
 
---
--- Name: TABLE product_telemetry; Type: ACL; Schema: application; Owner: fundermaps
---
-
-GRANT SELECT,INSERT,REFERENCES,DELETE,TRIGGER,UPDATE ON TABLE application.product_telemetry TO fundermaps_webapp;
-GRANT SELECT,INSERT,UPDATE ON TABLE application.product_telemetry TO fundermaps_webservice;
-GRANT SELECT ON TABLE application.product_telemetry TO fundermaps_batch;
-GRANT SELECT ON TABLE application.product_telemetry TO fundermaps_portal;
-
-
 --
 -- Name: TABLE product_tracker; Type: ACL; Schema: application; Owner: fundermaps
 --

global.json

@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "6.0.100",
+    "rollForward": "latestMinor"
+  }
+}

src/FunderMaps.AspNetCore/Authentication/ISecurityTokenProvider.cs

@@ -1,5 +1,5 @@
-using System.Security.Claims;
 using Microsoft.IdentityModel.Tokens;
+using System.Security.Claims;
 
 namespace FunderMaps.AspNetCore.Authentication
 {

src/FunderMaps.AspNetCore/Authentication/JwtBearerTokenProvider.cs

@@ -3,10 +3,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;
-using System;
-using System.Collections.Generic;
 using System.IdentityModel.Tokens.Jwt;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Security.Claims;
 

src/FunderMaps.AspNetCore/Authentication/JwtTokenValidationParameters.cs

@@ -1,4 +1,3 @@
-using System;
 using Microsoft.IdentityModel.Tokens;
 
 namespace FunderMaps.AspNetCore.Authentication

src/FunderMaps.AspNetCore/Authentication/PrincipalProvider.cs

@@ -1,8 +1,5 @@
 using FunderMaps.Core.Identity;
 using FunderMaps.Core.Types;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Security.Claims;
 
 namespace FunderMaps.AspNetCore.Authentication

src/FunderMaps.AspNetCore/Authorization/AuthorizationOptionsExtensions.cs

@@ -1,6 +1,5 @@
 using FunderMaps.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
-using System;
 
 namespace FunderMaps.AspNetCore.Authorization
 {

src/FunderMaps.AspNetCore/Controllers/AuthController.cs

@@ -5,8 +5,6 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Threading.Tasks;
 
 namespace FunderMaps.AspNetCore.Controllers
 {

src/FunderMaps.AspNetCore/Controllers/OrganizationController.cs

@@ -5,8 +5,6 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Threading.Tasks;
 
 namespace FunderMaps.AspNetCore.Controllers
 {

src/FunderMaps.AspNetCore/Controllers/OrganizationUserController.cs

@@ -7,9 +7,6 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace FunderMaps.AspNetCore.Controllers
 {

src/FunderMaps.AspNetCore/Controllers/UserController.cs

@@ -7,8 +7,6 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Threading.Tasks;
 
 namespace FunderMaps.AspNetCore.Controllers
 {

src/FunderMaps.AspNetCore/DataAnnotations/FormFileAttribute.cs

@@ -1,7 +1,5 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
 using Microsoft.AspNetCore.Http;
+using System.ComponentModel.DataAnnotations;
 
 namespace FunderMaps.AspNetCore.DataAnnotations
 {

src/FunderMaps.AspNetCore/DataTransferObjects/AnalysisCompleteDto.cs

@@ -1,5 +1,4 @@
-using FunderMaps.Core.Types;
-using System;
+using FunderMaps.Core.Types;
 
 namespace FunderMaps.AspNetCore.DataTransferObjects
 {

src/FunderMaps.AspNetCore/DataTransferObjects/AnalysisRiskPlusDto.cs

@@ -1,5 +1,4 @@
 using FunderMaps.Core.Types;
-using System;
 
 namespace FunderMaps.AspNetCore.DataTransferObjects
 {

src/FunderMaps.AspNetCore/DataTransferObjects/BlobAccessLinkDto.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace FunderMaps.AspNetCore.DataTransferObjects
 {
     /// <summary>

src/FunderMaps.AspNetCore/DataTransferObjects/ChangeOrganizationRoleDto.cs

@@ -1,5 +1,5 @@
-using System.ComponentModel.DataAnnotations;
 using FunderMaps.Core.Types;
+using System.ComponentModel.DataAnnotations;
 
 namespace FunderMaps.AspNetCore.DataTransferObjects
 {

src/FunderMaps.AspNetCore/DataTransferObjects/IncidentDto.cs

@@ -1,6 +1,5 @@
 using FunderMaps.Core.DataAnnotations;
 using FunderMaps.Core.Types;
-using System;
 using System.ComponentModel.DataAnnotations;
 
 namespace FunderMaps.AspNetCore.DataTransferObjects

src/FunderMaps.AspNetCore/DataTransferObjects/OrganizationDto.cs

@@ -1,4 +1,3 @@
-using System;
 using System.ComponentModel.DataAnnotations;
 
 namespace FunderMaps.AspNetCore.DataTransferObjects

src/FunderMaps.AspNetCore/DataTransferObjects/PaginationDto.cs

@@ -1,5 +1,5 @@
-using System.ComponentModel.DataAnnotations;
 using FunderMaps.Core;
+using System.ComponentModel.DataAnnotations;
 
 namespace FunderMaps.AspNetCore.DataTransferObjects
 {

src/FunderMaps.AspNetCore/DataTransferObjects/ResponseWrapper.cs

@@ -1,6 +1,3 @@
-using System.Collections.Generic;
-using System.Linq;
-
 namespace FunderMaps.AspNetCore.DataTransferObjects
 {
     /// <summary>

src/FunderMaps.AspNetCore/DataTransferObjects/SignInSecurityTokenDto.cs

@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace FunderMaps.AspNetCore.DataTransferObjects
 {

src/FunderMaps.AspNetCore/DataTransferObjects/StatisticsDto.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using FunderMaps.Core.Types;
+using FunderMaps.Core.Types;
 
 namespace FunderMaps.AspNetCore.DataTransferObjects
 {

src/FunderMaps.AspNetCore/DataTransferObjects/UserDto.cs

@@ -1,5 +1,4 @@
 using FunderMaps.Core.Types;
-using System;
 using System.ComponentModel.DataAnnotations;
 
 namespace FunderMaps.AspNetCore.DataTransferObjects

src/FunderMaps.AspNetCore/Extensions/ConfigurationExtensions.cs

@@ -1,6 +1,5 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.IdentityModel.Tokens;
-using System;
 using System.Globalization;
 using System.Text;
 

src/FunderMaps.AspNetCore/Extensions/MvcCoreMvcBuilderExtensions.cs

@@ -1,4 +1,3 @@
-using System;
 using FunderMaps.AspNetCore;
 
 namespace Microsoft.Extensions.DependencyInjection

src/FunderMaps.AspNetCore/Filters/FunderMapsCoreExceptionFilter.cs

@@ -1,10 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
 using FunderMaps.Core.Exceptions;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
+using System.Net;
 
 namespace FunderMaps.AspNetCore.Middleware
 {

src/FunderMaps.AspNetCore/FunderMaps.AspNetCore.csproj

@@ -2,8 +2,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>latest</LangVersion>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -12,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>

src/FunderMaps.AspNetCore/FunderMapsStartup.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
 using AutoMapper;
 using FunderMaps.AspNetCore.Authentication;
 using FunderMaps.AspNetCore.Authorization;
@@ -18,6 +16,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using System.Diagnostics.CodeAnalysis;
 
 [assembly: ApiController]
 [assembly: HostingStartup(typeof(FunderMaps.AspNetCore.FunderMapsStartup))]

src/FunderMaps.AspNetCore/HealthChecks/BlobStorageHealthCheck.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
 using FunderMaps.Core.Interfaces;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 using Microsoft.Extensions.Logging;

src/FunderMaps.AspNetCore/HealthChecks/EmailHealthCheck.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
 using FunderMaps.Core.Email;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 using Microsoft.Extensions.Logging;