-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
11 changed files
with
120 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,7 +17,6 @@ | |
| package org.keycloak.adapters.springsecurity.filter; | ||
|
|
||
| import org.keycloak.adapters.springsecurity.authentication.DirectAccessGrantAuthenticationProvider; | ||
| import org.keycloak.adapters.springsecurity.authentication.DirectAccessGrantUserDetailsAuthenticationProvider; | ||
| import org.keycloak.adapters.springsecurity.token.DirectAccessGrantToken; | ||
| import org.springframework.security.authentication.AuthenticationServiceException; | ||
| import org.springframework.security.core.Authentication; | ||
|
|
@@ -34,7 +33,6 @@ | |
| * @author <a href="mailto:[email protected]">Scott Rossillo</a> | ||
| * | ||
| * @see DirectAccessGrantAuthenticationProvider | ||
| * @see DirectAccessGrantUserDetailsAuthenticationProvider | ||
| * @see UsernamePasswordAuthenticationFilter | ||
| */ | ||
| public class DirectAccessGrantLoginFilter extends UsernamePasswordAuthenticationFilter { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,9 +14,10 @@ | |
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.keycloak.adapters.springsecurity.token; | ||
| package org.keycloak.adapters.springsecurity.userdetails.token; | ||
|
|
||
| import org.keycloak.adapters.KeycloakAccount; | ||
| import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken; | ||
| import org.springframework.security.core.GrantedAuthority; | ||
| import org.springframework.security.core.userdetails.UserDetails; | ||
| import org.springframework.util.Assert; | ||
|
|
@@ -28,7 +29,8 @@ | |
| * | ||
| * @author <a href="mailto:[email protected]">Scott Rossillo</a> | ||
| */ | ||
| public class KeycloakUserDetailsAuthenticationToken extends KeycloakAuthenticationToken { | ||
| public class KeycloakUserDetailsAuthenticationToken extends KeycloakAuthenticationToken | ||
| { | ||
|
|
||
| private UserDetails userDetails; | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
83 changes: 83 additions & 0 deletions
83
...ails/src/test/java/org/keycloak/adapters/springsecurity/userdetails/config/AppConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| /* | ||
| * Copyright 2015 Smartling, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.keycloak.adapters.springsecurity.userdetails.config; | ||
|
|
||
| import org.keycloak.adapters.springsecurity.AdapterDeploymentContextBean; | ||
| import org.keycloak.adapters.springsecurity.KeycloakSecurityComponents; | ||
| import org.keycloak.adapters.springsecurity.authentication.DirectAccessGrantAuthenticationProvider; | ||
| import org.keycloak.adapters.springsecurity.userdetails.authentication.DirectAccessGrantUserDetailsAuthenticationProvider; | ||
| import org.keycloak.adapters.springsecurity.service.DirectAccessGrantService; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.ComponentScan; | ||
| import org.springframework.context.annotation.Configuration; | ||
| import org.springframework.security.core.authority.SimpleGrantedAuthority; | ||
| import org.springframework.security.core.userdetails.User; | ||
| import org.springframework.security.core.userdetails.UserDetails; | ||
| import org.springframework.security.core.userdetails.UserDetailsService; | ||
| import org.springframework.security.provisioning.InMemoryUserDetailsManager; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.HashSet; | ||
| import java.util.Set; | ||
|
|
||
| /** | ||
| * Spring integration test application configuration. | ||
| */ | ||
| @Configuration | ||
| @ComponentScan(basePackageClasses = KeycloakSecurityComponents.class) | ||
| public class AppConfig | ||
| { | ||
|
|
||
| public static final String KNOWN_EMAIL = "[email protected]"; | ||
| public static final String KNOWN_USERNAME = "srossillo"; | ||
| public static final String KNOWN_PASSWORD = "password"; | ||
|
|
||
| @Autowired | ||
| protected DirectAccessGrantService directAccessGrantService; | ||
|
|
||
| @Bean | ||
| AdapterDeploymentContextBean adapterDeploymentContextBean() { | ||
| return new AdapterDeploymentContextBean(); | ||
| } | ||
|
|
||
| @Bean | ||
| DirectAccessGrantAuthenticationProvider directAccessGrantAuthenticationProvider() { | ||
| DirectAccessGrantAuthenticationProvider provider = new DirectAccessGrantAuthenticationProvider(); | ||
| provider.setAdapterDeploymentContextBean(adapterDeploymentContextBean()); | ||
| provider.setDirectAccessGrantService(directAccessGrantService); | ||
| return provider; | ||
| } | ||
|
|
||
| @Bean | ||
| DirectAccessGrantUserDetailsAuthenticationProvider directAccessGrantUserDetailsAuthenticationProvider() { | ||
| DirectAccessGrantUserDetailsAuthenticationProvider provider = new DirectAccessGrantUserDetailsAuthenticationProvider(); | ||
| provider.setAdapterDeploymentContextBean(adapterDeploymentContextBean()); | ||
| provider.setDirectAccessGrantService(directAccessGrantService); | ||
| provider.setUserDetailsService(userDetailsService()); | ||
| return provider; | ||
| } | ||
|
|
||
| @Bean | ||
| UserDetailsService userDetailsService() { | ||
| Set<UserDetails> users = new HashSet<>(); | ||
| User user = new User(KNOWN_EMAIL, "does_not_matter", Arrays.asList(new SimpleGrantedAuthority("user"))); | ||
| users.add(user); | ||
| return new InMemoryUserDetailsManager(Collections.unmodifiableCollection(users)); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters