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/model/Auth.java         | 39 --------------------
 src/main/java/com/juick/model/AuthResponse.java | 47 +++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 39 deletions(-)
 delete mode 100644 src/main/java/com/juick/model/Auth.java
 create mode 100644 src/main/java/com/juick/model/AuthResponse.java

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

diff --git a/src/main/java/com/juick/model/Auth.java b/src/main/java/com/juick/model/Auth.java
deleted file mode 100644
index 45185ace..00000000
--- a/src/main/java/com/juick/model/Auth.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2008-2019, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.juick.model;
-
-/**
- * Created by vt on 09/02/16.
- */
-public class Auth {
-    private final String account;
-    private final String authCode;
-
-    public Auth(String account, String authCode) {
-        this.account = account;
-        this.authCode = authCode;
-    }
-
-    public String getAccount() {
-        return account;
-    }
-
-    public String getAuthCode() {
-        return authCode;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/juick/model/AuthResponse.java b/src/main/java/com/juick/model/AuthResponse.java
new file mode 100644
index 00000000..b229c7ac
--- /dev/null
+++ b/src/main/java/com/juick/model/AuthResponse.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2008-2019, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.juick.model;
+
+import com.juick.server.api.Users;
+
+/**
+ * Created by vt on 09/02/16.
+ */
+public class AuthResponse {
+    private final Users.SecureUser user;
+    private final String account;
+    private final String authCode;
+
+    public AuthResponse(Users.SecureUser user, String account, String authCode) {
+        this.user = user;
+        this.account = account;
+        this.authCode = authCode;
+    }
+
+    public String getAccount() {
+        return account;
+    }
+
+    public String getAuthCode() {
+        return authCode;
+    }
+
+    public Users.SecureUser getUser() {
+        return user;
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3