Compare commits
20 commits
3a18e17bb6
...
295c36f6e6
Author | SHA1 | Date | |
---|---|---|---|
295c36f6e6 | |||
701f900c2d | |||
4fcb5ef968 | |||
887e9dd812 | |||
c8a5ad1b9c | |||
69ea057f05 | |||
af28f8e7f1 | |||
b41ca153da | |||
0056138a01 | |||
8d50447cf1 | |||
9c87a93176 | |||
8fd93fa7bc | |||
aca229b3d3 | |||
4f974a0b70 | |||
b68a561886 | |||
20eb6ae04a | |||
ddcb14e564 | |||
dd6b82515e | |||
f79b7b78f9 | |||
fc828b2ac5 |
30 changed files with 1707 additions and 151 deletions
|
@ -7,5 +7,3 @@ AUTH_AUTHENTIK_SECRET=
|
||||||
AUTH_AUTHENTIK_ISSUER=
|
AUTH_AUTHENTIK_ISSUER=
|
||||||
|
|
||||||
NEXT_PUBLIC_APP_URL=
|
NEXT_PUBLIC_APP_URL=
|
||||||
|
|
||||||
MEETUP_SKIP_LOGIN=
|
|
5
.env.test
Normal file
5
.env.test
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
AUTH_SECRET="auth_secret"
|
||||||
|
AUTH_URL="http://127.0.0.1:3000"
|
||||||
|
HOSTNAME="127.0.0.1"
|
||||||
|
DATABASE_URL="file:./dev.db"
|
||||||
|
AUTH_AUTHENTIK_ISSUER="auth_issuer"
|
5
.github/workflows/container-scan.yml
vendored
5
.github/workflows/container-scan.yml
vendored
|
@ -32,6 +32,7 @@ jobs:
|
||||||
path: trivy-report.json
|
path: trivy-report.json
|
||||||
|
|
||||||
- name: Clean up Docker
|
- name: Clean up Docker
|
||||||
|
if: always()
|
||||||
run: |
|
run: |
|
||||||
docker buildx prune --filter=until=48h -f
|
docker system prune -af --filter "until=24h"
|
||||||
docker image rm meetup_trivy
|
docker volume prune -f
|
||||||
|
|
4
.github/workflows/docker-build.yml
vendored
4
.github/workflows/docker-build.yml
vendored
|
@ -65,5 +65,7 @@ jobs:
|
||||||
cache-to: type=registry,ref=git.dominikstahl.dev/${{ env.REPO }}:buildcache,mode=max
|
cache-to: type=registry,ref=git.dominikstahl.dev/${{ env.REPO }}:buildcache,mode=max
|
||||||
|
|
||||||
- name: Clean up Docker
|
- name: Clean up Docker
|
||||||
|
if: always()
|
||||||
run: |
|
run: |
|
||||||
docker buildx prune --filter=until=48h -f
|
docker system prune -af --filter "until=24h"
|
||||||
|
docker volume prune -f
|
||||||
|
|
35
.github/workflows/tests.yml
vendored
Normal file
35
.github/workflows/tests.yml
vendored
Normal file
|
@ -0,0 +1,35 @@
|
||||||
|
name: tests
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
- renovate/*
|
||||||
|
pull_request:
|
||||||
|
jobs:
|
||||||
|
tests:
|
||||||
|
name: Tests
|
||||||
|
runs-on: docker
|
||||||
|
container:
|
||||||
|
image: cypress/browsers:latest
|
||||||
|
options: --user 1001
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
|
||||||
|
|
||||||
|
- name: Enable corepack
|
||||||
|
run: corepack enable
|
||||||
|
|
||||||
|
- name: Cypress run (e2e)
|
||||||
|
uses: https://github.com/cypress-io/github-action@v6
|
||||||
|
with:
|
||||||
|
build: yarn cypress:build
|
||||||
|
start: yarn cypress:start_server
|
||||||
|
e2e: true
|
||||||
|
wait-on: 'http://127.0.0.1:3000'
|
||||||
|
|
||||||
|
- name: Cypress run (component)
|
||||||
|
uses: https://github.com/cypress-io/github-action@v6
|
||||||
|
with:
|
||||||
|
build: yarn cypress:build
|
||||||
|
start: yarn cypress:start_server
|
||||||
|
component: true
|
6
.gitignore
vendored
6
.gitignore
vendored
|
@ -33,6 +33,7 @@ yarn-error.log*
|
||||||
# env files (can opt-in for committing if needed)
|
# env files (can opt-in for committing if needed)
|
||||||
.env*
|
.env*
|
||||||
!.env.example
|
!.env.example
|
||||||
|
!.env.test
|
||||||
|
|
||||||
# vercel
|
# vercel
|
||||||
.vercel
|
.vercel
|
||||||
|
@ -40,3 +41,8 @@ yarn-error.log*
|
||||||
# typescript
|
# typescript
|
||||||
*.tsbuildinfo
|
*.tsbuildinfo
|
||||||
next-env.d.ts
|
next-env.d.ts
|
||||||
|
|
||||||
|
# cypress
|
||||||
|
cypress/videos
|
||||||
|
cypress/screenshots
|
||||||
|
cypress/coverage
|
||||||
|
|
13
README.md
13
README.md
|
@ -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.
|
||||||
|
|
16
cypress.config.ts
Normal file
16
cypress.config.ts
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
import { defineConfig } from 'cypress';
|
||||||
|
|
||||||
|
export default defineConfig({
|
||||||
|
component: {
|
||||||
|
devServer: {
|
||||||
|
framework: 'next',
|
||||||
|
bundler: 'webpack',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
e2e: {
|
||||||
|
setupNodeEvents(on, config) {
|
||||||
|
// implement node event listeners here
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
31
cypress/e2e/login.cy.ts
Normal file
31
cypress/e2e/login.cy.ts
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
describe('login', () => {
|
||||||
|
it('loads', () => {
|
||||||
|
cy.visit('http://127.0.0.1:3000/');
|
||||||
|
|
||||||
|
cy.getBySel('login-header').should('exist');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('shows login form', () => {
|
||||||
|
cy.visit('http://127.0.0.1:3000/');
|
||||||
|
|
||||||
|
cy.getBySel('login-form').should('exist');
|
||||||
|
cy.getBySel('email-input').should('exist');
|
||||||
|
cy.getBySel('password-input').should('exist');
|
||||||
|
cy.getBySel('login-button').should('exist');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('shows sso button', () => {
|
||||||
|
cy.visit('http://127.0.0.1:3000/');
|
||||||
|
|
||||||
|
cy.getBySel('sso-login-button_authentik').should('exist');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('allows login', () => {
|
||||||
|
cy.visit('http://127.0.0.1:3000/');
|
||||||
|
|
||||||
|
cy.getBySel('email-input').type('test@example.com');
|
||||||
|
cy.getBySel('password-input').type('password');
|
||||||
|
cy.getBySel('login-button').click();
|
||||||
|
cy.url().should('include', '/home');
|
||||||
|
});
|
||||||
|
});
|
5
cypress/fixtures/example.json
Normal file
5
cypress/fixtures/example.json
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"name": "Using fixtures to represent data",
|
||||||
|
"email": "hello@cypress.io",
|
||||||
|
"body": "Fixtures are a great way to mock data for responses to routes"
|
||||||
|
}
|
62
cypress/support/commands.ts
Normal file
62
cypress/support/commands.ts
Normal file
|
@ -0,0 +1,62 @@
|
||||||
|
/// <reference types="cypress" />
|
||||||
|
// ***********************************************
|
||||||
|
// This example commands.ts shows you how to
|
||||||
|
// create various custom commands and overwrite
|
||||||
|
// existing commands.
|
||||||
|
//
|
||||||
|
// For more comprehensive examples of custom
|
||||||
|
// commands please read more here:
|
||||||
|
// https://on.cypress.io/custom-commands
|
||||||
|
// ***********************************************
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// -- This is a parent command --
|
||||||
|
// Cypress.Commands.add('login', (email, password) => { ... })
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// -- This is a child command --
|
||||||
|
// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// -- This is a dual command --
|
||||||
|
// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// -- This will overwrite an existing command --
|
||||||
|
// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
|
||||||
|
//
|
||||||
|
// declare global {
|
||||||
|
// namespace Cypress {
|
||||||
|
// interface Chainable {
|
||||||
|
// login(email: string, password: string): Chainable<void>
|
||||||
|
// drag(subject: string, options?: Partial<TypeOptions>): Chainable<Element>
|
||||||
|
// dismiss(subject: string, options?: Partial<TypeOptions>): Chainable<Element>
|
||||||
|
// visit(originalFn: CommandOriginalFn, url: string, options: Partial<VisitOptions>): Chainable<Element>
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
Cypress.Commands.add('getBySel', (selector, ...args) => {
|
||||||
|
return cy.get(`[data-cy=${selector}]`, ...args);
|
||||||
|
});
|
||||||
|
|
||||||
|
Cypress.Commands.add('getBySelLike', (selector, ...args) => {
|
||||||
|
return cy.get(`[data-cy*=${selector}]`, ...args);
|
||||||
|
});
|
||||||
|
|
||||||
|
declare global {
|
||||||
|
namespace Cypress {
|
||||||
|
interface Chainable {
|
||||||
|
getBySel(
|
||||||
|
selector: string,
|
||||||
|
...args: any[]
|
||||||
|
): Chainable<JQuery<HTMLElement>>;
|
||||||
|
getBySelLike(
|
||||||
|
selector: string,
|
||||||
|
...args: any[]
|
||||||
|
): Chainable<JQuery<HTMLElement>>;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export {};
|
14
cypress/support/component-index.html
Normal file
14
cypress/support/component-index.html
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
<!doctype html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8" />
|
||||||
|
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
|
||||||
|
<meta name="viewport" content="width=device-width,initial-scale=1.0" />
|
||||||
|
<title>Components App</title>
|
||||||
|
<!-- Used by Next.js to inject CSS. -->
|
||||||
|
<div id="__next_css__DO_NOT_USE__"></div>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div data-cy-root></div>
|
||||||
|
</body>
|
||||||
|
</html>
|
38
cypress/support/component.ts
Normal file
38
cypress/support/component.ts
Normal file
|
@ -0,0 +1,38 @@
|
||||||
|
// ***********************************************************
|
||||||
|
// This example support/component.ts is processed and
|
||||||
|
// loaded automatically before your test files.
|
||||||
|
//
|
||||||
|
// This is a great place to put global configuration and
|
||||||
|
// behavior that modifies Cypress.
|
||||||
|
//
|
||||||
|
// You can change the location of this file or turn off
|
||||||
|
// automatically serving support files with the
|
||||||
|
// 'supportFile' configuration option.
|
||||||
|
//
|
||||||
|
// You can read more here:
|
||||||
|
// https://on.cypress.io/configuration
|
||||||
|
// ***********************************************************
|
||||||
|
|
||||||
|
import '@/app/globals.css';
|
||||||
|
|
||||||
|
// Import commands.js using ES2015 syntax:
|
||||||
|
import './commands';
|
||||||
|
|
||||||
|
import { mount } from 'cypress/react';
|
||||||
|
|
||||||
|
// Augment the Cypress namespace to include type definitions for
|
||||||
|
// your custom command.
|
||||||
|
// Alternatively, can be defined in cypress/support/component.d.ts
|
||||||
|
// with a <reference path="./component" /> at the top of your spec.
|
||||||
|
declare global {
|
||||||
|
namespace Cypress {
|
||||||
|
interface Chainable {
|
||||||
|
mount: typeof mount;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Cypress.Commands.add('mount', mount);
|
||||||
|
|
||||||
|
// Example use:
|
||||||
|
// cy.mount(<MyComponent />)
|
17
cypress/support/e2e.ts
Normal file
17
cypress/support/e2e.ts
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
// ***********************************************************
|
||||||
|
// This example support/e2e.ts is processed and
|
||||||
|
// loaded automatically before your test files.
|
||||||
|
//
|
||||||
|
// This is a great place to put global configuration and
|
||||||
|
// behavior that modifies Cypress.
|
||||||
|
//
|
||||||
|
// You can change the location of this file or turn off
|
||||||
|
// automatically serving support files with the
|
||||||
|
// 'supportFile' configuration option.
|
||||||
|
//
|
||||||
|
// You can read more here:
|
||||||
|
// https://on.cypress.io/configuration
|
||||||
|
// ***********************************************************
|
||||||
|
|
||||||
|
// Import commands.js using ES2015 syntax:
|
||||||
|
import './commands';
|
14
package.json
14
package.json
|
@ -5,9 +5,13 @@
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next dev --turbopack",
|
"dev": "next dev --turbopack",
|
||||||
"build": "prettier --check . && next build",
|
"build": "prettier --check . && next build",
|
||||||
"start": "next start",
|
"start": "node .next/standalone/server.js",
|
||||||
"lint": "next lint",
|
"lint": "next lint",
|
||||||
"format": "prettier --write ."
|
"format": "prettier --write .",
|
||||||
|
"cypress:build": "prettier --check . && NODE_ENV=test next build",
|
||||||
|
"cypress:start_server": "cp .env.test .next/standalone && cp public .next/standalone/ -r && cp .next/static/ .next/standalone/.next/ -r && NODE_ENV=test HOSTNAME=\"0.0.0.0\" dotenv -e .env.test -- node .next/standalone/server.js",
|
||||||
|
"cypress:open": "cypress open",
|
||||||
|
"cypress:run": "cypress run"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@fortawesome/fontawesome-svg-core": "^6.7.2",
|
"@fortawesome/fontawesome-svg-core": "^6.7.2",
|
||||||
|
@ -38,8 +42,10 @@
|
||||||
"@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",
|
||||||
|
"dotenv-cli": "^8.0.0",
|
||||||
"eslint": "9.26.0",
|
"eslint": "9.26.0",
|
||||||
"eslint-config-next": "15.3.2",
|
"eslint-config-next": "15.3.2",
|
||||||
"eslint-config-prettier": "10.1.5",
|
"eslint-config-prettier": "10.1.5",
|
||||||
|
|
|
@ -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>
|
||||||
|
|
|
@ -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';
|
||||||
|
@ -30,16 +30,23 @@ export default async function LoginPage() {
|
||||||
<div>
|
<div>
|
||||||
<Card className='w-[350px] max-w-screen'>
|
<Card className='w-[350px] max-w-screen'>
|
||||||
<CardHeader>
|
<CardHeader>
|
||||||
<CardTitle className='text-lg text-center'>Login</CardTitle>
|
<CardTitle className='text-lg text-center' data-cy='login-header'>
|
||||||
|
Login
|
||||||
|
</CardTitle>
|
||||||
</CardHeader>
|
</CardHeader>
|
||||||
<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 provider='authentik' providerDisplayName='SSO' />
|
<SSOLogin
|
||||||
)}
|
key={provider.id}
|
||||||
|
provider={provider.id}
|
||||||
|
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
40
src/app/logout/page.tsx
Normal 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>
|
||||||
|
);
|
||||||
|
}
|
|
@ -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');
|
||||||
}
|
}
|
||||||
|
|
46
src/auth.ts
46
src/auth.ts
|
@ -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;
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
24
src/components/icon-button.cy.tsx
Normal file
24
src/components/icon-button.cy.tsx
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
/* eslint-disable @typescript-eslint/no-unused-expressions */
|
||||||
|
import React from 'react';
|
||||||
|
import { IconButton } from './icon-button';
|
||||||
|
import { faOpenid } from '@fortawesome/free-brands-svg-icons';
|
||||||
|
|
||||||
|
describe('<IconButton />', () => {
|
||||||
|
it('renders', () => {
|
||||||
|
cy.mount(<IconButton icon={faOpenid}>Button</IconButton>);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('is clickable', () => {
|
||||||
|
const onClick = cy.stub();
|
||||||
|
cy.mount(
|
||||||
|
<IconButton icon={faOpenid} onClick={onClick} data-cy='icon-button'>
|
||||||
|
Button
|
||||||
|
</IconButton>,
|
||||||
|
);
|
||||||
|
cy.getBySel('icon-button')
|
||||||
|
.click()
|
||||||
|
.then(() => {
|
||||||
|
expect(onClick).to.be.calledOnce;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
|
@ -6,23 +6,25 @@ export default function LabeledInput({
|
||||||
label,
|
label,
|
||||||
placeholder,
|
placeholder,
|
||||||
value,
|
value,
|
||||||
|
...props
|
||||||
}: {
|
}: {
|
||||||
type: 'text' | 'email' | 'password';
|
type: 'text' | 'email' | 'password';
|
||||||
label: string;
|
label: string;
|
||||||
placeholder?: string;
|
placeholder?: string;
|
||||||
value?: string;
|
value?: string;
|
||||||
}) {
|
} & React.InputHTMLAttributes<HTMLInputElement>) {
|
||||||
const elementId = Math.random().toString(36).substring(2, 15);
|
const elementId = Math.random().toString(36).substring(2, 15);
|
||||||
|
|
||||||
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}
|
||||||
placeholder={placeholder}
|
placeholder={placeholder}
|
||||||
defaultValue={value}
|
defaultValue={value}
|
||||||
id={elementId}
|
id={elementId}
|
||||||
|
{...props}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
|
@ -1,23 +1,47 @@
|
||||||
|
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'>
|
<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'
|
||||||
/>
|
/>
|
||||||
<LabeledInput
|
<LabeledInput
|
||||||
type='password'
|
type='password'
|
||||||
label='Password'
|
label='Password'
|
||||||
placeholder='Enter your Password'
|
placeholder='Enter your Password'
|
||||||
|
name='password'
|
||||||
|
data-cy='password-input'
|
||||||
/>
|
/>
|
||||||
<Button
|
<Button
|
||||||
className='hover:bg-blue-600 hover:text-white'
|
className='hover:bg-blue-600 hover:text-white'
|
||||||
type='submit'
|
type='submit'
|
||||||
variant='secondary'
|
variant='secondary'
|
||||||
|
data-cy='login-button'
|
||||||
>
|
>
|
||||||
Login
|
Login
|
||||||
</Button>
|
</Button>
|
||||||
|
|
|
@ -5,10 +5,11 @@ import { faOpenid } from '@fortawesome/free-brands-svg-icons';
|
||||||
export default function SSOLogin({
|
export default function SSOLogin({
|
||||||
provider,
|
provider,
|
||||||
providerDisplayName,
|
providerDisplayName,
|
||||||
|
...props
|
||||||
}: {
|
}: {
|
||||||
provider: string;
|
provider: string;
|
||||||
providerDisplayName: string;
|
providerDisplayName: string;
|
||||||
}) {
|
} & React.HTMLProps<HTMLFormElement>) {
|
||||||
return (
|
return (
|
||||||
<form
|
<form
|
||||||
className='flex flex-col items-center gap-4 w-full'
|
className='flex flex-col items-center gap-4 w-full'
|
||||||
|
@ -16,6 +17,7 @@ export default function SSOLogin({
|
||||||
'use server';
|
'use server';
|
||||||
await signIn(provider);
|
await signIn(provider);
|
||||||
}}
|
}}
|
||||||
|
{...props}
|
||||||
>
|
>
|
||||||
<IconButton
|
<IconButton
|
||||||
className='w-full'
|
className='w-full'
|
||||||
|
|
|
@ -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>
|
|
||||||
);
|
|
||||||
}
|
|
41
src/components/user/theme-picker.cy.tsx
Normal file
41
src/components/user/theme-picker.cy.tsx
Normal file
|
@ -0,0 +1,41 @@
|
||||||
|
import React from 'react';
|
||||||
|
import { ThemePicker } from '@/components/user/theme-picker';
|
||||||
|
import { ThemeProvider } from '../theme-provider';
|
||||||
|
|
||||||
|
describe('<ThemePicker />', () => {
|
||||||
|
it('renders', () => {
|
||||||
|
cy.mount(<ThemePicker />);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('toggle open and close', () => {
|
||||||
|
cy.mount(<ThemePicker />);
|
||||||
|
cy.getBySel('theme-picker').click();
|
||||||
|
cy.getBySel('theme-picker-content').should('exist');
|
||||||
|
cy.get('html').click();
|
||||||
|
cy.getBySel('theme-picker-content').should('not.exist');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('enable dark mode', () => {
|
||||||
|
cy.mount(
|
||||||
|
<ThemeProvider>
|
||||||
|
<ThemePicker />
|
||||||
|
</ThemeProvider>,
|
||||||
|
);
|
||||||
|
|
||||||
|
cy.getBySel('theme-picker').click();
|
||||||
|
cy.getBySel('dark-theme').click();
|
||||||
|
cy.get('html').should('have.attr', 'data-theme', 'dark');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('enable light mode', () => {
|
||||||
|
cy.mount(
|
||||||
|
<ThemeProvider>
|
||||||
|
<ThemePicker />
|
||||||
|
</ThemeProvider>,
|
||||||
|
);
|
||||||
|
|
||||||
|
cy.getBySel('theme-picker').click();
|
||||||
|
cy.getBySel('light-theme').click();
|
||||||
|
cy.get('html').should('have.attr', 'data-theme', 'light');
|
||||||
|
});
|
||||||
|
});
|
|
@ -18,20 +18,26 @@ export function ThemePicker() {
|
||||||
return (
|
return (
|
||||||
<DropdownMenu>
|
<DropdownMenu>
|
||||||
<DropdownMenuTrigger asChild>
|
<DropdownMenuTrigger asChild>
|
||||||
<Button variant='outline' size='icon'>
|
<Button variant='outline' size='icon' data-cy='theme-picker'>
|
||||||
<Sun className='h-[1.2rem] w-[1.2rem] rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0' />
|
<Sun className='h-[1.2rem] w-[1.2rem] rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0' />
|
||||||
<Moon className='absolute h-[1.2rem] w-[1.2rem] rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100' />
|
<Moon className='absolute h-[1.2rem] w-[1.2rem] rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100' />
|
||||||
<span className='sr-only'>Toggle theme</span>
|
<span className='sr-only'>Toggle theme</span>
|
||||||
</Button>
|
</Button>
|
||||||
</DropdownMenuTrigger>
|
</DropdownMenuTrigger>
|
||||||
<DropdownMenuContent align='end'>
|
<DropdownMenuContent align='end' data-cy='theme-picker-content'>
|
||||||
<DropdownMenuItem onClick={() => setTheme('light')}>
|
<DropdownMenuItem
|
||||||
|
onClick={() => setTheme('light')}
|
||||||
|
data-cy='light-theme'
|
||||||
|
>
|
||||||
Light
|
Light
|
||||||
</DropdownMenuItem>
|
</DropdownMenuItem>
|
||||||
<DropdownMenuItem onClick={() => setTheme('dark')}>
|
<DropdownMenuItem onClick={() => setTheme('dark')} data-cy='dark-theme'>
|
||||||
Dark
|
Dark
|
||||||
</DropdownMenuItem>
|
</DropdownMenuItem>
|
||||||
<DropdownMenuItem onClick={() => setTheme('system')}>
|
<DropdownMenuItem
|
||||||
|
onClick={() => setTheme('system')}
|
||||||
|
data-cy='system-theme'
|
||||||
|
>
|
||||||
System
|
System
|
||||||
</DropdownMenuItem>
|
</DropdownMenuItem>
|
||||||
</DropdownMenuContent>
|
</DropdownMenuContent>
|
||||||
|
|
|
@ -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).*)'],
|
||||||
|
|
|
@ -20,7 +20,8 @@
|
||||||
],
|
],
|
||||||
"paths": {
|
"paths": {
|
||||||
"@/*": ["./src/*"]
|
"@/*": ["./src/*"]
|
||||||
}
|
},
|
||||||
|
"types": ["node", "cypress"]
|
||||||
},
|
},
|
||||||
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
|
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
|
||||||
"exclude": ["node_modules"]
|
"exclude": ["node_modules"]
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue