Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
45d21154cc | ||
|
|
46a618daea | ||
|
|
a1cff78f0c | ||
|
|
94dd6355b4 | ||
| f2fead959d | |||
|
|
be2a470d01 | ||
|
|
643cb9da78 |
@@ -6,7 +6,7 @@
|
|||||||
<httpHeaders>
|
<httpHeaders>
|
||||||
<property>
|
<property>
|
||||||
<name>Authorization</name>
|
<name>Authorization</name>
|
||||||
<value>token {access_token}</value>
|
<value>token ${env.MAVEN_TOKEN}</value>
|
||||||
</property>
|
</property>
|
||||||
</httpHeaders>
|
</httpHeaders>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
{
|
{
|
||||||
"branches": ["master"],
|
"branches": ["master"],
|
||||||
|
"tagFormat": "${version}",
|
||||||
"plugins": [
|
"plugins": [
|
||||||
"@semantic-release/commit-analyzer",
|
"@semantic-release/commit-analyzer",
|
||||||
"@semantic-release/release-notes-generator",
|
"@semantic-release/release-notes-generator",
|
||||||
|
|||||||
21
CHANGELOG.md
21
CHANGELOG.md
@@ -1,3 +1,24 @@
|
|||||||
|
## [1.2.1](https://git.tools.ldpt.fr/lucasdpt/spring-keycloak-starter/compare/1.2.0...1.2.1) (2025-09-26)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* update bean init ([46a618d](https://git.tools.ldpt.fr/lucasdpt/spring-keycloak-starter/commit/46a618daea7637c565240e468829294860cc6478))
|
||||||
|
|
||||||
|
# [1.2.0](https://git.tools.ldpt.fr/lucasdpt/spring-keycloak-starter/compare/v1.1.0...1.2.0) (2025-09-26)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* refactor way to get CallerId ([94dd635](https://git.tools.ldpt.fr/lucasdpt/spring-keycloak-starter/commit/94dd6355b40e69ef6863a225bbe60f9f8a780047))
|
||||||
|
|
||||||
|
# [1.1.0](https://git.tools.ldpt.fr/lucasdpt/spring-keycloak-starter/compare/v1.0.1...v1.1.0) (2025-09-21)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* update settings.xml ([643cb9d](https://git.tools.ldpt.fr/lucasdpt/spring-keycloak-starter/commit/643cb9da78e41bcc0de7f08a94fe3e27efcc98be))
|
||||||
|
|
||||||
## [1.0.1](https://git.tools.ldpt.fr/lucasdpt/spring-keycloak-starter/compare/v1.0.0...v1.0.1) (2025-09-21)
|
## [1.0.1](https://git.tools.ldpt.fr/lucasdpt/spring-keycloak-starter/compare/v1.0.0...v1.0.1) (2025-09-21)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
2
pom.xml
2
pom.xml
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>fr.lucasdupont</groupId>
|
<groupId>fr.lucasdupont</groupId>
|
||||||
<artifactId>spring-keycloak-starter</artifactId>
|
<artifactId>spring-keycloak-starter</artifactId>
|
||||||
<version>1.0.1</version>
|
<version>1.2.1</version>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<maven.compiler.source>21</maven.compiler.source>
|
<maven.compiler.source>21</maven.compiler.source>
|
||||||
|
|||||||
@@ -1,28 +1,14 @@
|
|||||||
package fr.lucasdupont.security;
|
package fr.lucasdupont.security;
|
||||||
|
|
||||||
import org.springframework.core.MethodParameter;
|
|
||||||
import org.springframework.security.core.Authentication;
|
import org.springframework.security.core.Authentication;
|
||||||
import org.springframework.security.core.context.SecurityContextHolder;
|
import org.springframework.security.core.context.SecurityContextHolder;
|
||||||
import org.springframework.security.oauth2.jwt.Jwt;
|
import org.springframework.security.oauth2.jwt.Jwt;
|
||||||
import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
|
import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
|
||||||
import org.springframework.web.bind.support.WebDataBinderFactory;
|
import org.springframework.stereotype.Component;
|
||||||
import org.springframework.web.context.request.NativeWebRequest;
|
|
||||||
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
|
|
||||||
import org.springframework.web.method.support.ModelAndViewContainer;
|
|
||||||
|
|
||||||
public class CallerIdArgumentResolver implements HandlerMethodArgumentResolver {
|
public class CallerIdResolver {
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean supportsParameter(MethodParameter parameter) {
|
|
||||||
return CallerId.class.isAssignableFrom(parameter.getParameterType());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Object resolveArgument(MethodParameter parameter,
|
|
||||||
ModelAndViewContainer mavContainer,
|
|
||||||
NativeWebRequest webRequest,
|
|
||||||
WebDataBinderFactory binderFactory) throws IllegalAccessException {
|
|
||||||
|
|
||||||
|
public CallerId get() throws IllegalAccessException {
|
||||||
Authentication auth = SecurityContextHolder.getContext().getAuthentication();
|
Authentication auth = SecurityContextHolder.getContext().getAuthentication();
|
||||||
if (!(auth instanceof JwtAuthenticationToken jwtAuth)) {
|
if (!(auth instanceof JwtAuthenticationToken jwtAuth)) {
|
||||||
throw new IllegalAccessException("Authentication is not of type JwtAuthenticationToken");
|
throw new IllegalAccessException("Authentication is not of type JwtAuthenticationToken");
|
||||||
@@ -44,4 +30,5 @@ public class CallerIdArgumentResolver implements HandlerMethodArgumentResolver {
|
|||||||
return new CallerId(sub, CallerId.Type.USER);
|
return new CallerId(sub, CallerId.Type.USER);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -9,10 +9,6 @@ import org.springframework.security.config.annotation.web.configurers.AbstractHt
|
|||||||
import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationConverter;
|
import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationConverter;
|
||||||
import org.springframework.security.web.SecurityFilterChain;
|
import org.springframework.security.web.SecurityFilterChain;
|
||||||
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
|
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
|
||||||
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
|
|
||||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@AutoConfiguration
|
@AutoConfiguration
|
||||||
@ConditionalOnClass(HttpSecurity.class)
|
@ConditionalOnClass(HttpSecurity.class)
|
||||||
@@ -48,18 +44,8 @@ public class KeycloakAutoConfiguration {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
public WebMvcConfigurer callerIdArgumentResolverConfigurer(CallerIdArgumentResolver resolver) {
|
public CallerIdResolver callerIdResolver() {
|
||||||
return new WebMvcConfigurer() {
|
return new CallerIdResolver();
|
||||||
@Override
|
|
||||||
public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
|
|
||||||
resolvers.add(resolver);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public CallerIdArgumentResolver callerIdArgumentResolver() {
|
|
||||||
return new CallerIdArgumentResolver();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user