CHANGELOG.md

+## [17.3.3](https://gitlab.ics.muni.cz/perun/perun-proxyidp/v1/OpenID-Connect-Java-Spring-Server/compare/v17.3.2...v17.3.3) (2024-03-18)
+
+
+### Bug Fixes
+
+* 🐛 Throw correct error when no auth_code found ([1105142](https://gitlab.ics.muni.cz/perun/perun-proxyidp/v1/OpenID-Connect-Java-Spring-Server/commit/1105142f6be056ec6b432a307641f1155c81253f))
+
 ## [17.3.2](https://gitlab.ics.muni.cz/perun/perun-proxyidp/v1/OpenID-Connect-Java-Spring-Server/compare/v17.3.1...v17.3.2) (2024-03-18)
 
 

perun-oidc-server-webapp/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>cz.muni.ics</groupId>
 		<artifactId>perun-oidc-parent</artifactId>
-		<version>17.3.2</version>
+		<version>17.3.3</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

perun-oidc-server/pom.xml

@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>cz.muni.ics</groupId>
 		<artifactId>perun-oidc-parent</artifactId>
-		<version>17.3.2</version>
+		<version>17.3.3</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

perun-oidc-server/src/main/java/cz/muni/ics/oauth2/repository/impl/JpaAuthorizationCodeRepository.java

@@ -29,6 +29,7 @@ import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 import java.util.Collection;
@@ -67,7 +68,11 @@ public class JpaAuthorizationCodeRepository implements AuthorizationCodeReposito
 				AuthorizationCodeEntity.QUERY_BY_VALUE, AuthorizationCodeEntity.class
 		);
 		query.setParameter(AuthorizationCodeEntity.PARAM_CODE, code);
-		return query.getSingleResult();
+		try {
+			return query.getSingleResult();
+		} catch (NoResultException ex) {
+			return null;
+		}
 	}
 
 	/* (non-Javadoc)

perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/impl/DefaultOAuth2AuthorizationCodeService.java

@@ -100,7 +100,7 @@ public class DefaultOAuth2AuthorizationCodeService implements AuthorizationCodeS
 		AuthorizationCodeEntity result = repository.getByCode(code);
 
 		if (result == null) {
-			throw new InvalidGrantException("JpaAuthorizationCodeRepository: no authorization code found for value " + code);
+			throw new InvalidGrantException("No authorization code found for value " + code);
 		}
 
 		OAuth2Authentication auth = result.getAuthenticationHolder().getAuthentication();

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>cz.muni.ics</groupId>
 	<artifactId>perun-oidc-parent</artifactId>
-	<version>17.3.2</version>
+	<version>17.3.3</version>
 	<packaging>pom</packaging>
 
 	<modules>