Merge pull request #300 from dagstuan/addWatchAuto

Automatically add watch.

Author: dagstuan

SkredvarselGarminWeb/SkredvarselGarminWeb/Configuration/AuthenticationConfiguration.cs

@@ -25,7 +25,10 @@ public static void SetupAuthentication(
                 options.DefaultChallengeScheme = GoogleDefaults.AuthenticationScheme;
             })
             .AddCookie(CookieAuthenticationDefaults.AuthenticationScheme, options
-                => options.ExpireTimeSpan = TimeSpan.FromMinutes(60))
+                =>
+            {
+                options.ExpireTimeSpan = TimeSpan.FromMinutes(60);
+            })
             .AddScheme<GarminAuthenticationSchemeOptions, GarminAuthenticationHandler>("Garmin", options => { })
             .AddGoogle(options =>
             {

SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/AuthRouteBuilderExtensions.cs

@@ -5,7 +5,6 @@
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authentication.Facebook;
 using Microsoft.AspNetCore.Authentication.Google;
-using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Primitives;
 

SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/VippsSubscriptionEndpointsRouteBuilderExtensions.cs

@@ -73,6 +73,8 @@ private static ClaimsPrincipal GetVippsAgreementPrincipal(string userId, UserInf
     public static void MapVippsSubscriptionEndpoints(this IEndpointRouteBuilder app)
     {
         app.MapGet("/createVippsAgreement", async (
+            [FromQuery]
+            string? watchKey,
             HttpContext ctx,
             IVippsApiClient vippsApiClient,
             IUserService userService,
@@ -136,6 +138,7 @@ public static void MapVippsSubscriptionEndpoints(this IEndpointRouteBuilder app)
                 {
                     Id = createdAgreement.AgreementId,
                     CallbackId = callbackId,
+                    WatchKey = watchKey,
                     Created = dateTimeNowProvider.Now.ToUniversalTime(),
                     UserId = userId,
                     Status = AgreementStatus.PENDING,
@@ -163,6 +166,7 @@ public static void MapVippsSubscriptionEndpoints(this IEndpointRouteBuilder app)
             IVippsApiClient vippsApiClient,
             IVippsAgreementService subscriptionService,
             IUserService userService,
+            IWatchService watchService,
             INotificationService notificationService,
             IBackgroundJobClient backgroundJobClient,
             IDateTimeNowProvider dateTimeNowProvider,
@@ -236,10 +240,24 @@ VippsAgreementStatus.Stopped or
                             throw new Exception("Failed to associate agreement with user.");
                         }
 
+                        if (agreement.WatchKey != null)
+                        {
+                            var watchAddRequest = watchService.GetWatchAddRequest(agreement.WatchKey);
+
+                            if (watchAddRequest != null)
+                            {
+                                watchService.AddWatch(watchAddRequest, agreement.UserId);
+                            }
+                            else
+                            {
+                                logger.LogWarning("Failed to find watch add request with key {watchKey}.", agreement.WatchKey);
+                            }
+                        }
+
                         _ = Task.Run(notificationService.NotifyUserSubscribed);
 
                         agreement.SetAsActive();
-                        agreement.RemoveCallbackId();
+                        agreement.RemoveCallbackIdAndWatchKey();
 
                         try
                         {

SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/WatchApiRouteBuilderExtensions.cs

@@ -2,7 +2,6 @@
 
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.IdentityModel.Tokens;
 
 using SkredvarselGarminWeb.Configuration;
 using SkredvarselGarminWeb.Database;
@@ -112,25 +111,18 @@ public static void MapWatchApiEndpoints(this IEndpointRouteBuilder app)
             return watches.Select(w => w.ToEndpointModel());
         }).RequireAuthorization();
 
-        app.MapPost("/api/watches/{watchAddKey}", (HttpContext ctx, string watchAddKey, SkredvarselDbContext dbContext) =>
+        app.MapPost("/api/watches/{watchAddKey}", (HttpContext ctx, string watchAddKey, SkredvarselDbContext dbContext, IWatchService watchService) =>
         {
             var user = dbContext.GetUserOrThrow(ctx.User);
 
-            var watchAddRequest = dbContext.WatchAddRequests.FirstOrDefault(r => EF.Functions.ILike(r.Key, watchAddKey));
+            var watchAddRequest = watchService.GetWatchAddRequest(watchAddKey);
 
             if (watchAddRequest == null)
             {
                 return Results.Problem("Fant ikke noen klokke med den koden.", statusCode: (int)HttpStatusCode.BadRequest);
             }
 
-            dbContext.Remove(watchAddRequest);
-            dbContext.Add(new WatchEntityModel
-            {
-                Id = watchAddRequest.WatchId,
-                PartNumber = watchAddRequest.PartNumber,
-                UserId = user.Id
-            });
-            dbContext.SaveChanges();
+            watchService.AddWatch(watchAddRequest, user.Id);
 
             return Results.Ok();
         }).RequireAuthorization();

SkredvarselGarminWeb/SkredvarselGarminWeb/Entities/Agreement.cs

@@ -9,6 +9,8 @@ public class Agreement
 
     public required Guid? CallbackId { get; set; }
 
+    public required string? WatchKey { get; set; }
+
     public required DateTime Created { get; set; }
 
     public required AgreementStatus Status { get; set; }

SkredvarselGarminWeb/SkredvarselGarminWeb/Entities/Extensions/AgreementExtensions.cs

@@ -7,9 +7,10 @@ public static void SetUserId(this Agreement agreement, string userId)
         agreement.UserId = userId;
     }
 
-    public static void RemoveCallbackId(this Agreement agreement)
+    public static void RemoveCallbackIdAndWatchKey(this Agreement agreement)
     {
         agreement.CallbackId = null;
+        agreement.WatchKey = null;
     }
 
     public static void SetAsActive(this Agreement agreement)

SkredvarselGarminWeb/SkredvarselGarminWeb/Frontend/src/Components/AccountPage/AccountPage.tsx

@@ -7,17 +7,21 @@ import {
   DrawerContent,
   DrawerOverlay,
   Heading,
-  Text,
   Link,
+  Text,
 } from "@chakra-ui/react";
-import { useNavigate } from "react-router-dom";
+import { useEffect } from "react";
+import {
+  Link as RouterLink,
+  useNavigate,
+  useSearchParams,
+} from "react-router-dom";
+import { useNavigateOnClose } from "../../hooks/useNavigateOnClose";
 import { useUser } from "../../hooks/useUser";
+import { useAddWatch } from "../../hooks/useWatches";
 import { PersonalInfo } from "./PersonalInfo";
 import { Subscription } from "./Subscription";
 import { Watches } from "./Watches";
-import { Link as RouterLink } from "react-router-dom";
-import { useNavigateOnClose } from "../../hooks/useNavigateOnClose";
-import { useEffect } from "react";
 
 export const AccountPage = () => {
   const { data: user, isLoading: isLoadingUser } = useUser();
@@ -32,6 +36,25 @@ export const AccountPage = () => {
     }
   }, [user, isLoadingUser]);
 
+  const [searchParams, setSearchParams] = useSearchParams();
+  const watchKey = searchParams.get("watchKey");
+
+  const { mutate: mutateAddWatch, isPending: isAddWatchPending } = useAddWatch(
+    () => {
+      searchParams.delete("watchKey");
+      setSearchParams(searchParams, {
+        replace: true,
+        preventScrollReset: true,
+      });
+    },
+  );
+
+  useEffect(() => {
+    if (user && watchKey && !isAddWatchPending) {
+      mutateAddWatch(watchKey);
+    }
+  }, [mutateAddWatch, isAddWatchPending, user, watchKey]);
+
   return (
     <Drawer isOpen={!!user && !isClosing} onClose={onClose} size="md">
       <DrawerOverlay />

SkredvarselGarminWeb/SkredvarselGarminWeb/Frontend/src/Components/BuySubscriptionModal.tsx

@@ -1,30 +1,30 @@
 import {
+  Box,
+  Center,
+  Heading,
+  Icon,
+  Link,
   Modal,
-  ModalOverlay,
+  ModalBody,
+  ModalCloseButton,
   ModalContent,
   ModalHeader,
-  ModalCloseButton,
-  ModalBody,
+  ModalOverlay,
   Text,
   VStack,
-  Box,
-  Icon,
-  Center,
-  Heading,
-  Link,
 } from "@chakra-ui/react";
-import { Link as RouterLink } from "react-router-dom";
-import { VippsButton } from "./Buttons/VippsButton";
-import { FacebookButton } from "./Buttons/FacebookButton";
-import { GoogleButton } from "./Buttons/GoogleButton";
+import { ReactElement } from "react";
 import { FaPaperPlane } from "react-icons/fa";
+import { Link as RouterLink, useSearchParams } from "react-router-dom";
+import { useEmailLogin } from "../hooks/useEmailLogin";
 import { useNavigateOnClose } from "../hooks/useNavigateOnClose";
-import { useUser } from "../hooks/useUser";
 import { useNavigateToAccountIfLoggedIn } from "../hooks/useNavigateToAccountIfLoggedIn";
-import { OrDivider } from "./OrDivider";
-import { useEmailLogin } from "../hooks/useEmailLogin";
+import { useUser } from "../hooks/useUser";
+import { FacebookButton } from "./Buttons/FacebookButton";
+import { GoogleButton } from "./Buttons/GoogleButton";
+import { VippsButton } from "./Buttons/VippsButton";
 import { EmailLoginForm } from "./EmailLoginForm/EmailLoginForm";
-import { ReactElement } from "react";
+import { OrDivider } from "./OrDivider";
 
 type BuySubscriptionModalProps = {
   headerText?: string;
@@ -47,9 +47,12 @@ export const BuySubscriptionModal = (props: BuySubscriptionModalProps) => {
     ),
   } = props;
 
+  const [searchParams] = useSearchParams();
+  const watchKey = searchParams.get("watchKey");
+
   const { data: user, isLoading: isLoadingUser } = useUser();
 
-  useNavigateToAccountIfLoggedIn(user, isLoadingUser);
+  useNavigateToAccountIfLoggedIn(user, isLoadingUser, watchKey);
 
   const { isClosing, onClose } = useNavigateOnClose("/");
 
@@ -60,7 +63,7 @@ export const BuySubscriptionModal = (props: BuySubscriptionModalProps) => {
     handleEmailInputChange,
     handleSubmit,
     isPending,
-  } = useEmailLogin();
+  } = useEmailLogin(watchKey);
 
   return (
     <Modal isOpen={!isLoadingUser && !isClosing} onClose={onClose} isCentered>
@@ -83,7 +86,10 @@ export const BuySubscriptionModal = (props: BuySubscriptionModalProps) => {
                 </Box>
 
                 <VStack w="100%" alignItems="stretch">
-                  <VippsButton text="Kjøp abonnement med" />
+                  <VippsButton
+                    text="Kjøp abonnement med"
+                    link={`/createVippsAgreement${watchKey ? `?watchKey=${watchKey}` : ""}`}
+                  />
                 </VStack>
               </VStack>
 
@@ -104,8 +110,12 @@ export const BuySubscriptionModal = (props: BuySubscriptionModalProps) => {
                   </Heading>
                   <VStack gap={5} w="100%" alignItems="stretch">
                     <VStack gap={2} w="100%" alignItems="stretch">
-                      <GoogleButton link="/google-login?returnUrl=/account" />
-                      <FacebookButton link="/facebook-login?returnUrl=/account" />
+                      <GoogleButton
+                        link={`/google-login?returnUrl=/account${watchKey ? `?watchKey=${watchKey}` : ""}`}
+                      />
+                      <FacebookButton
+                        link={`/facebook-login?returnUrl=/account${watchKey ? `?watchKey=${watchKey}` : ""}`}
+                      />
                     </VStack>
 
                     <OrDivider text="Eller" />

SkredvarselGarminWeb/SkredvarselGarminWeb/Frontend/src/Components/LoginModal/LoginModal.tsx

@@ -1,18 +1,16 @@
 import {
+  Box,
+  Icon,
   Modal,
-  ModalOverlay,
+  ModalBody,
+  ModalCloseButton,
   ModalContent,
   ModalHeader,
-  ModalCloseButton,
-  ModalBody,
-  Icon,
-  Box,
-  Center,
+  ModalOverlay,
   Text,
   VStack,
 } from "@chakra-ui/react";
 import { useNavigateOnClose } from "../../hooks/useNavigateOnClose";
-import { useState } from "react";
 import { LoginContent } from "./LoginContent";
 
 import { FaPaperPlane } from "react-icons/fa";
@@ -34,7 +32,7 @@ export const LoginModal = (props: LoginModalProps) => {
     handleEmailInputChange,
     handleSubmit,
     isPending,
-  } = useEmailLogin();
+  } = useEmailLogin(null);
 
   return (
     <Modal isOpen={!isClosing} onClose={onClose} isCentered>

SkredvarselGarminWeb/SkredvarselGarminWeb/Frontend/src/hooks/useEmailLogin.ts

@@ -1,11 +1,16 @@
+import { useMutation } from "@tanstack/react-query";
 import { useState } from "react";
 import { api } from "../api";
-import { useMutation } from "@tanstack/react-query";
 
-export const sendLoginEmail = async (email: string) =>
-  api.post(`/email-login-send?email=${email}&returnUrl=/account`);
+export const sendLoginEmail = async (config: {
+  email: string;
+  watchKey: string | null;
+}) =>
+  api.post(
+    `/email-login-send?email=${config.email}&returnUrl=/account${config.watchKey ? `?watchKey=${config.watchKey}` : ""}`,
+  );
 
-export const useEmailLogin = () => {
+export const useEmailLogin = (watchKey: string | null) => {
   const [showSentEmail, setShowSentEmail] = useState(false);
 
   const [email, setEmail] = useState<string | undefined>(undefined);
@@ -30,7 +35,7 @@ export const useEmailLogin = () => {
     if (!email) {
       setError("Du må skrive en e-postadresse.");
     } else {
-      mutate(email);
+      mutate({ email, watchKey });
     }
   };