+ {typeof form.formState.errors.email?.message === 'string'
+ ? form.formState.errors.email.message
+ : ''}
+
+
logging out...
);
diff --git a/apps/hub/app/(auth)/oauth/_components/Authorize.tsx b/apps/hub/app/(auth)/oauth/_components/Authorize.tsx
new file mode 100644
index 00000000..22b5085b
--- /dev/null
+++ b/apps/hub/app/(auth)/oauth/_components/Authorize.tsx
@@ -0,0 +1,43 @@
+'use client';
+import { useSearchParams } from 'next/navigation';
+import { Service } from '../page';
+import { generateToken } from './action';
+
+export const Authorize = ({ service }: { service: Service }) => {
+ const searchParams = useSearchParams();
+ const legitimeUrl = service.approvedUrls.some((url) =>
+ searchParams.get('redirect_uri')?.startsWith(url)
+ );
+ if (!legitimeUrl)
+ return (
+
+
Unerlaubter Zugriff
+
Du greifst von einem ncith genehmigtem Server auf diese URL zu
+
+ );
+
+ return (
+
+ );
+};
diff --git a/apps/hub/app/(auth)/oauth/_components/action.ts b/apps/hub/app/(auth)/oauth/_components/action.ts
new file mode 100644
index 00000000..52204e89
--- /dev/null
+++ b/apps/hub/app/(auth)/oauth/_components/action.ts
@@ -0,0 +1,24 @@
+'use server';
+import { getServerSession } from '../../../api/auth/[...nextauth]/auth';
+import { Service } from '../page';
+import { PrismaClient } from '@repo/db';
+
+const prisma = new PrismaClient();
+
+export const generateToken = async (service: Service) => {
+ const session = await getServerSession();
+ if (!session) return null;
+
+ const accessToken = Array.from({ length: 10 }, () =>
+ Math.floor(Math.random() * 10)
+ ).join('');
+
+ const code = await prisma.oAuthToken.create({
+ data: {
+ clientId: service.id,
+ userId: session.user.id,
+ accessToken: accessToken,
+ },
+ });
+ return code;
+};
diff --git a/apps/hub/app/(auth)/oauth/page.tsx b/apps/hub/app/(auth)/oauth/page.tsx
new file mode 100644
index 00000000..f14951cb
--- /dev/null
+++ b/apps/hub/app/(auth)/oauth/page.tsx
@@ -0,0 +1,26 @@
+import { Authorize } from './_components/Authorize';
+
+export const services = [
+ {
+ id: '123456',
+ service: 'dispatch',
+ name: 'Leitstellendisposition',
+ approvedUrls: ['http://localhost:3001'],
+ },
+];
+export type Service = (typeof services)[number];
+
+export default async ({
+ searchParams,
+}: {
+ searchParams: Promise<{ [key: string]: string | string[] | undefined }>;
+}) => {
+ const { service: serviceId } = await searchParams;
+ const service = services.find((service) => service.id === serviceId);
+
+ if (!service) {
+ return
Service not found
;
+ }
+
+ return
;
+};
diff --git a/apps/hub/app/(auth)/register/_components/Register.tsx b/apps/hub/app/(auth)/register/_components/Register.tsx
index e32b815a..79eb42bc 100644
--- a/apps/hub/app/(auth)/register/_components/Register.tsx
+++ b/apps/hub/app/(auth)/register/_components/Register.tsx
@@ -17,8 +17,8 @@ export const Register = () => {
}),
firstname: z.string().min(2).max(30),
lastname: z.string().min(2).max(30),
- password: z.string().min(6),
- passwordConfirm: z.string().min(6),
+ password: z.string(),
+ passwordConfirm: z.string(),
})
.superRefine(({ password, passwordConfirm }, ctx) => {
if (password !== passwordConfirm) {
diff --git a/apps/hub/app/(auth)/register/page.tsx b/apps/hub/app/(auth)/register/page.tsx
index fc233e56..7fbb5823 100644
--- a/apps/hub/app/(auth)/register/page.tsx
+++ b/apps/hub/app/(auth)/register/page.tsx
@@ -3,22 +3,7 @@ import { Register } from './_components/Register';
export default () => {
return (
<>
-
+
);
};
diff --git a/apps/hub/app/api/auth/[...nextauth]/auth.ts b/apps/hub/app/api/auth/[...nextauth]/auth.ts
index 8d5c2de4..adf76e45 100644
--- a/apps/hub/app/api/auth/[...nextauth]/auth.ts
+++ b/apps/hub/app/api/auth/[...nextauth]/auth.ts
@@ -1,4 +1,7 @@
-import { AuthOptions } from 'next-auth';
+import {
+ AuthOptions,
+ getServerSession as getNextAuthServerSession,
+} from 'next-auth';
import { PrismaAdapter } from '@next-auth/prisma-adapter';
import Credentials from 'next-auth/providers/credentials';
import { PrismaClient } from '@prisma/client';
@@ -29,40 +32,28 @@ export const options: AuthOptions = {
},
}),
],
- secret: process.env.SECRET,
+ secret: process.env.NEXTAUTH_SECRET,
session: {
strategy: 'jwt',
maxAge: 30 * 24 * 60 * 60,
},
adapter: PrismaAdapter(prisma),
- events: {
- async signIn(message) {
- console.log('Signed in!', { message });
- },
- async signOut(message) {
- console.log('Signed out!', { message });
- },
- async createUser(message) {
- console.log('User created!', { message });
- },
- },
callbacks: {
jwt: async ({ token, user }) => {
- if (user) {
- token.uid = user;
+ if (user && 'firstname' in user) {
+ return {
+ ...token,
+ ...user,
+ };
}
-
return token;
},
- session: async ({ session, token }: any) => {
- // here we put session.useData and put inside it whatever you want to be in the session
- // here try to console.log(token) and see what it will have
- // sometimes the user get stored in token.uid.userData
- // sometimes the user data get stored in just token.uid
- session.userData = token.uid.userData;
-
- return session;
+ session: async ({ session, user, token }) => {
+ return {
+ ...session,
+ user: token,
+ };
},
},
pages: {
@@ -72,3 +63,5 @@ export const options: AuthOptions = {
newUser: '/register',
},
} satisfies AuthOptions;
+
+export const getServerSession = async () => getNextAuthServerSession(options);
diff --git a/apps/hub/app/layout.tsx b/apps/hub/app/layout.tsx
index 704e53eb..fb573531 100644
--- a/apps/hub/app/layout.tsx
+++ b/apps/hub/app/layout.tsx
@@ -3,6 +3,7 @@ import { Geist, Geist_Mono } from 'next/font/google';
import './globals.css';
import { getServerSession } from 'next-auth';
import { NextAuthSessionProvider } from './_components/AuthSessionProvider';
+import { options } from './api/auth/[...nextauth]/auth';
const geistSans = Geist({
variable: '--font-geist-sans',
@@ -24,8 +25,7 @@ export default async function RootLayout({
}: Readonly<{
children: React.ReactNode;
}>) {
- const session = await getServerSession();
-
+ const session = await getServerSession(options);
return (
diff --git a/apps/hub/app/page.tsx b/apps/hub/app/page.tsx
index 005f2119..5ebfaa09 100644
--- a/apps/hub/app/page.tsx
+++ b/apps/hub/app/page.tsx
@@ -1,11 +1,11 @@
'use client';
import { useSession } from 'next-auth/react';
+import Link from 'next/link';
import { useEffect } from 'react';
export default function Home() {
- const { data: session, status, update } = useSession();
- console.log(session, status);
+ const { data: session, update } = useSession();
useEffect(() => {
update();
}, []);
@@ -14,6 +14,9 @@ export default function Home() {
Hub
{!session && Not signed in
}
{session?.user?.firstname && Hi, {session?.user?.firstname}
}
+
+
+