Sync up with latest changes in Spring Social core/web

spring-attic · Jul 29, 2015 · 0263b47 · 0263b47
1 parent ab682b9
commit 0263b47
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/spring-social-showcase-boot/build.gradle b/spring-social-showcase-boot/build.gradle
@@ -1,10 +1,11 @@
 buildscript {
   repositories {
+    maven { url "http://repo.spring.io/libs-milestone" }
     maven { url "http://repo.spring.io/libs-snapshot" }
     mavenLocal()
   }
   dependencies {
-    classpath("org.springframework.boot:spring-boot-gradle-plugin:1.1.6.RELEASE")
+    classpath("org.springframework.boot:spring-boot-gradle-plugin:1.3.0.M1")
   }
 }
 
@@ -25,8 +26,8 @@ eclipse {
 }
 
 repositories {
-  maven { url "http://repo.spring.io/milestone" }
   mavenLocal()
+  maven { url "http://repo.spring.io/milestone" }
   mavenCentral()
   maven { url "http://repo.spring.io/libs-milestone" }
 }
@@ -37,6 +38,7 @@ dependencies {
   // Override Spring Boot's choice of Spring Social Facebook version
   compile("org.springframework.social:spring-social-facebook:2.0.1.RELEASE")
   compile("org.springframework.social:spring-social-facebook-web:2.0.1.RELEASE")
+  compile("org.springframework.social:spring-social-config:1.2.0.BUILD-SNAPSHOT")
 
   compile("org.springframework.boot:spring-boot-starter-social-twitter")
   compile("org.springframework.boot:spring-boot-starter-social-linkedin")
@@ -46,6 +48,7 @@ dependencies {
   compile("org.springframework.boot:spring-boot-starter-web")
   compile("org.springframework.boot:spring-boot-starter-jdbc")
   compile("com.h2database:h2")
+  testCompile("org.springframework.boot:spring-boot-starter-test")
 }
 
 task wrapper(type: Wrapper) {

diff --git a/...wcase-boot/src/main/java/org/springframework/social/showcase/signup/SignupController.java b/...wcase-boot/src/main/java/org/springframework/social/showcase/signup/SignupController.java
@@ -19,6 +19,8 @@
 import javax.validation.Valid;
 
 import org.springframework.social.connect.Connection;
+import org.springframework.social.connect.ConnectionFactoryLocator;
+import org.springframework.social.connect.UsersConnectionRepository;
 import org.springframework.social.connect.web.ProviderSignInUtils;
 import org.springframework.social.showcase.account.Account;
 import org.springframework.social.showcase.account.AccountRepository;
@@ -40,9 +42,11 @@ public class SignupController {
 	private final ProviderSignInUtils providerSignInUtils;
 
 	@Inject
-	public SignupController(AccountRepository accountRepository) {
+	public SignupController(AccountRepository accountRepository, 
+		                    ConnectionFactoryLocator connectionFactoryLocator,
+		                    UsersConnectionRepository connectionRepository) {
 		this.accountRepository = accountRepository;
-		this.providerSignInUtils = new ProviderSignInUtils();
+		this.providerSignInUtils = new ProviderSignInUtils(connectionFactoryLocator, connectionRepository);
 	}
 
 	@RequestMapping(value="/signup", method=RequestMethod.GET)

diff --git a/spring-social-showcase-boot/src/main/resources/templates/signin.html b/spring-social-showcase-boot/src/main/resources/templates/signin.html
@@ -57,7 +57,7 @@ <h1><a th:href="@{/}">Spring Social Showcase</a></h1>
 			<!-- FACEBOOK SIGNIN -->
 			<form name="fb_signin" id="fb_signin" th:action="@{/signin/facebook}" method="POST">
 				<input type="hidden" name="_csrf" th:value="${_csrf.token}"></input>
-				<input type="hidden" name="scope" value="publish_stream,user_photos,offline_access"></input>
+				<input type="hidden" name="scope" value="read_stream,user_posts,user_photos"></input>
 				<button type="submit"><img th:src="@{/social/facebook/sign-in-with-facebook.png}"></img></button>
 			</form>