From f148f16ac82815f65f0b4ff44e1b2184ec0da0b0 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Mon, 29 Apr 2019 16:25:38 +0300
Subject: Refactoring

---
 src/main/java/com/juick/server/api/ApiSocialLogin.java | 9 +++------
 1 file changed, 3 insertions(+), 6 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 fe5f2069..2d0a5c7e 100644
--- a/src/main/java/com/juick/server/api/ApiSocialLogin.java
+++ b/src/main/java/com/juick/server/api/ApiSocialLogin.java
@@ -302,13 +302,10 @@ public class ApiSocialLogin {
 
         String verifiedEmail = emailService.getEmailByAuthCode(verificationCode);
         if (StringUtils.isNotEmpty(verifiedEmail)) {
-            int uid = userService.createUser(username, password);
-            if (uid <= 0) {
-                throw new HttpBadRequestException();
-            }
-            emailService.addEmail(uid, verifiedEmail);
+            com.juick.User newUser = userService.createUser(username, password).orElseThrow(HttpBadRequestException::new);
+            emailService.addEmail(newUser.getUid(), verifiedEmail);
             emailService.deleteAuthCode(verificationCode);
-            return ResponseEntity.ok(userService.getUserByUID(uid).orElseThrow(IllegalStateException::new));
+            return ResponseEntity.ok(newUser);
         } else {
             return ResponseEntity.status(HttpStatus.FORBIDDEN).body(null);
         }
-- 
cgit v1.2.3