Facebook API update

1 files changed, 8 insertions, 11 deletions

diff --git a/src/main/java/com/juick/server/www/controllers/SocialLogin.java b/src/main/java/com/juick/server/www/controllers/SocialLogin.java
index bc631a1a..b071b6ca 100644
--- a/src/main/java/com/juick/server/www/controllers/SocialLogin.java
+++ b/src/main/java/com/juick/server/www/controllers/SocialLogin.java
@@ -142,7 +142,7 @@ public class SocialLogin {
                 .state(state)
                 .build(FacebookApi.instance());
         OAuth2AccessToken token = facebookService.getAccessToken(code);
-        final OAuthRequest meRequest = new OAuthRequest(Verb.GET, "https://graph.facebook.com/v2.10/me?fields=id,name,link,verified,email");
+        final OAuthRequest meRequest = new OAuthRequest(Verb.GET, "https://graph.facebook.com/v3.2/me?fields=id,name,link,verified,email");
         facebookService.signRequest(token, meRequest);
         String graph = facebookService.execute(meRequest).getBody();
         if (StringUtils.isBlank(graph)) {
@@ -151,14 +151,14 @@ public class SocialLogin {
         }
         User fb = jsonMapper.readValue(graph, User.class);
         long fbID = NumberUtils.toLong(fb.getId(), 0);
-        if (fbID == 0 || StringUtils.isBlank(fb.getName()) || StringUtils.isBlank(fb.getLink())) {
-            logger.error("Missing required fields, id: {}, name: {}, link: {}", fbID, fb.getName(), fb.getLink());
+        if (fbID == 0 || StringUtils.isBlank(fb.getName())) {
+            logger.error("Missing required fields, id: {}, name: {}", fbID, fb.getName());
             throw new HttpBadRequestException();
         }
 
         int uid = crosspostService.getUIDbyFBID(fbID);
         if (uid > 0) {
-            if (!crosspostService.updateFacebookUser(fbID, token.getAccessToken(), fb.getName(), fb.getLink())) {
+            if (!crosspostService.updateFacebookUser(fbID, token.getAccessToken(), fb.getName())) {
                 logger.error("error updating facebook user, id: {}, token: {}", fbID, token.getAccessToken());
                 throw new HttpBadRequestException();
             }
@@ -166,22 +166,19 @@ public class SocialLogin {
             c.setMaxAge(50 * 24 * 60 * 60);
             response.addCookie(c);
             return "redirect:" + redirectUrl;
-        } else if (fb.getVerified()) {
-            if (!crosspostService.createFacebookUser(fbID, state, token.getAccessToken(), fb.getName(), fb.getLink())) {
+        } else {
+            if (!crosspostService.createFacebookUser(fbID, state, token.getAccessToken(), fb.getName())) {
                 if (StringUtils.isNotEmpty(fb.getEmail())) {
-                    logger.info("found {} for facebook user {}", fb.getEmail(), fb.getLink());
+                    logger.info("found {} for facebook user {}", fb.getEmail());
                     Integer userId = crosspostService.getUIDbyFBID(fbID);
                     if (!emailService.getEmails(userId, false).contains(fb.getEmail())) {
                         emailService.addEmail(userId, fb.getEmail());
                     }
                 }
-                logger.info("email not found for facebook user {}", fb.getLink());
+                logger.info("email not found for facebook user {}", fb.getName());
                 throw new HttpBadRequestException();
             }
             return "redirect:/signup?type=fb&hash=" + state;
-        } else {
-            logger.error("Facebook account is not verified, id: {}", fbID);
-            throw new HttpBadRequestException();
         }
     }
     @GetMapping("/_twitter")