Merge pull request #271 from dagstuan/dotnet9

Upgrade to .net 9

Author: dagstuan

SkredvarselGarminWeb/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0.401-1-bookworm-slim AS base
+FROM mcr.microsoft.com/dotnet/sdk:9.0.100-bookworm-slim AS base
 RUN apt-get update
 RUN apt-get install -y ca-certificates curl gnupg
 RUN mkdir -p /etc/apt/keyrings
@@ -16,7 +16,7 @@ COPY . .
 RUN dotnet test
 RUN dotnet publish SkredvarselGarminWeb -c Release -o publish
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0.401-1-bookworm-slim
+FROM mcr.microsoft.com/dotnet/sdk:9.0.100-bookworm-slim
 EXPOSE 8080
 WORKDIR /app
 COPY --from=builder /app/publish ./

SkredvarselGarminWeb/SkredvarselGarminWeb.Tests/SkredvarselGarminWeb.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -10,9 +10,9 @@
 
   <ItemGroup>
     <PackageReference Include="AutoFixture" Version="4.18.1" />
-    <PackageReference Include="FluentAssertions" Version="6.12.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.10" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="FluentAssertions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />
     <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">

SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/ForecastAreaEndpointsRouteBuilderExtensions.cs

@@ -26,12 +26,9 @@ public static void MapForecastAreaEndpoints(this IEndpointRouteBuilder app)
 
             var geometry = serializer.Deserialize<FeatureCollection>(jsonReader);
 
-            if (geometry == null)
-            {
-                return Results.BadRequest("Invalid GeoJSON");
-            }
-
-            return Results.Ok(forecastAreaService.ReplaceForecastAreas(geometry));
+            return geometry == null ?
+                Results.BadRequest("Invalid GeoJSON") :
+                Results.Ok(forecastAreaService.ReplaceForecastAreas(geometry));
         }).DisableAntiforgery().RequireAuthorization("Admin");
     }
 }

SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/StripeSubscriptionEndpointsRouteBuilderExtensions.cs

@@ -42,7 +42,7 @@ public static void MapStripeSubscriptionEndpoints(this IEndpointRouteBuilder app
                 SuccessUrl = $"{baseUrl}/stripe-subscribe-callback?session_id={{CHECKOUT_SESSION_ID}}",
                 CancelUrl = $"{baseUrl}/account",
                 Mode = "subscription",
-                CustomerEmail = user.StripeCustomerId.IsNullOrEmpty() ? user.Email : null,
+                CustomerEmail = user.StripeCustomerId is { Length: > 0 } ? user.Email : null,
                 Customer = user.StripeCustomerId,
                 ClientReferenceId = user.Id,
                 LineItems = [

SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/SubscriptionEndpointsRouteBuilderExtensions.cs

@@ -71,17 +71,14 @@ public static void MapSubscriptionApiEndpoints(this IEndpointRouteBuilder app)
             var activeStripeSubscription = stripeSubscriptionsInDb
                 .FirstOrDefault(ss => ss.Status == Entities.StripeSubscriptionStatus.ACTIVE
                     || ss.Status == Entities.StripeSubscriptionStatus.UNSUBSCRIBED);
-            if (activeStripeSubscription != null)
-            {
-                return Results.Ok(new SubscriptionResponse
+            return activeStripeSubscription != null
+                ? Results.Ok(new SubscriptionResponse
                 {
                     SubscriptionType = SubscriptionType.Stripe,
                     StripeSubscriptionStatus = activeStripeSubscription.Status,
                     NextChargeDate = activeStripeSubscription.NextChargeDate,
-                });
-            }
-
-            return Results.NoContent();
+                })
+                : Results.NoContent();
         }).RequireAuthorization();
     }
 }

SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/VippsSubscriptionEndpointsRouteBuilderExtensions.cs

@@ -145,14 +145,15 @@ public static void MapVippsSubscriptionEndpoints(this IEndpointRouteBuilder app)
                     vippsAgreement = await vippsApiClient.GetAgreement(agreement.Id);
                 }
 
-                if (vippsAgreement.Status == VippsAgreementStatus.Stopped ||
-                    vippsAgreement.Status == VippsAgreementStatus.Expired)
+                if (vippsAgreement.Status is
+                    VippsAgreementStatus.Stopped or
+                    VippsAgreementStatus.Expired)
                 {
                     dbContext.Remove(agreement);
                 }
                 else if (vippsAgreement.Status == VippsAgreementStatus.Active)
                 {
-                    if (string.IsNullOrEmpty(agreement.UserId))
+                    if (agreement.UserId is { Length: > 0 })
                     {
                         var signedInUser = dbContext.GetUserOrNull(ctx.User);
                         if (signedInUser != null)

SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/WatchApiRouteBuilderExtensions.cs

@@ -74,7 +74,7 @@ public static void MapWatchApiEndpoints(this IEndpointRouteBuilder app)
             [FromHeader(Name = "Authorization")] string authorizationHeader,
             IGarminAuthenticationService garminAuthenticationService) =>
         {
-            if (authorizationHeader.IsNullOrEmpty())
+            if (authorizationHeader is { Length: > 0 })
             {
                 return Results.Unauthorized();
             }

SkredvarselGarminWeb/SkredvarselGarminWeb/Frontend/vite.config.ts

@@ -22,7 +22,10 @@ const keyFilePath = path.join(baseFolder, `${certificateName}.key`);
 
 // https://vitejs.dev/config/
 export default defineConfig(async () => {
-  if (!fs.existsSync(certFilePath) || !fs.existsSync(keyFilePath)) {
+  if (
+    process.env.NODE_ENV !== "production" &&
+    (!fs.existsSync(certFilePath) || !fs.existsSync(keyFilePath))
+  ) {
     // Wait for the certificate to be generated
     await new Promise<void>((resolve) => {
       spawn(

SkredvarselGarminWeb/SkredvarselGarminWeb/Hangfire/HangfireService.cs

@@ -47,8 +47,9 @@ public async Task RemoveStalePendingAgreements()
         {
             var vippsAgreement = await vippsApiClient.GetAgreement(agreement.Id);
 
-            if (vippsAgreement.Status == VippsAgreementStatus.Expired ||
-                vippsAgreement.Status == VippsAgreementStatus.Stopped)
+            if (vippsAgreement.Status is
+                VippsAgreementStatus.Expired or
+                VippsAgreementStatus.Stopped)
             {
                 logger.LogInformation("Deleting stale agreement {agreementId} since it was expired in Vipps.", agreement.Id);
                 dbContext.Remove(agreement);

SkredvarselGarminWeb/SkredvarselGarminWeb/Services/StripeService.cs

@@ -34,10 +34,11 @@ public void HandleWebhook(Event stripeEvent)
             StoreNewSubscriptionIfNotExists(session);
         }
         else if (
-            stripeEvent.Type == EventTypes.CustomerSubscriptionUpdated ||
-            stripeEvent.Type == EventTypes.CustomerSubscriptionDeleted ||
-            stripeEvent.Type == EventTypes.CustomerSubscriptionPaused ||
-            stripeEvent.Type == EventTypes.CustomerSubscriptionResumed)
+            stripeEvent.Type is
+                EventTypes.CustomerSubscriptionUpdated or
+                EventTypes.CustomerSubscriptionDeleted or
+                EventTypes.CustomerSubscriptionPaused or
+                EventTypes.CustomerSubscriptionResumed)
         {
             var subscription = (Subscription)stripeEvent.Data.Object;
             HandleSubscriptionUpdated(subscription);