Skip to content
Snippets Groups Projects
Commit f940605d authored by Dominik František Bučík's avatar Dominik František Bučík
Browse files

chore: merge branch 'fix_print' into 'main'

fix: :bug: dynreg resource claim and allowed resource comparation

See merge request !369
parents 10ee8378 21ceb47e
No related branches found
No related tags found
1 merge request!369fix: 🐛 dynreg resource claim and allowed resource comparation
Pipeline #390022 passed
......@@ -124,7 +124,7 @@ public class DynamicallyRegisteredRequestBody {
private Integer refreshTokenValiditySeconds = 0;
@JsonAlias("resources")
private Set<String> resourceIds = new HashSet<>();
private Set<String> resource = new HashSet<>();
@JsonAlias("reuse_refresh_token")
private boolean reuseRefreshToken = true;
......
......@@ -106,7 +106,7 @@ public class DynamicallyRegisteredRequestBodyResponse extends DynamicallyRegiste
this.setRequestUris(registeredClient.getRequestUris());
this.setAccessTokenValiditySeconds(registeredClient.getAccessTokenValiditySeconds());
this.setRefreshTokenValiditySeconds(registeredClient.getRefreshTokenValiditySeconds());
this.setResourceIds(registeredClient.getResourceIds());
this.setResource(registeredClient.getResourceIds());
this.setReuseRefreshToken(registeredClient.isReuseRefreshToken());
this.setIdTokenValiditySeconds(registeredClient.getIdTokenValiditySeconds());
this.setClearAccessTokensOnRefresh(registeredClient.isClearAccessTokensOnRefresh());
......
......@@ -7,7 +7,6 @@ import com.nimbusds.jose.jwk.JWKSet;
import com.nimbusds.jwt.JWTParser;
import cz.muni.ics.jwt.encryption.service.JWTEncryptionAndDecryptionService;
import cz.muni.ics.jwt.signer.service.JWTSigningAndValidationService;
import cz.muni.ics.oauth2.exception.InvalidTargetException;
import cz.muni.ics.oauth2.model.ClientDetailsEntity;
import cz.muni.ics.oauth2.model.DynamicallyRegisteredRequestBody;
import cz.muni.ics.oauth2.model.PKCEAlgorithm;
......@@ -108,7 +107,7 @@ public class DynamicClientRegistrationServiceImpl implements DynamicClientRegist
);
}
Set<String> requestedResourceIds = requestedRegistration.getResourceIds();
Set<String> requestedResourceIds = requestedRegistration.getResource();
Set<String> authResourceIds = tokenClient.getResourceIds();
if (requestedResourceIds != null && authResourceIds != null
&& !authResourceIds.containsAll(requestedResourceIds)
......@@ -341,7 +340,7 @@ public class DynamicClientRegistrationServiceImpl implements DynamicClientRegist
client.setRequestUris(requestedRegistration.getRequestUris());
client.setAccessTokenValiditySeconds(requestedRegistration.getAccessTokenValiditySeconds());
client.setRefreshTokenValiditySeconds(requestedRegistration.getRefreshTokenValiditySeconds());
client.setResourceIds(requestedRegistration.getResourceIds());
client.setResourceIds(requestedRegistration.getResource());
client.setReuseRefreshToken(requestedRegistration.isReuseRefreshToken());
client.setIdTokenValiditySeconds(requestedRegistration.getIdTokenValiditySeconds());
client.setClearAccessTokensOnRefresh(requestedRegistration.isClearAccessTokensOnRefresh());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment