UserUtils -> @Visitor

1 files changed, 5 insertions, 4 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 35d3c1f8..8081c54b 100644
--- a/src/main/java/com/juick/server/www/controllers/SocialLogin.java
+++ b/src/main/java/com/juick/server/www/controllers/SocialLogin.java
@@ -25,14 +25,14 @@ import com.github.scribejava.core.model.*;
 import com.github.scribejava.core.oauth.OAuth10aService;
 import com.github.scribejava.core.oauth.OAuth20Service;
 import com.juick.model.facebook.User;
+import com.juick.model.vk.UsersResponse;
 import com.juick.server.Utils;
 import com.juick.server.util.HttpBadRequestException;
-import com.juick.server.util.UserUtils;
 import com.juick.service.CrosspostService;
 import com.juick.service.EmailService;
 import com.juick.service.TelegramService;
 import com.juick.service.UserService;
-import com.juick.model.vk.UsersResponse;
+import com.juick.service.security.annotation.Visitor;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.codec.digest.HmacAlgorithms;
 import org.apache.commons.codec.digest.HmacUtils;
@@ -180,7 +180,9 @@ public class SocialLogin {
         }
     }
     @GetMapping("/_twitter")
-    protected void doTwitterLogin(HttpServletRequest request, HttpServletResponse response)
+    protected void doTwitterLogin(
+            @Visitor com.juick.User user,
+            HttpServletRequest request, HttpServletResponse response)
             throws IOException, ExecutionException, InterruptedException {
         String hash = StringUtils.EMPTY, request_token = StringUtils.EMPTY, request_token_secret = StringUtils.EMPTY;
         String verifier = request.getParameter("oauth_verifier");
@@ -196,7 +198,6 @@ public class SocialLogin {
                 request_token_secret = cookie.getValue();
             }
         }
-        com.juick.User user = UserUtils.getCurrentUser();
         OAuth10aService oAuthService = twitterBuilder
                 .apiSecret(twitterConsumerSecret)
                 .callback("https://juick.com/_twitter")