Compare commits
2 Commits
3b8aad65df
...
3eba8eed73
| Author | SHA1 | Date | |
|---|---|---|---|
| 3eba8eed73 | |||
| fdbbcc8386 |
8
.gitignore
vendored
8
.gitignore
vendored
@ -31,3 +31,11 @@ build/
|
||||
|
||||
### VS Code ###
|
||||
.vscode/
|
||||
|
||||
docker-compose.yml
|
||||
|
||||
src/main/resources/application-env.properties
|
||||
|
||||
.env
|
||||
|
||||
data/
|
||||
41
ReactFormTest/form-test/.gitignore
vendored
Normal file
41
ReactFormTest/form-test/.gitignore
vendored
Normal file
@ -0,0 +1,41 @@
|
||||
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
|
||||
|
||||
# dependencies
|
||||
/node_modules
|
||||
/.pnp
|
||||
.pnp.*
|
||||
.yarn/*
|
||||
!.yarn/patches
|
||||
!.yarn/plugins
|
||||
!.yarn/releases
|
||||
!.yarn/versions
|
||||
|
||||
# testing
|
||||
/coverage
|
||||
|
||||
# next.js
|
||||
/.next/
|
||||
/out/
|
||||
|
||||
# production
|
||||
/build
|
||||
|
||||
# misc
|
||||
.DS_Store
|
||||
*.pem
|
||||
|
||||
# debug
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
.pnpm-debug.log*
|
||||
|
||||
# env files (can opt-in for committing if needed)
|
||||
.env*
|
||||
|
||||
# vercel
|
||||
.vercel
|
||||
|
||||
# typescript
|
||||
*.tsbuildinfo
|
||||
next-env.d.ts
|
||||
36
ReactFormTest/form-test/README.md
Normal file
36
ReactFormTest/form-test/README.md
Normal file
@ -0,0 +1,36 @@
|
||||
This is a [Next.js](https://nextjs.org) project bootstrapped with [`create-next-app`](https://nextjs.org/docs/app/api-reference/cli/create-next-app).
|
||||
|
||||
## Getting Started
|
||||
|
||||
First, run the development server:
|
||||
|
||||
```bash
|
||||
npm run dev
|
||||
# or
|
||||
yarn dev
|
||||
# or
|
||||
pnpm dev
|
||||
# or
|
||||
bun dev
|
||||
```
|
||||
|
||||
Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
|
||||
|
||||
You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.
|
||||
|
||||
This project uses [`next/font`](https://nextjs.org/docs/app/building-your-application/optimizing/fonts) to automatically optimize and load [Geist](https://vercel.com/font), a new font family for Vercel.
|
||||
|
||||
## Learn More
|
||||
|
||||
To learn more about Next.js, take a look at the following resources:
|
||||
|
||||
- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
|
||||
- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
|
||||
|
||||
You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js) - your feedback and contributions are welcome!
|
||||
|
||||
## Deploy on Vercel
|
||||
|
||||
The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.
|
||||
|
||||
Check out our [Next.js deployment documentation](https://nextjs.org/docs/app/building-your-application/deploying) for more details.
|
||||
16
ReactFormTest/form-test/eslint.config.mjs
Normal file
16
ReactFormTest/form-test/eslint.config.mjs
Normal file
@ -0,0 +1,16 @@
|
||||
import { dirname } from "path";
|
||||
import { fileURLToPath } from "url";
|
||||
import { FlatCompat } from "@eslint/eslintrc";
|
||||
|
||||
const __filename = fileURLToPath(import.meta.url);
|
||||
const __dirname = dirname(__filename);
|
||||
|
||||
const compat = new FlatCompat({
|
||||
baseDirectory: __dirname,
|
||||
});
|
||||
|
||||
const eslintConfig = [
|
||||
...compat.extends("next/core-web-vitals", "next/typescript"),
|
||||
];
|
||||
|
||||
export default eslintConfig;
|
||||
7
ReactFormTest/form-test/next.config.ts
Normal file
7
ReactFormTest/form-test/next.config.ts
Normal file
@ -0,0 +1,7 @@
|
||||
import type { NextConfig } from "next";
|
||||
|
||||
const nextConfig: NextConfig = {
|
||||
/* config options here */
|
||||
};
|
||||
|
||||
export default nextConfig;
|
||||
5894
ReactFormTest/form-test/package-lock.json
generated
Normal file
5894
ReactFormTest/form-test/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
27
ReactFormTest/form-test/package.json
Normal file
27
ReactFormTest/form-test/package.json
Normal file
@ -0,0 +1,27 @@
|
||||
{
|
||||
"name": "form-test",
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "next dev",
|
||||
"build": "next build",
|
||||
"start": "next start",
|
||||
"lint": "next lint"
|
||||
},
|
||||
"dependencies": {
|
||||
"react": "^19.0.0",
|
||||
"react-dom": "^19.0.0",
|
||||
"next": "15.1.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"typescript": "^5",
|
||||
"@types/node": "^20",
|
||||
"@types/react": "^19",
|
||||
"@types/react-dom": "^19",
|
||||
"postcss": "^8",
|
||||
"tailwindcss": "^3.4.1",
|
||||
"eslint": "^9",
|
||||
"eslint-config-next": "15.1.3",
|
||||
"@eslint/eslintrc": "^3"
|
||||
}
|
||||
}
|
||||
8
ReactFormTest/form-test/postcss.config.mjs
Normal file
8
ReactFormTest/form-test/postcss.config.mjs
Normal file
@ -0,0 +1,8 @@
|
||||
/** @type {import('postcss-load-config').Config} */
|
||||
const config = {
|
||||
plugins: {
|
||||
tailwindcss: {},
|
||||
},
|
||||
};
|
||||
|
||||
export default config;
|
||||
1
ReactFormTest/form-test/public/file.svg
Normal file
1
ReactFormTest/form-test/public/file.svg
Normal file
@ -0,0 +1 @@
|
||||
<svg fill="none" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="M14.5 13.5V5.41a1 1 0 0 0-.3-.7L9.8.29A1 1 0 0 0 9.08 0H1.5v13.5A2.5 2.5 0 0 0 4 16h8a2.5 2.5 0 0 0 2.5-2.5m-1.5 0v-7H8v-5H3v12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1M9.5 5V2.12L12.38 5zM5.13 5h-.62v1.25h2.12V5zm-.62 3h7.12v1.25H4.5zm.62 3h-.62v1.25h7.12V11z" clip-rule="evenodd" fill="#666" fill-rule="evenodd"/></svg>
|
||||
|
After Width: | Height: | Size: 391 B |
1
ReactFormTest/form-test/public/globe.svg
Normal file
1
ReactFormTest/form-test/public/globe.svg
Normal file
@ -0,0 +1 @@
|
||||
<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g clip-path="url(#a)"><path fill-rule="evenodd" clip-rule="evenodd" d="M10.27 14.1a6.5 6.5 0 0 0 3.67-3.45q-1.24.21-2.7.34-.31 1.83-.97 3.1M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16m.48-1.52a7 7 0 0 1-.96 0H7.5a4 4 0 0 1-.84-1.32q-.38-.89-.63-2.08a40 40 0 0 0 3.92 0q-.25 1.2-.63 2.08a4 4 0 0 1-.84 1.31zm2.94-4.76q1.66-.15 2.95-.43a7 7 0 0 0 0-2.58q-1.3-.27-2.95-.43a18 18 0 0 1 0 3.44m-1.27-3.54a17 17 0 0 1 0 3.64 39 39 0 0 1-4.3 0 17 17 0 0 1 0-3.64 39 39 0 0 1 4.3 0m1.1-1.17q1.45.13 2.69.34a6.5 6.5 0 0 0-3.67-3.44q.65 1.26.98 3.1M8.48 1.5l.01.02q.41.37.84 1.31.38.89.63 2.08a40 40 0 0 0-3.92 0q.25-1.2.63-2.08a4 4 0 0 1 .85-1.32 7 7 0 0 1 .96 0m-2.75.4a6.5 6.5 0 0 0-3.67 3.44 29 29 0 0 1 2.7-.34q.31-1.83.97-3.1M4.58 6.28q-1.66.16-2.95.43a7 7 0 0 0 0 2.58q1.3.27 2.95.43a18 18 0 0 1 0-3.44m.17 4.71q-1.45-.12-2.69-.34a6.5 6.5 0 0 0 3.67 3.44q-.65-1.27-.98-3.1" fill="#666"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
|
||||
|
After Width: | Height: | Size: 1.0 KiB |
1
ReactFormTest/form-test/public/next.svg
Normal file
1
ReactFormTest/form-test/public/next.svg
Normal file
@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>
|
||||
|
After Width: | Height: | Size: 1.3 KiB |
1
ReactFormTest/form-test/public/vercel.svg
Normal file
1
ReactFormTest/form-test/public/vercel.svg
Normal file
@ -0,0 +1 @@
|
||||
<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1155 1000"><path d="m577.3 0 577.4 1000H0z" fill="#fff"/></svg>
|
||||
|
After Width: | Height: | Size: 128 B |
1
ReactFormTest/form-test/public/window.svg
Normal file
1
ReactFormTest/form-test/public/window.svg
Normal file
@ -0,0 +1 @@
|
||||
<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill-rule="evenodd" clip-rule="evenodd" d="M1.5 2.5h13v10a1 1 0 0 1-1 1h-11a1 1 0 0 1-1-1zM0 1h16v11.5a2.5 2.5 0 0 1-2.5 2.5h-11A2.5 2.5 0 0 1 0 12.5zm3.75 4.5a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5M7 4.75a.75.75 0 1 1-1.5 0 .75.75 0 0 1 1.5 0m1.75.75a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5" fill="#666"/></svg>
|
||||
|
After Width: | Height: | Size: 385 B |
BIN
ReactFormTest/form-test/src/app/favicon.ico
Normal file
BIN
ReactFormTest/form-test/src/app/favicon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 25 KiB |
21
ReactFormTest/form-test/src/app/globals.css
Normal file
21
ReactFormTest/form-test/src/app/globals.css
Normal file
@ -0,0 +1,21 @@
|
||||
@tailwind base;
|
||||
@tailwind components;
|
||||
@tailwind utilities;
|
||||
|
||||
:root {
|
||||
--background: #ffffff;
|
||||
--foreground: #171717;
|
||||
}
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
:root {
|
||||
--background: #0a0a0a;
|
||||
--foreground: #ededed;
|
||||
}
|
||||
}
|
||||
|
||||
body {
|
||||
color: var(--foreground);
|
||||
background: var(--background);
|
||||
font-family: Arial, Helvetica, sans-serif;
|
||||
}
|
||||
34
ReactFormTest/form-test/src/app/layout.tsx
Normal file
34
ReactFormTest/form-test/src/app/layout.tsx
Normal file
@ -0,0 +1,34 @@
|
||||
import type { Metadata } from "next";
|
||||
import { Geist, Geist_Mono } from "next/font/google";
|
||||
import "./globals.css";
|
||||
|
||||
const geistSans = Geist({
|
||||
variable: "--font-geist-sans",
|
||||
subsets: ["latin"],
|
||||
});
|
||||
|
||||
const geistMono = Geist_Mono({
|
||||
variable: "--font-geist-mono",
|
||||
subsets: ["latin"],
|
||||
});
|
||||
|
||||
export const metadata: Metadata = {
|
||||
title: "Create Next App",
|
||||
description: "Generated by create next app",
|
||||
};
|
||||
|
||||
export default function RootLayout({
|
||||
children,
|
||||
}: Readonly<{
|
||||
children: React.ReactNode;
|
||||
}>) {
|
||||
return (
|
||||
<html lang="en">
|
||||
<body
|
||||
className={`${geistSans.variable} ${geistMono.variable} antialiased`}
|
||||
>
|
||||
{children}
|
||||
</body>
|
||||
</html>
|
||||
);
|
||||
}
|
||||
117
ReactFormTest/form-test/src/app/page.tsx
Normal file
117
ReactFormTest/form-test/src/app/page.tsx
Normal file
@ -0,0 +1,117 @@
|
||||
"use client"
|
||||
|
||||
import Image from "next/image";
|
||||
import { useState } from "react";
|
||||
|
||||
export default function Home() {
|
||||
const [email, setEmail] = useState<string>('');
|
||||
const [password, setPassword] = useState<string>('');
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
|
||||
e.preventDefault();
|
||||
setError(null);
|
||||
try {
|
||||
const response = await fetch('http://localhost:8080/login', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({ email, password }),
|
||||
});
|
||||
if (!response.ok) {
|
||||
throw new Error('Failed to login');
|
||||
}
|
||||
|
||||
const data = await response.json();
|
||||
console.log('Login successful', data);
|
||||
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
}
|
||||
|
||||
const handleRegister = async (e: React.MouseEvent<HTMLButtonElement>) => {
|
||||
e.preventDefault();
|
||||
setError(null);
|
||||
const firstName = "first_name";
|
||||
const lastName = "last_name";
|
||||
const username = "username";
|
||||
try {
|
||||
const response = await fetch('http://localhost:8080/register', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({ username, firstName, lastName, email, password }),
|
||||
});
|
||||
if (!response.ok) {
|
||||
throw new Error('Failed to register');
|
||||
}
|
||||
|
||||
const data = await response.json();
|
||||
console.log('Register successful', data);
|
||||
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
}
|
||||
return (
|
||||
<div style={{ maxWidth: '400px', margin: '50px auto', padding: '20px', border: '1px solid #ccc', borderRadius: '8px', backgroundColor: 'black', color: 'black' }}>
|
||||
<h1 style={{ textAlign: 'center', color: 'white' }}>Login</h1>
|
||||
<form onSubmit={handleSubmit}>
|
||||
<div style={{ marginBottom: '15px' }}>
|
||||
<label htmlFor="email" style={{ display: 'block', marginBottom: '5px', color: 'white' }}>Email:</label>
|
||||
<input
|
||||
type="email"
|
||||
id="email"
|
||||
value={email}
|
||||
onChange={(e) => setEmail(e.target.value)}
|
||||
required
|
||||
style={{ width: '100%', padding: '8px', boxSizing: 'border-box' }}
|
||||
/>
|
||||
</div>
|
||||
<div style={{ marginBottom: '15px' }}>
|
||||
<label htmlFor="password" style={{ display: 'block', marginBottom: '5px', color: 'white' }}>Password:</label>
|
||||
<input
|
||||
type="password"
|
||||
id="password"
|
||||
value={password}
|
||||
onChange={(e) => setPassword(e.target.value)}
|
||||
required
|
||||
style={{ width: '100%', padding: '8px', boxSizing: 'border-box' }}
|
||||
/>
|
||||
</div>
|
||||
<button
|
||||
type="submit"
|
||||
style={{
|
||||
width: '100%',
|
||||
padding: '10px',
|
||||
backgroundColor: '#0070f3',
|
||||
color: 'white',
|
||||
border: 'none',
|
||||
borderRadius: '4px',
|
||||
}}
|
||||
>
|
||||
Login
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
onClick={handleRegister}
|
||||
style={{
|
||||
margin: '10px 0',
|
||||
width: '100%',
|
||||
padding: '10px',
|
||||
backgroundColor: '#0070f3',
|
||||
color: 'white',
|
||||
border: 'none',
|
||||
borderRadius: '4px',
|
||||
}}
|
||||
>
|
||||
Register
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
18
ReactFormTest/form-test/tailwind.config.ts
Normal file
18
ReactFormTest/form-test/tailwind.config.ts
Normal file
@ -0,0 +1,18 @@
|
||||
import type { Config } from "tailwindcss";
|
||||
|
||||
export default {
|
||||
content: [
|
||||
"./src/pages/**/*.{js,ts,jsx,tsx,mdx}",
|
||||
"./src/components/**/*.{js,ts,jsx,tsx,mdx}",
|
||||
"./src/app/**/*.{js,ts,jsx,tsx,mdx}",
|
||||
],
|
||||
theme: {
|
||||
extend: {
|
||||
colors: {
|
||||
background: "var(--background)",
|
||||
foreground: "var(--foreground)",
|
||||
},
|
||||
},
|
||||
},
|
||||
plugins: [],
|
||||
} satisfies Config;
|
||||
27
ReactFormTest/form-test/tsconfig.json
Normal file
27
ReactFormTest/form-test/tsconfig.json
Normal file
@ -0,0 +1,27 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"target": "ES2017",
|
||||
"lib": ["dom", "dom.iterable", "esnext"],
|
||||
"allowJs": true,
|
||||
"skipLibCheck": true,
|
||||
"strict": true,
|
||||
"noEmit": true,
|
||||
"esModuleInterop": true,
|
||||
"module": "esnext",
|
||||
"moduleResolution": "bundler",
|
||||
"resolveJsonModule": true,
|
||||
"isolatedModules": true,
|
||||
"jsx": "preserve",
|
||||
"incremental": true,
|
||||
"plugins": [
|
||||
{
|
||||
"name": "next"
|
||||
}
|
||||
],
|
||||
"paths": {
|
||||
"@/*": ["./src/*"]
|
||||
}
|
||||
},
|
||||
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
|
||||
"exclude": ["node_modules"]
|
||||
}
|
||||
51
pom.xml
51
pom.xml
@ -1,30 +1,31 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<version>3.4.1</version>
|
||||
<relativePath/> <!-- lookup parent from repository -->
|
||||
<relativePath /> <!-- lookup parent from repository -->
|
||||
</parent>
|
||||
<groupId>com.inoct</groupId>
|
||||
<artifactId>NoctuAuthenticator</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
<name>NoctuAuthenticator</name>
|
||||
<description>Noctu Authenticator</description>
|
||||
<url/>
|
||||
<url />
|
||||
<licenses>
|
||||
<license/>
|
||||
<license />
|
||||
</licenses>
|
||||
<developers>
|
||||
<developer/>
|
||||
<developer />
|
||||
</developers>
|
||||
<scm>
|
||||
<connection/>
|
||||
<developerConnection/>
|
||||
<tag/>
|
||||
<url/>
|
||||
<connection />
|
||||
<developerConnection />
|
||||
<tag />
|
||||
<url />
|
||||
</scm>
|
||||
<properties>
|
||||
<java.version>23</java.version>
|
||||
@ -84,15 +85,45 @@
|
||||
<artifactId>spring-security-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.jsonwebtoken</groupId>
|
||||
<artifactId>jjwt</artifactId>
|
||||
<version>0.9.1</version> <!-- Use the latest version available -->
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<configuration>
|
||||
<annotationProcessorPaths>
|
||||
<path>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
</path>
|
||||
</annotationProcessorPaths>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<excludes>
|
||||
<exclude>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
</exclude>
|
||||
</excludes>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
</project>
|
||||
15
src/main/java/com/inoct/NoctuAuthenticator/JWTUtils.java
Normal file
15
src/main/java/com/inoct/NoctuAuthenticator/JWTUtils.java
Normal file
@ -0,0 +1,15 @@
|
||||
package com.inoct.NoctuAuthenticator;
|
||||
|
||||
import io.jsonwebtoken.Jwts;
|
||||
import io.jsonwebtoken.SignatureAlgorithm;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class JWTUtils {
|
||||
|
||||
public String generateToken(String username, String email, String source) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,46 @@
|
||||
package com.inoct.NoctuAuthenticator.config;
|
||||
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
|
||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
||||
import org.springframework.security.web.SecurityFilterChain;
|
||||
import org.springframework.web.cors.CorsConfiguration;
|
||||
import org.springframework.web.cors.CorsConfigurationSource;
|
||||
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
|
||||
import org.springframework.web.filter.CorsFilter;
|
||||
|
||||
@Configuration
|
||||
public class SecurityConfig {
|
||||
|
||||
@Bean
|
||||
//TODO Make sure it is rate-limited.
|
||||
public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
|
||||
http
|
||||
.authorizeHttpRequests(auth -> auth
|
||||
.requestMatchers("/login", "/register", "/oauth/**").permitAll() // Public authentication endpoints
|
||||
.anyRequest().authenticated() // Secure other endpoints
|
||||
)
|
||||
.csrf(csrf -> csrf.disable())
|
||||
.cors(cors -> cors.configurationSource(corsConfigurationSource())); // Enable CORS
|
||||
return http.build();
|
||||
}
|
||||
|
||||
@Bean
|
||||
public CorsConfigurationSource corsConfigurationSource() {
|
||||
CorsConfiguration corsConfiguration = new CorsConfiguration();
|
||||
corsConfiguration.addAllowedOrigin("http://localhost:3000"); // Frontend URL
|
||||
corsConfiguration.addAllowedHeader("*"); // Allow all headers
|
||||
corsConfiguration.addAllowedMethod("*"); // Allow all HTTP methods
|
||||
corsConfiguration.setAllowCredentials(true); // Allow cookies/auth headers
|
||||
|
||||
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
|
||||
source.registerCorsConfiguration("/**", corsConfiguration); // Apply to all endpoints
|
||||
return source;
|
||||
}
|
||||
|
||||
@Bean
|
||||
public BCryptPasswordEncoder passwordEncoder() {
|
||||
return new BCryptPasswordEncoder();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,59 @@
|
||||
package com.inoct.NoctuAuthenticator.controller;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.security.core.annotation.AuthenticationPrincipal;
|
||||
import org.springframework.security.oauth2.core.user.OAuth2User;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import com.inoct.NoctuAuthenticator.dto.UserDTO;
|
||||
import com.inoct.NoctuAuthenticator.entity.User;
|
||||
import com.inoct.NoctuAuthenticator.service.UserService;
|
||||
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/")
|
||||
public class UserController {
|
||||
|
||||
@Autowired
|
||||
private UserService userService;
|
||||
|
||||
@GetMapping("/login")
|
||||
public ResponseEntity<UserDTO> loginUser(@RequestBody String username, @RequestBody String password) {
|
||||
UserDTO user = userService.authenticateUser(username, password);
|
||||
return user != null ? ResponseEntity.ok(user) : ResponseEntity.notFound().build();
|
||||
}
|
||||
|
||||
@GetMapping("/oauth")
|
||||
public ResponseEntity<UserDTO> oauthLogin(@RequestBody String username, @RequestBody String password) {
|
||||
UserDTO user = userService.authenticateUser(username, password);
|
||||
return user != null ? ResponseEntity.ok(user) : ResponseEntity.notFound().build();
|
||||
}
|
||||
|
||||
@PostMapping("/register")
|
||||
public ResponseEntity<User> registerUser(@RequestBody UserDTO userDTO) {
|
||||
System.out.println(userDTO);
|
||||
User user = userService.createUser(userDTO);
|
||||
return user != null ? ResponseEntity.ok(user) : ResponseEntity.notFound().build();
|
||||
}
|
||||
|
||||
@PutMapping("/{id}")
|
||||
public ResponseEntity<UserDTO> updateUser(@PathVariable Long id, @RequestBody User userDetails) {
|
||||
UserDTO updatedUser = userService.updateUser(id, userDetails);
|
||||
return updatedUser != null ? ResponseEntity.ok(updatedUser) : ResponseEntity.notFound().build();
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
public ResponseEntity<Void> deleteUser(@PathVariable Long id) {
|
||||
userService.deleteUser(id);
|
||||
return ResponseEntity.noContent().build();
|
||||
}
|
||||
|
||||
@GetMapping("/welcome")
|
||||
public String welcome(@AuthenticationPrincipal OAuth2User user) {
|
||||
Map<String, Object> attributes = user.getAttributes();
|
||||
return "Welcome " + attributes.get("name") + "!";
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
package com.inoct.NoctuAuthenticator.dto;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
|
||||
public class OauthDataDTO {
|
||||
private Long id;
|
||||
|
||||
private Long userId;
|
||||
|
||||
@NotNull
|
||||
private String provider;
|
||||
|
||||
@NotNull
|
||||
private String providerUserId;
|
||||
|
||||
@NotNull
|
||||
private String accessToken;
|
||||
|
||||
@NotNull
|
||||
private String refreshToken;
|
||||
|
||||
LocalDateTime expiresAt;
|
||||
|
||||
@NotNull
|
||||
private String [] scopes;
|
||||
}
|
||||
42
src/main/java/com/inoct/NoctuAuthenticator/dto/UserDTO.java
Normal file
42
src/main/java/com/inoct/NoctuAuthenticator/dto/UserDTO.java
Normal file
@ -0,0 +1,42 @@
|
||||
package com.inoct.NoctuAuthenticator.dto;
|
||||
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.inoct.NoctuAuthenticator.validation.ValidateUser;
|
||||
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Builder
|
||||
@ValidateUser
|
||||
public class UserDTO {
|
||||
private Long id;
|
||||
|
||||
@NotNull
|
||||
private String username;
|
||||
|
||||
@NotNull
|
||||
private String firstName;
|
||||
|
||||
@NotNull
|
||||
private String lastName;
|
||||
|
||||
private String email;
|
||||
|
||||
private List<String> roles;
|
||||
|
||||
private String password;
|
||||
|
||||
@NotNull
|
||||
private boolean oauth;
|
||||
|
||||
private OauthDataDTO oauthData;
|
||||
|
||||
}
|
||||
@ -0,0 +1,65 @@
|
||||
package com.inoct.NoctuAuthenticator.entity;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.hibernate.annotations.UpdateTimestamp;
|
||||
import org.springframework.data.annotation.CreatedDate;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Entity
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Getter
|
||||
@Setter
|
||||
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
|
||||
@Builder
|
||||
public class OauthData {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@EqualsAndHashCode.Include
|
||||
private Long id;
|
||||
|
||||
@EqualsAndHashCode.Include
|
||||
@Transient
|
||||
private final UUID tempId = UUID.randomUUID();
|
||||
|
||||
@OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "user_id")
|
||||
@NotNull
|
||||
private User user;
|
||||
|
||||
@NotNull
|
||||
private String provider;
|
||||
|
||||
@NotNull
|
||||
private String providerUserId;
|
||||
|
||||
@NotNull
|
||||
private String accessToken;
|
||||
|
||||
@NotNull
|
||||
private String refreshToken;
|
||||
|
||||
LocalDateTime expiresAt;
|
||||
|
||||
@NotNull
|
||||
private String [] scopes;
|
||||
|
||||
@CreatedDate
|
||||
@Column(updatable = false)
|
||||
LocalDateTime createdDateTime;
|
||||
|
||||
@UpdateTimestamp
|
||||
LocalDateTime updateTimestamp;
|
||||
|
||||
}
|
||||
80
src/main/java/com/inoct/NoctuAuthenticator/entity/User.java
Normal file
80
src/main/java/com/inoct/NoctuAuthenticator/entity/User.java
Normal file
@ -0,0 +1,80 @@
|
||||
package com.inoct.NoctuAuthenticator.entity;
|
||||
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
import org.hibernate.annotations.UpdateTimestamp;
|
||||
import org.hibernate.validator.constraints.UniqueElements;
|
||||
import org.springframework.data.annotation.CreatedDate;
|
||||
|
||||
import com.inoct.NoctuAuthenticator.validation.ValidateUser;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
import lombok.EqualsAndHashCode.Include;
|
||||
|
||||
|
||||
|
||||
@Entity
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Getter
|
||||
@Setter
|
||||
@ValidateUser
|
||||
@Table(name = "users",
|
||||
uniqueConstraints = {
|
||||
@UniqueConstraint(columnNames = "username"),
|
||||
@UniqueConstraint(columnNames = "email")
|
||||
})
|
||||
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
|
||||
public class User {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Include
|
||||
private Long id;
|
||||
|
||||
@Include
|
||||
@NotNull
|
||||
private String username;
|
||||
|
||||
@Transient
|
||||
@Include
|
||||
private final UUID tempId = UUID.randomUUID();
|
||||
|
||||
@NotNull
|
||||
private String firstName;
|
||||
@NotNull
|
||||
private String lastName;
|
||||
|
||||
@Include
|
||||
private String email;
|
||||
|
||||
private String password;
|
||||
|
||||
private List<String> roles;
|
||||
|
||||
@OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
|
||||
OauthData oauthData;
|
||||
|
||||
@NotNull
|
||||
private boolean oauth;
|
||||
|
||||
@CreatedDate
|
||||
@Column(updatable = false)
|
||||
private LocalDate createdDate;
|
||||
|
||||
@UpdateTimestamp
|
||||
private LocalDate updatedDate;
|
||||
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
package com.inoct.NoctuAuthenticator.repository;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import com.inoct.NoctuAuthenticator.entity.User;
|
||||
|
||||
@Repository
|
||||
public interface UserRepository extends JpaRepository<User, Long> {
|
||||
User findByUsername(String username);
|
||||
User findByEmail(String email);
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
package com.inoct.NoctuAuthenticator.service;
|
||||
|
||||
import com.inoct.NoctuAuthenticator.dto.UserDTO;
|
||||
import com.inoct.NoctuAuthenticator.entity.User;
|
||||
import org.springframework.stereotype.Service;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
public interface UserService {
|
||||
|
||||
List<UserDTO> findAllUsers();
|
||||
|
||||
UserDTO authenticateUser(String userName, String password);
|
||||
|
||||
UserDTO getUserById(Long id);
|
||||
|
||||
User createUser(UserDTO user);
|
||||
|
||||
void deleteUser(Long id);
|
||||
|
||||
UserDTO findUserByUsername(String username);
|
||||
|
||||
UserDTO findUserByEmail(String email);
|
||||
|
||||
UserDTO updateUser(Long id, User userDetails);
|
||||
|
||||
}
|
||||
@ -0,0 +1,91 @@
|
||||
package com.inoct.NoctuAuthenticator.service.impl;
|
||||
|
||||
import com.inoct.NoctuAuthenticator.dto.UserDTO;
|
||||
import com.inoct.NoctuAuthenticator.entity.User;
|
||||
import com.inoct.NoctuAuthenticator.repository.UserRepository;
|
||||
import com.inoct.NoctuAuthenticator.service.UserService;
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
public class UserServiceImpl implements UserService {
|
||||
|
||||
@Autowired
|
||||
private UserRepository userRepository;
|
||||
|
||||
@Override
|
||||
public User createUser(UserDTO userDTO) {
|
||||
User user = mapFromDTO(userDTO);
|
||||
return userRepository.save(user);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteUser(Long id) {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<UserDTO> findAllUsers() {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UserDTO findUserByEmail(String email) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UserDTO getUserById(Long id) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UserDTO findUserByUsername(String username) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UserDTO updateUser(Long id, User userDetails) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UserDTO authenticateUser(String userName, String password) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
private UserDTO mapToDTO(User user) {
|
||||
UserDTO userDTO = UserDTO.builder()
|
||||
.id(user.getId())
|
||||
.username(user.getUsername())
|
||||
.firstName(user.getFirstName())
|
||||
.lastName(user.getLastName())
|
||||
.email(user.getEmail())
|
||||
.roles(user.getRoles())
|
||||
.oauth(user.isOauth())
|
||||
.build();
|
||||
return userDTO;
|
||||
}
|
||||
|
||||
private User mapFromDTO(UserDTO userDTO) {
|
||||
User user = User.builder()
|
||||
.username(userDTO.getUsername())
|
||||
.firstName(userDTO.getFirstName())
|
||||
.lastName(userDTO.getLastName())
|
||||
.email(userDTO.getEmail())
|
||||
.roles(userDTO.getRoles())
|
||||
.oauth(userDTO.isOauth())
|
||||
.build();
|
||||
return user;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
package com.inoct.NoctuAuthenticator.validation;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
import jakarta.validation.Constraint;
|
||||
import jakarta.validation.Payload;
|
||||
|
||||
@Constraint(validatedBy = ValidateUserValidator.class)
|
||||
@Target({ElementType.TYPE}) // Apply this annotation at the class level
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface ValidateUser {
|
||||
String message() default "Invalid user details";
|
||||
|
||||
Class<?>[] groups() default {};
|
||||
|
||||
Class<? extends Payload>[] payload() default {};
|
||||
}
|
||||
@ -0,0 +1,34 @@
|
||||
package com.inoct.NoctuAuthenticator.validation;
|
||||
|
||||
import com.inoct.NoctuAuthenticator.entity.User;
|
||||
import jakarta.validation.ConstraintValidator;
|
||||
import jakarta.validation.ConstraintValidatorContext;
|
||||
|
||||
public class ValidateUserValidator implements ConstraintValidator<ValidateUser, User> {
|
||||
|
||||
@Override
|
||||
public boolean isValid(User user, ConstraintValidatorContext context) {
|
||||
if (user == null) {
|
||||
return true; // Validation for null objects is handled separately
|
||||
}
|
||||
|
||||
// Example validation logic:
|
||||
// Ensure the username is not null and at least 3 characters long
|
||||
if (user.getUsername() == null || user.getUsername().length() < 3) {
|
||||
context.buildConstraintViolationWithTemplate("Username must be at least 3 characters long")
|
||||
.addPropertyNode("username")
|
||||
.addConstraintViolation();
|
||||
return false;
|
||||
}
|
||||
|
||||
// Ensure the email follows a specific pattern (simplified example)
|
||||
if (user.getEmail() != null && !user.getEmail().contains("@")) {
|
||||
context.buildConstraintViolationWithTemplate("Invalid email format")
|
||||
.addPropertyNode("email")
|
||||
.addConstraintViolation();
|
||||
return false;
|
||||
}
|
||||
|
||||
return true; // Valid user
|
||||
}
|
||||
}
|
||||
@ -1 +1,36 @@
|
||||
spring.application.name=NoctuAuthenticator
|
||||
|
||||
# Import additional properties from application.properties.env
|
||||
spring.config.import=classpath:application-env.properties
|
||||
|
||||
# PostgreSQL configuration
|
||||
spring.datasource.url=${POSTGRES_URL}
|
||||
spring.datasource.username=${POSTGRES_USER}
|
||||
spring.datasource.password=${POSTGRES_PASSWORD}
|
||||
spring.datasource.driver-class-name=org.postgresql.Driver
|
||||
|
||||
|
||||
#JPA configuration
|
||||
sprint.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
|
||||
spring.jpa.hibernate.ddl-auto=create-drop
|
||||
|
||||
|
||||
# Redis configuration
|
||||
spring.redis.host=${REDIS_HOST}
|
||||
spring.redis.port=${REDIS_PORT}
|
||||
#spring.redis.password=${REDIS_PASSWORD}
|
||||
|
||||
#Google Oauth2.0 configuration
|
||||
# OAuth2 Client Configuration for Google
|
||||
spring.security.oauth2.client.registration.google.client-id=${GOOGLE_CLIENT_ID}
|
||||
spring.security.oauth2.client.registration.google.client-secret=${GOOGLE_CLIENT_SECRET}
|
||||
spring.security.oauth2.client.registration.google.redirect-uri=http://localhost:8080/login/oauth2/code/google
|
||||
spring.security.oauth2.client.registration.google.scope=email,profile
|
||||
spring.security.oauth2.client.registration.google.client-authentication-method=post
|
||||
spring.security.oauth2.client.registration.google.authorization-grant-type=authorization_code
|
||||
|
||||
# Provider-specific configuration (optional)
|
||||
spring.security.oauth2.client.provider.google.authorization-uri=https://accounts.google.com/o/oauth2/v2/auth
|
||||
spring.security.oauth2.client.provider.google.token-uri=https://oauth2.googleapis.com/token
|
||||
spring.security.oauth2.client.provider.google.user-info-uri=https://openidconnect.googleapis.com/v1/userinfo
|
||||
spring.security.oauth2.client.provider.google.user-name-attribute=sub
|
||||
|
||||
Loading…
Reference in New Issue
Block a user