Merge pull request #7 from wiemanboy/feature/cleanup

Cleanup test env variables and configuration

.github/workflows/test.yml

@@ -27,7 +27,3 @@ jobs:
         run: mvn test
         env:
           FUNCTIONAL_TESTING: false
-          AUTH0_CLIENT_ID: ${{ secrets.AUTH0_CLIENT_ID }}
-          AUTH0_CLIENT_SECRET: ${{ secrets.AUTH0_CLIENT_SECRET }}
-          "okta.oauth2.issuer": https://${{ secrets.OKTA_OAUTH2_ISSUER }}/
-          "okta.oauth2.audience": ${{ secrets.OKTA_OAUTH2_AUDIENCE }}

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.wiemanboy</groupId>
     <artifactId>WiemanApi</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
     <name>WiemanApi</name>
     <description>WiemanApi</description>
     <url/>

src/main/java/com/wiemanboy/wiemanapi/config/SecurityConfig.java

@@ -2,7 +2,6 @@
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
@@ -11,7 +10,7 @@
 import org.springframework.security.oauth2.jwt.*;
 import org.springframework.security.web.SecurityFilterChain;
 
-@Configuration
+
 @EnableWebSecurity
 public class SecurityConfig {
 

src/main/resources/application-prod.properties

@@ -0,0 +1,4 @@
+okta.oauth2.issuer=https://${AUTH0_DOMAIN}/
+okta.oauth2.client-id=${AUTH0_CLIENT_ID}
+okta.oauth2.client-secret=${AUTH0_CLIENT_SECRET}
+okta.oauth2.audience=${AUTH0_AUDIENCE}

src/main/resources/application.properties

@@ -10,8 +10,4 @@ spring.data.mongodb.database=${MONGO_DB:dev_db}
 spring.data.mongodb.username=${MONGO_USER:admin}
 spring.data.mongodb.password=${MONGO_PASS:admin}
 spring.data.mongodb.authentication-database=${MONGO_AUTH_DB:admin}
-spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
-okta.oauth2.issuer=https://${AUTH0_BASE_URL}/
-okta.oauth2.client-id=${AUTH0_CLIENT_ID}
-okta.oauth2.client-secret=${AUTH0_CLIENT_SECRET}
-okta.oauth2.audience=${AUTH0_AUDIENCE}
+spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration

src/test/java/com/wiemanboy/wiemanapi/WiemanApiApplicationTests.java

@@ -1,11 +1,9 @@
 package com.wiemanboy.wiemanapi;
 
 import com.wiemanboy.wiemanapi.config.TestSecurityConfig;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
-@Disabled
 @SpringBootTest(classes = {TestSecurityConfig.class, WiemanApiApplication.class})
 class WiemanApiApplicationTests {
 

src/test/java/com/wiemanboy/wiemanapi/presentation/ProfileControllerTest.java

@@ -5,7 +5,6 @@
 import com.wiemanboy.wiemanapi.config.TestSecurityConfig;
 import com.wiemanboy.wiemanapi.data.ProfileRepository;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +18,6 @@
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@Disabled
 @SpringBootTest(classes = {TestSecurityConfig.class, WiemanApiApplication.class})
 @AutoConfigureMockMvc
 public class ProfileControllerTest {