From c9d67837cbcaae84a03b7bd14e508ca62880f87f Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sat, 7 Mar 2020 13:20:45 +0300
Subject: Reorganize project layout

---
 src/main/java/com/juick/server/api/ApiSocialLogin.java | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/main/java/com/juick/server/api/ApiSocialLogin.java')

diff --git a/src/main/java/com/juick/server/api/ApiSocialLogin.java b/src/main/java/com/juick/server/api/ApiSocialLogin.java
index 6a6b4293..24010dd2 100644
--- a/src/main/java/com/juick/server/api/ApiSocialLogin.java
+++ b/src/main/java/com/juick/server/api/ApiSocialLogin.java
@@ -33,18 +33,17 @@ import com.google.api.client.http.javanet.NetHttpTransport;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.jackson2.JacksonFactory;
 import com.juick.model.AuthResponse;
-import com.juick.model.facebook.User;
+import com.juick.model.ext.facebook.User;
 import com.juick.server.util.HttpBadRequestException;
 import com.juick.service.CrosspostService;
 import com.juick.service.EmailService;
 import com.juick.service.UserService;
-import com.juick.model.vk.UsersResponse;
+import com.juick.model.ext.vk.UsersResponse;
 import com.nimbusds.jose.JOSEException;
 import com.nimbusds.jose.proc.BadJOSEException;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
-import org.checkerframework.checker.units.qual.A;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -219,7 +218,7 @@ public class ApiSocialLogin {
         vkAuthService.signRequest(token, meRequest);
         String graph = vkAuthService.execute(meRequest).getBody();
 
-        com.juick.model.vk.User jsonUser = jsonMapper.readValue(graph, UsersResponse.class).getUsers().get(0);
+        com.juick.model.ext.vk.User jsonUser = jsonMapper.readValue(graph, UsersResponse.class).getUsers().get(0);
         String vkName = jsonUser.getFirstName() + " " + jsonUser.getLastName();
         String vkLink = jsonUser.getScreenName();
 
@@ -253,7 +252,7 @@ public class ApiSocialLogin {
         GoogleIdToken idToken = verifier.verify(idTokenString);
         if (idToken != null) {
             String email = idToken.getPayload().getEmail();
-            com.juick.User visitor = userService.getUserByEmail(email);
+            com.juick.model.User visitor = userService.getUserByEmail(email);
             if (visitor.isAnonymous()) {
                 String verificationCode = RandomStringUtils.randomAlphanumeric(8).toUpperCase();
                 emailService.addVerificationCode(null, email, verificationCode);
@@ -266,7 +265,7 @@ public class ApiSocialLogin {
     }
     @ResponseBody
     @PostMapping("/api/signup")
-    public ResponseEntity<com.juick.User> signupWithEmail(String username, String password, String verificationCode) {
+    public ResponseEntity<com.juick.model.User> signupWithEmail(String username, String password, String verificationCode) {
         if (username.length() < 2 || username.length() > 16 || !username.matches("^[a-zA-Z0-9\\-]+$")
                 || password.length() < 6 || password.length() > 32) {
             throw new HttpBadRequestException();
@@ -274,7 +273,7 @@ public class ApiSocialLogin {
 
         String verifiedEmail = emailService.getEmailByAuthCode(verificationCode);
         if (StringUtils.isNotEmpty(verifiedEmail)) {
-            com.juick.User newUser = userService.createUser(username, password).orElseThrow(HttpBadRequestException::new);
+            com.juick.model.User newUser = userService.createUser(username, password).orElseThrow(HttpBadRequestException::new);
             emailService.addEmail(newUser.getUid(), verifiedEmail);
             emailService.deleteAuthCode(verificationCode);
             return ResponseEntity.ok(newUser);
@@ -301,7 +300,7 @@ public class ApiSocialLogin {
         var email = api.validateToken(idToken);
 
         if (email.isPresent()) {
-            com.juick.User user = userService.getUserByEmail(email.get());
+            com.juick.model.User user = userService.getUserByEmail(email.get());
             if (!user.isAnonymous()) {
                 String redirectUrl = crosspostService.verifyVKState(body.get("state"));
                 if (StringUtils.isBlank(redirectUrl)) {
-- 
cgit v1.2.3