X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fyourshouter%2FSocialConfig.java;h=7cc9a63b5ce2237cdffa553dab35a3a67b9563ba;hb=2eb6c7a9db8500a78e896e81de7045090c8e1013;hp=fc136adc0d5d823da6726f741fb4442a02202413;hpb=2050f0ba66eda0003559b4f4b13aabf31ade350e;p=examples%2Ffacebook-app
diff --git a/src/main/java/de/juplo/yourshouter/SocialConfig.java b/src/main/java/de/juplo/yourshouter/SocialConfig.java
index fc136ad..7cc9a63 100644
--- a/src/main/java/de/juplo/yourshouter/SocialConfig.java
+++ b/src/main/java/de/juplo/yourshouter/SocialConfig.java
@@ -2,18 +2,23 @@ package de.juplo.yourshouter;
+import javax.inject.Inject;
+import org.apache.http.HttpRequestFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Scope;
import org.springframework.context.annotation.ScopedProxyMode;
import org.springframework.social.UserIdSource;
import org.springframework.core.env.Environment;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.security.core.context.SecurityContext;
import org.springframework.social.config.annotation.ConnectionFactoryConfigurer;
import org.springframework.social.config.annotation.EnableSocial;
import org.springframework.social.config.annotation.SocialConfigurerAdapter;
import org.springframework.social.connect.Connection;
import org.springframework.social.connect.ConnectionFactoryLocator;
import org.springframework.social.connect.ConnectionRepository;
+import org.springframework.social.connect.ConnectionSignUp;
import org.springframework.social.connect.UsersConnectionRepository;
import org.springframework.social.connect.mem.InMemoryUsersConnectionRepository;
import org.springframework.social.connect.web.ConnectController;
@@ -33,6 +38,12 @@ import org.springframework.social.facebook.web.CanvasSignInController;
@EnableSocial
public class SocialConfig extends SocialConfigurerAdapter
{
+ @Inject
+ ConnectionSignUp connectionSignUp;
+ @Inject
+ SignInAdapter signInAdapter;
+
+
/**
* Add a {@link FacebookConnectionFactory} to the configuration.
* The factory is configured through the keys facebook.app.id
@@ -73,7 +84,7 @@ public class SocialConfig extends SocialConfigurerAdapter
{
InMemoryUsersConnectionRepository repository =
new InMemoryUsersConnectionRepository(connectionFactoryLocator);
- repository.setConnectionSignUp(new ProviderUserIdConnectionSignUp());
+ repository.setConnectionSignUp(connectionSignUp);
return repository;
}
@@ -91,7 +102,7 @@ public class SocialConfig extends SocialConfigurerAdapter
@Override
public UserIdSource getUserIdSource()
{
- return new SecurityContextUserIdSource();
+ return new SpringSecurityContextUserIdSource();
}
@@ -134,11 +145,8 @@ public class SocialConfig extends SocialConfigurerAdapter
UsersConnectionRepository repository
)
{
- ProviderSignInController controller = new ProviderSignInController(
- factoryLocator,
- repository,
- new UserCookieSignInAdapter()
- );
+ ProviderSignInController controller =
+ new ProviderSignInController(factoryLocator, repository, signInAdapter);
return controller;
}
@@ -162,7 +170,7 @@ public class SocialConfig extends SocialConfigurerAdapter
new CanvasSignInController(
factoryLocator,
repository,
- new UserCookieSignInAdapter(),
+ signInAdapter,
env.getProperty("facebook.app.id"),
env.getProperty("facebook.app.secret"),
env.getProperty("facebook.app.canvas")
@@ -188,4 +196,28 @@ public class SocialConfig extends SocialConfigurerAdapter
repository.findPrimaryConnection(Facebook.class);
return connection != null ? connection.getApi() : null;
}
+
+ /**
+ * Use the HttpClient
from Apaches HttpComponents
+ * for HTTP-requests.
+ *
+ * We also configure shorter intervals for the connection timeout and the
+ * read timeout.
+ *
+ * @param env The {@link Environment}, to read additional parameters from.
+ * @return The alternative implementation of {@link HttpRequestFactory}.
+ */
+ @Bean
+ public HttpComponentsClientHttpRequestFactory requestFactory(Environment env)
+ {
+ HttpComponentsClientHttpRequestFactory factory =
+ new HttpComponentsClientHttpRequestFactory();
+ factory.setConnectTimeout(
+ Integer.parseInt(env.getProperty("httpclient.timeout.connection"))
+ );
+ factory.setReadTimeout(
+ Integer.parseInt(env.getProperty("httpclient.timeout.read"))
+ );
+ return factory;
+ }
}