Clean up social login

3 files changed, 17 insertions, 7 deletions

diff --git a/src/main/java/com/juick/service/UserService.java b/src/main/java/com/juick/service/UserService.java
index 6f7cb58f..3c7a3235 100644
--- a/src/main/java/com/juick/service/UserService.java
+++ b/src/main/java/com/juick/service/UserService.java
@@ -170,7 +170,7 @@ public interface UserService {
 
     boolean updateFacebookUser(long fbID, String token, String fbName);
 
-    int getUIDbyVKID(long vkID);
+    Optional<User> getUserByVKID(long vkID);
 
     boolean createVKUser(long vkID, String loginhash, String token, String vkName, String vkLink);
 
diff --git a/src/main/java/com/juick/service/UserServiceImpl.java b/src/main/java/com/juick/service/UserServiceImpl.java
index 0bbeea91..a5ab8432 100644
--- a/src/main/java/com/juick/service/UserServiceImpl.java
+++ b/src/main/java/com/juick/service/UserServiceImpl.java
@@ -40,6 +40,7 @@ import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.lang.StackWalker.Option;
 import java.net.URI;
 import java.sql.*;
 import java.time.Instant;
@@ -815,10 +816,15 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
 
     @Transactional(readOnly = true)
     @Override
-    public int getUIDbyVKID(long vkID) {
-        var users = getJdbcTemplate().queryForList("""
-                    SELECT user_id FROM vk WHERE vk_id=? AND user_id IS NOT NULL""", Integer.class, vkID);
-        return users.isEmpty() ? 0 : users.get(0);
+    public Optional<User> getUserByVKID(long vkID) {
+        List<User> list = getJdbcTemplate().query(
+                "SELECT DISTINCT u.id, u.nick, u.passw, u.banned, u.last_seen, " +
+                        "COALESCE(f.fb_id, vk.vk_id, t.tg_id, e.user_id, 0) AS verified, premium " +
+                        "FROM users u LEFT JOIN facebook f ON f.user_id = u.id " +
+                        "LEFT JOIN vk ON u.id = vk.user_id LEFT JOIN telegram t ON u.id = t.user_id " +
+                        "LEFT JOIN emails e ON e.user_id = u.id WHERE vk.vk_id = ?", new UserMapper(), vkID);
+
+        return list.isEmpty() ? Optional.empty() : Optional.of(list.get(0));
     }
 
     @Transactional
diff --git a/src/main/java/com/juick/service/VKService.java b/src/main/java/com/juick/service/VKService.java
index b9b2483f..7f6b2516 100644
--- a/src/main/java/com/juick/service/VKService.java
+++ b/src/main/java/com/juick/service/VKService.java
@@ -30,6 +30,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.web.util.UriComponentsBuilder;
 
 import jakarta.inject.Inject;
 
@@ -40,7 +41,8 @@ public class VKService {
     private String VK_APPID;
     @Value("${vk_secret:secret}")
     private String VK_SECRET;
-    private static final String VK_REDIRECT = "https://juick.com/_vklogin";
+    @Value("${ap_base_uri:http://localhost:8080/}")
+    private String baseUri;
     @Inject
     private ObjectMapper jsonMapper;
     @Inject
@@ -49,10 +51,12 @@ public class VKService {
 
     @PostConstruct
     public void init() {
+        UriComponentsBuilder redirectBuilder = UriComponentsBuilder.fromUriString(baseUri);
+        String redirectUri = redirectBuilder.replacePath("/_vklogin").build().toUriString();
         ServiceBuilder vkBuilder = new ServiceBuilder(VK_APPID);
         setVkAuthService(vkBuilder.apiSecret(VK_SECRET)
                 .defaultScope("friends,wall,offline,groups")
-                .callback(VK_REDIRECT)
+                .callback(redirectUri)
                 .build(VkontakteApi.instance()));
     }