From 1963c48b01689bd2324470e4dc138f43d98a34c7 Mon Sep 17 00:00:00 2001
From: Chris Lemaire <c.lemaire@student.tudelft.nl>
Date: Tue, 5 May 2020 18:22:46 +0200
Subject: [PATCH] Move SSO classes into own package
This change is to separate future 2fa related classes from the SSO
related classes and configurations of SAML and In-memory database.
---
.../lib/security/LabradorSecurityConfigurerAdapter.java | 1 +
.../lib/security/{ => sso}/LabradorSSOConfigurer.java | 2 +-
.../lib/security/{ => sso}/memory/InMemorySecurityConfig.java | 4 ++--
.../security/{ => sso}/memory/InMemoryUserDetailsService.java | 2 +-
.../lib/security/{ => sso}/memory/InMemoryUserProvider.java | 2 +-
.../lib/security/{ => sso}/saml/SAMLSecurityConfig.java | 4 ++--
.../lib/security/{ => sso}/saml/SAMLUserDetailsService.java | 2 +-
.../security/{ => sso}/memory/InMemorySecurityConfigTest.java | 2 +-
.../{ => sso}/memory/InMemoryUserDetailsServiceTest.java | 2 +-
.../memory/LabradorSecurityConfigurerAdapterTest.java | 2 +-
.../{ => sso}/saml/LabradorSecurityConfigurerAdapterTest.java | 2 +-
.../security/{ => sso}/saml/SAMLUserDetailsServiceTest.java | 2 +-
.../tudelft/labracore/test/lib/common/TestUserProvider.java | 2 +-
13 files changed, 15 insertions(+), 14 deletions(-)
rename src/main/java/nl/tudelft/labracore/lib/security/{ => sso}/LabradorSSOConfigurer.java (97%)
rename src/main/java/nl/tudelft/labracore/lib/security/{ => sso}/memory/InMemorySecurityConfig.java (97%)
rename src/main/java/nl/tudelft/labracore/lib/security/{ => sso}/memory/InMemoryUserDetailsService.java (97%)
rename src/main/java/nl/tudelft/labracore/lib/security/{ => sso}/memory/InMemoryUserProvider.java (98%)
rename src/main/java/nl/tudelft/labracore/lib/security/{ => sso}/saml/SAMLSecurityConfig.java (96%)
rename src/main/java/nl/tudelft/labracore/lib/security/{ => sso}/saml/SAMLUserDetailsService.java (98%)
rename src/test/java/nl/tudelft/labracore/lib/security/{ => sso}/memory/InMemorySecurityConfigTest.java (96%)
rename src/test/java/nl/tudelft/labracore/lib/security/{ => sso}/memory/InMemoryUserDetailsServiceTest.java (97%)
rename src/test/java/nl/tudelft/labracore/lib/security/{ => sso}/memory/LabradorSecurityConfigurerAdapterTest.java (99%)
rename src/test/java/nl/tudelft/labracore/lib/security/{ => sso}/saml/LabradorSecurityConfigurerAdapterTest.java (98%)
rename src/test/java/nl/tudelft/labracore/lib/security/{ => sso}/saml/SAMLUserDetailsServiceTest.java (98%)
diff --git a/src/main/java/nl/tudelft/labracore/lib/security/LabradorSecurityConfigurerAdapter.java b/src/main/java/nl/tudelft/labracore/lib/security/LabradorSecurityConfigurerAdapter.java
index cf41462..2e7df59 100644
--- a/src/main/java/nl/tudelft/labracore/lib/security/LabradorSecurityConfigurerAdapter.java
+++ b/src/main/java/nl/tudelft/labracore/lib/security/LabradorSecurityConfigurerAdapter.java
@@ -18,6 +18,7 @@
package nl.tudelft.labracore.lib.security;
import nl.tudelft.labracore.lib.LabracoreApiConfig;
+import nl.tudelft.labracore.lib.security.sso.LabradorSSOConfigurer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
diff --git a/src/main/java/nl/tudelft/labracore/lib/security/LabradorSSOConfigurer.java b/src/main/java/nl/tudelft/labracore/lib/security/sso/LabradorSSOConfigurer.java
similarity index 97%
rename from src/main/java/nl/tudelft/labracore/lib/security/LabradorSSOConfigurer.java
rename to src/main/java/nl/tudelft/labracore/lib/security/sso/LabradorSSOConfigurer.java
index 4ce9cdc..81c49ec 100644
--- a/src/main/java/nl/tudelft/labracore/lib/security/LabradorSSOConfigurer.java
+++ b/src/main/java/nl/tudelft/labracore/lib/security/sso/LabradorSSOConfigurer.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package nl.tudelft.labracore.lib.security;
+package nl.tudelft.labracore.lib.security.sso;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
diff --git a/src/main/java/nl/tudelft/labracore/lib/security/memory/InMemorySecurityConfig.java b/src/main/java/nl/tudelft/labracore/lib/security/sso/memory/InMemorySecurityConfig.java
similarity index 97%
rename from src/main/java/nl/tudelft/labracore/lib/security/memory/InMemorySecurityConfig.java
rename to src/main/java/nl/tudelft/labracore/lib/security/sso/memory/InMemorySecurityConfig.java
index 4d53f62..be59572 100644
--- a/src/main/java/nl/tudelft/labracore/lib/security/memory/InMemorySecurityConfig.java
+++ b/src/main/java/nl/tudelft/labracore/lib/security/sso/memory/InMemorySecurityConfig.java
@@ -15,10 +15,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package nl.tudelft.labracore.lib.security.memory;
+package nl.tudelft.labracore.lib.security.sso.memory;
import nl.tudelft.labracore.lib.security.LabradorAuthenticationSuccessHandler;
-import nl.tudelft.labracore.lib.security.LabradorSSOConfigurer;
+import nl.tudelft.labracore.lib.security.sso.LabradorSSOConfigurer;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
diff --git a/src/main/java/nl/tudelft/labracore/lib/security/memory/InMemoryUserDetailsService.java b/src/main/java/nl/tudelft/labracore/lib/security/sso/memory/InMemoryUserDetailsService.java
similarity index 97%
rename from src/main/java/nl/tudelft/labracore/lib/security/memory/InMemoryUserDetailsService.java
rename to src/main/java/nl/tudelft/labracore/lib/security/sso/memory/InMemoryUserDetailsService.java
index 1322bb3..bc00ece 100644
--- a/src/main/java/nl/tudelft/labracore/lib/security/memory/InMemoryUserDetailsService.java
+++ b/src/main/java/nl/tudelft/labracore/lib/security/sso/memory/InMemoryUserDetailsService.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package nl.tudelft.labracore.lib.security.memory;
+package nl.tudelft.labracore.lib.security.sso.memory;
import nl.tudelft.labracore.api.dto.Person;
import nl.tudelft.labracore.lib.security.LabradorUserDetails;
diff --git a/src/main/java/nl/tudelft/labracore/lib/security/memory/InMemoryUserProvider.java b/src/main/java/nl/tudelft/labracore/lib/security/sso/memory/InMemoryUserProvider.java
similarity index 98%
rename from src/main/java/nl/tudelft/labracore/lib/security/memory/InMemoryUserProvider.java
rename to src/main/java/nl/tudelft/labracore/lib/security/sso/memory/InMemoryUserProvider.java
index e670ca4..d58abf5 100644
--- a/src/main/java/nl/tudelft/labracore/lib/security/memory/InMemoryUserProvider.java
+++ b/src/main/java/nl/tudelft/labracore/lib/security/sso/memory/InMemoryUserProvider.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package nl.tudelft.labracore.lib.security.memory;
+package nl.tudelft.labracore.lib.security.sso.memory;
import java.util.HashMap;
import java.util.Map;
diff --git a/src/main/java/nl/tudelft/labracore/lib/security/saml/SAMLSecurityConfig.java b/src/main/java/nl/tudelft/labracore/lib/security/sso/saml/SAMLSecurityConfig.java
similarity index 96%
rename from src/main/java/nl/tudelft/labracore/lib/security/saml/SAMLSecurityConfig.java
rename to src/main/java/nl/tudelft/labracore/lib/security/sso/saml/SAMLSecurityConfig.java
index be25258..2bf4569 100644
--- a/src/main/java/nl/tudelft/labracore/lib/security/saml/SAMLSecurityConfig.java
+++ b/src/main/java/nl/tudelft/labracore/lib/security/sso/saml/SAMLSecurityConfig.java
@@ -15,10 +15,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package nl.tudelft.labracore.lib.security.saml;
+package nl.tudelft.labracore.lib.security.sso.saml;
import nl.tudelft.labracore.lib.security.LabradorAuthenticationSuccessHandler;
-import nl.tudelft.labracore.lib.security.LabradorSSOConfigurer;
+import nl.tudelft.labracore.lib.security.sso.LabradorSSOConfigurer;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.context.annotation.Bean;
diff --git a/src/main/java/nl/tudelft/labracore/lib/security/saml/SAMLUserDetailsService.java b/src/main/java/nl/tudelft/labracore/lib/security/sso/saml/SAMLUserDetailsService.java
similarity index 98%
rename from src/main/java/nl/tudelft/labracore/lib/security/saml/SAMLUserDetailsService.java
rename to src/main/java/nl/tudelft/labracore/lib/security/sso/saml/SAMLUserDetailsService.java
index f500364..010a722 100644
--- a/src/main/java/nl/tudelft/labracore/lib/security/saml/SAMLUserDetailsService.java
+++ b/src/main/java/nl/tudelft/labracore/lib/security/sso/saml/SAMLUserDetailsService.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package nl.tudelft.labracore.lib.security.saml;
+package nl.tudelft.labracore.lib.security.sso.saml;
import nl.tudelft.labracore.api.dto.Person;
import nl.tudelft.labracore.lib.security.LabradorUserDetails;
diff --git a/src/test/java/nl/tudelft/labracore/lib/security/memory/InMemorySecurityConfigTest.java b/src/test/java/nl/tudelft/labracore/lib/security/sso/memory/InMemorySecurityConfigTest.java
similarity index 96%
rename from src/test/java/nl/tudelft/labracore/lib/security/memory/InMemorySecurityConfigTest.java
rename to src/test/java/nl/tudelft/labracore/lib/security/sso/memory/InMemorySecurityConfigTest.java
index 6842784..16194ca 100644
--- a/src/test/java/nl/tudelft/labracore/lib/security/memory/InMemorySecurityConfigTest.java
+++ b/src/test/java/nl/tudelft/labracore/lib/security/sso/memory/InMemorySecurityConfigTest.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package nl.tudelft.labracore.lib.security.memory;
+package nl.tudelft.labracore.lib.security.sso.memory;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/nl/tudelft/labracore/lib/security/memory/InMemoryUserDetailsServiceTest.java b/src/test/java/nl/tudelft/labracore/lib/security/sso/memory/InMemoryUserDetailsServiceTest.java
similarity index 97%
rename from src/test/java/nl/tudelft/labracore/lib/security/memory/InMemoryUserDetailsServiceTest.java
rename to src/test/java/nl/tudelft/labracore/lib/security/sso/memory/InMemoryUserDetailsServiceTest.java
index 289f8af..697e0b8 100644
--- a/src/test/java/nl/tudelft/labracore/lib/security/memory/InMemoryUserDetailsServiceTest.java
+++ b/src/test/java/nl/tudelft/labracore/lib/security/sso/memory/InMemoryUserDetailsServiceTest.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package nl.tudelft.labracore.lib.security.memory;
+package nl.tudelft.labracore.lib.security.sso.memory;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
diff --git a/src/test/java/nl/tudelft/labracore/lib/security/memory/LabradorSecurityConfigurerAdapterTest.java b/src/test/java/nl/tudelft/labracore/lib/security/sso/memory/LabradorSecurityConfigurerAdapterTest.java
similarity index 99%
rename from src/test/java/nl/tudelft/labracore/lib/security/memory/LabradorSecurityConfigurerAdapterTest.java
rename to src/test/java/nl/tudelft/labracore/lib/security/sso/memory/LabradorSecurityConfigurerAdapterTest.java
index ad0bc6d..c98bc4e 100644
--- a/src/test/java/nl/tudelft/labracore/lib/security/memory/LabradorSecurityConfigurerAdapterTest.java
+++ b/src/test/java/nl/tudelft/labracore/lib/security/sso/memory/LabradorSecurityConfigurerAdapterTest.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package nl.tudelft.labracore.lib.security.memory;
+package nl.tudelft.labracore.lib.security.sso.memory;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
diff --git a/src/test/java/nl/tudelft/labracore/lib/security/saml/LabradorSecurityConfigurerAdapterTest.java b/src/test/java/nl/tudelft/labracore/lib/security/sso/saml/LabradorSecurityConfigurerAdapterTest.java
similarity index 98%
rename from src/test/java/nl/tudelft/labracore/lib/security/saml/LabradorSecurityConfigurerAdapterTest.java
rename to src/test/java/nl/tudelft/labracore/lib/security/sso/saml/LabradorSecurityConfigurerAdapterTest.java
index 8b9baa7..e6a6d85 100644
--- a/src/test/java/nl/tudelft/labracore/lib/security/saml/LabradorSecurityConfigurerAdapterTest.java
+++ b/src/test/java/nl/tudelft/labracore/lib/security/sso/saml/LabradorSecurityConfigurerAdapterTest.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package nl.tudelft.labracore.lib.security.saml;
+package nl.tudelft.labracore.lib.security.sso.saml;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
diff --git a/src/test/java/nl/tudelft/labracore/lib/security/saml/SAMLUserDetailsServiceTest.java b/src/test/java/nl/tudelft/labracore/lib/security/sso/saml/SAMLUserDetailsServiceTest.java
similarity index 98%
rename from src/test/java/nl/tudelft/labracore/lib/security/saml/SAMLUserDetailsServiceTest.java
rename to src/test/java/nl/tudelft/labracore/lib/security/sso/saml/SAMLUserDetailsServiceTest.java
index b106676..d6bf8a3 100644
--- a/src/test/java/nl/tudelft/labracore/lib/security/saml/SAMLUserDetailsServiceTest.java
+++ b/src/test/java/nl/tudelft/labracore/lib/security/sso/saml/SAMLUserDetailsServiceTest.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-package nl.tudelft.labracore.lib.security.saml;
+package nl.tudelft.labracore.lib.security.sso.saml;
import static nl.tudelft.labracore.api.dto.Person.DefaultRoleEnum.STUDENT;
import static nl.tudelft.labracore.api.dto.Person.DefaultRoleEnum.TEACHER;
diff --git a/src/test/java/nl/tudelft/labracore/test/lib/common/TestUserProvider.java b/src/test/java/nl/tudelft/labracore/test/lib/common/TestUserProvider.java
index 8d57a0b..05f08bf 100644
--- a/src/test/java/nl/tudelft/labracore/test/lib/common/TestUserProvider.java
+++ b/src/test/java/nl/tudelft/labracore/test/lib/common/TestUserProvider.java
@@ -20,7 +20,7 @@ package nl.tudelft.labracore.test.lib.common;
import static nl.tudelft.labracore.api.dto.Person.DefaultRoleEnum.STUDENT;
import static nl.tudelft.labracore.api.dto.Person.DefaultRoleEnum.TEACHER;
-import nl.tudelft.labracore.lib.security.memory.InMemoryUserProvider;
+import nl.tudelft.labracore.lib.security.sso.memory.InMemoryUserProvider;
import org.springframework.stereotype.Service;
--
GitLab