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 72c30a4

Browse files
A couple of more updates, and then tested to be working
1 parent a1a89f4 commit 72c30a4

File tree

6 files changed

+20
-12
lines changed

6 files changed

+20
-12
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ protected void configure(HttpSecurity http) throws Exception {
6666

6767
http
6868
.formLogin()
69-
//.loginPage("/signin")
69+
.loginPage("/signin")
7070
.permitAll().and()
7171
.rememberMe().key(rememberMeKey).rememberMeServices(rememberMeServices()).and()
7272
.logout()

‎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/users/SignInController.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
@Controller
77
public class SignInController {
88

9-
// @RequestMapping("/signin")
10-
// public String signIn() {
11-
// return "signin";
12-
// }
9+
@RequestMapping("/signin")
10+
public String signIn() {
11+
return "signin";
12+
}
1313

1414
}

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

Lines changed: 9 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

@@ -46,6 +47,14 @@ public static void logInUser(User user) {
4647
Authentication authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
4748
SecurityContextHolder.getContext().setAuthentication(authentication);
4849
}
50+
51+
public static boolean isAuthorized(Facebook facebook) {
52+
try {
53+
return facebook.isAuthorized();
54+
} catch (Throwable t){
55+
return false;
56+
}
57+
}
4958

5059

5160
}

‎src/main/resources/application.properties

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,5 @@ spring.jpa.database: MYSQL
2525
#
2626

2727
#Facebook
28-
spring.social.facebook.appId: your app id
29-
spring.social.facebook.appSecret: your app secret
30-
31-
logging.level.: DEBUG
32-
logging.file: C:\\tmp\\social-log.txt
28+
spring.social.facebook.appId: your_app_id
29+
spring.social.facebook.appSecret: your_app_secret

0 commit comments

Comments
(0)

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