Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use connectTimeout and readTimeout configurations #2

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,10 @@ Extensions
List of known extension
* [Google](https://github.com/grails-plugins/grails-spring-security-oauth2-google)
* [Facebook](https://github.com/MatrixCrawler/grails-spring-security-oauth2-facebook)
* [Github] (https://github.com/rpalcolea/grails-spring-security-oauth2-github)
* [Github](https://github.com/rpalcolea/grails-spring-security-oauth2-github)
* [Outlook](https://github.com/andreperegrina/grails-spring-security-oauth2-outlook)
* [VK](https://github.com/purpleraven/grails-spring-security-oauth2-vk)
* [Odnoklassniki](https://github.com/purpleraven/grails-spring-security-oauth2-ok)


How to create a new provider plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,14 +150,22 @@ class SpringSecurityOauth2BaseService {
if (apiSecret == null || apiSecret.isEmpty()) {
throw new OAuth2Exception("API Secret for provider '" + providerService.providerID + "' is missing")
}

def connectTimeout = getConfigValue(providerService.providerID, "connectTimeout") as Integer
def readTimeout = getConfigValue(providerService.providerID, "readTimeout") as Integer

log.debug("connectTimeout: $connectTimeout, readTimeout: $readTimeout")

_providerConfigurationMap.put(providerService.providerID, new OAuth2ProviderConfiguration(
apiKey: apiKey,
apiSecret: apiSecret,
callbackUrl: callbackURL,
successUrl: successUrl,
failureUrl: failureUrl,
scope: scopes ? providerService.getScopes() + providerService.scopeSeparator + scopes : providerService.getScopes(),
debug: grailsApplication.config.getProperty('oauth2.debug') ? grailsApplication.config.getProperty('oauth2.debug') : false
debug: grailsApplication.config.getProperty('oauth2.debug') ? grailsApplication.config.getProperty('oauth2.debug') : false,
connectTimeout:connectTimeout,
readTimeout:readTimeout
))
providerService.init(_providerConfigurationMap.get(providerService.providerID))
providerServiceMap.put(providerService.providerID, providerService)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,10 @@ abstract class OAuth2AbstractProviderService implements OAuth2ProviderService {
OAuth20Service buildScribeService(OAuth2ProviderConfiguration providerConfiguration) {
ServiceBuilder serviceBuilder = new ServiceBuilder(providerConfiguration.apiKey)
.apiSecret(providerConfiguration.apiSecret)
if (providerConfiguration.callbackUrl) {
.state(secretState)
.connectTimeout(providerConfiguration.connectTimeout).readTimeout(providerConfiguration.readTimeout)

if (providerConfiguration.callbackUrl) {
serviceBuilder.callback(providerConfiguration.callbackUrl)
}
if (providerConfiguration.scope) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,8 @@ class OAuth2ProviderConfiguration {
String successUrl

String failureUrl

Integer connectTimeout

Integer readTimeout
}