>
+ | undefined;
+
+ if (data && !isError(data)) {
+ return Success, now log in!;
;
+ }
+
+ let errors: JSX.Element[] = [];
+
+ if (data) {
+ errors = data.errors.map((e) => {
+ return {e};
+ });
+ }
+
+ const navigation = useNavigation();
+ const busy = navigation.state === "submitting";
+
+ return (
+
+ {errors}
+
+
+ );
+}
diff --git a/client/src/Signup.tsx b/client/src/Signup.tsx
new file mode 100644
index 0000000..b88497b
--- /dev/null
+++ b/client/src/Signup.tsx
@@ -0,0 +1,43 @@
+import "./Auth.scss";
+import { Form, Link, useActionData, useNavigation } from "react-router-dom";
+import { signupAction } from "./actions";
+import { isError } from "./api/dto";
+
+export function Signup() {
+ const data = useActionData() as
+ | Awaited>
+ | undefined;
+
+ if (data && !isError(data)) {
+ return Success, now log in!;
;
+ }
+
+ let errors: JSX.Element[] = [];
+
+ if (data) {
+ errors = data.errors.map((e) => {
+ return {e};
+ });
+ }
+
+ const navigation = useNavigation();
+ const busy = navigation.state === "submitting";
+
+ return (
+
+ {errors}
+
+
+ );
+}
diff --git a/client/src/actions.ts b/client/src/actions.ts
new file mode 100644
index 0000000..ece4b3c
--- /dev/null
+++ b/client/src/actions.ts
@@ -0,0 +1,29 @@
+import { signup } from "./api/Person";
+import { ActionFunctionArgs, redirect } from "react-router-dom";
+import { login } from "./api/Token";
+import { isError } from "./api/dto";
+import { setToken } from "./api/utils";
+
+export async function loginAction({ request }: ActionFunctionArgs) {
+ const formData = await request.formData();
+ const ret = await login(
+ formData.get("username")!.toString(),
+ formData.get("password")!.toString(),
+ );
+
+ if (!isError(ret)) {
+ setToken(ret.token);
+ return redirect("/home");
+ }
+
+ return ret;
+}
+
+export async function signupAction({ request }: ActionFunctionArgs) {
+ const formData = await request.formData();
+ return await signup(
+ formData.get("username")!.toString(),
+ formData.get("fullName")!.toString(),
+ formData.get("password")!.toString(),
+ );
+}
diff --git a/client/src/api/Person.ts b/client/src/api/Person.ts
new file mode 100644
index 0000000..3135234
--- /dev/null
+++ b/client/src/api/Person.ts
@@ -0,0 +1,18 @@
+import { fetchJSON, fetchJSONAuth } from "./utils";
+import { PersonToResp, TPersonToResp } from "./dto";
+
+export async function signup(
+ username: string,
+ fullName: string,
+ password: string,
+): Promise {
+ return fetchJSON("/person", "POST", PersonToResp, {
+ username,
+ fullName,
+ password,
+ });
+}
+
+export async function getSelf(): Promise {
+ return fetchJSONAuth("/person", "GET", PersonToResp);
+}
diff --git a/client/src/api/Token.ts b/client/src/api/Token.ts
new file mode 100644
index 0000000..a36336e
--- /dev/null
+++ b/client/src/api/Token.ts
@@ -0,0 +1,12 @@
+import { TokenToResp, TTokenToResp } from "./dto";
+import { fetchJSON } from "./utils";
+
+export async function login(
+ username: string,
+ password: string,
+): Promise {
+ return fetchJSON("/token", "POST", TokenToResp, {
+ username,
+ password,
+ });
+}
diff --git a/client/src/api/dto.ts b/client/src/api/dto.ts
new file mode 100644
index 0000000..7a40e3b
--- /dev/null
+++ b/client/src/api/dto.ts
@@ -0,0 +1,46 @@
+import { z } from "zod";
+
+export const ErrorTo = z.object({
+ errors: z.array(z.string()),
+ code: z.number(),
+});
+export type TErrorTo = z.infer;
+
+function CreateAPIResponse(obj: T) {
+ return z.union([ErrorTo, obj]);
+}
+
+export const PersonSignupTo = z.object({
+ username: z.string(),
+ fullName: z.string(),
+ password: z.string(),
+});
+export type TPersonSignupTo = z.infer;
+
+export const PersonTo = z.object({
+ uuid: z.string(),
+ username: z.string(),
+ fullName: z.string(),
+});
+export type TPersonTo = z.infer;
+
+export const PersonToResp = CreateAPIResponse(PersonTo);
+export type TPersonToResp = z.infer;
+
+export const TokenRequestTo = z.object({
+ username: z.string(),
+ password: z.string(),
+});
+export type TTokenRequestTo = z.infer;
+
+export const TokenTo = z.object({
+ token: z.string(),
+});
+export type TTokenTo = z.infer;
+
+export const TokenToResp = CreateAPIResponse(TokenTo);
+export type TTokenToResp = z.infer;
+
+export function isError(value: unknown): value is TErrorTo {
+ return ErrorTo.safeParse(value).success;
+}
diff --git a/client/src/api/utils.ts b/client/src/api/utils.ts
new file mode 100644
index 0000000..0ad738f
--- /dev/null
+++ b/client/src/api/utils.ts
@@ -0,0 +1,68 @@
+// import { apiRoot } from "~src/env";
+
+const apiRoot: string = "http://localhost:8080";
+
+let token: string | null;
+
+export function setToken(_token: string): void {
+ token = _token;
+ localStorage.setItem("jwt_token", token);
+}
+
+export function getToken(): string | null {
+ if (!token && localStorage.getItem("jwt_token") != null) {
+ token = localStorage.getItem("jwt_token");
+ }
+ return token;
+}
+
+export function deleteToken(): void {
+ token = null;
+ localStorage.removeItem("jwt_token");
+}
+
+export async function fetchJSON T }>(
+ path: string,
+ method: string,
+ parser: P,
+ body?: string | Record | File,
+ headers?: Record,
+): Promise {
+ const reqBody = () =>
+ body instanceof File
+ ? (() => {
+ const fd = new FormData();
+ fd.append("file", body);
+ return fd;
+ })()
+ : JSON.stringify(body);
+
+ const reqHeaders = () =>
+ body instanceof File
+ ? headers
+ : { ...headers, "Content-Type": "application/json" };
+
+ const response = await fetch(apiRoot + path, {
+ method,
+ headers: reqHeaders(),
+ body: reqBody(),
+ });
+ return parser.parse(await response.json());
+}
+
+export async function fetchJSONAuth T }>(
+ path: string,
+ method: string,
+ parser: P,
+ body?: string | Record | File,
+ headers?: Record,
+): Promise {
+ if (token) {
+ return fetchJSON(path, method, parser, body, {
+ ...headers,
+ Authorization: `Bearer ${token}`,
+ });
+ } else {
+ throw new Error("Not logged in");
+ }
+}
diff --git a/client/src/index.html b/client/src/index.html
index ab51a94..b3b7946 100644
--- a/client/src/index.html
+++ b/client/src/index.html
@@ -2,7 +2,7 @@
- Hello world
+ Y
diff --git a/client/src/loaders.ts b/client/src/loaders.ts
new file mode 100644
index 0000000..4c3645e
--- /dev/null
+++ b/client/src/loaders.ts
@@ -0,0 +1,5 @@
+import { getSelf } from "./api/Person";
+
+export async function homeLoader() {
+ return await getSelf();
+}
diff --git a/server/build.gradle b/server/build.gradle
index 110af72..3caf017 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -27,6 +27,7 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-security'
+ implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation 'org.springframework.security:spring-security-test'
compileOnly 'org.projectlombok:lombok'
developmentOnly 'org.springframework.boot:spring-boot-devtools'
@@ -34,6 +35,8 @@ dependencies {
runtimeOnly 'org.mariadb.jdbc:mariadb-java-client'
annotationProcessor 'org.projectlombok:lombok'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
+ // For TestRestTemplate as default client can't handle UNAUTHORIZED response
+ testImplementation 'org.apache.httpcomponents.client5:httpclient5:5.3'
implementation 'io.jsonwebtoken:jjwt-api:0.12.3'
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.3'
diff --git a/server/src/main/java/com/usatiuk/tjv/y/server/controller/ApiExceptionHandler.java b/server/src/main/java/com/usatiuk/tjv/y/server/controller/ApiExceptionHandler.java
new file mode 100644
index 0000000..0669041
--- /dev/null
+++ b/server/src/main/java/com/usatiuk/tjv/y/server/controller/ApiExceptionHandler.java
@@ -0,0 +1,22 @@
+package com.usatiuk.tjv.y.server.controller;
+
+import com.usatiuk.tjv.y.server.dto.ErrorTo;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.context.request.WebRequest;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
+
+@ControllerAdvice
+public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
+ @ExceptionHandler(value = {ConstraintViolationException.class})
+ protected ResponseEntity