update oidc config and outputs user info
This commit is contained in:
@@ -3,26 +3,21 @@ package me.hatter.sample;
|
|||||||
import org.springframework.security.core.Authentication;
|
import org.springframework.security.core.Authentication;
|
||||||
import org.springframework.security.core.annotation.AuthenticationPrincipal;
|
import org.springframework.security.core.annotation.AuthenticationPrincipal;
|
||||||
import org.springframework.security.core.context.SecurityContextHolder;
|
import org.springframework.security.core.context.SecurityContextHolder;
|
||||||
import org.springframework.security.oauth2.core.oidc.user.OidcUser;
|
import org.springframework.security.oauth2.core.user.OAuth2User;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
public class SampleController {
|
public class SampleController {
|
||||||
@GetMapping("/oidc-principal")
|
@GetMapping("/oauth2-principal")
|
||||||
public OidcUser getOidcUserPrincipal(
|
public OAuth2User getOidcUserPrincipal(
|
||||||
@AuthenticationPrincipal OidcUser principal) {
|
@AuthenticationPrincipal OAuth2User principal) {
|
||||||
return principal;
|
return principal;
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/oidc-principal2")
|
@GetMapping("/oauth2-principal2")
|
||||||
public Object getOidcUserPrincipal2() {
|
public Object getOidcUserPrincipal2() {
|
||||||
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
|
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
|
||||||
if (authentication.getPrincipal() instanceof OidcUser) {
|
return authentication.getPrincipal();
|
||||||
OidcUser principal = ((OidcUser) authentication.getPrincipal());
|
|
||||||
return principal;
|
|
||||||
} else {
|
|
||||||
return authentication.getPrincipal();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,12 +8,9 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
|
|||||||
public class SecurityConfig extends WebSecurityConfigurerAdapter {
|
public class SecurityConfig extends WebSecurityConfigurerAdapter {
|
||||||
@Override
|
@Override
|
||||||
protected void configure(HttpSecurity http) throws Exception {
|
protected void configure(HttpSecurity http) throws Exception {
|
||||||
http// only disable these during testing or for non-browser clients
|
http.authorizeRequests()
|
||||||
// .cors().disable()
|
|
||||||
// .csrf().disable()
|
|
||||||
.authorizeRequests()
|
|
||||||
.anyRequest().authenticated()
|
.anyRequest().authenticated()
|
||||||
.and()
|
.and()
|
||||||
.oauth2Login().loginPage("/oauth2/authorization/google");
|
.oauth2Login();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,5 +4,6 @@ application.title=This is SpringBoot sample application
|
|||||||
spring.mvc.throw-exception-if-no-handler-found=true
|
spring.mvc.throw-exception-if-no-handler-found=true
|
||||||
spring.resources.add-mappings=false
|
spring.resources.add-mappings=false
|
||||||
|
|
||||||
spring.security.oauth2.client.registration.google.client-id=test
|
spring.security.oauth2.client.provider.login.issuer-uri=<issuer>
|
||||||
spring.security.oauth2.client.registration.google.client-secret=test
|
spring.security.oauth2.client.registration.login.client-id=<client-id>
|
||||||
|
spring.security.oauth2.client.registration.login.client-secret=<client-secret>
|
||||||
|
|||||||
Reference in New Issue
Block a user