diff options
| author |   Seshu Kumar M <seshu.kumar.m@huawei.com> | 2019-12-20 08:20:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-12-20 08:20:26 +0000 |
| commit | 77cc65a64dabb180062d5cb20827e68428033bf1 (patch) | |
| tree | 3281e09dd3c6b61a27692858176c13e236456fc5 /common | |
| parent | 07fc1b52da6485e0ec8774f79d506b696aed218a (diff) | |
| parent | 837beb73d7aa6e8f7e4e932ac71e59663b868992 (diff) | |
Merge "Added AAF Integration related changes"
Diffstat (limited to 'common')
| -rw-r--r-- | common/pom.xml | 11 | ||||
| -rw-r--r-- | common/src/main/java/org/onap/so/security/WebSecurityConfig.java | 8 |
2 files changed, 12 insertions, 7 deletions
diff --git a/common/pom.xml b/common/pom.xml index aa1ac654da..94b28e91bd 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -131,6 +131,17 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.onap.aaf.authz</groupId> + <artifactId>aaf-cadi-aaf</artifactId> + <version>2.1.9</version> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.reflections</groupId> <artifactId>reflections</artifactId> <version>0.9.11</version> diff --git a/common/src/main/java/org/onap/so/security/WebSecurityConfig.java b/common/src/main/java/org/onap/so/security/WebSecurityConfig.java index 635784c642..44ac62d14f 100644 --- a/common/src/main/java/org/onap/so/security/WebSecurityConfig.java +++ b/common/src/main/java/org/onap/so/security/WebSecurityConfig.java @@ -32,7 +32,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; @ConfigurationProperties(prefix = "spring.security") -public class WebSecurityConfig extends WebSecurityConfigurerAdapter { +public class WebSecurityConfig { private List<UserCredentials> credentials; private List<String> roles = new ArrayList<>(); @@ -65,10 +65,4 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { public BCryptPasswordEncoder passwordEncoder() { return new BCryptPasswordEncoder(); } - - @Override - protected void configure(AuthenticationManagerBuilder auth) throws Exception { - auth.userDetailsService(userDetailsService()).passwordEncoder(passwordEncoder()); - } - } |