projects
/
examples
/
facebook-app
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactored instantiation of helper classes: @Service instead of manual
[examples/facebook-app]
/
src
/
main
/
java
/
de
/
juplo
/
yourshouter
/
SocialConfig.java
diff --git
a/src/main/java/de/juplo/yourshouter/SocialConfig.java
b/src/main/java/de/juplo/yourshouter/SocialConfig.java
index
4efa0e2
..
4573fbb
100644
(file)
--- 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;
import org.apache.http.HttpRequestFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@
-16,6
+17,7
@@
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.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;
import org.springframework.social.connect.UsersConnectionRepository;
import org.springframework.social.connect.mem.InMemoryUsersConnectionRepository;
import org.springframework.social.connect.web.ConnectController;
@@
-35,6
+37,12
@@
import org.springframework.social.facebook.web.CanvasSignInController;
@EnableSocial
public class SocialConfig extends SocialConfigurerAdapter
{
@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>
/**
* Add a {@link FacebookConnectionFactory} to the configuration.
* The factory is configured through the keys <code>facebook.app.id</code>
@@
-75,7
+83,7
@@
public class SocialConfig extends SocialConfigurerAdapter
{
InMemoryUsersConnectionRepository repository =
new InMemoryUsersConnectionRepository(connectionFactoryLocator);
{
InMemoryUsersConnectionRepository repository =
new InMemoryUsersConnectionRepository(connectionFactoryLocator);
- repository.setConnectionSignUp(
new ProviderUserIdConnectionSignUp()
);
+ repository.setConnectionSignUp(
connectionSignUp
);
return repository;
}
return repository;
}
@@
-136,11
+144,8
@@
public class SocialConfig extends SocialConfigurerAdapter
UsersConnectionRepository repository
)
{
UsersConnectionRepository repository
)
{
- ProviderSignInController controller = new ProviderSignInController(
- factoryLocator,
- repository,
- new UserCookieSignInAdapter()
- );
+ ProviderSignInController controller =
+ new ProviderSignInController(factoryLocator, repository, signInAdapter);
return controller;
}
return controller;
}
@@
-164,7
+169,7
@@
public class SocialConfig extends SocialConfigurerAdapter
new CanvasSignInController(
factoryLocator,
repository,
new CanvasSignInController(
factoryLocator,
repository,
-
new UserCookieSignInAdapter()
,
+
signInAdapter
,
env.getProperty("facebook.app.id"),
env.getProperty("facebook.app.secret"),
env.getProperty("facebook.app.canvas")
env.getProperty("facebook.app.id"),
env.getProperty("facebook.app.secret"),
env.getProperty("facebook.app.canvas")