X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fyourshouter%2FSocialConfig.java;h=40a0aa5f7c2132d3575f099351cfbc5e7fa8d64c;hb=f1e0b9b0179c176ad143862cbe56a24d319c87ba;hp=466ed23c53b8e2db239293a8d3be54a834fbc8de;hpb=3ba0e06f2f52ca1959dccaa33e288369914571af;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 466ed23..40a0aa5 100644
--- a/src/main/java/de/juplo/yourshouter/SocialConfig.java
+++ b/src/main/java/de/juplo/yourshouter/SocialConfig.java
@@ -2,11 +2,9 @@ package de.juplo.yourshouter;
 
 
 
-import java.math.BigInteger;
 import javax.inject.Inject;
 import javax.sql.DataSource;
 import org.apache.http.HttpRequestFactory;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
@@ -26,7 +24,6 @@ import org.springframework.social.connect.ConnectionSignUp;
 import org.springframework.social.connect.UsersConnectionRepository;
 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;
@@ -49,11 +46,6 @@ public class SocialConfig extends SocialConfigurerAdapter
   @Inject
   SignInAdapter signInAdapter;
 
-  @Value("${facebook.app.secret}")
-  String secret;
-  @Value("${facebook.app.salt}")
-  String salt;
-
 
   /**
    * Add a {@link FacebookConnectionFactory} to the configuration.
@@ -100,10 +92,7 @@ public class SocialConfig extends SocialConfigurerAdapter
         new JdbcUsersConnectionRepository(
             dataSource,
             connectionFactoryLocator,
-            Encryptors.text(
-                secret,
-                String.format("%08x", new BigInteger(1, salt.getBytes()))
-                )
+            Encryptors.noOpText()
             );
     repository.setConnectionSignUp(connectionSignUp);
     return repository;
@@ -151,26 +140,6 @@ 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 <code>signed_request</code>, that Facebook sends to the canvas-page.