X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fyourshouter%2FSocialConfig.java;h=3718953ee79105b814136ea4f46c1b19c6699f29;hb=a3c19a140b586c1fe442aec45b2d4f9238405adb;hp=2abcd4283f3db0844c2bd5755357c53ba318066c;hpb=02f599692669d48f9865764fda994ad61d203ffb;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 2abcd42..3718953 100644
--- a/src/main/java/de/juplo/yourshouter/SocialConfig.java
+++ b/src/main/java/de/juplo/yourshouter/SocialConfig.java
@@ -2,23 +2,33 @@ package de.juplo.yourshouter;
+import javax.inject.Inject;
+import javax.sql.DataSource;
+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.security.crypto.encrypt.Encryptors;
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.jdbc.JdbcUsersConnectionRepository;
import org.springframework.social.connect.web.ConnectController;
+import org.springframework.social.connect.web.ProviderSignInController;
+import org.springframework.social.connect.web.SignInAdapter;
import org.springframework.social.facebook.api.Facebook;
import org.springframework.social.facebook.connect.FacebookConnectionFactory;
+import org.springframework.social.facebook.web.CanvasSignInController;
/**
@@ -30,6 +40,14 @@ import org.springframework.social.facebook.connect.FacebookConnectionFactory;
@EnableSocial
public class SocialConfig extends SocialConfigurerAdapter
{
+ @Inject
+ DataSource dataSource;
+ @Inject
+ ConnectionSignUp connectionSignUp;
+ @Inject
+ SignInAdapter signInAdapter;
+
+
/**
* Add a {@link FacebookConnectionFactory} to the configuration.
* The factory is configured through the keys facebook.app.id
@@ -53,24 +71,31 @@ public class SocialConfig extends SocialConfigurerAdapter
}
/**
- * Configure an instance of {@link InMemoryUsersConnection} as persistent
- * store of user/connection-mappings.
+ * {@inheritDoc}
*
- * At the moment, no special configuration is needed.
+ * Configure an instance of {@link JdbcUsersConnection} as persistent
+ * store of user/connection-mappings.
+ *
+ * The app-secret is reused as password for the encryption of the data.
+ * The salt can be changed in the pom.xml
+ *
+ * This does only work, if you have the Java Crypto Extension (JCE) in
+ * full strength version, since Spring Security is using a 256-bit key.
*
- * @param connectionFactoryLocator
- * The {@link ConnectionFactoryLocator} will be injected by Spring.
- * @return
- * The configured {@link UsersConnectionRepository}.
+ * @see http://stackoverflow.com/a/17637354
*/
@Override
public UsersConnectionRepository getUsersConnectionRepository(
ConnectionFactoryLocator connectionFactoryLocator
)
{
- InMemoryUsersConnectionRepository repository =
- new InMemoryUsersConnectionRepository(connectionFactoryLocator);
- repository.setConnectionSignUp(new ProviderUserIdConnectionSignUp());
+ JdbcUsersConnectionRepository repository =
+ new JdbcUsersConnectionRepository(
+ dataSource,
+ connectionFactoryLocator,
+ Encryptors.noOpText()
+ );
+ repository.setConnectionSignUp(connectionSignUp);
return repository;
}
@@ -88,7 +113,7 @@ public class SocialConfig extends SocialConfigurerAdapter
@Override
public UserIdSource getUserIdSource()
{
- return new SecurityContextUserIdSource();
+ return new SpringSecurityContextUserIdSource();
}
@@ -116,6 +141,53 @@ public class SocialConfig extends SocialConfigurerAdapter
return controller;
}
+ /**
+ * Configure the {@link ProviderSignInController} to use our implementation
+ * of {@link SignInAdapter} to sign in the user by storing the ID in the
+ * {@link SecurityContext} and the user-cookie.
+ *
+ * @param factoryLocator The {@link ConnectionFactoryLocator} will be injected by Spring.
+ * @param repository The {@link UserConnectionRepository} will be injected by Spring.
+ * @return The configured {@link ProviderSignInController}
+ */
+ @Bean
+ public ProviderSignInController signInController(
+ ConnectionFactoryLocator factoryLocator,
+ UsersConnectionRepository repository
+ )
+ {
+ ProviderSignInController controller =
+ new ProviderSignInController(factoryLocator, repository, signInAdapter);
+ return controller;
+ }
+
+ /**
+ * Configure the {@link CanvasSignInController} to enable sign-in through
+ * the signed_request
, that Facebook sends to the canvas-page.
+ *
+ * @param factoryLocator The {@link ConnectionFactoryLocator} will be injected by Spring.
+ * @param repository The {@link UserConnectionRepository} will be injected by Spring.
+ * @param env The {@link Environment}, to read additional parameters from.
+ * @return The configured {@link CanvasSignInController}
+ */
+ @Bean
+ public CanvasSignInController canvasSignInController(
+ ConnectionFactoryLocator factoryLocator,
+ UsersConnectionRepository repository,
+ Environment env
+ )
+ {
+ return
+ new CanvasSignInController(
+ factoryLocator,
+ repository,
+ signInAdapter,
+ env.getProperty("facebook.app.id"),
+ env.getProperty("facebook.app.secret"),
+ env.getProperty("facebook.app.canvas")
+ );
+ }
+
/**
* Configure a scoped bean named facebook
, that enables
* access to the Graph-API in the name of the current user.
@@ -135,4 +207,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;
+ }
}