feature : introduce v3 with new Spring Authorization Server tables

Author: patternhelloworld

README.md

@@ -7,7 +7,7 @@
 <dependency>
     <groupId>io.github.patternknife.securityhelper.oauth2.api</groupId>
     <artifactId>spring-security-oauth2-password-jpa-implementation</artifactId>
-    <version>2.8.1</version>
+    <version>3.0.0</version>
 </dependency>
 ```
 * Set up the same access & refresh token APIs on both ``/oauth2/token`` and on our controller layer such as ``/api/v1/traditional-oauth/token``, both of which function same and have `the same request & response payloads for success and errors`. (However, ``/oauth2/token`` is the standard that "spring-authorization-server" provides.)
@@ -40,7 +40,9 @@
 * Authentication management based on a combination of username, client ID, and App-Token
   * What is an App-Token? An App-Token is a new access token generated each time the same account logs in. If the token values are the same, the same access token is shared.
 * Separated UserDetails implementation for Admin and Customer roles as an example. (This can be extended as desired by implementing ``UserDetailsServiceFactory``)
-* Provide MySQL DDL, which consists of oauth\_access\_token, oauth\_refresh\_token and oauth\_client\_details, which is tables in Security 5. As I mean to migrate current security system to Security 6, I haven't changed them to the ``authorization`` table indicated in https://github.com/spring-projects/spring-authorization-server.
+* For versions greater than or equal to v3, including the latest version (Spring Security 6), provide MySQL DDL, which consists of ``oauth2_authorization`` and ``oauth2_registered_client``.
+* For v2 (Spring Security 5), provide MySQL DDL, which consists of ``oauth_access_token, oauth_refresh_token and oauth_client_details``, which are tables in Security 5. As I meant to migrate current security system to Security 6 back then, I hadn't changed them to the ``oauth2_authorization`` table indicated in https://github.com/spring-projects/spring-authorization-server.
+
 * Application of Spring Rest Docs
 
 ## Dependencies

client/pom.xml

@@ -7,7 +7,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.patternknife.securityhelper.oauth2.client</groupId>
     <artifactId>spring-security-oauth2-password-jpa-implementation-client</artifactId>
-    <version>2.8.1</version>
+    <version>3.0.0</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -48,7 +48,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
         <dependency>
             <groupId>io.github.patternknife.securityhelper.oauth2.api</groupId>
             <artifactId>spring-security-oauth2-password-jpa-implementation</artifactId>
-            <version>2.8.1</version>
+            <version>3.0.0</version>
         </dependency>
 
         <!-- DB -->

client/src/main/java/com/patternknife/securityhelper/oauth2/client/config/logger/module/ResponseErrorLogConfig.java

@@ -3,7 +3,8 @@
 import com.patternknife.securityhelper.oauth2.client.config.response.error.GlobalExceptionHandler;
 import com.patternknife.securityhelper.oauth2.client.config.logger.common.CommonLoggingRequest;
 
-import com.patternknife.securityhelper.oauth2.client.config.response.error.dto.CustomErrorResponsePayload;
+
+import io.github.patternknife.securityhelper.oauth2.api.config.security.response.error.dto.ErrorResponsePayload;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
@@ -30,12 +31,12 @@ public void endpointAfterExceptionReturning(JoinPoint p, Object returnValue) {
         try {
             if (p.getTarget().getClass().equals(GlobalExceptionHandler.class)) {
 
-                CustomErrorResponsePayload customErrorResponsePayload = (CustomErrorResponsePayload) ((ResponseEntity) returnValue).getBody();
+                ErrorResponsePayload errorResponsePayload = (ErrorResponsePayload) ((ResponseEntity) returnValue).getBody();
                 loggedText += String.format("[After - Error Response]\n message : %s || \n userMessage : %s || \n cause : %s || \n stackTrace : %s",
-                        customErrorResponsePayload != null ? customErrorResponsePayload.getMessage() : "No error message",
-                        customErrorResponsePayload != null ? customErrorResponsePayload.getUserMessage() : "No error userMessage",
-                        customErrorResponsePayload != null ? customErrorResponsePayload.getCause() : "No error detail cause",
-                        customErrorResponsePayload != null ? customErrorResponsePayload.getStackTrace() : "No error detail stack trace");
+                        errorResponsePayload != null ? errorResponsePayload.getMessage() : "No error message",
+                        errorResponsePayload != null ? errorResponsePayload.getUserMessage() : "No error userMessage",
+                        errorResponsePayload != null ? errorResponsePayload.getCause() : "No error detail cause",
+                        errorResponsePayload != null ? errorResponsePayload.getStackTrace() : "No error detail stack trace");
             }
         } catch (Exception ex4) {
 

client/src/main/java/com/patternknife/securityhelper/oauth2/client/config/response/error/CustomExceptionUtils.java

@@ -3,7 +3,8 @@
 import com.patternknife.securityhelper.oauth2.client.config.logger.common.CommonLoggingRequest;
 
 import com.patternknife.securityhelper.oauth2.client.config.logger.module.ResponseSuccessLogConfig;
-import com.patternknife.securityhelper.oauth2.client.config.response.error.dto.CustomErrorResponsePayload;
+
+import io.github.patternknife.securityhelper.oauth2.api.config.security.response.error.dto.ErrorResponsePayload;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,10 +28,10 @@ public static void createNonStoppableErrorMessage(String message) {
         } catch (Exception ex2) {
             logger.error(ex2.getMessage());
         } finally {
-            CustomErrorResponsePayload customErrorResponsePayload = new CustomErrorResponsePayload(message, "Without error param " + " / Thread ID = " + Thread.currentThread().getId() + " / StackTrace",
+            ErrorResponsePayload errorResponsePayload = new ErrorResponsePayload(message, "Without error param " + " / Thread ID = " + Thread.currentThread().getId() + " / StackTrace",
                     message, "", "");
 
-            logger.error(" / " + customErrorResponsePayload.toString());
+            logger.error(" / " + errorResponsePayload.toString());
         }
 
     }
@@ -45,10 +46,10 @@ public static void createNonStoppableErrorMessage(String message, Throwable ex)
         } catch (Exception ex2) {
             logger.error(ex2.getMessage());
         } finally {
-            CustomErrorResponsePayload customErrorResponsePayload = new CustomErrorResponsePayload(message, "Without error param " + " / Thread ID = " + Thread.currentThread().getId() + " / StackTrace",
+            ErrorResponsePayload errorResponsePayload = new ErrorResponsePayload(message, "Without error param " + " / Thread ID = " + Thread.currentThread().getId() + " / StackTrace",
                     message, CustomExceptionUtils.getAllStackTraces(ex), CustomExceptionUtils.getAllCauses(ex));
 
-            logger.error(" / " + customErrorResponsePayload.toString());
+            logger.error(" / " + errorResponsePayload.toString());
         }
 
     }

client/src/main/java/com/patternknife/securityhelper/oauth2/client/config/response/error/GlobalExceptionHandler.java

@@ -1,8 +1,6 @@
 package com.patternknife.securityhelper.oauth2.client.config.response.error;
 
 
-import com.patternknife.securityhelper.oauth2.client.config.response.error.dto.CustomErrorResponsePayload;
-
 import com.patternknife.securityhelper.oauth2.client.config.response.error.message.GeneralErrorMessage;
 import io.github.patternknife.securityhelper.oauth2.api.config.security.response.error.util.ExceptionKnifeUtils;
 import io.github.patternknife.securityhelper.oauth2.api.config.security.response.error.dto.ErrorResponsePayload;
@@ -63,9 +61,9 @@ public ResponseEntity<?> authorizationException(Exception ex, WebRequest request
     // Unhandled
     @ExceptionHandler(Exception.class)
     public ResponseEntity<?> unhandledExceptionHandler(Exception ex, WebRequest request) {
-        CustomErrorResponsePayload customErrorResponsePayload = new CustomErrorResponsePayload(ex.getMessage(), request.getDescription(false), GeneralErrorMessage.UNHANDLED_ERROR.getUserMessage(),
+        ErrorResponsePayload errorResponsePayload = new ErrorResponsePayload(ex.getMessage(), request.getDescription(false), GeneralErrorMessage.UNHANDLED_ERROR.getUserMessage(),
                 CustomExceptionUtils.getAllStackTraces(ex), CustomExceptionUtils.getAllCauses(ex));
-        return new ResponseEntity<>(customErrorResponsePayload, HttpStatus.INTERNAL_SERVER_ERROR);
+        return new ResponseEntity<>(errorResponsePayload, HttpStatus.INTERNAL_SERVER_ERROR);
     }
 
 }

client/src/main/java/com/patternknife/securityhelper/oauth2/client/config/response/error/dto/CustomErrorResponsePayload.java

@@ -2,10 +2,9 @@
 
 
 import io.github.patternknife.securityhelper.oauth2.api.config.security.aop.SecurityPointCut;
-import io.github.patternknife.securityhelper.oauth2.api.config.security.entity.KnifeOauthAccessToken;
-import io.github.patternknife.securityhelper.oauth2.api.config.security.entity.KnifeOauthRefreshToken;
-import io.github.patternknife.securityhelper.oauth2.api.config.security.entity.KnifeOauthClientDetail;
 
+import io.github.patternknife.securityhelper.oauth2.api.config.security.entity.KnifeAuthorization;
+import io.github.patternknife.securityhelper.oauth2.api.config.security.entity.KnifeClient;
 import jakarta.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 
@@ -14,10 +13,8 @@
 @Service
 @RequiredArgsConstructor
 public class SecurityPointCutImpl implements SecurityPointCut {
-
     @Override
-    public <T> @Nullable T afterTokensSaved(@Nullable KnifeOauthAccessToken knifeOauthAccessToken, @Nullable KnifeOauthRefreshToken knifeOauthRefreshToken, @Nullable KnifeOauthClientDetail knifeOauthClientDetail) {
-
+    public <T> @Nullable T afterTokensSaved(@Nullable KnifeAuthorization knifeAuthorization, @Nullable KnifeClient knifeClient) {
         // Implement what you need right after tokens are persisted.
         return null;
     }

client/src/main/java/com/patternknife/securityhelper/oauth2/client/config/securityimpl/aop/SecurityPointCutImpl.java

@@ -1,7 +1,6 @@
 package com.patternknife.securityhelper.oauth2.client.config.securityimpl.serivce.userdetail;
 
 
-import io.github.patternknife.securityhelper.oauth2.api.config.security.dao.KnifeOauthClientDetailRepository;
 import com.patternknife.securityhelper.oauth2.client.config.securityimpl.guard.AccessTokenUserInfo;
 import com.patternknife.securityhelper.oauth2.client.config.securityimpl.guard.AdditionalAccessTokenUserInfo;
 
@@ -12,6 +11,7 @@
 import com.patternknife.securityhelper.oauth2.client.domain.admin.entity.QAdminRole;
 import com.patternknife.securityhelper.oauth2.client.domain.role.entity.QRole;
 import com.querydsl.jpa.impl.JPAQueryFactory;
+import io.github.patternknife.securityhelper.oauth2.api.config.security.dao.KnifeClientRepository;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -34,16 +34,16 @@ public class AdminDetailsService extends QuerydslRepositorySupport implements Us
     private final JPAQueryFactory jpaQueryFactory;
 
     private final AdminRepository adminRepository;
-    private final KnifeOauthClientDetailRepository knifeOauthClientDetailRepository;
+    private final KnifeClientRepository knifeClientRepository;
 
     private EntityManager entityManager;
 
     public AdminDetailsService(AdminRepository adminRepository,
-                               @Qualifier("authJpaQueryFactory") JPAQueryFactory jpaQueryFactory, KnifeOauthClientDetailRepository knifeOauthClientDetailRepository) {
+                               @Qualifier("authJpaQueryFactory") JPAQueryFactory jpaQueryFactory, KnifeClientRepository knifeClientRepository) {
         super(Admin.class);
         this.adminRepository = adminRepository;
         this.jpaQueryFactory = jpaQueryFactory;
-        this.knifeOauthClientDetailRepository = knifeOauthClientDetailRepository;
+        this.knifeClientRepository = knifeClientRepository;
     }
 
     @Override

client/src/main/java/com/patternknife/securityhelper/oauth2/client/config/securityimpl/serivce/userdetail/AdminDetailsService.java

@@ -1,7 +1,6 @@
 package com.patternknife.securityhelper.oauth2.client.config.securityimpl.serivce.userdetail;
 
 
-import io.github.patternknife.securityhelper.oauth2.api.config.security.dao.KnifeOauthClientDetailRepository;
 import com.patternknife.securityhelper.oauth2.client.config.securityimpl.guard.AccessTokenUserInfo;
 import com.patternknife.securityhelper.oauth2.client.config.securityimpl.guard.AdditionalAccessTokenUserInfo;
 import com.patternknife.securityhelper.oauth2.client.config.response.error.exception.auth.UserDeletedException;
@@ -13,6 +12,7 @@
 import com.patternknife.securityhelper.oauth2.client.domain.customer.entity.QCustomerRole;
 import com.patternknife.securityhelper.oauth2.client.domain.role.entity.QRole;
 import com.querydsl.jpa.impl.JPAQueryFactory;
+import io.github.patternknife.securityhelper.oauth2.api.config.security.dao.KnifeClientRepository;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -34,15 +34,13 @@ public class CustomerDetailsService extends QuerydslRepositorySupport implements
     private final JPAQueryFactory jpaQueryFactory;
 
     private final CustomerRepository customerRepository;
-    private final KnifeOauthClientDetailRepository knifeOauthClientDetailRepository;
 
     private EntityManager entityManager;
 
-    public CustomerDetailsService (CustomerRepository customerRepository, KnifeOauthClientDetailRepository knifeOauthClientDetailRepository,
+    public CustomerDetailsService (CustomerRepository customerRepository,
                        @Qualifier("authJpaQueryFactory") JPAQueryFactory jpaQueryFactory) {
         super(Customer.class);
         this.customerRepository = customerRepository;
-        this.knifeOauthClientDetailRepository = knifeOauthClientDetailRepository;
         this.jpaQueryFactory = jpaQueryFactory;
     }