From 94107f2210588a71d636a452f211358fb740a321 Mon Sep 17 00:00:00 2001 From: Fabio Formosa Date: Sat, 1 Oct 2022 00:40:58 +0200 Subject: [PATCH] #63 removed properties which have a default value from the showcase --- .../properties/InMemoryAccountProperties.java | 2 +- .../security/SecurityControllerTest.java | 8 +-- .../security/SecurityLoginViaCookieTest.java | 8 +-- .../SecurityLoginViaDefaultStrategyTest.java | 8 +-- ...urityLoginViaHeaderAndLoginFilterTest.java | 8 +-- .../security/SecurityLoginViaHeaderTest.java | 8 +-- .../src/main/resources/application.yml | 62 +++++++------------ 7 files changed, 45 insertions(+), 59 deletions(-) diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/properties/InMemoryAccountProperties.java b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/properties/InMemoryAccountProperties.java index b6ffdaf..583bc0f 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/properties/InMemoryAccountProperties.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/properties/InMemoryAccountProperties.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.List; @Configuration -@ConfigurationProperties(prefix = "quartz-manager.accounts.in-memory") +@ConfigurationProperties(prefix = "quartz-manager.security.accounts.in-memory") @Getter @Setter public class InMemoryAccountProperties { private boolean enabled; diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityControllerTest.java b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityControllerTest.java index 0ca06f8..39ede6a 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityControllerTest.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityControllerTest.java @@ -23,10 +23,10 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. "quartz-manager.security.jwt.header-strategy.header=Authorization", "quartz-manager.security.jwt.cookie-strategy.enabled=true", "quartz-manager.security.jwt.cookie-strategy.cookie=AUTH-TOKEN", - "quartz-manager.accounts.in-memory.enabled=true", - "quartz-manager.accounts.in-memory.users[0].name=foo", - "quartz-manager.accounts.in-memory.users[0].password=bar", - "quartz-manager.accounts.in-memory.users[0].roles[0]=admin", + "quartz-manager.security.accounts.in-memory.enabled=true", + "quartz-manager.security.accounts.in-memory.users[0].name=foo", + "quartz-manager.security.accounts.in-memory.users[0].password=bar", + "quartz-manager.security.accounts.in-memory.users[0].roles[0]=admin", }) public class SecurityControllerTest { diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaCookieTest.java b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaCookieTest.java index c04cc9e..5a2d484 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaCookieTest.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaCookieTest.java @@ -20,10 +20,10 @@ import org.springframework.test.context.TestPropertySource; "quartz-manager.security.jwt.header-strategy.header=Authorization", "quartz-manager.security.jwt.cookie-strategy.enabled=true", "quartz-manager.security.jwt.cookie-strategy.cookie=AUTH-TOKEN", - "quartz-manager.accounts.in-memory.enabled=true", - "quartz-manager.accounts.in-memory.users[0].name=foo", - "quartz-manager.accounts.in-memory.users[0].password=bar", - "quartz-manager.accounts.in-memory.users[0].roles[0]=admin", + "quartz-manager.security.accounts.in-memory.enabled=true", + "quartz-manager.security.accounts.in-memory.users[0].name=foo", + "quartz-manager.security.accounts.in-memory.users[0].password=bar", + "quartz-manager.security.accounts.in-memory.users[0].roles[0]=admin", }) public class SecurityLoginViaCookieTest extends AbstractSecurityLoginTest { diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaDefaultStrategyTest.java b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaDefaultStrategyTest.java index 6f0a6ab..2997322 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaDefaultStrategyTest.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaDefaultStrategyTest.java @@ -11,10 +11,10 @@ import org.springframework.test.context.TestPropertySource; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @TestPropertySource(properties = { - "quartz-manager.accounts.in-memory.enabled=true", - "quartz-manager.accounts.in-memory.users[0].name=foo", - "quartz-manager.accounts.in-memory.users[0].password=bar", - "quartz-manager.accounts.in-memory.users[0].roles[0]=admin", + "quartz-manager.security.accounts.in-memory.enabled=true", + "quartz-manager.security.accounts.in-memory.users[0].name=foo", + "quartz-manager.security.accounts.in-memory.users[0].password=bar", + "quartz-manager.security.accounts.in-memory.users[0].roles[0]=admin", }) public class SecurityLoginViaDefaultStrategyTest extends AbstractSecurityLoginTest { diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaHeaderAndLoginFilterTest.java b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaHeaderAndLoginFilterTest.java index 8ae21b8..edd7aea 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaHeaderAndLoginFilterTest.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaHeaderAndLoginFilterTest.java @@ -19,10 +19,10 @@ import org.springframework.test.context.TestPropertySource; "quartz-manager.security.jwt.header-strategy.enabled=true", "quartz-manager.security.jwt.header-strategy.header=Authorization", "quartz-manager.security.jwt.cookie-strategy.enabled=false", - "quartz-manager.accounts.in-memory.enabled=true", - "quartz-manager.accounts.in-memory.users[0].name=foo", - "quartz-manager.accounts.in-memory.users[0].password=bar", - "quartz-manager.accounts.in-memory.users[0].roles[0]=admin", + "quartz-manager.security.accounts.in-memory.enabled=true", + "quartz-manager.security.accounts.in-memory.users[0].name=foo", + "quartz-manager.security.accounts.in-memory.users[0].password=bar", + "quartz-manager.security.accounts.in-memory.users[0].roles[0]=admin", }) public class SecurityLoginViaHeaderAndLoginFilterTest extends AbstractSecurityLoginTest { diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaHeaderTest.java b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaHeaderTest.java index 38c610e..7b556a6 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaHeaderTest.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaHeaderTest.java @@ -18,10 +18,10 @@ import org.springframework.test.context.TestPropertySource; "quartz-manager.security.jwt.header-strategy.enabled=true", "quartz-manager.security.jwt.header-strategy.header=Authorization", "quartz-manager.security.jwt.cookie-strategy.enabled=false", - "quartz-manager.accounts.in-memory.enabled=true", - "quartz-manager.accounts.in-memory.users[0].name=foo", - "quartz-manager.accounts.in-memory.users[0].password=bar", - "quartz-manager.accounts.in-memory.users[0].roles[0]=admin", + "quartz-manager.security.accounts.in-memory.enabled=true", + "quartz-manager.security.accounts.in-memory.users[0].name=foo", + "quartz-manager.security.accounts.in-memory.users[0].password=bar", + "quartz-manager.security.accounts.in-memory.users[0].roles[0]=admin", }) public class SecurityLoginViaHeaderTest extends AbstractSecurityLoginTest { diff --git a/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/application.yml b/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/application.yml index cd64605..88a03fe 100644 --- a/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/application.yml +++ b/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/application.yml @@ -4,19 +4,36 @@ server: session.timeout : 28800 port: 8080 +quartz: + enabled: true + +quartz-manager: + jobClassPackages: it.fabioformosa.quartzmanager.jobs + security: + jwt: + secret: "bibidibobidiboo" + expiration-in-sec: 28800 # 8 hours + accounts: + in-memory: + enabled: true + users: + - name: admin + password: admin + roles: + - ADMIN + persistence: + quartz: + datasource: + url: "jdbc:postgresql://localhost:5432/quartzmanager" + user: "quartzmanager" + password: "quartzmanager" + spring: thymeleaf: cache: false mode: LEGACYHTML5 jpa.open-in-view: false -quartz: - enabled: true - -job: - frequency: 4000 - repeatCount: 19 - logging: level: org.springframework.web: WARN @@ -24,34 +41,3 @@ logging: org.springframework.boot.autoconfigure.security: INFO it.fabioformosa: DEBUG org.quartz: INFO - -quartz-manager: - persistence: - quartz: - datasource: - url: "jdbc:postgresql://localhost:5432/quartzmanager" - user: "quartzmanager" - password: "quartzmanager" - security: - login-model: - form-login-enabled: true - userpwd-filter-enabled : false - jwt: - enabled: true - secret: "bibidibobidiboo" - expiration-in-sec: 28800 # 8 hours - header-strategy: - enabled: false - header: "Authorization" - cookie-strategy: - enabled: true - cookie: AUTH-TOKEN - jobClassPackages: it.fabioformosa.quartzmanager.jobs - accounts: - in-memory: - enabled: true - users: - - name: admin - password: admin - roles: - - ADMIN