fix : important bugs on App-Token areas

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>3.0.0</version>
+    <version>3.0.1</version>
 </dependency>
 ```
 For v2, using the database tables from Spring Security 5 (only the database tables; follow the dependencies as above):

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>3.0.0</version>
+    <version>3.0.1</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>3.0.0</version>
+            <version>3.0.1</version>
         </dependency>
 
         <!-- DB -->

mysql/schema.sql

@@ -8,7 +8,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <groupId>io.github.patternknife.securityhelper.oauth2.api</groupId>
     <artifactId>spring-security-oauth2-password-jpa-implementation</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
     <name>spring-security-oauth2-password-jpa-implementation</name>
     <description>The implementation of Spring Security 6 Spring Authorization Server for stateful OAuth2 Password Grant</description>
     <packaging>jar</packaging>

pom.xml

@@ -6,6 +6,7 @@
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
+import org.springframework.security.oauth2.server.authorization.OAuth2Authorization;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -90,6 +91,16 @@ public interface KnifeAuthorizationRepository extends JpaRepository<KnifeAuthori
 
 
     Optional<KnifeAuthorization> findByPrincipalNameAndRegisteredClientIdAndAccessTokenAppToken(String principalName, String registeredClientId, String accessTokenAppToken);
+
+    @Query("SELECT o FROM KnifeAuthorization o WHERE o.principalName = :principalName AND o.registeredClientId = :registeredClientId AND o.accessTokenAppToken = :accessTokenAppToken AND o.accessTokenExpiresAt > CURRENT_TIMESTAMP")
+    Optional<KnifeAuthorization> findValidAuthorizationByPrincipalNameAndClientIdAndAppToken(
+            @Param("principalName") String principalName,
+            @Param("registeredClientId") String registeredClientId,
+            @Param("accessTokenAppToken") String accessTokenAppToken
+    );
+
+
+
     Optional<List<KnifeAuthorization>> findListByPrincipalNameAndRegisteredClientIdAndAccessTokenAppToken(String principalName, String registeredClientId, String accessTokenAppToken);
     @Modifying
     @Transactional(rollbackFor=Exception.class)

src/main/java/io/github/patternknife/securityhelper/oauth2/api/config/security/dao/KnifeAuthorizationRepository.java

@@ -90,10 +90,10 @@ public class KnifeAuthorization {
     private String refreshTokenValue;
 
     @Column(name = "refresh_token_issued_at")
-    private Instant refreshTokenIssuedAt;
+    private LocalDateTime refreshTokenIssuedAt;
 
     @Column(name = "refresh_token_expires_at")
-    private Instant refreshTokenExpiresAt;
+    private LocalDateTime refreshTokenExpiresAt;
 
     @Lob
     @Column(name = "refresh_token_metadata")

src/main/java/io/github/patternknife/securityhelper/oauth2/api/config/security/entity/KnifeAuthorization.java

@@ -6,7 +6,7 @@
 import io.github.patternknife.securityhelper.oauth2.api.config.security.response.error.dto.ErrorMessages;
 import io.github.patternknife.securityhelper.oauth2.api.config.security.message.DefaultSecurityUserExceptionMessage;
 import io.github.patternknife.securityhelper.oauth2.api.config.security.message.ISecurityUserExceptionMessageService;
-import io.github.patternknife.securityhelper.oauth2.api.config.security.serivce.CommonOAuth2AuthorizationCycle;
+import io.github.patternknife.securityhelper.oauth2.api.config.security.serivce.CommonOAuth2AuthorizationSaver;
 import io.github.patternknife.securityhelper.oauth2.api.config.security.serivce.DefaultOauth2AuthenticationHashCheckService;
 import io.github.patternknife.securityhelper.oauth2.api.config.security.serivce.persistence.authorization.OAuth2AuthorizationServiceImpl;
 import io.github.patternknife.securityhelper.oauth2.api.config.security.token.CustomGrantAuthenticationToken;
@@ -31,7 +31,7 @@
 @AllArgsConstructor
 public final class KnifeOauth2AuthenticationProvider implements AuthenticationProvider {
 
-    private final CommonOAuth2AuthorizationCycle commonOAuth2AuthorizationCycle;
+    private final CommonOAuth2AuthorizationSaver commonOAuth2AuthorizationCycle;
     private final ConditionalDetailsService conditionalDetailsService;
     private final DefaultOauth2AuthenticationHashCheckService oauth2AuthenticationHashCheckService;
     private final OAuth2AuthorizationServiceImpl oAuth2AuthorizationService;
@@ -67,7 +67,7 @@ public Authentication authenticate(Authentication authentication)
                 }
 
 
-                OAuth2Authorization oAuth2Authorization = commonOAuth2AuthorizationCycle.run(userDetails, ((CustomGrantAuthenticationToken) authentication).getGrantType(), clientId, ((CustomGrantAuthenticationToken) authentication).getAdditionalParameters(), null);
+                OAuth2Authorization oAuth2Authorization = commonOAuth2AuthorizationCycle.save(userDetails, ((CustomGrantAuthenticationToken) authentication).getGrantType(), clientId, ((CustomGrantAuthenticationToken) authentication).getAdditionalParameters(), null);
 
                 RegisteredClient registeredClient = oAuth2ClientAuthenticationToken.getRegisteredClient();
 

src/main/java/io/github/patternknife/securityhelper/oauth2/api/config/security/provider/auth/endpoint/KnifeOauth2AuthenticationProvider.java

@@ -10,10 +10,10 @@
 /*
 *    Create = Build + Persist
 * */
-public interface CommonOAuth2AuthorizationCycle {
+public interface CommonOAuth2AuthorizationSaver {
 
-     OAuth2Authorization run(UserDetails userDetails, AuthorizationGrantType authorizationGrantType,
-                                                            String clientId, Map<String, Object> additionalParameters,
-                                                            @Nullable Map<String, Object> modifiableAdditionalParameters);
+     OAuth2Authorization save(UserDetails userDetails, AuthorizationGrantType authorizationGrantType,
+                              String clientId, Map<String, Object> additionalParameters,
+                              @Nullable Map<String, Object> modifiableAdditionalParameters);
 
 }

src/main/java/io/github/patternknife/securityhelper/oauth2/api/config/security/serivce/CommonOAuth2AuthorizationCycle.java renamed to src/main/java/io/github/patternknife/securityhelper/oauth2/api/config/security/serivce/CommonOAuth2AuthorizationSaver.java

@@ -23,16 +23,16 @@
 
 @Service
 @RequiredArgsConstructor
-public class CommonOAuth2AuthorizationCycleImpl implements CommonOAuth2AuthorizationCycle {
+public class CommonOAuth2AuthorizationSaverImpl implements CommonOAuth2AuthorizationSaver {
 
      private static final Logger logger = LoggerFactory.getLogger(KnifeSecurityLogConfig.class);
 
      private final OAuth2AuthorizationBuildingService oAuth2AuthorizationBuildingService;
      private final OAuth2AuthorizationServiceImpl oAuth2AuthorizationService;
 
      @Override
-     public OAuth2Authorization run(UserDetails userDetails, AuthorizationGrantType authorizationGrantType, String clientId,
-                                                                   Map<String, Object> additionalParameters, Map<String, Object> modifiableAdditionalParameters) {
+     public OAuth2Authorization save(UserDetails userDetails, AuthorizationGrantType authorizationGrantType, String clientId,
+                                     Map<String, Object> additionalParameters, Map<String, Object> modifiableAdditionalParameters) {
 
           OAuth2Authorization oAuth2Authorization = oAuth2AuthorizationService.findByUserNameAndClientIdAndAppToken(userDetails.getUsername(), clientId, (String) additionalParameters.get(KnifeHttpHeaders.APP_TOKEN));
           if(authorizationGrantType.getValue().equals(AuthorizationGrantType.PASSWORD.getValue())){

src/main/java/io/github/patternknife/securityhelper/oauth2/api/config/security/serivce/CommonOAuth2AuthorizationCycleImpl.java renamed to src/main/java/io/github/patternknife/securityhelper/oauth2/api/config/security/serivce/CommonOAuth2AuthorizationSaverImpl.java

@@ -21,6 +21,11 @@
 
 import java.util.Map;
 
+/*
+*
+*   The term "build" means a "newly created OAuth2Authorization" (no update)
+*
+* */
 @Component
 @RequiredArgsConstructor
 public class OAuth2AuthorizationBuildingServiceImpl implements OAuth2AuthorizationBuildingService {