Fixes order state not updating in the callback page

Hajoppi · Sep 15, 2023 · 059cff0 · 059cff0
1 parent d43c913
commit 059cff0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/app/[locale]/callback/page.tsx b/app/[locale]/callback/page.tsx
@@ -2,6 +2,7 @@ import paytrailService from '@/utils/paytrail';
 
 import { serverFetchAPI } from '@/lib/serverApi';
 import { CallbackPageFields } from '@/utils/models';
+import { updateOrderState } from '@/app/api/createPayment/route';
 
 import Result from './Result';
 
@@ -18,6 +19,8 @@ const getContent = async (locale: string) => {
   }
 }
 
+
+
 type Props = {
   params: {
     locale: string
@@ -28,6 +31,13 @@ type Props = {
 const CallbackPage = async ({params: {locale}, searchParams}: Props) => {
   const params = searchParams;
   const isValid = paytrailService.verifyPayment(params);
+  if(isValid) {
+    await updateOrderState(
+      Number(params['checkout-reference']),
+      params['checkout-status'] || 'fail',
+      params['checkout-transaction-id'] || undefined,
+      );
+  }
   const paymentStatus = params['checkout-status'] as CheckoutStatus;
   const content = await getContent(locale);
 

diff --git a/app/[locale]/signups/Component.tsx b/app/[locale]/signups/Component.tsx
@@ -1,3 +1,5 @@
+"use client";
+
 import Link from 'next/link';
 
 import { fetchAPI } from '@/lib/api';
@@ -85,10 +87,8 @@ const Signups = ({content, categories, locale}: Props) => {
           </div>
         </div>)}
       <div className='mt-4'>
-      <Link href="">
-        <a onClick={goBack} className='underline text-primary-900 dark:text-primary-100'>
-          {translation.back}
-        </a>
+      <Link onClick={goBack} className='underline text-primary-900 dark:text-primary-100' href="">
+        {translation.back}
       </Link>
       </div>
 

diff --git a/app/api/verifyPaymentCallback/route.ts b/app/api/verifyPaymentCallback/route.ts
@@ -2,17 +2,18 @@ import { NextRequest, NextResponse } from "next/server";
 import paytrailService from "@/utils/paytrail";
 import { updateOrderState } from "../createPayment/route";
 
+
+// This is called by paytrail directly
 export const GET = async (request: NextRequest) => {
-  if (request.method !== 'GET') return NextResponse.json({}, {status: 405});
   const query = request.nextUrl.searchParams;
   const queryObject = Object.fromEntries(query.entries())
   try {
     const result = paytrailService.verifyPayment(queryObject);
     if (!result) return NextResponse.json({}, {status: 400});
     await updateOrderState(
-      Number(query.get('checkout-reference')),
-      query.get('checkout-status') || 'fail',
-      query.get('checkout-transaction-id') || undefined,
+      Number(queryObject['checkout-reference']),
+      queryObject['checkout-status'] || 'fail',
+      queryObject['checkout-transaction-id'] || undefined,
       );
     return NextResponse.json({}, {status: 200});
   } catch(error) {