From ce2d168fb7af7f893c12682bd500078339f20a2d Mon Sep 17 00:00:00 2001 From: Ricardo Campos Date: Fri, 27 Sep 2024 11:02:48 -0300 Subject: [PATCH] feat: rename packages --- client/src/api-service/api.ts | 37 +++++++++++++++- client/src/api-service/apiConfig.ts | 2 + client/src/types/CsrfToken.ts | 5 +++ client/src/views/Task/index.tsx | 23 ++++++++-- .../java_api/config/CloudNativeConfig.java | 44 ------------------- .../JavaApiApplication.java | 2 +- .../server/config/CloudNativeConfig.java | 44 +++++++++++++++++++ .../config/CorsConfig.java | 3 +- .../config/HttpServletRequestRuntimeHint.java | 2 +- .../config/SecurityConfig.java | 16 ++++--- .../config/SwaggerConfig.java | 2 +- .../controller/AuthenticationController.java | 12 ++--- .../controller/HomeController.java | 8 ++-- .../controller/NoteController.java | 12 ++--- .../controller/RestExceptionController.java | 4 +- .../controller/TaskController.java | 14 +++--- .../controller/UserController.java | 6 +-- .../controller/UserSessionController.java | 42 +++++++++++++++--- .../entity/NoteEntity.java | 2 +- .../entity/NoteUrlEntity.java | 2 +- .../entity/TaskEntity.java | 2 +- .../entity/TaskUrlEntity.java | 2 +- .../entity/UserEntity.java | 2 +- .../exception/BadPasswordException.java | 2 +- .../exception/NoteNotFoundException.java | 2 +- .../exception/TaskNotFoundException.java | 2 +- .../exception/UserAlreadyExistsException.java | 2 +- .../exception/UserForbiddenException.java | 2 +- .../exception/UserNotFoundException.java | 2 +- .../filter/JwtAuthenticationFilter.java | 6 +-- .../repository/NoteRepository.java | 4 +- .../repository/NoteUrlRepository.java | 4 +- .../repository/TaskRepository.java | 4 +- .../repository/TaskUrlRepository.java | 4 +- .../repository/UserRepository.java | 4 +- .../request/LoginRequest.java | 2 +- .../request/NotePatchRequest.java | 2 +- .../request/NoteRequest.java | 2 +- .../request/NoteUrlPatchRequest.java | 2 +- .../request/TaskPatchRequest.java | 2 +- .../request/TaskRequest.java | 2 +- .../request/TaskUrlPatchRequest.java | 2 +- .../response/FieldIssueResponse.java | 2 +- .../response/JwtAuthenticationResponse.java | 2 +- .../response/NoteResponse.java | 6 +-- .../response/NoteUrlResponse.java | 2 +- .../response/SearchResponse.java | 2 +- .../response/SummaryResponse.java | 2 +- .../response/TaskResponse.java | 6 +-- .../response/TaskUrlResponse.java | 2 +- .../response/UserResponse.java | 2 +- .../response/ValidationExceptionResponse.java | 2 +- .../service/AuthService.java | 8 ++-- .../service/HomeService.java | 6 +-- .../service/JwtService.java | 2 +- .../service/NoteService.java | 10 ++--- .../service/TaskService.java | 10 ++--- .../service/UserService.java | 2 +- .../service/impl/AuthServiceImpl.java | 24 +++++----- .../service/impl/HomeServiceImpl.java | 16 +++---- .../service/impl/JwtServiceImpl.java | 4 +- .../service/impl/NoteServiceImpl.java | 28 ++++++------ .../service/impl/TaskServiceImpl.java | 28 ++++++------ .../service/impl/UserServiceImpl.java | 8 ++-- .../{java_api => server}/util/AuthUtil.java | 2 +- .../JavaApiApplicationTests.java | 2 +- .../AuthenticationControllerTest.java | 8 ++-- .../controller/HomeControllerTest.java | 12 ++--- 68 files changed, 315 insertions(+), 223 deletions(-) create mode 100644 client/src/types/CsrfToken.ts delete mode 100644 server/src/main/java/br/com/tasknoteapp/java_api/config/CloudNativeConfig.java rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/JavaApiApplication.java (92%) create mode 100644 server/src/main/java/br/com/tasknoteapp/server/config/CloudNativeConfig.java rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/config/CorsConfig.java (93%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/config/HttpServletRequestRuntimeHint.java (94%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/config/SecurityConfig.java (87%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/config/SwaggerConfig.java (97%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/controller/AuthenticationController.java (90%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/controller/HomeController.java (92%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/controller/NoteController.java (95%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/controller/RestExceptionController.java (83%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/controller/TaskController.java (94%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/controller/UserController.java (90%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/controller/UserSessionController.java (56%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/entity/NoteEntity.java (95%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/entity/NoteUrlEntity.java (94%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/entity/TaskEntity.java (95%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/entity/TaskUrlEntity.java (94%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/entity/UserEntity.java (97%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/exception/BadPasswordException.java (89%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/exception/NoteNotFoundException.java (90%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/exception/TaskNotFoundException.java (90%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/exception/UserAlreadyExistsException.java (90%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/exception/UserForbiddenException.java (90%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/exception/UserNotFoundException.java (90%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/filter/JwtAuthenticationFilter.java (94%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/repository/NoteRepository.java (82%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/repository/NoteUrlRepository.java (66%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/repository/TaskRepository.java (81%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/repository/TaskUrlRepository.java (66%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/repository/UserRepository.java (74%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/request/LoginRequest.java (91%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/request/NotePatchRequest.java (90%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/request/NoteRequest.java (91%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/request/NoteUrlPatchRequest.java (56%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/request/TaskPatchRequest.java (90%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/request/TaskRequest.java (90%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/request/TaskUrlPatchRequest.java (56%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/response/FieldIssueResponse.java (81%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/response/JwtAuthenticationResponse.java (55%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/response/NoteResponse.java (90%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/response/NoteUrlResponse.java (88%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/response/SearchResponse.java (70%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/response/SummaryResponse.java (64%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/response/TaskResponse.java (90%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/response/TaskUrlResponse.java (88%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/response/UserResponse.java (94%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/response/ValidationExceptionResponse.java (95%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/service/AuthService.java (85%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/service/HomeService.java (73%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/service/JwtService.java (92%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/service/NoteService.java (55%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/service/TaskService.java (59%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/service/UserService.java (84%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/service/impl/AuthServiceImpl.java (87%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/service/impl/HomeServiceImpl.java (75%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/service/impl/JwtServiceImpl.java (96%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/service/impl/NoteServiceImpl.java (85%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/service/impl/TaskServiceImpl.java (85%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/service/impl/UserServiceImpl.java (79%) rename server/src/main/java/br/com/tasknoteapp/{java_api => server}/util/AuthUtil.java (97%) rename server/src/test/java/br/com/tasknoteapp/{java_api => server}/JavaApiApplicationTests.java (83%) rename server/src/test/java/br/com/tasknoteapp/{java_api => server}/controller/AuthenticationControllerTest.java (94%) rename server/src/test/java/br/com/tasknoteapp/{java_api => server}/controller/HomeControllerTest.java (92%) diff --git a/client/src/api-service/api.ts b/client/src/api-service/api.ts index 54ca594..11c075e 100644 --- a/client/src/api-service/api.ts +++ b/client/src/api-service/api.ts @@ -1,4 +1,5 @@ import { API_TOKEN } from '../app-constants/app-constants'; +import { CsrfToken } from '../types/CsrfToken'; /** * Retrieves the API token from local storage. @@ -10,6 +11,16 @@ function getToken(): string { return tokenState ?? ''; } +function getHeaders(csrf?: CsrfToken): Headers { + const headers: Headers = new Headers(); + headers.append('Content-Type', 'application/json'); + headers.append('Authorization', `Bearer ${getToken()}`); + if (csrf) { + headers.append('X-CSRF-TOKEN', csrf.token); + } + return headers; +} + /** * */ @@ -44,14 +55,38 @@ const api = { return false; }, + getCSRF: async (url: string) => { + const csrfReq = await fetch(url, { + method: 'GET', + mode: 'cors', + headers: getHeaders() + }); + if (csrfReq.ok) { + const data = await csrfReq.json(); + return data; + } + handleError(csrfReq.status); + return false; + }, + postJSON: async (url: string, payload: object) => { + let token = document.cookie + .split('; ') + .find(row => row.startsWith('XSRF-TOKEN=')) + ?.split('=')[1]; + + if (!token) token = ''; + console.log("sending token", token); + const response = await fetch(url, { method: 'POST', mode: 'cors', headers: { 'Content-Type': 'application/json', - Authorization: `Bearer ${getToken()}` + Authorization: `Bearer ${getToken()}`, + 'X-CSRF-TOKEN': token }, + credentials: 'include', body: JSON.stringify(payload) }); if (response.ok) { diff --git a/client/src/api-service/apiConfig.ts b/client/src/api-service/apiConfig.ts index 7da8b86..b44260c 100644 --- a/client/src/api-service/apiConfig.ts +++ b/client/src/api-service/apiConfig.ts @@ -10,6 +10,8 @@ const ApiConfig = { refreshTokenUrl: `${server}/rest/user-sessions/refresh`, + csrfTokenUrl: `${server}/rest/user-sessions/csrf`, + tasksUrl: `${server}/rest/tasks`, homeUrl: `${server}/rest/home`, diff --git a/client/src/types/CsrfToken.ts b/client/src/types/CsrfToken.ts new file mode 100644 index 0000000..83df2dc --- /dev/null +++ b/client/src/types/CsrfToken.ts @@ -0,0 +1,5 @@ +export type CsrfToken = { + headerName: string; + parameterName: string; + token: string; +}; diff --git a/client/src/views/Task/index.tsx b/client/src/views/Task/index.tsx index 820510c..f5163ad 100644 --- a/client/src/views/Task/index.tsx +++ b/client/src/views/Task/index.tsx @@ -7,6 +7,7 @@ import { TaskResponse } from '../../types/TaskResponse'; import api from '../../api-service/api'; import ApiConfig from '../../api-service/apiConfig'; import './style.css'; +import { CsrfToken } from '../../types/CsrfToken'; /** * @@ -27,12 +28,21 @@ function Task(): JSX.Element { } }; + const getCsrf = async () => { + try { + const token: CsrfToken = await api.getCSRF(ApiConfig.csrfTokenUrl); + return token; + } catch (e) { + handleError(e); + } + }; + const loadTasks = async () => { - const tasksFetched: TaskResponse[] | Error = await api.getJSON(ApiConfig.tasksUrl); - if (tasksFetched instanceof Error) { - handleError(tasksFetched); - } else { + try { + const tasksFetched: TaskResponse[] = await api.getJSON(ApiConfig.tasksUrl); setTasks(tasksFetched); + } catch (e) { + handleError(e); } }; @@ -41,6 +51,11 @@ function Task(): JSX.Element { description: desc, urls: url ? [url] : [] }; + // const csrf: CsrfToken | undefined = await getCsrf(); + // if (!csrf) { + // handleError('Unable to get server resources!'); + // return false; + // } try { await api.postJSON(ApiConfig.tasksUrl, payload); loadTasks(); diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/config/CloudNativeConfig.java b/server/src/main/java/br/com/tasknoteapp/java_api/config/CloudNativeConfig.java deleted file mode 100644 index 90ff9df..0000000 --- a/server/src/main/java/br/com/tasknoteapp/java_api/config/CloudNativeConfig.java +++ /dev/null @@ -1,44 +0,0 @@ -package br.com.tasknoteapp.java_api.config; - -import br.com.tasknoteapp.java_api.request.LoginRequest; -import br.com.tasknoteapp.java_api.request.NotePatchRequest; -import br.com.tasknoteapp.java_api.request.NoteRequest; -import br.com.tasknoteapp.java_api.request.NoteUrlPatchRequest; -import br.com.tasknoteapp.java_api.request.TaskPatchRequest; -import br.com.tasknoteapp.java_api.request.TaskRequest; -import br.com.tasknoteapp.java_api.request.TaskUrlPatchRequest; -import br.com.tasknoteapp.java_api.response.JwtAuthenticationResponse; -import br.com.tasknoteapp.java_api.response.NoteResponse; -import br.com.tasknoteapp.java_api.response.NoteUrlResponse; -import br.com.tasknoteapp.java_api.response.SearchResponse; -import br.com.tasknoteapp.java_api.response.SummaryResponse; -import br.com.tasknoteapp.java_api.response.TaskResponse; -import br.com.tasknoteapp.java_api.response.TaskUrlResponse; -import br.com.tasknoteapp.java_api.response.UserResponse; -import org.springframework.aot.hint.annotation.RegisterReflectionForBinding; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.ImportRuntimeHints; - -@Configuration -@RegisterReflectionForBinding({ - LoginRequest.class, - NotePatchRequest.class, - NoteRequest.class, - NoteUrlPatchRequest.class, - TaskPatchRequest.class, - TaskRequest.class, - TaskUrlPatchRequest.class, - JwtAuthenticationResponse.class, - NoteResponse.class, - NoteUrlResponse.class, - SearchResponse.class, - SummaryResponse.class, - TaskResponse.class, - TaskUrlResponse.class, - UserResponse.class, - io.jsonwebtoken.Claims.class, - io.jsonwebtoken.Jwts.class, - io.jsonwebtoken.impl.security.StandardSecureDigestAlgorithms.class, -}) -@ImportRuntimeHints(value = {HttpServletRequestRuntimeHint.class}) -public class CloudNativeConfig {} diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/JavaApiApplication.java b/server/src/main/java/br/com/tasknoteapp/server/JavaApiApplication.java similarity index 92% rename from server/src/main/java/br/com/tasknoteapp/java_api/JavaApiApplication.java rename to server/src/main/java/br/com/tasknoteapp/server/JavaApiApplication.java index 86382b9..2579941 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/JavaApiApplication.java +++ b/server/src/main/java/br/com/tasknoteapp/server/JavaApiApplication.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api; +package br.com.tasknoteapp.server; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/server/src/main/java/br/com/tasknoteapp/server/config/CloudNativeConfig.java b/server/src/main/java/br/com/tasknoteapp/server/config/CloudNativeConfig.java new file mode 100644 index 0000000..154a1b3 --- /dev/null +++ b/server/src/main/java/br/com/tasknoteapp/server/config/CloudNativeConfig.java @@ -0,0 +1,44 @@ +package br.com.tasknoteapp.server.config; + +import br.com.tasknoteapp.server.request.LoginRequest; +import br.com.tasknoteapp.server.request.NotePatchRequest; +import br.com.tasknoteapp.server.request.NoteRequest; +import br.com.tasknoteapp.server.request.NoteUrlPatchRequest; +import br.com.tasknoteapp.server.request.TaskPatchRequest; +import br.com.tasknoteapp.server.request.TaskRequest; +import br.com.tasknoteapp.server.request.TaskUrlPatchRequest; +import br.com.tasknoteapp.server.response.JwtAuthenticationResponse; +import br.com.tasknoteapp.server.response.NoteResponse; +import br.com.tasknoteapp.server.response.NoteUrlResponse; +import br.com.tasknoteapp.server.response.SearchResponse; +import br.com.tasknoteapp.server.response.SummaryResponse; +import br.com.tasknoteapp.server.response.TaskResponse; +import br.com.tasknoteapp.server.response.TaskUrlResponse; +import br.com.tasknoteapp.server.response.UserResponse; +import org.springframework.aot.hint.annotation.RegisterReflectionForBinding; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.ImportRuntimeHints; + +@Configuration +@RegisterReflectionForBinding({ + LoginRequest.class, + NotePatchRequest.class, + NoteRequest.class, + NoteUrlPatchRequest.class, + TaskPatchRequest.class, + TaskRequest.class, + TaskUrlPatchRequest.class, + JwtAuthenticationResponse.class, + NoteResponse.class, + NoteUrlResponse.class, + SearchResponse.class, + SummaryResponse.class, + TaskResponse.class, + TaskUrlResponse.class, + UserResponse.class, + io.jsonwebtoken.Claims.class, + io.jsonwebtoken.Jwts.class, + io.jsonwebtoken.impl.security.StandardSecureDigestAlgorithms.class, +}) +@ImportRuntimeHints(value = {HttpServletRequestRuntimeHint.class}) +public class CloudNativeConfig {} diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/config/CorsConfig.java b/server/src/main/java/br/com/tasknoteapp/server/config/CorsConfig.java similarity index 93% rename from server/src/main/java/br/com/tasknoteapp/java_api/config/CorsConfig.java rename to server/src/main/java/br/com/tasknoteapp/server/config/CorsConfig.java index 5c32820..927b43d 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/config/CorsConfig.java +++ b/server/src/main/java/br/com/tasknoteapp/server/config/CorsConfig.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.config; +package br.com.tasknoteapp.server.config; import java.util.Arrays; import lombok.extern.slf4j.Slf4j; @@ -28,6 +28,7 @@ public class CorsConfig implements WebMvcConfigurer { registry .addMapping("/**") .allowedOrigins(allowedOrigins) + .allowCredentials(true) .allowedMethods("GET", "PUT", "POST", "DELETE", "OPTIONS", "HEAD", "PATCH"); } } diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/config/HttpServletRequestRuntimeHint.java b/server/src/main/java/br/com/tasknoteapp/server/config/HttpServletRequestRuntimeHint.java similarity index 94% rename from server/src/main/java/br/com/tasknoteapp/java_api/config/HttpServletRequestRuntimeHint.java rename to server/src/main/java/br/com/tasknoteapp/server/config/HttpServletRequestRuntimeHint.java index f555cfe..1729c40 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/config/HttpServletRequestRuntimeHint.java +++ b/server/src/main/java/br/com/tasknoteapp/server/config/HttpServletRequestRuntimeHint.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.config; +package br.com.tasknoteapp.server.config; import jakarta.servlet.http.HttpServletRequest; import org.springframework.aot.hint.ProxyHints; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/config/SecurityConfig.java b/server/src/main/java/br/com/tasknoteapp/server/config/SecurityConfig.java similarity index 87% rename from server/src/main/java/br/com/tasknoteapp/java_api/config/SecurityConfig.java rename to server/src/main/java/br/com/tasknoteapp/server/config/SecurityConfig.java index ff20a36..0dc3e5a 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/config/SecurityConfig.java +++ b/server/src/main/java/br/com/tasknoteapp/server/config/SecurityConfig.java @@ -1,7 +1,7 @@ -package br.com.tasknoteapp.java_api.config; +package br.com.tasknoteapp.server.config; -import br.com.tasknoteapp.java_api.filter.JwtAuthenticationFilter; -import br.com.tasknoteapp.java_api.service.UserService; +import br.com.tasknoteapp.server.filter.JwtAuthenticationFilter; +import br.com.tasknoteapp.server.service.UserService; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -14,11 +14,11 @@ import org.springframework.security.config.annotation.authentication.configurati import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; -import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import org.springframework.security.web.csrf.CookieCsrfTokenRepository; /** This class contains security configurations. */ @Configuration @@ -40,7 +40,11 @@ public class SecurityConfig { @Bean public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { http.cors(Customizer.withDefaults()) - .csrf(custom -> custom.ignoringRequestMatchers("/auth/**")) + .csrf( + custom -> + custom + .ignoringRequestMatchers("/auth/**") + .csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())) .authorizeHttpRequests( request -> request @@ -52,8 +56,6 @@ public class SecurityConfig { .permitAll() .anyRequest() .permitAll()) - .sessionManagement( - manager -> manager.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) .httpBasic(AbstractHttpConfigurer::disable) .formLogin(AbstractHttpConfigurer::disable) .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class) diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/config/SwaggerConfig.java b/server/src/main/java/br/com/tasknoteapp/server/config/SwaggerConfig.java similarity index 97% rename from server/src/main/java/br/com/tasknoteapp/java_api/config/SwaggerConfig.java rename to server/src/main/java/br/com/tasknoteapp/server/config/SwaggerConfig.java index a350deb..29362f5 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/config/SwaggerConfig.java +++ b/server/src/main/java/br/com/tasknoteapp/server/config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.config; +package br.com.tasknoteapp.server.config; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/controller/AuthenticationController.java b/server/src/main/java/br/com/tasknoteapp/server/controller/AuthenticationController.java similarity index 90% rename from server/src/main/java/br/com/tasknoteapp/java_api/controller/AuthenticationController.java rename to server/src/main/java/br/com/tasknoteapp/server/controller/AuthenticationController.java index e81d302..604501f 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/controller/AuthenticationController.java +++ b/server/src/main/java/br/com/tasknoteapp/server/controller/AuthenticationController.java @@ -1,10 +1,10 @@ -package br.com.tasknoteapp.java_api.controller; +package br.com.tasknoteapp.server.controller; -import br.com.tasknoteapp.java_api.exception.UserAlreadyExistsException; -import br.com.tasknoteapp.java_api.exception.UserNotFoundException; -import br.com.tasknoteapp.java_api.request.LoginRequest; -import br.com.tasknoteapp.java_api.response.JwtAuthenticationResponse; -import br.com.tasknoteapp.java_api.service.AuthService; +import br.com.tasknoteapp.server.exception.UserAlreadyExistsException; +import br.com.tasknoteapp.server.exception.UserNotFoundException; +import br.com.tasknoteapp.server.request.LoginRequest; +import br.com.tasknoteapp.server.response.JwtAuthenticationResponse; +import br.com.tasknoteapp.server.service.AuthService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/controller/HomeController.java b/server/src/main/java/br/com/tasknoteapp/server/controller/HomeController.java similarity index 92% rename from server/src/main/java/br/com/tasknoteapp/java_api/controller/HomeController.java rename to server/src/main/java/br/com/tasknoteapp/server/controller/HomeController.java index ec5d640..5d83f23 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/controller/HomeController.java +++ b/server/src/main/java/br/com/tasknoteapp/server/controller/HomeController.java @@ -1,8 +1,8 @@ -package br.com.tasknoteapp.java_api.controller; +package br.com.tasknoteapp.server.controller; -import br.com.tasknoteapp.java_api.response.SearchResponse; -import br.com.tasknoteapp.java_api.response.SummaryResponse; -import br.com.tasknoteapp.java_api.service.HomeService; +import br.com.tasknoteapp.server.response.SearchResponse; +import br.com.tasknoteapp.server.response.SummaryResponse; +import br.com.tasknoteapp.server.service.HomeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/controller/NoteController.java b/server/src/main/java/br/com/tasknoteapp/server/controller/NoteController.java similarity index 95% rename from server/src/main/java/br/com/tasknoteapp/java_api/controller/NoteController.java rename to server/src/main/java/br/com/tasknoteapp/server/controller/NoteController.java index 6388f6e..16067e0 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/controller/NoteController.java +++ b/server/src/main/java/br/com/tasknoteapp/server/controller/NoteController.java @@ -1,10 +1,10 @@ -package br.com.tasknoteapp.java_api.controller; +package br.com.tasknoteapp.server.controller; -import br.com.tasknoteapp.java_api.entity.NoteEntity; -import br.com.tasknoteapp.java_api.request.NotePatchRequest; -import br.com.tasknoteapp.java_api.request.NoteRequest; -import br.com.tasknoteapp.java_api.response.NoteResponse; -import br.com.tasknoteapp.java_api.service.NoteService; +import br.com.tasknoteapp.server.entity.NoteEntity; +import br.com.tasknoteapp.server.request.NotePatchRequest; +import br.com.tasknoteapp.server.request.NoteRequest; +import br.com.tasknoteapp.server.response.NoteResponse; +import br.com.tasknoteapp.server.service.NoteService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/controller/RestExceptionController.java b/server/src/main/java/br/com/tasknoteapp/server/controller/RestExceptionController.java similarity index 83% rename from server/src/main/java/br/com/tasknoteapp/java_api/controller/RestExceptionController.java rename to server/src/main/java/br/com/tasknoteapp/server/controller/RestExceptionController.java index 1f78731..db0e12a 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/controller/RestExceptionController.java +++ b/server/src/main/java/br/com/tasknoteapp/server/controller/RestExceptionController.java @@ -1,6 +1,6 @@ -package br.com.tasknoteapp.java_api.controller; +package br.com.tasknoteapp.server.controller; -import br.com.tasknoteapp.java_api.response.ValidationExceptionResponse; +import br.com.tasknoteapp.server.response.ValidationExceptionResponse; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/controller/TaskController.java b/server/src/main/java/br/com/tasknoteapp/server/controller/TaskController.java similarity index 94% rename from server/src/main/java/br/com/tasknoteapp/java_api/controller/TaskController.java rename to server/src/main/java/br/com/tasknoteapp/server/controller/TaskController.java index 44d9387..edac400 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/controller/TaskController.java +++ b/server/src/main/java/br/com/tasknoteapp/server/controller/TaskController.java @@ -1,11 +1,11 @@ -package br.com.tasknoteapp.java_api.controller; +package br.com.tasknoteapp.server.controller; -import br.com.tasknoteapp.java_api.entity.TaskEntity; -import br.com.tasknoteapp.java_api.exception.TaskNotFoundException; -import br.com.tasknoteapp.java_api.request.TaskPatchRequest; -import br.com.tasknoteapp.java_api.request.TaskRequest; -import br.com.tasknoteapp.java_api.response.TaskResponse; -import br.com.tasknoteapp.java_api.service.TaskService; +import br.com.tasknoteapp.server.entity.TaskEntity; +import br.com.tasknoteapp.server.exception.TaskNotFoundException; +import br.com.tasknoteapp.server.request.TaskPatchRequest; +import br.com.tasknoteapp.server.request.TaskRequest; +import br.com.tasknoteapp.server.response.TaskResponse; +import br.com.tasknoteapp.server.service.TaskService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/controller/UserController.java b/server/src/main/java/br/com/tasknoteapp/server/controller/UserController.java similarity index 90% rename from server/src/main/java/br/com/tasknoteapp/java_api/controller/UserController.java rename to server/src/main/java/br/com/tasknoteapp/server/controller/UserController.java index c1b4589..fd92071 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/controller/UserController.java +++ b/server/src/main/java/br/com/tasknoteapp/server/controller/UserController.java @@ -1,7 +1,7 @@ -package br.com.tasknoteapp.java_api.controller; +package br.com.tasknoteapp.server.controller; -import br.com.tasknoteapp.java_api.response.UserResponse; -import br.com.tasknoteapp.java_api.service.AuthService; +import br.com.tasknoteapp.server.response.UserResponse; +import br.com.tasknoteapp.server.service.AuthService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/controller/UserSessionController.java b/server/src/main/java/br/com/tasknoteapp/server/controller/UserSessionController.java similarity index 56% rename from server/src/main/java/br/com/tasknoteapp/java_api/controller/UserSessionController.java rename to server/src/main/java/br/com/tasknoteapp/server/controller/UserSessionController.java index 07801a4..3a72664 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/controller/UserSessionController.java +++ b/server/src/main/java/br/com/tasknoteapp/server/controller/UserSessionController.java @@ -1,19 +1,25 @@ -package br.com.tasknoteapp.java_api.controller; +package br.com.tasknoteapp.server.controller; -import br.com.tasknoteapp.java_api.exception.UserNotFoundException; -import br.com.tasknoteapp.java_api.response.JwtAuthenticationResponse; -import br.com.tasknoteapp.java_api.service.AuthService; +import br.com.tasknoteapp.server.exception.UserNotFoundException; +import br.com.tasknoteapp.server.response.JwtAuthenticationResponse; +import br.com.tasknoteapp.server.service.AuthService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +import org.springframework.security.web.csrf.CsrfToken; +import org.springframework.security.web.csrf.CsrfTokenRepository; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** This class contains resources for handling user sessions. */ +@Slf4j @RestController @RequestMapping("/rest/user-sessions") @AllArgsConstructor @@ -28,7 +34,7 @@ public class UserSessionController { * @return JwtAuthenticationResponse with token created. * @throws UserNotFoundException if user not found */ - @GetMapping(path = "/refresh") + @GetMapping("/refresh") @Operation( summary = "Refresh an existing user session", description = "Refresh an existing user session, generating a new token", @@ -47,4 +53,30 @@ public class UserSessionController { String token = authService.refreshCurrentUserToken(); return new JwtAuthenticationResponse(token); } + + /** + * Gets the CSRF token. + * + * @param token The token injected by Spring Security + * @return The token + */ + @GetMapping(path = "/csrf", produces = "application/json") + @Operation( + summary = "Gets the CSRF token", + description = "Gets the CSRF token to be used for requests", + responses = { + @ApiResponse(responseCode = "200", description = "Token successfully retrieved"), + @ApiResponse( + responseCode = "403", + description = "Forbidden. Access Denied", + content = @Content(schema = @Schema(implementation = Void.class))), + @ApiResponse( + responseCode = "404", + description = "User not found", + content = @Content(schema = @Schema(implementation = Void.class))) + }) + public CsrfToken getCsrfToken(CsrfToken token) { + log.info("Getting CSRF token {}", token); + return token; + } } diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/entity/NoteEntity.java b/server/src/main/java/br/com/tasknoteapp/server/entity/NoteEntity.java similarity index 95% rename from server/src/main/java/br/com/tasknoteapp/java_api/entity/NoteEntity.java rename to server/src/main/java/br/com/tasknoteapp/server/entity/NoteEntity.java index c8d351e..e21f2c1 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/entity/NoteEntity.java +++ b/server/src/main/java/br/com/tasknoteapp/server/entity/NoteEntity.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.entity; +package br.com.tasknoteapp.server.entity; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/entity/NoteUrlEntity.java b/server/src/main/java/br/com/tasknoteapp/server/entity/NoteUrlEntity.java similarity index 94% rename from server/src/main/java/br/com/tasknoteapp/java_api/entity/NoteUrlEntity.java rename to server/src/main/java/br/com/tasknoteapp/server/entity/NoteUrlEntity.java index fc5385b..a96258e 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/entity/NoteUrlEntity.java +++ b/server/src/main/java/br/com/tasknoteapp/server/entity/NoteUrlEntity.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.entity; +package br.com.tasknoteapp.server.entity; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/entity/TaskEntity.java b/server/src/main/java/br/com/tasknoteapp/server/entity/TaskEntity.java similarity index 95% rename from server/src/main/java/br/com/tasknoteapp/java_api/entity/TaskEntity.java rename to server/src/main/java/br/com/tasknoteapp/server/entity/TaskEntity.java index 5a3f3f4..55ab76b 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/entity/TaskEntity.java +++ b/server/src/main/java/br/com/tasknoteapp/server/entity/TaskEntity.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.entity; +package br.com.tasknoteapp.server.entity; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/entity/TaskUrlEntity.java b/server/src/main/java/br/com/tasknoteapp/server/entity/TaskUrlEntity.java similarity index 94% rename from server/src/main/java/br/com/tasknoteapp/java_api/entity/TaskUrlEntity.java rename to server/src/main/java/br/com/tasknoteapp/server/entity/TaskUrlEntity.java index 108e954..580e583 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/entity/TaskUrlEntity.java +++ b/server/src/main/java/br/com/tasknoteapp/server/entity/TaskUrlEntity.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.entity; +package br.com.tasknoteapp.server.entity; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/entity/UserEntity.java b/server/src/main/java/br/com/tasknoteapp/server/entity/UserEntity.java similarity index 97% rename from server/src/main/java/br/com/tasknoteapp/java_api/entity/UserEntity.java rename to server/src/main/java/br/com/tasknoteapp/server/entity/UserEntity.java index f01e609..ba1c3d4 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/entity/UserEntity.java +++ b/server/src/main/java/br/com/tasknoteapp/server/entity/UserEntity.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.entity; +package br.com.tasknoteapp.server.entity; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/exception/BadPasswordException.java b/server/src/main/java/br/com/tasknoteapp/server/exception/BadPasswordException.java similarity index 89% rename from server/src/main/java/br/com/tasknoteapp/java_api/exception/BadPasswordException.java rename to server/src/main/java/br/com/tasknoteapp/server/exception/BadPasswordException.java index b323ec0..78e8222 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/exception/BadPasswordException.java +++ b/server/src/main/java/br/com/tasknoteapp/server/exception/BadPasswordException.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.exception; +package br.com.tasknoteapp.server.exception; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/exception/NoteNotFoundException.java b/server/src/main/java/br/com/tasknoteapp/server/exception/NoteNotFoundException.java similarity index 90% rename from server/src/main/java/br/com/tasknoteapp/java_api/exception/NoteNotFoundException.java rename to server/src/main/java/br/com/tasknoteapp/server/exception/NoteNotFoundException.java index 10e14ef..cc57664 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/exception/NoteNotFoundException.java +++ b/server/src/main/java/br/com/tasknoteapp/server/exception/NoteNotFoundException.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.exception; +package br.com.tasknoteapp.server.exception; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/exception/TaskNotFoundException.java b/server/src/main/java/br/com/tasknoteapp/server/exception/TaskNotFoundException.java similarity index 90% rename from server/src/main/java/br/com/tasknoteapp/java_api/exception/TaskNotFoundException.java rename to server/src/main/java/br/com/tasknoteapp/server/exception/TaskNotFoundException.java index 2842b6c..695c8f9 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/exception/TaskNotFoundException.java +++ b/server/src/main/java/br/com/tasknoteapp/server/exception/TaskNotFoundException.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.exception; +package br.com.tasknoteapp.server.exception; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/exception/UserAlreadyExistsException.java b/server/src/main/java/br/com/tasknoteapp/server/exception/UserAlreadyExistsException.java similarity index 90% rename from server/src/main/java/br/com/tasknoteapp/java_api/exception/UserAlreadyExistsException.java rename to server/src/main/java/br/com/tasknoteapp/server/exception/UserAlreadyExistsException.java index 61a7f64..68cc33b 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/exception/UserAlreadyExistsException.java +++ b/server/src/main/java/br/com/tasknoteapp/server/exception/UserAlreadyExistsException.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.exception; +package br.com.tasknoteapp.server.exception; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/exception/UserForbiddenException.java b/server/src/main/java/br/com/tasknoteapp/server/exception/UserForbiddenException.java similarity index 90% rename from server/src/main/java/br/com/tasknoteapp/java_api/exception/UserForbiddenException.java rename to server/src/main/java/br/com/tasknoteapp/server/exception/UserForbiddenException.java index 7bce7cf..37ff35d 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/exception/UserForbiddenException.java +++ b/server/src/main/java/br/com/tasknoteapp/server/exception/UserForbiddenException.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.exception; +package br.com.tasknoteapp.server.exception; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/exception/UserNotFoundException.java b/server/src/main/java/br/com/tasknoteapp/server/exception/UserNotFoundException.java similarity index 90% rename from server/src/main/java/br/com/tasknoteapp/java_api/exception/UserNotFoundException.java rename to server/src/main/java/br/com/tasknoteapp/server/exception/UserNotFoundException.java index 8164883..abc6366 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/exception/UserNotFoundException.java +++ b/server/src/main/java/br/com/tasknoteapp/server/exception/UserNotFoundException.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.exception; +package br.com.tasknoteapp.server.exception; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/filter/JwtAuthenticationFilter.java b/server/src/main/java/br/com/tasknoteapp/server/filter/JwtAuthenticationFilter.java similarity index 94% rename from server/src/main/java/br/com/tasknoteapp/java_api/filter/JwtAuthenticationFilter.java rename to server/src/main/java/br/com/tasknoteapp/server/filter/JwtAuthenticationFilter.java index f2097e2..0ac3f03 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/filter/JwtAuthenticationFilter.java +++ b/server/src/main/java/br/com/tasknoteapp/server/filter/JwtAuthenticationFilter.java @@ -1,7 +1,7 @@ -package br.com.tasknoteapp.java_api.filter; +package br.com.tasknoteapp.server.filter; -import br.com.tasknoteapp.java_api.service.JwtService; -import br.com.tasknoteapp.java_api.service.UserService; +import br.com.tasknoteapp.server.service.JwtService; +import br.com.tasknoteapp.server.service.UserService; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/repository/NoteRepository.java b/server/src/main/java/br/com/tasknoteapp/server/repository/NoteRepository.java similarity index 82% rename from server/src/main/java/br/com/tasknoteapp/java_api/repository/NoteRepository.java rename to server/src/main/java/br/com/tasknoteapp/server/repository/NoteRepository.java index d03a3e6..0b7313c 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/repository/NoteRepository.java +++ b/server/src/main/java/br/com/tasknoteapp/server/repository/NoteRepository.java @@ -1,6 +1,6 @@ -package br.com.tasknoteapp.java_api.repository; +package br.com.tasknoteapp.server.repository; -import br.com.tasknoteapp.java_api.entity.NoteEntity; +import br.com.tasknoteapp.server.entity.NoteEntity; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/repository/NoteUrlRepository.java b/server/src/main/java/br/com/tasknoteapp/server/repository/NoteUrlRepository.java similarity index 66% rename from server/src/main/java/br/com/tasknoteapp/java_api/repository/NoteUrlRepository.java rename to server/src/main/java/br/com/tasknoteapp/server/repository/NoteUrlRepository.java index 60a7810..cf630f4 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/repository/NoteUrlRepository.java +++ b/server/src/main/java/br/com/tasknoteapp/server/repository/NoteUrlRepository.java @@ -1,6 +1,6 @@ -package br.com.tasknoteapp.java_api.repository; +package br.com.tasknoteapp.server.repository; -import br.com.tasknoteapp.java_api.entity.NoteUrlEntity; +import br.com.tasknoteapp.server.entity.NoteUrlEntity; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/repository/TaskRepository.java b/server/src/main/java/br/com/tasknoteapp/server/repository/TaskRepository.java similarity index 81% rename from server/src/main/java/br/com/tasknoteapp/java_api/repository/TaskRepository.java rename to server/src/main/java/br/com/tasknoteapp/server/repository/TaskRepository.java index 3c72e55..758f10d 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/repository/TaskRepository.java +++ b/server/src/main/java/br/com/tasknoteapp/server/repository/TaskRepository.java @@ -1,6 +1,6 @@ -package br.com.tasknoteapp.java_api.repository; +package br.com.tasknoteapp.server.repository; -import br.com.tasknoteapp.java_api.entity.TaskEntity; +import br.com.tasknoteapp.server.entity.TaskEntity; import java.util.List; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/repository/TaskUrlRepository.java b/server/src/main/java/br/com/tasknoteapp/server/repository/TaskUrlRepository.java similarity index 66% rename from server/src/main/java/br/com/tasknoteapp/java_api/repository/TaskUrlRepository.java rename to server/src/main/java/br/com/tasknoteapp/server/repository/TaskUrlRepository.java index aa54506..655bb83 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/repository/TaskUrlRepository.java +++ b/server/src/main/java/br/com/tasknoteapp/server/repository/TaskUrlRepository.java @@ -1,6 +1,6 @@ -package br.com.tasknoteapp.java_api.repository; +package br.com.tasknoteapp.server.repository; -import br.com.tasknoteapp.java_api.entity.TaskUrlEntity; +import br.com.tasknoteapp.server.entity.TaskUrlEntity; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/repository/UserRepository.java b/server/src/main/java/br/com/tasknoteapp/server/repository/UserRepository.java similarity index 74% rename from server/src/main/java/br/com/tasknoteapp/java_api/repository/UserRepository.java rename to server/src/main/java/br/com/tasknoteapp/server/repository/UserRepository.java index af80264..37b991a 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/repository/UserRepository.java +++ b/server/src/main/java/br/com/tasknoteapp/server/repository/UserRepository.java @@ -1,6 +1,6 @@ -package br.com.tasknoteapp.java_api.repository; +package br.com.tasknoteapp.server.repository; -import br.com.tasknoteapp.java_api.entity.UserEntity; +import br.com.tasknoteapp.server.entity.UserEntity; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/request/LoginRequest.java b/server/src/main/java/br/com/tasknoteapp/server/request/LoginRequest.java similarity index 91% rename from server/src/main/java/br/com/tasknoteapp/java_api/request/LoginRequest.java rename to server/src/main/java/br/com/tasknoteapp/server/request/LoginRequest.java index 6ececf6..6e4710c 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/request/LoginRequest.java +++ b/server/src/main/java/br/com/tasknoteapp/server/request/LoginRequest.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.request; +package br.com.tasknoteapp.server.request; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Email; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/request/NotePatchRequest.java b/server/src/main/java/br/com/tasknoteapp/server/request/NotePatchRequest.java similarity index 90% rename from server/src/main/java/br/com/tasknoteapp/java_api/request/NotePatchRequest.java rename to server/src/main/java/br/com/tasknoteapp/server/request/NotePatchRequest.java index fdd04a6..4f3e00d 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/request/NotePatchRequest.java +++ b/server/src/main/java/br/com/tasknoteapp/server/request/NotePatchRequest.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.request; +package br.com.tasknoteapp.server.request; import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/request/NoteRequest.java b/server/src/main/java/br/com/tasknoteapp/server/request/NoteRequest.java similarity index 91% rename from server/src/main/java/br/com/tasknoteapp/java_api/request/NoteRequest.java rename to server/src/main/java/br/com/tasknoteapp/server/request/NoteRequest.java index 7c14684..b3466b6 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/request/NoteRequest.java +++ b/server/src/main/java/br/com/tasknoteapp/server/request/NoteRequest.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.request; +package br.com.tasknoteapp.server.request; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/request/NoteUrlPatchRequest.java b/server/src/main/java/br/com/tasknoteapp/server/request/NoteUrlPatchRequest.java similarity index 56% rename from server/src/main/java/br/com/tasknoteapp/java_api/request/NoteUrlPatchRequest.java rename to server/src/main/java/br/com/tasknoteapp/server/request/NoteUrlPatchRequest.java index 28d2fda..f550450 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/request/NoteUrlPatchRequest.java +++ b/server/src/main/java/br/com/tasknoteapp/server/request/NoteUrlPatchRequest.java @@ -1,3 +1,3 @@ -package br.com.tasknoteapp.java_api.request; +package br.com.tasknoteapp.server.request; public record NoteUrlPatchRequest(Long id, String url) {} diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/request/TaskPatchRequest.java b/server/src/main/java/br/com/tasknoteapp/server/request/TaskPatchRequest.java similarity index 90% rename from server/src/main/java/br/com/tasknoteapp/java_api/request/TaskPatchRequest.java rename to server/src/main/java/br/com/tasknoteapp/server/request/TaskPatchRequest.java index ed3073d..8ab43a6 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/request/TaskPatchRequest.java +++ b/server/src/main/java/br/com/tasknoteapp/server/request/TaskPatchRequest.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.request; +package br.com.tasknoteapp.server.request; import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/request/TaskRequest.java b/server/src/main/java/br/com/tasknoteapp/server/request/TaskRequest.java similarity index 90% rename from server/src/main/java/br/com/tasknoteapp/java_api/request/TaskRequest.java rename to server/src/main/java/br/com/tasknoteapp/server/request/TaskRequest.java index 1e6abcc..c87edb6 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/request/TaskRequest.java +++ b/server/src/main/java/br/com/tasknoteapp/server/request/TaskRequest.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.request; +package br.com.tasknoteapp.server.request; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/request/TaskUrlPatchRequest.java b/server/src/main/java/br/com/tasknoteapp/server/request/TaskUrlPatchRequest.java similarity index 56% rename from server/src/main/java/br/com/tasknoteapp/java_api/request/TaskUrlPatchRequest.java rename to server/src/main/java/br/com/tasknoteapp/server/request/TaskUrlPatchRequest.java index fda9686..de4891f 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/request/TaskUrlPatchRequest.java +++ b/server/src/main/java/br/com/tasknoteapp/server/request/TaskUrlPatchRequest.java @@ -1,3 +1,3 @@ -package br.com.tasknoteapp.java_api.request; +package br.com.tasknoteapp.server.request; public record TaskUrlPatchRequest(Long id, String url) {} diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/response/FieldIssueResponse.java b/server/src/main/java/br/com/tasknoteapp/server/response/FieldIssueResponse.java similarity index 81% rename from server/src/main/java/br/com/tasknoteapp/java_api/response/FieldIssueResponse.java rename to server/src/main/java/br/com/tasknoteapp/server/response/FieldIssueResponse.java index 9f8ba9d..1c80c76 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/response/FieldIssueResponse.java +++ b/server/src/main/java/br/com/tasknoteapp/server/response/FieldIssueResponse.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.response; +package br.com.tasknoteapp.server.response; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/response/JwtAuthenticationResponse.java b/server/src/main/java/br/com/tasknoteapp/server/response/JwtAuthenticationResponse.java similarity index 55% rename from server/src/main/java/br/com/tasknoteapp/java_api/response/JwtAuthenticationResponse.java rename to server/src/main/java/br/com/tasknoteapp/server/response/JwtAuthenticationResponse.java index b9e36be..c487895 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/response/JwtAuthenticationResponse.java +++ b/server/src/main/java/br/com/tasknoteapp/server/response/JwtAuthenticationResponse.java @@ -1,3 +1,3 @@ -package br.com.tasknoteapp.java_api.response; +package br.com.tasknoteapp.server.response; public record JwtAuthenticationResponse(String token) {} diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/response/NoteResponse.java b/server/src/main/java/br/com/tasknoteapp/server/response/NoteResponse.java similarity index 90% rename from server/src/main/java/br/com/tasknoteapp/java_api/response/NoteResponse.java rename to server/src/main/java/br/com/tasknoteapp/server/response/NoteResponse.java index f92e947..6f81f79 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/response/NoteResponse.java +++ b/server/src/main/java/br/com/tasknoteapp/server/response/NoteResponse.java @@ -1,7 +1,7 @@ -package br.com.tasknoteapp.java_api.response; +package br.com.tasknoteapp.server.response; -import br.com.tasknoteapp.java_api.entity.NoteEntity; -import br.com.tasknoteapp.java_api.entity.NoteUrlEntity; +import br.com.tasknoteapp.server.entity.NoteEntity; +import br.com.tasknoteapp.server.entity.NoteUrlEntity; import io.swagger.v3.oas.annotations.media.Schema; import java.util.ArrayList; import java.util.List; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/response/NoteUrlResponse.java b/server/src/main/java/br/com/tasknoteapp/server/response/NoteUrlResponse.java similarity index 88% rename from server/src/main/java/br/com/tasknoteapp/java_api/response/NoteUrlResponse.java rename to server/src/main/java/br/com/tasknoteapp/server/response/NoteUrlResponse.java index 285bb34..cf16278 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/response/NoteUrlResponse.java +++ b/server/src/main/java/br/com/tasknoteapp/server/response/NoteUrlResponse.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.response; +package br.com.tasknoteapp.server.response; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/response/SearchResponse.java b/server/src/main/java/br/com/tasknoteapp/server/response/SearchResponse.java similarity index 70% rename from server/src/main/java/br/com/tasknoteapp/java_api/response/SearchResponse.java rename to server/src/main/java/br/com/tasknoteapp/server/response/SearchResponse.java index c197e4f..3eb92a7 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/response/SearchResponse.java +++ b/server/src/main/java/br/com/tasknoteapp/server/response/SearchResponse.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.response; +package br.com.tasknoteapp.server.response; import java.util.List; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/response/SummaryResponse.java b/server/src/main/java/br/com/tasknoteapp/server/response/SummaryResponse.java similarity index 64% rename from server/src/main/java/br/com/tasknoteapp/java_api/response/SummaryResponse.java rename to server/src/main/java/br/com/tasknoteapp/server/response/SummaryResponse.java index 1207a64..5aab782 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/response/SummaryResponse.java +++ b/server/src/main/java/br/com/tasknoteapp/server/response/SummaryResponse.java @@ -1,3 +1,3 @@ -package br.com.tasknoteapp.java_api.response; +package br.com.tasknoteapp.server.response; public record SummaryResponse(Integer pendingTaskCount, Integer doneTaskCount) {} diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/response/TaskResponse.java b/server/src/main/java/br/com/tasknoteapp/server/response/TaskResponse.java similarity index 90% rename from server/src/main/java/br/com/tasknoteapp/java_api/response/TaskResponse.java rename to server/src/main/java/br/com/tasknoteapp/server/response/TaskResponse.java index 1cceef5..f32c41b 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/response/TaskResponse.java +++ b/server/src/main/java/br/com/tasknoteapp/server/response/TaskResponse.java @@ -1,7 +1,7 @@ -package br.com.tasknoteapp.java_api.response; +package br.com.tasknoteapp.server.response; -import br.com.tasknoteapp.java_api.entity.TaskEntity; -import br.com.tasknoteapp.java_api.entity.TaskUrlEntity; +import br.com.tasknoteapp.server.entity.TaskEntity; +import br.com.tasknoteapp.server.entity.TaskUrlEntity; import io.swagger.v3.oas.annotations.media.Schema; import java.util.ArrayList; import java.util.List; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/response/TaskUrlResponse.java b/server/src/main/java/br/com/tasknoteapp/server/response/TaskUrlResponse.java similarity index 88% rename from server/src/main/java/br/com/tasknoteapp/java_api/response/TaskUrlResponse.java rename to server/src/main/java/br/com/tasknoteapp/server/response/TaskUrlResponse.java index 6dc8435..d45874e 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/response/TaskUrlResponse.java +++ b/server/src/main/java/br/com/tasknoteapp/server/response/TaskUrlResponse.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.response; +package br.com.tasknoteapp.server.response; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/response/UserResponse.java b/server/src/main/java/br/com/tasknoteapp/server/response/UserResponse.java similarity index 94% rename from server/src/main/java/br/com/tasknoteapp/java_api/response/UserResponse.java rename to server/src/main/java/br/com/tasknoteapp/server/response/UserResponse.java index beac92a..464cdf4 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/response/UserResponse.java +++ b/server/src/main/java/br/com/tasknoteapp/server/response/UserResponse.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.response; +package br.com.tasknoteapp.server.response; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDateTime; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/response/ValidationExceptionResponse.java b/server/src/main/java/br/com/tasknoteapp/server/response/ValidationExceptionResponse.java similarity index 95% rename from server/src/main/java/br/com/tasknoteapp/java_api/response/ValidationExceptionResponse.java rename to server/src/main/java/br/com/tasknoteapp/server/response/ValidationExceptionResponse.java index 85393b9..2510962 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/response/ValidationExceptionResponse.java +++ b/server/src/main/java/br/com/tasknoteapp/server/response/ValidationExceptionResponse.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.response; +package br.com.tasknoteapp.server.response; import java.util.List; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/service/AuthService.java b/server/src/main/java/br/com/tasknoteapp/server/service/AuthService.java similarity index 85% rename from server/src/main/java/br/com/tasknoteapp/java_api/service/AuthService.java rename to server/src/main/java/br/com/tasknoteapp/server/service/AuthService.java index 007f179..4997794 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/service/AuthService.java +++ b/server/src/main/java/br/com/tasknoteapp/server/service/AuthService.java @@ -1,8 +1,8 @@ -package br.com.tasknoteapp.java_api.service; +package br.com.tasknoteapp.server.service; -import br.com.tasknoteapp.java_api.entity.UserEntity; -import br.com.tasknoteapp.java_api.request.LoginRequest; -import br.com.tasknoteapp.java_api.response.UserResponse; +import br.com.tasknoteapp.server.entity.UserEntity; +import br.com.tasknoteapp.server.request.LoginRequest; +import br.com.tasknoteapp.server.response.UserResponse; import java.util.List; import java.util.Optional; import org.springframework.security.core.userdetails.User; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/service/HomeService.java b/server/src/main/java/br/com/tasknoteapp/server/service/HomeService.java similarity index 73% rename from server/src/main/java/br/com/tasknoteapp/java_api/service/HomeService.java rename to server/src/main/java/br/com/tasknoteapp/server/service/HomeService.java index f541745..0f0682f 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/service/HomeService.java +++ b/server/src/main/java/br/com/tasknoteapp/server/service/HomeService.java @@ -1,7 +1,7 @@ -package br.com.tasknoteapp.java_api.service; +package br.com.tasknoteapp.server.service; -import br.com.tasknoteapp.java_api.response.SearchResponse; -import br.com.tasknoteapp.java_api.response.SummaryResponse; +import br.com.tasknoteapp.server.response.SearchResponse; +import br.com.tasknoteapp.server.response.SummaryResponse; /** This interface contains methods for handling user Home requests. */ public interface HomeService { diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/service/JwtService.java b/server/src/main/java/br/com/tasknoteapp/server/service/JwtService.java similarity index 92% rename from server/src/main/java/br/com/tasknoteapp/java_api/service/JwtService.java rename to server/src/main/java/br/com/tasknoteapp/server/service/JwtService.java index 9aa3a08..9d93f34 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/service/JwtService.java +++ b/server/src/main/java/br/com/tasknoteapp/server/service/JwtService.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.service; +package br.com.tasknoteapp.server.service; import java.time.LocalDateTime; import java.util.Map; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/service/NoteService.java b/server/src/main/java/br/com/tasknoteapp/server/service/NoteService.java similarity index 55% rename from server/src/main/java/br/com/tasknoteapp/java_api/service/NoteService.java rename to server/src/main/java/br/com/tasknoteapp/server/service/NoteService.java index 0a81c7b..f507897 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/service/NoteService.java +++ b/server/src/main/java/br/com/tasknoteapp/server/service/NoteService.java @@ -1,9 +1,9 @@ -package br.com.tasknoteapp.java_api.service; +package br.com.tasknoteapp.server.service; -import br.com.tasknoteapp.java_api.entity.NoteEntity; -import br.com.tasknoteapp.java_api.request.NotePatchRequest; -import br.com.tasknoteapp.java_api.request.NoteRequest; -import br.com.tasknoteapp.java_api.response.NoteResponse; +import br.com.tasknoteapp.server.entity.NoteEntity; +import br.com.tasknoteapp.server.request.NotePatchRequest; +import br.com.tasknoteapp.server.request.NoteRequest; +import br.com.tasknoteapp.server.response.NoteResponse; import java.util.List; public interface NoteService { diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/service/TaskService.java b/server/src/main/java/br/com/tasknoteapp/server/service/TaskService.java similarity index 59% rename from server/src/main/java/br/com/tasknoteapp/java_api/service/TaskService.java rename to server/src/main/java/br/com/tasknoteapp/server/service/TaskService.java index c6dbebc..a94035a 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/service/TaskService.java +++ b/server/src/main/java/br/com/tasknoteapp/server/service/TaskService.java @@ -1,9 +1,9 @@ -package br.com.tasknoteapp.java_api.service; +package br.com.tasknoteapp.server.service; -import br.com.tasknoteapp.java_api.entity.TaskEntity; -import br.com.tasknoteapp.java_api.request.TaskPatchRequest; -import br.com.tasknoteapp.java_api.request.TaskRequest; -import br.com.tasknoteapp.java_api.response.TaskResponse; +import br.com.tasknoteapp.server.entity.TaskEntity; +import br.com.tasknoteapp.server.request.TaskPatchRequest; +import br.com.tasknoteapp.server.request.TaskRequest; +import br.com.tasknoteapp.server.response.TaskResponse; import java.util.List; /** This interface contains methods for handling user user Tasks. */ diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/service/UserService.java b/server/src/main/java/br/com/tasknoteapp/server/service/UserService.java similarity index 84% rename from server/src/main/java/br/com/tasknoteapp/java_api/service/UserService.java rename to server/src/main/java/br/com/tasknoteapp/server/service/UserService.java index 9208f9d..c525365 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/service/UserService.java +++ b/server/src/main/java/br/com/tasknoteapp/server/service/UserService.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.service; +package br.com.tasknoteapp.server.service; import org.springframework.security.core.userdetails.UserDetailsService; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/service/impl/AuthServiceImpl.java b/server/src/main/java/br/com/tasknoteapp/server/service/impl/AuthServiceImpl.java similarity index 87% rename from server/src/main/java/br/com/tasknoteapp/java_api/service/impl/AuthServiceImpl.java rename to server/src/main/java/br/com/tasknoteapp/server/service/impl/AuthServiceImpl.java index f64dca5..8eb5474 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/service/impl/AuthServiceImpl.java +++ b/server/src/main/java/br/com/tasknoteapp/server/service/impl/AuthServiceImpl.java @@ -1,16 +1,16 @@ -package br.com.tasknoteapp.java_api.service.impl; +package br.com.tasknoteapp.server.service.impl; -import br.com.tasknoteapp.java_api.entity.UserEntity; -import br.com.tasknoteapp.java_api.exception.BadPasswordException; -import br.com.tasknoteapp.java_api.exception.UserAlreadyExistsException; -import br.com.tasknoteapp.java_api.exception.UserForbiddenException; -import br.com.tasknoteapp.java_api.exception.UserNotFoundException; -import br.com.tasknoteapp.java_api.repository.UserRepository; -import br.com.tasknoteapp.java_api.request.LoginRequest; -import br.com.tasknoteapp.java_api.response.UserResponse; -import br.com.tasknoteapp.java_api.service.AuthService; -import br.com.tasknoteapp.java_api.service.JwtService; -import br.com.tasknoteapp.java_api.util.AuthUtil; +import br.com.tasknoteapp.server.entity.UserEntity; +import br.com.tasknoteapp.server.exception.BadPasswordException; +import br.com.tasknoteapp.server.exception.UserAlreadyExistsException; +import br.com.tasknoteapp.server.exception.UserForbiddenException; +import br.com.tasknoteapp.server.exception.UserNotFoundException; +import br.com.tasknoteapp.server.repository.UserRepository; +import br.com.tasknoteapp.server.request.LoginRequest; +import br.com.tasknoteapp.server.response.UserResponse; +import br.com.tasknoteapp.server.service.AuthService; +import br.com.tasknoteapp.server.service.JwtService; +import br.com.tasknoteapp.server.util.AuthUtil; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/service/impl/HomeServiceImpl.java b/server/src/main/java/br/com/tasknoteapp/server/service/impl/HomeServiceImpl.java similarity index 75% rename from server/src/main/java/br/com/tasknoteapp/java_api/service/impl/HomeServiceImpl.java rename to server/src/main/java/br/com/tasknoteapp/server/service/impl/HomeServiceImpl.java index a6ad519..e162976 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/service/impl/HomeServiceImpl.java +++ b/server/src/main/java/br/com/tasknoteapp/server/service/impl/HomeServiceImpl.java @@ -1,12 +1,12 @@ -package br.com.tasknoteapp.java_api.service.impl; +package br.com.tasknoteapp.server.service.impl; -import br.com.tasknoteapp.java_api.response.NoteResponse; -import br.com.tasknoteapp.java_api.response.SearchResponse; -import br.com.tasknoteapp.java_api.response.SummaryResponse; -import br.com.tasknoteapp.java_api.response.TaskResponse; -import br.com.tasknoteapp.java_api.service.HomeService; -import br.com.tasknoteapp.java_api.service.NoteService; -import br.com.tasknoteapp.java_api.service.TaskService; +import br.com.tasknoteapp.server.response.NoteResponse; +import br.com.tasknoteapp.server.response.SearchResponse; +import br.com.tasknoteapp.server.response.SummaryResponse; +import br.com.tasknoteapp.server.response.TaskResponse; +import br.com.tasknoteapp.server.service.HomeService; +import br.com.tasknoteapp.server.service.NoteService; +import br.com.tasknoteapp.server.service.TaskService; import java.util.List; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/service/impl/JwtServiceImpl.java b/server/src/main/java/br/com/tasknoteapp/server/service/impl/JwtServiceImpl.java similarity index 96% rename from server/src/main/java/br/com/tasknoteapp/java_api/service/impl/JwtServiceImpl.java rename to server/src/main/java/br/com/tasknoteapp/server/service/impl/JwtServiceImpl.java index 62d9d95..ee077d5 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/service/impl/JwtServiceImpl.java +++ b/server/src/main/java/br/com/tasknoteapp/server/service/impl/JwtServiceImpl.java @@ -1,6 +1,6 @@ -package br.com.tasknoteapp.java_api.service.impl; +package br.com.tasknoteapp.server.service.impl; -import br.com.tasknoteapp.java_api.service.JwtService; +import br.com.tasknoteapp.server.service.JwtService; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.MalformedJwtException; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/service/impl/NoteServiceImpl.java b/server/src/main/java/br/com/tasknoteapp/server/service/impl/NoteServiceImpl.java similarity index 85% rename from server/src/main/java/br/com/tasknoteapp/java_api/service/impl/NoteServiceImpl.java rename to server/src/main/java/br/com/tasknoteapp/server/service/impl/NoteServiceImpl.java index c8b9f07..280ff3a 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/service/impl/NoteServiceImpl.java +++ b/server/src/main/java/br/com/tasknoteapp/server/service/impl/NoteServiceImpl.java @@ -1,18 +1,18 @@ -package br.com.tasknoteapp.java_api.service.impl; +package br.com.tasknoteapp.server.service.impl; -import br.com.tasknoteapp.java_api.entity.NoteEntity; -import br.com.tasknoteapp.java_api.entity.NoteUrlEntity; -import br.com.tasknoteapp.java_api.entity.UserEntity; -import br.com.tasknoteapp.java_api.exception.NoteNotFoundException; -import br.com.tasknoteapp.java_api.repository.NoteRepository; -import br.com.tasknoteapp.java_api.repository.NoteUrlRepository; -import br.com.tasknoteapp.java_api.request.NotePatchRequest; -import br.com.tasknoteapp.java_api.request.NoteRequest; -import br.com.tasknoteapp.java_api.request.NoteUrlPatchRequest; -import br.com.tasknoteapp.java_api.response.NoteResponse; -import br.com.tasknoteapp.java_api.service.AuthService; -import br.com.tasknoteapp.java_api.service.NoteService; -import br.com.tasknoteapp.java_api.util.AuthUtil; +import br.com.tasknoteapp.server.entity.NoteEntity; +import br.com.tasknoteapp.server.entity.NoteUrlEntity; +import br.com.tasknoteapp.server.entity.UserEntity; +import br.com.tasknoteapp.server.exception.NoteNotFoundException; +import br.com.tasknoteapp.server.repository.NoteRepository; +import br.com.tasknoteapp.server.repository.NoteUrlRepository; +import br.com.tasknoteapp.server.request.NotePatchRequest; +import br.com.tasknoteapp.server.request.NoteRequest; +import br.com.tasknoteapp.server.request.NoteUrlPatchRequest; +import br.com.tasknoteapp.server.response.NoteResponse; +import br.com.tasknoteapp.server.service.AuthService; +import br.com.tasknoteapp.server.service.NoteService; +import br.com.tasknoteapp.server.util.AuthUtil; import jakarta.transaction.Transactional; import java.util.ArrayList; import java.util.List; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/service/impl/TaskServiceImpl.java b/server/src/main/java/br/com/tasknoteapp/server/service/impl/TaskServiceImpl.java similarity index 85% rename from server/src/main/java/br/com/tasknoteapp/java_api/service/impl/TaskServiceImpl.java rename to server/src/main/java/br/com/tasknoteapp/server/service/impl/TaskServiceImpl.java index a98f23d..00603ee 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/service/impl/TaskServiceImpl.java +++ b/server/src/main/java/br/com/tasknoteapp/server/service/impl/TaskServiceImpl.java @@ -1,18 +1,18 @@ -package br.com.tasknoteapp.java_api.service.impl; +package br.com.tasknoteapp.server.service.impl; -import br.com.tasknoteapp.java_api.entity.TaskEntity; -import br.com.tasknoteapp.java_api.entity.TaskUrlEntity; -import br.com.tasknoteapp.java_api.entity.UserEntity; -import br.com.tasknoteapp.java_api.exception.TaskNotFoundException; -import br.com.tasknoteapp.java_api.repository.TaskRepository; -import br.com.tasknoteapp.java_api.repository.TaskUrlRepository; -import br.com.tasknoteapp.java_api.request.TaskPatchRequest; -import br.com.tasknoteapp.java_api.request.TaskRequest; -import br.com.tasknoteapp.java_api.request.TaskUrlPatchRequest; -import br.com.tasknoteapp.java_api.response.TaskResponse; -import br.com.tasknoteapp.java_api.service.AuthService; -import br.com.tasknoteapp.java_api.service.TaskService; -import br.com.tasknoteapp.java_api.util.AuthUtil; +import br.com.tasknoteapp.server.entity.TaskEntity; +import br.com.tasknoteapp.server.entity.TaskUrlEntity; +import br.com.tasknoteapp.server.entity.UserEntity; +import br.com.tasknoteapp.server.exception.TaskNotFoundException; +import br.com.tasknoteapp.server.repository.TaskRepository; +import br.com.tasknoteapp.server.repository.TaskUrlRepository; +import br.com.tasknoteapp.server.request.TaskPatchRequest; +import br.com.tasknoteapp.server.request.TaskRequest; +import br.com.tasknoteapp.server.request.TaskUrlPatchRequest; +import br.com.tasknoteapp.server.response.TaskResponse; +import br.com.tasknoteapp.server.service.AuthService; +import br.com.tasknoteapp.server.service.TaskService; +import br.com.tasknoteapp.server.util.AuthUtil; import jakarta.transaction.Transactional; import java.util.ArrayList; import java.util.List; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/service/impl/UserServiceImpl.java b/server/src/main/java/br/com/tasknoteapp/server/service/impl/UserServiceImpl.java similarity index 79% rename from server/src/main/java/br/com/tasknoteapp/java_api/service/impl/UserServiceImpl.java rename to server/src/main/java/br/com/tasknoteapp/server/service/impl/UserServiceImpl.java index 740dbf9..8d44267 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/service/impl/UserServiceImpl.java +++ b/server/src/main/java/br/com/tasknoteapp/server/service/impl/UserServiceImpl.java @@ -1,8 +1,8 @@ -package br.com.tasknoteapp.java_api.service.impl; +package br.com.tasknoteapp.server.service.impl; -import br.com.tasknoteapp.java_api.entity.UserEntity; -import br.com.tasknoteapp.java_api.repository.UserRepository; -import br.com.tasknoteapp.java_api.service.UserService; +import br.com.tasknoteapp.server.entity.UserEntity; +import br.com.tasknoteapp.server.repository.UserRepository; +import br.com.tasknoteapp.server.service.UserService; import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.security.core.userdetails.UserDetails; diff --git a/server/src/main/java/br/com/tasknoteapp/java_api/util/AuthUtil.java b/server/src/main/java/br/com/tasknoteapp/server/util/AuthUtil.java similarity index 97% rename from server/src/main/java/br/com/tasknoteapp/java_api/util/AuthUtil.java rename to server/src/main/java/br/com/tasknoteapp/server/util/AuthUtil.java index 67b8d32..69ee3a4 100644 --- a/server/src/main/java/br/com/tasknoteapp/java_api/util/AuthUtil.java +++ b/server/src/main/java/br/com/tasknoteapp/server/util/AuthUtil.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.util; +package br.com.tasknoteapp.server.util; import java.util.Objects; import java.util.Optional; diff --git a/server/src/test/java/br/com/tasknoteapp/java_api/JavaApiApplicationTests.java b/server/src/test/java/br/com/tasknoteapp/server/JavaApiApplicationTests.java similarity index 83% rename from server/src/test/java/br/com/tasknoteapp/java_api/JavaApiApplicationTests.java rename to server/src/test/java/br/com/tasknoteapp/server/JavaApiApplicationTests.java index 21f639a..58b3716 100644 --- a/server/src/test/java/br/com/tasknoteapp/java_api/JavaApiApplicationTests.java +++ b/server/src/test/java/br/com/tasknoteapp/server/JavaApiApplicationTests.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api; +package br.com.tasknoteapp.server; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/server/src/test/java/br/com/tasknoteapp/java_api/controller/AuthenticationControllerTest.java b/server/src/test/java/br/com/tasknoteapp/server/controller/AuthenticationControllerTest.java similarity index 94% rename from server/src/test/java/br/com/tasknoteapp/java_api/controller/AuthenticationControllerTest.java rename to server/src/test/java/br/com/tasknoteapp/server/controller/AuthenticationControllerTest.java index 7a6f0ef..7e385d1 100644 --- a/server/src/test/java/br/com/tasknoteapp/java_api/controller/AuthenticationControllerTest.java +++ b/server/src/test/java/br/com/tasknoteapp/server/controller/AuthenticationControllerTest.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.controller; +package br.com.tasknoteapp.server.controller; import static org.mockito.Mockito.when; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; @@ -7,9 +7,9 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import br.com.tasknoteapp.java_api.exception.UserAlreadyExistsException; -import br.com.tasknoteapp.java_api.request.LoginRequest; -import br.com.tasknoteapp.java_api.service.AuthService; +import br.com.tasknoteapp.server.exception.UserAlreadyExistsException; +import br.com.tasknoteapp.server.request.LoginRequest; +import br.com.tasknoteapp.server.service.AuthService; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/server/src/test/java/br/com/tasknoteapp/java_api/controller/HomeControllerTest.java b/server/src/test/java/br/com/tasknoteapp/server/controller/HomeControllerTest.java similarity index 92% rename from server/src/test/java/br/com/tasknoteapp/java_api/controller/HomeControllerTest.java rename to server/src/test/java/br/com/tasknoteapp/server/controller/HomeControllerTest.java index 93c4181..6a3516c 100644 --- a/server/src/test/java/br/com/tasknoteapp/java_api/controller/HomeControllerTest.java +++ b/server/src/test/java/br/com/tasknoteapp/server/controller/HomeControllerTest.java @@ -1,4 +1,4 @@ -package br.com.tasknoteapp.java_api.controller; +package br.com.tasknoteapp.server.controller; import static org.mockito.Mockito.when; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; @@ -6,11 +6,11 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import br.com.tasknoteapp.java_api.response.NoteResponse; -import br.com.tasknoteapp.java_api.response.SearchResponse; -import br.com.tasknoteapp.java_api.response.SummaryResponse; -import br.com.tasknoteapp.java_api.response.TaskResponse; -import br.com.tasknoteapp.java_api.service.HomeService; +import br.com.tasknoteapp.server.response.NoteResponse; +import br.com.tasknoteapp.server.response.SearchResponse; +import br.com.tasknoteapp.server.response.SummaryResponse; +import br.com.tasknoteapp.server.response.TaskResponse; +import br.com.tasknoteapp.server.service.HomeService; import java.util.List; import org.hamcrest.Matchers; import org.junit.jupiter.api.DisplayName;