From f2da3ee132adc756232beebeeac43801d2cf72be Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Wed, 21 May 2025 12:14:05 +0200 Subject: [PATCH] refactor(security): reorganize OAuth2 packages and classes --- .../de/szut/casino/security/oauth2/OAuth2UserInfoFactory.java | 2 ++ .../casino/security/{ => oauth2/github}/GitHubController.java | 3 +-- .../security/oauth2/{ => github}/GitHubOAuth2UserInfo.java | 4 +++- .../casino/security/{ => oauth2/github}/GitHubService.java | 4 +--- .../security/{dto => oauth2/github}/GithubCallbackDto.java | 2 +- .../casino/security/{ => oauth2/google}/GoogleController.java | 4 ++-- .../security/oauth2/{ => google}/GoogleOAuth2UserInfo.java | 4 +++- .../casino/security/{ => oauth2/google}/GoogleService.java | 2 +- 8 files changed, 14 insertions(+), 11 deletions(-) rename backend/src/main/java/de/szut/casino/security/{ => oauth2/github}/GitHubController.java (94%) rename backend/src/main/java/de/szut/casino/security/oauth2/{ => github}/GitHubOAuth2UserInfo.java (82%) rename backend/src/main/java/de/szut/casino/security/{ => oauth2/github}/GitHubService.java (98%) rename backend/src/main/java/de/szut/casino/security/{dto => oauth2/github}/GithubCallbackDto.java (65%) rename backend/src/main/java/de/szut/casino/security/{ => oauth2/google}/GoogleController.java (93%) rename backend/src/main/java/de/szut/casino/security/oauth2/{ => google}/GoogleOAuth2UserInfo.java (82%) rename backend/src/main/java/de/szut/casino/security/{ => oauth2/google}/GoogleService.java (99%) diff --git a/backend/src/main/java/de/szut/casino/security/oauth2/OAuth2UserInfoFactory.java b/backend/src/main/java/de/szut/casino/security/oauth2/OAuth2UserInfoFactory.java index 8e0e936..66633e0 100644 --- a/backend/src/main/java/de/szut/casino/security/oauth2/OAuth2UserInfoFactory.java +++ b/backend/src/main/java/de/szut/casino/security/oauth2/OAuth2UserInfoFactory.java @@ -1,6 +1,8 @@ package de.szut.casino.security.oauth2; import de.szut.casino.exceptionHandling.exceptions.OAuth2AuthenticationProcessingException; +import de.szut.casino.security.oauth2.github.GitHubOAuth2UserInfo; +import de.szut.casino.security.oauth2.google.GoogleOAuth2UserInfo; import de.szut.casino.user.AuthProvider; import java.util.Map; diff --git a/backend/src/main/java/de/szut/casino/security/GitHubController.java b/backend/src/main/java/de/szut/casino/security/oauth2/github/GitHubController.java similarity index 94% rename from backend/src/main/java/de/szut/casino/security/GitHubController.java rename to backend/src/main/java/de/szut/casino/security/oauth2/github/GitHubController.java index b45fb62..9abf96c 100644 --- a/backend/src/main/java/de/szut/casino/security/GitHubController.java +++ b/backend/src/main/java/de/szut/casino/security/oauth2/github/GitHubController.java @@ -1,7 +1,6 @@ -package de.szut.casino.security; +package de.szut.casino.security.oauth2.github; import de.szut.casino.security.dto.AuthResponseDto; -import de.szut.casino.security.dto.GithubCallbackDto; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/backend/src/main/java/de/szut/casino/security/oauth2/GitHubOAuth2UserInfo.java b/backend/src/main/java/de/szut/casino/security/oauth2/github/GitHubOAuth2UserInfo.java similarity index 82% rename from backend/src/main/java/de/szut/casino/security/oauth2/GitHubOAuth2UserInfo.java rename to backend/src/main/java/de/szut/casino/security/oauth2/github/GitHubOAuth2UserInfo.java index f98390e..c764fc7 100644 --- a/backend/src/main/java/de/szut/casino/security/oauth2/GitHubOAuth2UserInfo.java +++ b/backend/src/main/java/de/szut/casino/security/oauth2/github/GitHubOAuth2UserInfo.java @@ -1,4 +1,6 @@ -package de.szut.casino.security.oauth2; +package de.szut.casino.security.oauth2.github; + +import de.szut.casino.security.oauth2.OAuth2UserInfo; import java.util.Map; diff --git a/backend/src/main/java/de/szut/casino/security/GitHubService.java b/backend/src/main/java/de/szut/casino/security/oauth2/github/GitHubService.java similarity index 98% rename from backend/src/main/java/de/szut/casino/security/GitHubService.java rename to backend/src/main/java/de/szut/casino/security/oauth2/github/GitHubService.java index 1051498..4a8df24 100644 --- a/backend/src/main/java/de/szut/casino/security/GitHubService.java +++ b/backend/src/main/java/de/szut/casino/security/oauth2/github/GitHubService.java @@ -1,12 +1,10 @@ -package de.szut.casino.security; +package de.szut.casino.security.oauth2.github; import de.szut.casino.security.dto.AuthResponseDto; import de.szut.casino.security.jwt.JwtUtils; import de.szut.casino.user.AuthProvider; import de.szut.casino.user.UserEntity; import de.szut.casino.user.UserRepository; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpEntity; diff --git a/backend/src/main/java/de/szut/casino/security/dto/GithubCallbackDto.java b/backend/src/main/java/de/szut/casino/security/oauth2/github/GithubCallbackDto.java similarity index 65% rename from backend/src/main/java/de/szut/casino/security/dto/GithubCallbackDto.java rename to backend/src/main/java/de/szut/casino/security/oauth2/github/GithubCallbackDto.java index 07619aa..620a708 100644 --- a/backend/src/main/java/de/szut/casino/security/dto/GithubCallbackDto.java +++ b/backend/src/main/java/de/szut/casino/security/oauth2/github/GithubCallbackDto.java @@ -1,4 +1,4 @@ -package de.szut.casino.security.dto; +package de.szut.casino.security.oauth2.github; import lombok.Data; diff --git a/backend/src/main/java/de/szut/casino/security/GoogleController.java b/backend/src/main/java/de/szut/casino/security/oauth2/google/GoogleController.java similarity index 93% rename from backend/src/main/java/de/szut/casino/security/GoogleController.java rename to backend/src/main/java/de/szut/casino/security/oauth2/google/GoogleController.java index 2219d5d..30907f8 100644 --- a/backend/src/main/java/de/szut/casino/security/GoogleController.java +++ b/backend/src/main/java/de/szut/casino/security/oauth2/google/GoogleController.java @@ -1,7 +1,7 @@ -package de.szut.casino.security; +package de.szut.casino.security.oauth2.google; import de.szut.casino.security.dto.AuthResponseDto; -import de.szut.casino.security.dto.GithubCallbackDto; +import de.szut.casino.security.oauth2.github.GithubCallbackDto; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/backend/src/main/java/de/szut/casino/security/oauth2/GoogleOAuth2UserInfo.java b/backend/src/main/java/de/szut/casino/security/oauth2/google/GoogleOAuth2UserInfo.java similarity index 82% rename from backend/src/main/java/de/szut/casino/security/oauth2/GoogleOAuth2UserInfo.java rename to backend/src/main/java/de/szut/casino/security/oauth2/google/GoogleOAuth2UserInfo.java index 66fc99c..819a9b3 100644 --- a/backend/src/main/java/de/szut/casino/security/oauth2/GoogleOAuth2UserInfo.java +++ b/backend/src/main/java/de/szut/casino/security/oauth2/google/GoogleOAuth2UserInfo.java @@ -1,4 +1,6 @@ -package de.szut.casino.security.oauth2; +package de.szut.casino.security.oauth2.google; + +import de.szut.casino.security.oauth2.OAuth2UserInfo; import java.util.Map; diff --git a/backend/src/main/java/de/szut/casino/security/GoogleService.java b/backend/src/main/java/de/szut/casino/security/oauth2/google/GoogleService.java similarity index 99% rename from backend/src/main/java/de/szut/casino/security/GoogleService.java rename to backend/src/main/java/de/szut/casino/security/oauth2/google/GoogleService.java index 703b85a..fd30303 100644 --- a/backend/src/main/java/de/szut/casino/security/GoogleService.java +++ b/backend/src/main/java/de/szut/casino/security/oauth2/google/GoogleService.java @@ -1,4 +1,4 @@ -package de.szut.casino.security; +package de.szut.casino.security.oauth2.google; import de.szut.casino.security.dto.AuthResponseDto; import de.szut.casino.security.jwt.JwtUtils;