Merge pull request #118 from dagstuan/handleNulluser

Handle case where user that wanted to subscribe could not be registered.

Author: dagstuan

SkredvarselGarminWeb/SkredvarselGarminWeb/Database/DbContextUserExtensions.cs

@@ -2,22 +2,40 @@
 using System.Security.Principal;
 using Microsoft.EntityFrameworkCore;
 using SkredvarselGarminWeb.Entities;
+using SkredvarselGarminWeb.Extensions;
 using SkredvarselGarminWeb.Helpers;
 
 namespace SkredvarselGarminWeb.Database;
 
 public static class DbContextUserExtensions
 {
-    public static User GetUserOrThrow(this SkredvarselDbContext dbContext, IIdentity? identity)
+    public static User? GetUserOrNull(this SkredvarselDbContext dbContext, ClaimsPrincipal? principal)
     {
-        if (identity == null)
+        if (principal == null)
         {
-            throw new Exception("Unauthenticated user.");
+            return null;
         }
 
-        var email = ((ClaimsIdentity)identity).FindFirst("email")!.Value;
+        var claims = principal.Claims;
 
-        return dbContext.Users.First(u => u.Email == email);
+        var email = claims.GetClaimValueOrNull("email");
+
+        var user = dbContext.Users.FirstOrDefault(u => u.Email == email);
+
+        if (user == null)
+        {
+            var sub = claims.GetClaimValueOrNull("sub");
+
+            return dbContext.Users.FirstOrDefault(u => u.Id == sub);
+        }
+
+        return user;
+    }
+
+    public static User GetUserOrThrow(this SkredvarselDbContext dbContext, ClaimsPrincipal? principal)
+    {
+        return dbContext.GetUserOrNull(principal)
+            ?? throw new Exception("Unable to find user for principal.");
     }
 
     public static User? GetUserForWatchOrNull(this SkredvarselDbContext dbContext, string watchId)

SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/StripeSubscriptionEndpointsRouteBuilderExtensions.cs

@@ -17,10 +17,12 @@ public static void MapStripeSubscriptionEndpoints(this IEndpointRouteBuilder app
         app.MapGet("/createStripeSubscription", async (
             HttpContext ctx,
             SkredvarselDbContext dbContext,
+            IUserService userService,
             IStripeClient stripeClient,
             IOptions<StripeOptions> stripeOptions) =>
         {
-            var user = dbContext.GetUserOrThrow(ctx.User.Identity);
+            var user = await userService.GetUserOrRegisterLogin(ctx.User);
+
             var baseUrl = ctx.GetBaseUrl();
 
             var userHasActiveStripeSubscriptions = dbContext.StripeSubscriptions
@@ -79,7 +81,7 @@ public static void MapStripeSubscriptionEndpoints(this IEndpointRouteBuilder app
             IStripeClient stripeClient,
             SkredvarselDbContext dbContext) =>
         {
-            var user = dbContext.GetUserOrThrow(ctx.User.Identity);
+            var user = dbContext.GetUserOrThrow(ctx.User);
             var baseUrl = ctx.GetBaseUrl();
 
             var options = new Stripe.BillingPortal.SessionCreateOptions

SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/SubscriptionEndpointsRouteBuilderExtensions.cs

@@ -21,7 +21,7 @@ public static void MapSubscriptionApiEndpoints(this IEndpointRouteBuilder app)
             IBackgroundJobClient backgroundJobClient,
             SkredvarselDbContext dbContext) =>
         {
-            var user = dbContext.GetUserOrThrow(ctx.User.Identity);
+            var user = dbContext.GetUserOrThrow(ctx.User);
 
             var vippsAgreementsInDb = dbContext.Agreements
                 .OrderByDescending(a => a.Created)

SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/TestEndpointsRouteBuilderExtensions.cs

@@ -32,7 +32,7 @@ public static void MapTestEndpoints(this IEndpointRouteBuilder app)
 
         app.MapGet("/api/test/agreements/create", async (HttpContext ctx, IVippsApiClient vippsApiClient, SkredvarselDbContext dbContext) =>
         {
-            var user = dbContext.GetUserOrThrow(ctx.User.Identity);
+            var user = dbContext.GetUserOrThrow(ctx.User);
 
             var baseUrl = "https://skredvarsel.app";
 

SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/UserRouteBuilderExtensions.cs

@@ -22,7 +22,7 @@ public static void MapUserEndpoints(this IEndpointRouteBuilder app)
             }
             else
             {
-                var userInDb = dbContext.GetUserOrThrow(ctx.User.Identity);
+                var userInDb = dbContext.GetUserOrThrow(ctx.User);
                 var isAdmin = await authorizationService.AuthorizeAsync(ctx.User, "Admin");
                 return Results.Ok(new User
                 {

SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/VippsSubscriptionEndpointsRouteBuilderExtensions.cs

@@ -24,10 +24,11 @@ public static void MapVippsSubscriptionEndpoints(this IEndpointRouteBuilder app)
         app.MapGet("/createVippsAgreement", async (
             HttpContext ctx,
             IVippsApiClient vippsApiClient,
+            IUserService userService,
             SkredvarselDbContext dbContext,
             IDateTimeNowProvider dateTimeNowProvider) =>
         {
-            var user = dbContext.GetUserOrThrow(ctx.User.Identity);
+            var user = await userService.GetUserOrRegisterLogin(ctx.User);
 
             var userId = user.Id;
 
@@ -152,7 +153,7 @@ public static void MapVippsSubscriptionEndpoints(this IEndpointRouteBuilder app)
             INtfyApiClient ntifyApiClient,
             SkredvarselDbContext dbContext) =>
         {
-            var user = dbContext.GetUserOrThrow(ctx.User.Identity);
+            var user = dbContext.GetUserOrThrow(ctx.User);
 
             var agreementInDb = dbContext.Agreements
                 .Where(a => a.Status == AgreementStatus.ACTIVE)
@@ -183,7 +184,7 @@ public static void MapVippsSubscriptionEndpoints(this IEndpointRouteBuilder app)
             INtfyApiClient ntifyApiClient,
             SkredvarselDbContext dbContext) =>
         {
-            var user = dbContext.GetUserOrThrow(ctx.User.Identity);
+            var user = dbContext.GetUserOrThrow(ctx.User);
 
             var agreementInDb = dbContext.Agreements
                 .Where(a => a.Status == AgreementStatus.UNSUBSCRIBED)

SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/WatchApiRouteBuilderExtensions.cs

@@ -64,7 +64,7 @@ public static void MapWatchApiEndpoints(this IEndpointRouteBuilder app)
 
         app.MapGet("/api/watches", (HttpContext ctx, SkredvarselDbContext dbContext) =>
         {
-            var user = dbContext.GetUserOrThrow(ctx.User.Identity);
+            var user = dbContext.GetUserOrThrow(ctx.User);
 
             var watches = dbContext.Watches.Where(w => w.UserId == user.Id);
 
@@ -73,7 +73,7 @@ public static void MapWatchApiEndpoints(this IEndpointRouteBuilder app)
 
         app.MapPost("/api/watches/{watchAddKey}", (HttpContext ctx, string watchAddKey, SkredvarselDbContext dbContext) =>
         {
-            var user = dbContext.GetUserOrThrow(ctx.User.Identity);
+            var user = dbContext.GetUserOrThrow(ctx.User);
 
             var watchAddRequest = dbContext.WatchAddRequests.FirstOrDefault(r => r.Key == watchAddKey);
 
@@ -96,7 +96,7 @@ public static void MapWatchApiEndpoints(this IEndpointRouteBuilder app)
 
         app.MapDelete("/api/watches/{watchId}", (HttpContext ctx, SkredvarselDbContext dbContext, string watchId) =>
         {
-            var user = dbContext.GetUserOrThrow(ctx.User.Identity);
+            var user = dbContext.GetUserOrThrow(ctx.User);
 
             var watch = dbContext.Watches.FirstOrDefault(w => w.Id == watchId && w.UserId == user.Id);
 

SkredvarselGarminWeb/SkredvarselGarminWeb/Services/IUserService.cs

@@ -1,8 +1,11 @@
 using System.Security.Claims;
+using SkredvarselGarminWeb.Entities;
 
 namespace SkredvarselGarminWeb.Services;
 
 public interface IUserService
 {
+    Task<User> GetUserOrRegisterLogin(ClaimsPrincipal principal);
+
     Task RegisterLogin(ClaimsPrincipal user);
 }

SkredvarselGarminWeb/SkredvarselGarminWeb/Services/UserService.cs

@@ -11,6 +11,18 @@ public class UserService(
     SkredvarselDbContext dbContext,
     IDateTimeNowProvider dateTimeNowProvider) : IUserService
 {
+    public async Task<User> GetUserOrRegisterLogin(ClaimsPrincipal principal)
+    {
+        var user = dbContext.GetUserOrNull(principal);
+
+        if (user == null)
+        {
+            await RegisterLogin(principal);
+        }
+
+        return dbContext.GetUserOrThrow(principal);
+    }
+
     public async Task RegisterLogin(ClaimsPrincipal user)
     {
         var dateNow = DateOnly.FromDateTime(dateTimeNowProvider.Now);