From f462d7335567960978e16c5e042c99b54daa94b6 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 12 Dec 2019 11:28:12 +0300
Subject: Cleanup IDEA code issues

---
 .../com/juick/server/www/controllers/SocialLogin.java     | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/main/java/com/juick/server/www/controllers/SocialLogin.java')

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 e845247e..602f32c3 100644
--- a/src/main/java/com/juick/server/www/controllers/SocialLogin.java
+++ b/src/main/java/com/juick/server/www/controllers/SocialLogin.java
@@ -74,12 +74,11 @@ public class SocialLogin {
     private String FACEBOOK_SECRET;
     @Value("${ap_base_uri:http://localhost:8080/}")
     private String baseUri;
-    private String facebookRedirectUri;
     private static final String VK_REDIRECT = "http://juick.com/_vklogin";
     private static final String TWITTER_VERIFY_URL = "https://api.twitter.com/1.1/account/verify_credentials.json";
     @Inject
     private ObjectMapper jsonMapper;
-    private ServiceBuilder facebookBuilder, twitterBuilder, vkBuilder;
+    private ServiceBuilder twitterBuilder;
     private OAuth20Service facebookAuthService, vkAuthService;
 
     @Value("${twitter_consumer_key:appid}")
@@ -104,11 +103,11 @@ public class SocialLogin {
 
     @PostConstruct
     public void init() {
-        facebookBuilder = new ServiceBuilder(FACEBOOK_APPID);
+        ServiceBuilder facebookBuilder = new ServiceBuilder(FACEBOOK_APPID);
         twitterBuilder = new ServiceBuilder(twitterConsumerKey);
-        vkBuilder = new ServiceBuilder(VK_APPID);
+        ServiceBuilder vkBuilder = new ServiceBuilder(VK_APPID);
         UriComponentsBuilder facebookRedirectBuilder = UriComponentsBuilder.fromUriString(baseUri);
-        facebookRedirectUri = facebookRedirectBuilder.replacePath("/_fblogin").build().toUriString();
+        String facebookRedirectUri = facebookRedirectBuilder.replacePath("/_fblogin").build().toUriString();
         facebookAuthService = facebookBuilder
                 .apiSecret(FACEBOOK_SECRET)
                 .callback(facebookRedirectUri)
@@ -168,7 +167,7 @@ public class SocialLogin {
         } else {
             if (!crosspostService.createFacebookUser(fbID, state, token.getAccessToken(), fb.getName())) {
                 if (StringUtils.isNotEmpty(fb.getEmail())) {
-                    logger.info("found {} for facebook user {}", fb.getEmail());
+                    logger.info("found {} for facebook user {}", fb.getEmail(), fb.getName());
                     Integer userId = crosspostService.getUIDbyFBID(fbID);
                     if (!emailService.getEmails(userId, false).contains(fb.getEmail())) {
                         emailService.addEmail(userId, fb.getEmail());
@@ -265,7 +264,7 @@ public class SocialLogin {
             throw new HttpBadRequestException();
         }
 
-        Long vkID = NumberUtils.toLong(jsonUser.getId(), 0);
+        long vkID = NumberUtils.toLong(jsonUser.getId(), 0);
         int uid = crosspostService.getUIDbyVKID(vkID);
         if (uid > 0) {
             Cookie c = new Cookie("hash", userService.getHashByUID(uid));
@@ -295,7 +294,7 @@ public class SocialLogin {
         byte[] secretKey = DigestUtils.sha256(telegramToken);
         String resultString = new HmacUtils(HmacAlgorithms.HMAC_SHA_256, secretKey).hmacHex(dataCheckString);
         if (hash.equals(resultString)) {
-            Long tgUser = Long.valueOf(params.get("id"));
+            long tgUser = Long.parseLong(params.get("id"));
             int uid = telegramService.getUser(tgUser);
             if (uid > 0) {
                 Cookie c = new Cookie("hash", userService.getHashByUID(uid));
-- 
cgit v1.2.3