Bump Microsoft.AspNetCore.Authentication.JwtBearer from 5.0.6 to 5.0.9 in /UKSF.Api.Auth

.editorconfig

@@ -0,0 +1,28 @@
+# EditorConfig
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.json]
+indent_size = 4
+indent_style = space
+
+[*.{markdown,md}]
+indent_size = 4
+indent_style = space
+trim_trailing_whitespace = false
+
+[*.xml]
+indent_size = 4
+indent_style = space
+
+[*.{yaml,yml}]
+indent_size = 2
+indent_style = space

.github/workflows/test.yml

@@ -0,0 +1,27 @@
+name: Build & Run Tests
+env:
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  Test:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v1.7.2
+      with:
+        dotnet-version: 5.x
+    - name: Build with dotnet
+      run: dotnet build -c Release
+    - name: Run tests with coverage
+      run: dotnet test ./UKSF.Api.sln -c Release --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=../coverage/lcov.info /p:Exclude="[UKSF.PostMessage]*"
+    - name: Coveralls
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -232,7 +232,6 @@ _Pvt_Extensions
 
 # Sensitive configs
 **/appconfig/**
-/UKSFWebsite.Api/website-backend-config/**
 **/build_output/**
 **/build_tests/**
 **/__pycache__/**
@@ -260,5 +259,5 @@ coverage.xml
 .idea/
 
 # Specific
-!UKSFWebsite.Api.Services/Debug**
 appsettings.Development.json
+*.info

NuGet.Config

@@ -5,8 +5,7 @@
         <add key="automatic" value="True" />
     </packageRestore>
     <packageSources>
-        <add key="nuget.org" value="https://api.nuget.org/v3/" />
-        <add key="dotnetpreview" value="https://dotnet.myget.org/F/aspnetcore-dev/api/" />
+        <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     </packageSources>
     <activePackageSource>
        <add key="All" value="(Aggregate source)" />

README.md

@@ -1 +1,3 @@
 # UKSF Website Backend
+
+[![Coverage Status](https://coveralls.io/repos/github/uksf/api/badge.svg?branch=master)](https://coveralls.io/github/uksf/api?branch=master)

Tests/Tests.csproj

@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+    </PropertyGroup>
+
+</Project>

Tests/UKSF.Api.Admin.Tests/DependencyInjectionTests.cs

@@ -0,0 +1,49 @@
+using FluentAssertions;
+using Microsoft.Extensions.DependencyInjection;
+using UKSF.Api.Admin.Controllers;
+using UKSF.Api.Admin.EventHandlers;
+using UKSF.Api.Admin.ScheduledActions;
+using UKSF.Api.Tests.Common;
+using Xunit;
+
+namespace UKSF.Api.Admin.Tests
+{
+    public class DependencyInjectionTests : DependencyInjectionTestsBase
+    {
+        public DependencyInjectionTests()
+        {
+            Services.AddUksfAdmin();
+        }
+
+        [Fact]
+        public void When_resolving_controllers()
+        {
+            Services.AddTransient<DataController>();
+            Services.AddTransient<VariablesController>();
+            Services.AddTransient<VersionController>();
+            ServiceProvider serviceProvider = Services.BuildServiceProvider();
+
+            serviceProvider.GetRequiredService<DataController>().Should().NotBeNull();
+            serviceProvider.GetRequiredService<VariablesController>().Should().NotBeNull();
+            serviceProvider.GetRequiredService<VersionController>().Should().NotBeNull();
+        }
+
+        [Fact]
+        public void When_resolving_event_handlers()
+        {
+            Services.AddTransient<LogDataEventHandler>();
+            ServiceProvider serviceProvider = Services.BuildServiceProvider();
+
+            serviceProvider.GetRequiredService<LogDataEventHandler>().Should().NotBeNull();
+        }
+
+        [Fact]
+        public void When_resolving_scheduled_actions()
+        {
+            Services.AddTransient<ActionPruneLogs>();
+            ServiceProvider serviceProvider = Services.BuildServiceProvider();
+
+            serviceProvider.GetRequiredService<ActionPruneLogs>().Should().NotBeNull();
+        }
+    }
+}

Tests/UKSF.Api.Admin.Tests/UKSF.Api.Admin.Tests.csproj

@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+
+        <IsPackable>false</IsPackable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="FluentAssertions" Version="6.0.0"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0"/>
+        <PackageReference Include="xunit" Version="2.4.1"/>
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="coverlet.collector" Version="3.1.0">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\..\UKSF.Api.Admin\UKSF.Api.Admin.csproj" />
+      <ProjectReference Include="..\UKSF.Api.Tests.Common\UKSF.Api.Tests.Common.csproj" />
+    </ItemGroup>
+
+</Project>

Tests/UKSF.Api.ArmaMissions.Tests/UKSF.Api.ArmaMissions.Tests.csproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+
+        <IsPackable>false</IsPackable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0"/>
+        <PackageReference Include="xunit" Version="2.4.1" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="coverlet.collector" Version="3.1.0">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+    </ItemGroup>
+
+</Project>

Tests/UKSF.Api.ArmaServer.Tests/DependencyInjectionTests.cs

@@ -0,0 +1,31 @@
+using FluentAssertions;
+using Microsoft.Extensions.DependencyInjection;
+using UKSF.Api.Admin;
+using UKSF.Api.ArmaMissions;
+using UKSF.Api.ArmaServer.Controllers;
+using UKSF.Api.Personnel;
+using UKSF.Api.Tests.Common;
+using Xunit;
+
+namespace UKSF.Api.ArmaServer.Tests
+{
+    public class DependencyInjectionTests : DependencyInjectionTestsBase
+    {
+        public DependencyInjectionTests()
+        {
+            Services.AddUksfAdmin();
+            Services.AddUksfPersonnel();
+            Services.AddUksfArmaMissions();
+            Services.AddUksfArmaServer();
+        }
+
+        [Fact]
+        public void When_resolving_controllers()
+        {
+            Services.AddTransient<GameServersController>();
+            ServiceProvider serviceProvider = Services.BuildServiceProvider();
+
+            serviceProvider.GetRequiredService<GameServersController>().Should().NotBeNull();
+        }
+    }
+}

Tests/UKSF.Api.ArmaServer.Tests/UKSF.Api.ArmaServer.Tests.csproj

@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+
+        <IsPackable>false</IsPackable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="FluentAssertions" Version="6.0.0"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0"/>
+        <PackageReference Include="xunit" Version="2.4.1"/>
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="coverlet.collector" Version="3.1.0">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\..\UKSF.Api.ArmaServer\UKSF.Api.ArmaServer.csproj" />
+      <ProjectReference Include="..\UKSF.Api.Tests.Common\UKSF.Api.Tests.Common.csproj" />
+    </ItemGroup>
+
+</Project>