1 files changed, 12 insertions, 6 deletions
diff --git a/src/main/java/com/juick/service/VKService.java b/src/main/java/com/juick/service/VKService.java
index 19fa5b58..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,14 +51,16 @@ 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()));
     }
 
-    public void updatePremiumStatus(Integer userId) {
+    public boolean updatePremiumStatus(Integer userId) {
         var vkUser = userService.getVkTokens(userId);
         if (vkUser != null) {
             OAuth2AccessToken token = new OAuth2AccessToken(vkUser.getRight());
@@ -65,12 +69,13 @@ public class VKService {
             getVkAuthService().signRequest(token, donRequest);
             try (Response vkResponse = getVkAuthService().execute(donRequest)) {
                 if (vkResponse.isSuccessful()) {
-                    logger.info(vkResponse.getBody());
+                    logger.debug(vkResponse.getBody());
                     var response = jsonMapper.readTree(vkResponse.getBody());
                     if (response.has("response")) {
                         var isDon = response.get("response").intValue() > 0;
-                        logger.info("{} is Don: {}", vkUser.getLeft(), isDon);
+                        logger.debug("{} is Don: {}", vkUser.getLeft(), isDon);
                         userService.setPremium(userId, isDon);
+                        return isDon;
                     } else {
                         // token is expired or does not have "groups" permissions
                         userService.updateVkToken(userId, "");
@@ -80,8 +85,9 @@ public class VKService {
                 logger.error("Don request error", e);
             }
         } else {
-            logger.warn("User is not connected to VK: {}", userId);
+            logger.debug("User is not connected to VK: {}", userId);
         }
+        return false;
     }
 
     public OAuth20Service getVkAuthService() {