From 6d177fbb3e57409b223e835eabc79009a89a1031 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 27 Feb 2020 14:00:13 +0300
Subject: API: handle existing Google user flow

---
 src/main/java/com/juick/service/UserService.java     | 4 ++--
 src/main/java/com/juick/service/UserServiceImpl.java | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/main/java/com/juick/service')

diff --git a/src/main/java/com/juick/service/UserService.java b/src/main/java/com/juick/service/UserService.java
index cc834173..71b38594 100644
--- a/src/main/java/com/juick/service/UserService.java
+++ b/src/main/java/com/juick/service/UserService.java
@@ -19,7 +19,7 @@ package com.juick.service;
 
 import com.juick.Message;
 import com.juick.User;
-import com.juick.model.Auth;
+import com.juick.model.AuthResponse;
 
 import javax.annotation.Nonnull;
 import java.util.Collection;
@@ -113,7 +113,7 @@ public interface UserService {
 
     List<String> getAllJIDs(User user);
 
-    List<Auth> getAuthCodes(User user);
+    List<AuthResponse> getAuthCodes(User user);
 
     List<String> getEmails(User user);
 
diff --git a/src/main/java/com/juick/service/UserServiceImpl.java b/src/main/java/com/juick/service/UserServiceImpl.java
index dc35f361..9f01b4db 100644
--- a/src/main/java/com/juick/service/UserServiceImpl.java
+++ b/src/main/java/com/juick/service/UserServiceImpl.java
@@ -20,7 +20,7 @@ package com.juick.service;
 import com.juick.Message;
 import com.juick.User;
 import com.juick.model.AnonymousUser;
-import com.juick.model.Auth;
+import com.juick.model.AuthResponse;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -630,10 +630,10 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
 
     @Transactional(readOnly = true)
     @Override
-    public List<Auth> getAuthCodes(final User user) {
+    public List<AuthResponse> getAuthCodes(final User user) {
         return getJdbcTemplate().query(
                 "SELECT account,authcode FROM auth WHERE user_id=? AND protocol='xmpp'",
-                (rs, num) -> new Auth(rs.getString(1), rs.getString(2)),
+                (rs, num) -> new AuthResponse(null, rs.getString(1), rs.getString(2)),
                 user.getUid());
     }
 
-- 
cgit v1.2.3