Compare commits

..

20 commits

Author SHA1 Message Date
295c36f6e6
fix: listen on 127.0.0.1
Some checks failed
container-scan / Container Scan (pull_request) Failing after 1m35s
tests / Tests (pull_request) Failing after 1m6s
docker-build / docker (pull_request) Failing after 6m19s
2025-05-13 23:58:54 +02:00
701f900c2d
fix(tests): start server for e2e tests 2025-05-13 23:58:53 +02:00
4fcb5ef968
chore(ci): improve docker cleanup 2025-05-13 23:58:52 +02:00
887e9dd812
chore(ci): run e2e tests in workflow 2025-05-13 23:58:51 +02:00
c8a5ad1b9c
chore(ci): docker cleanup 2025-05-13 23:58:50 +02:00
69ea057f05
test(e2e): test login page 2025-05-13 23:58:49 +02:00
af28f8e7f1
chore: add testing workflow 2025-05-13 23:56:51 +02:00
b41ca153da
test: theme-picker 2025-05-13 23:56:50 +02:00
0056138a01
test: icon-button 2025-05-13 23:56:49 +02:00
8d50447cf1
test: helper functions 2025-05-13 23:56:48 +02:00
9c87a93176
test: initialize cypress e2e testing library 2025-05-13 23:56:47 +02:00
8fd93fa7bc Merge pull request 'refactor: auth flow, middleware and login page' (#55)
All checks were successful
container-scan / Container Scan (push) Successful in 2m3s
docker-build / docker (push) Successful in 3m41s
Reviewed-on: #55
Reviewed-by: Maximilian Liebmann <lima@noreply.git.dominikstahl.dev>
2025-05-13 18:34:58 +00:00
aca229b3d3 refactor: removes unused sso logout button 2025-05-13 18:34:58 +00:00
4f974a0b70 docs: test user for development 2025-05-13 18:34:58 +00:00
b68a561886 feat: add logout page 2025-05-13 18:34:58 +00:00
20eb6ae04a refactor: dynamically generated login page 2025-05-13 18:34:58 +00:00
ddcb14e564 refactor: move auth check into pages 2025-05-13 18:34:58 +00:00
dd6b82515e chore(deps): update dependency @types/react-dom to v19.1.5
All checks were successful
container-scan / Container Scan (push) Successful in 1m51s
docker-build / docker (push) Successful in 1m54s
2025-05-13 11:00:46 +00:00
f79b7b78f9 Merge pull request 'chore(deps): update dependency @types/react to v19.1.4' (#57)
All checks were successful
container-scan / Container Scan (push) Successful in 1m21s
docker-build / docker (push) Successful in 1m4s
Reviewed-on: #57
Reviewed-by: Dominik <mail@dominikstahl.dev>
2025-05-12 21:10:15 +00:00
fc828b2ac5 chore(deps): update dependency @types/react to v19.1.4
All checks were successful
container-scan / Container Scan (pull_request) Successful in 2m26s
docker-build / docker (pull_request) Successful in 3m5s
docker-build / docker (push) Successful in 4m20s
2025-05-12 20:00:50 +00:00
13 changed files with 143 additions and 69 deletions

View file

@ -7,5 +7,3 @@ AUTH_AUTHENTIK_SECRET=
AUTH_AUTHENTIK_ISSUER= AUTH_AUTHENTIK_ISSUER=
NEXT_PUBLIC_APP_URL= NEXT_PUBLIC_APP_URL=
MEETUP_SKIP_LOGIN=

View file

@ -94,10 +94,6 @@ This project is built with a modern tech stack:
# Base URL of your application # Base URL of your application
NEXT_PUBLIC_APP_URL="http://localhost:3000" NEXT_PUBLIC_APP_URL="http://localhost:3000"
# Development: Skip login flow (set to "true" to bypass authentication)
# Ensure this is NOT set to "true" in production.
MEETUP_SKIP_LOGIN="false"
``` ```
4. **Apply database migrations (Prisma):** 4. **Apply database migrations (Prisma):**
@ -111,11 +107,20 @@ This project is built with a modern tech stack:
- (Optional: If you need to generate Prisma Client without running migrations, use `npx prisma generate`) - (Optional: If you need to generate Prisma Client without running migrations, use `npx prisma generate`)
5. **Run the development server:** 5. **Run the development server:**
```bash ```bash
yarn dev yarn dev
``` ```
Open [http://localhost:3000](http://localhost:3000) in your browser to see the application. Open [http://localhost:3000](http://localhost:3000) in your browser to see the application.
The test user for the application is:
```bash
email: test@example.com
password: password
```
**Self-Hosting with Docker (Planned):** **Self-Hosting with Docker (Planned):**
- A Docker image and `docker-compose.yml` file will be provided in the future to allow for easy self-hosting of the MeetUP application. This setup will also include database services. Instructions will be updated here once available. - A Docker image and `docker-compose.yml` file will be provided in the future to allow for easy self-hosting of the MeetUP application. This setup will also include database services. Instructions will be updated here once available.

View file

@ -42,8 +42,8 @@
"@eslint/eslintrc": "3.3.1", "@eslint/eslintrc": "3.3.1",
"@tailwindcss/postcss": "4.1.6", "@tailwindcss/postcss": "4.1.6",
"@types/node": "22.15.17", "@types/node": "22.15.17",
"@types/react": "19.1.3", "@types/react": "19.1.4",
"@types/react-dom": "19.1.4", "@types/react-dom": "19.1.5",
"cypress": "14.3.3", "cypress": "14.3.3",
"dotenv-cli": "^8.0.0", "dotenv-cli": "^8.0.0",
"eslint": "9.26.0", "eslint": "9.26.0",

View file

@ -1,4 +1,3 @@
import { Logout } from '@/components/user/sso-logout-button';
import { RedirectButton } from '@/components/user/redirect-button'; import { RedirectButton } from '@/components/user/redirect-button';
import { ThemePicker } from '@/components/user/theme-picker'; import { ThemePicker } from '@/components/user/theme-picker';
@ -8,7 +7,7 @@ export default function Home() {
<div className='absolute top-4 right-4'>{<ThemePicker />}</div> <div className='absolute top-4 right-4'>{<ThemePicker />}</div>
<div> <div>
<h1>Home</h1> <h1>Home</h1>
<Logout /> <RedirectButton redirectUrl='/logout' buttonText='Logout' />
<RedirectButton redirectUrl='/settings' buttonText='Settings' /> <RedirectButton redirectUrl='/settings' buttonText='Settings' />
</div> </div>
</div> </div>

View file

@ -1,4 +1,4 @@
import { auth } from '@/auth'; import { auth, providerMap } from '@/auth';
import SSOLogin from '@/components/user/sso-login-button'; import SSOLogin from '@/components/user/sso-login-button';
import LoginForm from '@/components/user/login-form'; import LoginForm from '@/components/user/login-form';
import { redirect } from 'next/navigation'; import { redirect } from 'next/navigation';
@ -37,15 +37,16 @@ export default async function LoginPage() {
<CardContent className='gap-6 flex flex-col'> <CardContent className='gap-6 flex flex-col'>
<LoginForm /> <LoginForm />
<hr /> {providerMap.length > 0 && <hr />}
{process.env.AUTH_AUTHENTIK_ISSUER && ( {providerMap.map((provider) => (
<SSOLogin <SSOLogin
provider='authentik' key={provider.id}
providerDisplayName='SSO' provider={provider.id}
data-cy='sso-login-button_authentik' providerDisplayName={provider.name}
data-cy={'sso-login-button_' + provider.name.toLowerCase()}
/> />
)} ))}
</CardContent> </CardContent>
</Card> </Card>
</div> </div>

40
src/app/logout/page.tsx Normal file
View file

@ -0,0 +1,40 @@
import { signOut } from '@/auth';
import { Button } from '@/components/ui/button';
import {
Card,
CardContent,
CardDescription,
CardHeader,
CardTitle,
} from '@/components/ui/card';
export default function SignOutPage() {
return (
<div className='flex flex-col items-center justify-center h-screen'>
<form
action={async () => {
'use server';
await signOut({ redirectTo: '/login' });
}}
>
<Card className='w-[350px] max-w-screen'>
<CardHeader>
<CardTitle className='text-lg text-center'>Logout</CardTitle>
<CardDescription className='text-center'>
Are you sure you want to log out?
</CardDescription>
</CardHeader>
<CardContent className='gap-6 flex flex-col'>
<Button
className='hover:bg-blue-600 hover:text-white'
type='submit'
variant='secondary'
>
Logout
</Button>
</CardContent>
</Card>
</form>
</div>
);
}

View file

@ -1,3 +1,9 @@
export default function Home() { import { auth } from '@/auth';
return <div></div>; import { redirect } from 'next/navigation';
export default async function Home() {
const session = await auth();
if (!session?.user) redirect('/login');
else redirect('/home');
} }

View file

@ -1,13 +1,49 @@
import NextAuth from 'next-auth'; import NextAuth from 'next-auth';
import type { Provider } from 'next-auth/providers';
import Credentials from 'next-auth/providers/credentials';
import Authentik from 'next-auth/providers/authentik'; import Authentik from 'next-auth/providers/authentik';
const providers: Provider[] = [
!process.env.DISABLE_PASSWORD_LOGIN &&
Credentials({
credentials: { password: { label: 'Password', type: 'password' } },
authorize(c) {
if (c.password !== 'password') return null;
return {
id: 'test',
name: 'Test User',
email: 'test@example.com',
};
},
}),
process.env.AUTH_AUTHENTIK_ID && Authentik,
].filter(Boolean) as Provider[];
export const providerMap = providers
.map((provider) => {
if (typeof provider === 'function') {
const providerData = provider();
return { id: providerData.id, name: providerData.name };
} else {
return { id: provider.id, name: provider.name };
}
})
.filter((provider) => provider.id !== 'credentials');
export const { handlers, signIn, signOut, auth } = NextAuth({ export const { handlers, signIn, signOut, auth } = NextAuth({
providers: [process.env.AUTH_AUTHENTIK_ISSUER ? Authentik : null].filter( providers,
(x) => x !== null, session: {
), strategy: 'jwt',
},
pages: {
signIn: '/login',
signOut: '/logout',
},
callbacks: { callbacks: {
authorized: async ({ auth }) => { authorized({ auth }) {
return !!auth; return !!auth?.user;
}, },
}, },
}); });

View file

@ -17,7 +17,7 @@ export default function LabeledInput({
return ( return (
<div className='flex flex-col gap-1'> <div className='flex flex-col gap-1'>
<Label htmlFor={elementId}>{label}</Label> <Label htmlFor={name}>{label}</Label>
<Input <Input
type={type} type={type}

View file

@ -1,19 +1,40 @@
import { signIn } from '@/auth';
import LabeledInput from '@/components/labeled-input'; import LabeledInput from '@/components/labeled-input';
import { Button } from '@/components/ui/button'; import { Button } from '@/components/ui/button';
import { AuthError } from 'next-auth';
import { redirect } from 'next/navigation';
const SIGNIN_ERROR_URL = '/error';
export default function LoginForm() { export default function LoginForm() {
return ( return (
<form className='flex flex-col gap-5 w-full' data-cy='login-form'> <form
className='flex flex-col gap-5 w-full'
data-cy='login-form'
action={async (formData) => {
'use server';
try {
await signIn('credentials', formData);
} catch (error) {
if (error instanceof AuthError) {
return redirect(`${SIGNIN_ERROR_URL}?error=${error.type}`);
}
throw error;
}
}}
>
<LabeledInput <LabeledInput
type='email' type='email'
label='E-Mail' label='E-Mail'
placeholder='Enter your E-Mail' placeholder='Enter your E-Mail'
name='email'
data-cy='email-input' data-cy='email-input'
/> />
<LabeledInput <LabeledInput
type='password' type='password'
label='Password' label='Password'
placeholder='Enter your Password' placeholder='Enter your Password'
name='password'
data-cy='password-input' data-cy='password-input'
/> />
<Button <Button

View file

@ -1,18 +0,0 @@
import { signOut } from '@/auth';
import { IconButton } from '@/components/icon-button';
import { faDoorOpen } from '@fortawesome/free-solid-svg-icons';
export function Logout() {
return (
<form
action={async () => {
'use server';
await signOut({ redirectTo: '/login' });
}}
>
<IconButton type='submit' variant='destructive' icon={faDoorOpen}>
Sign Out
</IconButton>
</form>
);
}

View file

@ -1,18 +1,4 @@
import { auth } from '@/auth'; export { auth as middleware } from '@/auth';
export default auth((req) => {
if (
!req.auth &&
req.nextUrl.pathname !== '/login' &&
process.env.MEETUP_SKIP_LOGIN !== 'true'
) {
const newUrl = new URL('/login', req.nextUrl.origin);
return Response.redirect(newUrl);
} else if (req.auth != null && req.nextUrl.pathname === '/') {
const newUrl = new URL('/home', req.nextUrl.origin);
return Response.redirect(newUrl);
}
});
export const config = { export const config = {
matcher: ['/((?!api|_next/static|_next/image|favicon.ico).*)'], matcher: ['/((?!api|_next/static|_next/image|favicon.ico).*)'],

View file

@ -1890,21 +1890,21 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/react-dom@npm:19.1.4": "@types/react-dom@npm:19.1.5":
version: 19.1.4 version: 19.1.5
resolution: "@types/react-dom@npm:19.1.4" resolution: "@types/react-dom@npm:19.1.5"
peerDependencies: peerDependencies:
"@types/react": ^19.0.0 "@types/react": ^19.0.0
checksum: 10c0/6ae65e7dce761c06b6cdc38221eb320ecb17b1a346f6055053d549fa07c0ddfdb8274e051e7940b5769f2591c982001ebd5d8dc3e0738418d262021ef15c09fd checksum: 10c0/2a29e77cf6bb6e9f57bcfa54509c216cad2e16e244f0bd56369966ec88c072b9c91f6011d14f9e18fbfe2b801b18b86f616de75e5c8aef0be73c1f74abb33b49
languageName: node languageName: node
linkType: hard linkType: hard
"@types/react@npm:19.1.3": "@types/react@npm:19.1.4":
version: 19.1.3 version: 19.1.4
resolution: "@types/react@npm:19.1.3" resolution: "@types/react@npm:19.1.4"
dependencies: dependencies:
csstype: "npm:^3.0.2" csstype: "npm:^3.0.2"
checksum: 10c0/f158f88871b8df1eeed637942d3e6142abcf505b617e4921ef3763b6d4f22241b9a883d864878dd2b6a2bdc8f4e7f871f24ef88f633d144a63257f4764b9478d checksum: 10c0/501350d4f9cef13c5dd1b1496fa70ebaff52f6fa359b623b51c9d817e5bc4333fa3c8b7a6a4cbc88c643385052d66a243c3ceccfd6926062f917a2dd0535f6b3
languageName: node languageName: node
linkType: hard linkType: hard
@ -5395,8 +5395,8 @@ __metadata:
"@radix-ui/react-tabs": "npm:^1.1.11" "@radix-ui/react-tabs": "npm:^1.1.11"
"@tailwindcss/postcss": "npm:4.1.6" "@tailwindcss/postcss": "npm:4.1.6"
"@types/node": "npm:22.15.17" "@types/node": "npm:22.15.17"
"@types/react": "npm:19.1.3" "@types/react": "npm:19.1.4"
"@types/react-dom": "npm:19.1.4" "@types/react-dom": "npm:19.1.5"
class-variance-authority: "npm:^0.7.1" class-variance-authority: "npm:^0.7.1"
clsx: "npm:^2.1.1" clsx: "npm:^2.1.1"
cypress: "npm:14.3.3" cypress: "npm:14.3.3"