Commit 2cfbbf8

committed

Merge branch 'boot-1.3-migration'

Conflicts: src/main/java/com/naturalprogrammer/spring/socialsample/config/SocialConfig.java

2 parents d4e7393 + 72c30a4 commit 2cfbbf8Copy full SHA for 2cfbbf8

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public static void logInUser(User user) {`
`47`	`47`	`Authentication authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());`
`48`	`48`	`SecurityContextHolder.getContext().setAuthentication(authentication);`
`49`	`49`	`}`
`50`		`-`
	`50`	`+`
`51`	`51`	`public static boolean isAuthorized(Facebook facebook) {`
`52`	`52`	`try {`
`53`	`53`	`return facebook.isAuthorized();`

Comments

(0)