security fixes

ToanPV90 · Jun 9, 2020 · 7b4aac3 · 7b4aac3
1 parent 858edea
commit 7b4aac3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Thu May 21 14:31:09 MSK 2020
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-bin.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/users/application/build.gradle b/users/application/build.gradle
@@ -1,20 +1,14 @@
 dependencies {
     implementation project(':common')
-    implementation project(':web')
+    implementation project(':security:security-config')
     implementation project(':users:users-integration-events')
 
-    // todo organize versions in one place
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-    implementation 'io.springfox:springfox-swagger2:2.9.2'
-    implementation 'io.springfox:springfox-swagger-ui:2.9.2'
     implementation 'io.jsonwebtoken:jjwt:0.9.1'
     implementation 'org.passay:passay:1.5.0'
 
-    implementation 'org.mapstruct:mapstruct:1.3.1.Final'
-    annotationProcessor 'org.mapstruct:mapstruct-processor:1.3.1.Final'
-
     compileOnly 'org.projectlombok:lombok:1.18.10'
     annotationProcessor 'org.projectlombok:lombok:1.18.10'
 

diff --git a/.../java/com/educational/platform/users/registration/UserRegistrationCommandHandlerTest.java b/.../java/com/educational/platform/users/registration/UserRegistrationCommandHandlerTest.java
@@ -6,8 +6,6 @@
 import com.educational.platform.users.User;
 import com.educational.platform.users.UserRepository;
 import com.educational.platform.users.integration.event.UserCreatedIntegrationEvent;
-import com.educational.platform.users.registration.UserRegistrationCommand;
-import com.educational.platform.users.registration.UserRegistrationCommandHandler;
 import com.educational.platform.users.security.JwtTokenProvider;
 import org.assertj.core.api.ThrowableAssert;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/users/web/build.gradle b/users/web/build.gradle
@@ -1,5 +1,6 @@
 dependencies {
     implementation project(':common')
+    implementation project(':security:security-config')
     implementation project(':web')
     implementation project(':users:users-application')
 

diff --git a/users/web/src/main/java/com/educational/platform/users/security/WebSecurityConfig.java b/users/web/src/main/java/com/educational/platform/users/security/WebSecurityConfig.java
@@ -1,6 +1,7 @@
 package com.educational.platform.users.security;
 
 import lombok.RequiredArgsConstructor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -14,7 +15,9 @@
 @RequiredArgsConstructor
 @Configuration
 @EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled = true)
+@ConditionalOnProperty(
+        name = "com.educational.platform.security.enabled",
+        havingValue = "true")
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
     private final JwtTokenProvider jwtTokenProvider;