X-Git-Url: http://juplo.de/gitweb/?p=examples%2Ffacebook-app;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fyourshouter%2FSocialConfig.java;h=7cc9a63b5ce2237cdffa553dab35a3a67b9563ba;hp=4efa0e2e592911f09a152814984126c631969485;hb=8f6d3c83aa9651e593b57b3d47cfd50a4ae73661;hpb=f45e5e611f7d990477ede18dfc79a18d926eb347

diff --git a/src/main/java/de/juplo/yourshouter/SocialConfig.java b/src/main/java/de/juplo/yourshouter/SocialConfig.java
index 4efa0e2..7cc9a63 100644
--- a/src/main/java/de/juplo/yourshouter/SocialConfig.java
+++ b/src/main/java/de/juplo/yourshouter/SocialConfig.java
@@ -2,6 +2,7 @@ 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;
@@ -10,12 +11,14 @@ 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;
@@ -35,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 <code>facebook.app.id</code>
@@ -75,7 +84,7 @@ public class SocialConfig extends SocialConfigurerAdapter
   {
     InMemoryUsersConnectionRepository repository =
         new InMemoryUsersConnectionRepository(connectionFactoryLocator);
-    repository.setConnectionSignUp(new ProviderUserIdConnectionSignUp());
+    repository.setConnectionSignUp(connectionSignUp);
     return repository;
   }
 
@@ -93,7 +102,7 @@ public class SocialConfig extends SocialConfigurerAdapter
   @Override
   public UserIdSource getUserIdSource()
   {
-    return new SecurityContextUserIdSource();
+    return new SpringSecurityContextUserIdSource();
   }
 
 
@@ -136,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;
   }
 
@@ -164,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")