ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

http-service: use spring externalized configuration for oauth id/secret

Browse Source
This commit is contained in:
Adam
2017-09-10 13:19:03 -04:00
parent 78f5ddcd3a
commit 2cc0eb4766
4 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
http-service/src/main/java/net/runelite/http/service/SpringBootWebApplication.java
View File

@@ -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 @Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
{ {

5
http-service/src/main/java/net/runelite/http/service/account/AccountService.java
View File

@@ -49,6 +49,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; 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.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@@ -97,8 +98,8 @@ public class AccountService
@Autowired @Autowired
public AccountService( public AccountService(
@Qualifier("Runelite SQL2O") Sql2o sql2o, @Qualifier("Runelite SQL2O") Sql2o sql2o,
@Qualifier("OAuth Client ID") String oauthClientId, @Value("${oauth.client-id}") String oauthClientId,
@Qualifier("OAuth Client Secret") String oauthClientSecret, @Value("${oauth.client-secret}") String oauthClientSecret,
AuthFilter auth AuthFilter auth
) )
{ {

12
http-service/src/test/java/net/runelite/http/service/SpringBootWebApplicationTest.java
View File

@@ -48,18 +48,6 @@ public class SpringBootWebApplicationTest
} }
@Bean("OAuth Client ID")
String oauthClientId()
{
return "moo";
}
@Bean("OAuth Client Secret")
String oauthClientSecret()
{
return "moo2";
}
@Test @Test
@Ignore @Ignore
public void test() throws InterruptedException public void test() throws InterruptedException

2
http-service/src/test/resources/application.properties Normal file
View File

@@ -0,0 +1,2 @@
oauth.client-id=moo
oauth.client-secret=cow