From 2cc0eb47662c3b7e48ed960d18bee6240aa25d2e Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 10 Sep 2017 13:19:03 -0400 Subject: [PATCH] http-service: use spring externalized configuration for oauth id/secret --- .../http/service/SpringBootWebApplication.java | 12 ------------ .../http/service/account/AccountService.java | 5 +++-- .../http/service/SpringBootWebApplicationTest.java | 12 ------------ .../src/test/resources/application.properties | 2 ++ 4 files changed, 5 insertions(+), 26 deletions(-) create mode 100644 http-service/src/test/resources/application.properties diff --git a/http-service/src/main/java/net/runelite/http/service/SpringBootWebApplication.java b/http-service/src/main/java/net/runelite/http/service/SpringBootWebApplication.java index 1522aa2fd1..be455fc7f3 100644 --- a/http-service/src/main/java/net/runelite/http/service/SpringBootWebApplication.java +++ b/http-service/src/main/java/net/runelite/http/service/SpringBootWebApplication.java @@ -59,18 +59,6 @@ public class SpringBootWebApplication extends SpringBootServletInitializer } - @Bean("OAuth Client ID") - String oauthClientId() throws NamingException - { - return (String) getContext().lookup("runelite-oauth-client-id"); - } - - @Bean("OAuth Client Secret") - String oauthClientSecret() throws NamingException - { - return (String) getContext().lookup("runelite-oauth-client-secret"); - } - @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { diff --git a/http-service/src/main/java/net/runelite/http/service/account/AccountService.java b/http-service/src/main/java/net/runelite/http/service/account/AccountService.java index 5dd62feb2a..cc7f8f2e82 100644 --- a/http-service/src/main/java/net/runelite/http/service/account/AccountService.java +++ b/http-service/src/main/java/net/runelite/http/service/account/AccountService.java @@ -49,6 +49,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @@ -97,8 +98,8 @@ public class AccountService @Autowired public AccountService( @Qualifier("Runelite SQL2O") Sql2o sql2o, - @Qualifier("OAuth Client ID") String oauthClientId, - @Qualifier("OAuth Client Secret") String oauthClientSecret, + @Value("${oauth.client-id}") String oauthClientId, + @Value("${oauth.client-secret}") String oauthClientSecret, AuthFilter auth ) { diff --git a/http-service/src/test/java/net/runelite/http/service/SpringBootWebApplicationTest.java b/http-service/src/test/java/net/runelite/http/service/SpringBootWebApplicationTest.java index 317fac3261..a957150b07 100644 --- a/http-service/src/test/java/net/runelite/http/service/SpringBootWebApplicationTest.java +++ b/http-service/src/test/java/net/runelite/http/service/SpringBootWebApplicationTest.java @@ -48,18 +48,6 @@ public class SpringBootWebApplicationTest } - @Bean("OAuth Client ID") - String oauthClientId() - { - return "moo"; - } - - @Bean("OAuth Client Secret") - String oauthClientSecret() - { - return "moo2"; - } - @Test @Ignore public void test() throws InterruptedException diff --git a/http-service/src/test/resources/application.properties b/http-service/src/test/resources/application.properties new file mode 100644 index 0000000000..27cffd3487 --- /dev/null +++ b/http-service/src/test/resources/application.properties @@ -0,0 +1,2 @@ +oauth.client-id=moo +oauth.client-secret=cow \ No newline at end of file