completed oauth implementation on hub and dispatch

apps/hub/app/(auth)/login/_components/Login.tsx

@@ -2,6 +2,7 @@
 import { zodResolver } from '@hookform/resolvers/zod';
 import { signIn } from 'next-auth/react';
 import Link from 'next/link';
+import { useSearchParams } from 'next/navigation';
 import { useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { Toaster, toast } from 'react-hot-toast';
@@ -9,7 +10,7 @@ import { z } from 'zod';
 
 export const Login = () => {
   const [isLoading, setIsLoading] = useState(false);
-
+  const searchParams = useSearchParams();
   const schema = z.object({
     email: z.string().email(),
     password: z.string(),
@@ -20,14 +21,14 @@ export const Login = () => {
   const form = useForm<schemaType>({
     resolver: zodResolver(schema),
   });
-  console.log(form.formState.errors);
+
   return (
     <form
       className="card-body"
       onSubmit={form.handleSubmit(async () => {
         setIsLoading(true);
         const data = await signIn('credentials', {
-          callbackUrl: '/',
+          callbackUrl: searchParams.get('redirect') || '/',
           email: form.getValues('email'),
           password: form.getValues('password'),
         });

apps/hub/app/(auth)/oauth/_components/Authorize.tsx

@@ -1,13 +1,18 @@
 'use client';
-import { useSearchParams } from 'next/navigation';
+import { redirect, useSearchParams } from 'next/navigation';
 import { Service } from '../page';
 import { generateToken } from './action';
+import { useSession } from 'next-auth/react';
 
 export const Authorize = ({ service }: { service: Service }) => {
   const searchParams = useSearchParams();
   const legitimeUrl = service.approvedUrls.some((url) =>
     searchParams.get('redirect_uri')?.startsWith(url)
   );
+  const { data: session } = useSession();
+  console.log(session);
+  if (!session)
+    redirect('/login?redirect=' + encodeURIComponent(window.location.href));
   if (!legitimeUrl)
     return (
       <div className="card-body">
@@ -32,7 +37,7 @@ export const Authorize = ({ service }: { service: Service }) => {
           className="btn btn-primary"
           onClick={async () => {
             const code = await generateToken(service);
-            window.location.href = `${searchParams.get('redirect_uri')}?code=${code}`;
+            window.location.href = `${searchParams.get('redirect_uri')}?code=${code?.accessToken}`;
           }}
         >
           Zulassen