Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit d4e7393

Browse files
Merge branch 'connect-disconnect'
2 parents b2a4717 + e4c568d commit d4e7393

File tree

7 files changed

+18
-11
lines changed

7 files changed

+18
-11
lines changed

‎pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
<parent>
1515
<groupId>org.springframework.boot</groupId>
1616
<artifactId>spring-boot-starter-parent</artifactId>
17-
<version>1.2.1.RELEASE</version>
17+
<version>1.3.0.RELEASE</version>
1818
<relativePath/> <!-- lookup parent from repository -->
1919
</parent>
2020

2121
<properties>
2222
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23-
<start-class>com.naturalprogrammer.spring.socialsample.NpSpringSocialSampleApplication</start-class>
2423
<java.version>1.8</java.version>
2524
</properties>
2625

‎src/main/java/com/naturalprogrammer/spring/socialsample/config/SocialConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ public UsersConnectionRepository getUsersConnectionRepository(ConnectionFactoryL
3737
}
3838

3939
@Bean
40-
public ProviderSignInUtils providerSignInUtils() {
41-
return new ProviderSignInUtils();
40+
public ProviderSignInUtils providerSignInUtils(ConnectionFactoryLocatorconnectionFactoryLocator, UsersConnectionRepositoryconnectionRepository) {
41+
return new ProviderSignInUtils(connectionFactoryLocator, connectionRepository);
4242
};
4343

4444
@Override

‎src/main/java/com/naturalprogrammer/spring/socialsample/config/WebSecurityConfig.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
1212
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
1313
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
14-
import org.springframework.security.config.annotation.web.servlet.configuration.EnableWebMvcSecurity;
1514
import org.springframework.security.core.userdetails.UserDetailsService;
1615
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
1716
import org.springframework.security.crypto.password.PasswordEncoder;
@@ -20,7 +19,6 @@
2019
import org.springframework.social.security.SpringSocialConfigurer;
2120

2221
@Configuration
23-
@EnableWebMvcSecurity
2422
public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
2523

2624
private final Log log = LogFactory.getLog(WebSecurityConfig.class);

‎src/main/java/com/naturalprogrammer/spring/socialsample/users/FetchFacebookDataController.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import org.springframework.web.bind.annotation.SessionAttributes;
1313
import org.springframework.web.bind.support.SessionStatus;
1414

15+
import com.naturalprogrammer.spring.socialsample.util.MyUtil;
16+
1517
@Controller
1618
@RequestMapping("/users/current/facebook-data")
1719
@SessionAttributes("redirectAfterConnecting")
@@ -27,7 +29,7 @@ public FetchFacebookDataController(Facebook facebook) {
2729
@RequestMapping(method=RequestMethod.GET)
2830
public String helloFacebook(Model model, SessionStatus status) {
2931

30-
if (!facebook.isAuthorized()) {
32+
if (!MyUtil.isAuthorized(facebook)) {
3133
model.addAttribute("redirectAfterConnecting", "/users/current/facebook-data");
3234
return "forward:/connect/facebook";
3335
}

‎src/main/java/com/naturalprogrammer/spring/socialsample/users/ProfileController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public String getById(@PathVariable("userId") long userId, Model model, SessionS
4444

4545
status.setComplete();
4646

47-
model.addAttribute("facebookAuthorized", facebook.isAuthorized());
47+
model.addAttribute("facebookAuthorized", MyUtil.isAuthorized(facebook));
4848
model.addAttribute(userService.findOne(userId));
4949

5050
return "user";

‎src/main/java/com/naturalprogrammer/spring/socialsample/util/MyUtil.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
99
import org.springframework.security.core.Authentication;
1010
import org.springframework.security.core.context.SecurityContextHolder;
11+
import org.springframework.social.facebook.api.Facebook;
1112
import org.springframework.stereotype.Component;
1213
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
1314

@@ -47,5 +48,12 @@ public static void logInUser(User user) {
4748
SecurityContextHolder.getContext().setAuthentication(authentication);
4849
}
4950

51+
public static boolean isAuthorized(Facebook facebook) {
52+
try {
53+
return facebook.isAuthorized();
54+
} catch (Throwable t){
55+
return false;
56+
}
57+
}
5058

5159
}

‎src/main/resources/application.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#
22
## View resolver
33
#
4-
spring.view.prefix: /WEB-INF/jsp/
5-
spring.view.suffix: .jsp
6-
error.whitelabel.enabled=false
4+
spring.mvc.view.prefix: /WEB-INF/jsp/
5+
spring.mvc.view.suffix: .jsp
6+
server.error.whitelabel.enabled=false
77

88
spring.profiles.active = dev
99
rememberMe.privateKey: some_secret_word

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /