From d50af456a1c1172ad33e5c730d43d9925e924b19 Mon Sep 17 00:00:00 2001
From: upagge <upagge@icloud.com>
Date: Sat, 28 Mar 2020 06:44:37 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=BE=D1=80=D0=BC=D0=BE=D1=87=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D0=B0=D0=B2=D1=82=D0=BE=D1=80=D0=B8=D0=B7=D0=B0=D1=86?=
 =?UTF-8?q?=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                  | 2 +-
 .../java/com/tsc/bitbucketbot/service/UserService.java   | 2 +-
 .../tsc/bitbucketbot/service/impl/UserServiceImpl.java   | 6 ++++--
 src/main/resources/public/index.html                     | 9 +++++----
 src/main/resources/public/static/css/signin.css          | 1 +
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index f765163..8375a81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.tsc.bitbucketbot</groupId>
     <artifactId>bitbucketbot</artifactId>
-    <version>1.3.0-RELEASE</version>
+    <version>1.4.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/src/main/java/com/tsc/bitbucketbot/service/UserService.java b/src/main/java/com/tsc/bitbucketbot/service/UserService.java
index 6625bbb..366d8d9 100644
--- a/src/main/java/com/tsc/bitbucketbot/service/UserService.java
+++ b/src/main/java/com/tsc/bitbucketbot/service/UserService.java
@@ -13,7 +13,7 @@ public interface UserService {
 
     Set<String> existsByLogin(@NonNull Set<String> logins);
 
-    Optional<User> reg(@NonNull User user);
+    User reg(@NonNull User user);
 
     List<User> addAll(Set<User> newUsers);
 
diff --git a/src/main/java/com/tsc/bitbucketbot/service/impl/UserServiceImpl.java b/src/main/java/com/tsc/bitbucketbot/service/impl/UserServiceImpl.java
index 1bcdb13..cb99fb0 100644
--- a/src/main/java/com/tsc/bitbucketbot/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/tsc/bitbucketbot/service/impl/UserServiceImpl.java
@@ -34,7 +34,7 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public Optional<User> reg(@NonNull User user) {
+    public User reg(@NonNull User user) {
         final Optional<User> optUser = userRepository.findByLogin(user.getLogin());
         if (optUser.isPresent()) {
             final User oldUser = optUser.get();
@@ -42,10 +42,12 @@ public class UserServiceImpl implements UserService {
                 Optional<PullRequestSheetJson> sheetJson = Utils.urlToJson(bitbucketConfig.getUrlPullRequestClose(), user.getToken(), PullRequestSheetJson.class);
                 if (sheetJson.isPresent()) {
                     oldUser.setTelegramId(user.getTelegramId());
-                    return Optional.of(userRepository.save(oldUser));
+                    return userRepository.save(oldUser);
                 } else {
                     throw new RegException("Ваш токен не валиден");
                 }
+            } else {
+                throw new RegException("Вы уже авторизованы в системе");
             }
         }
         throw new RegException("Пользователь не найден, подождите обновление базы пользователей!");
diff --git a/src/main/resources/public/index.html b/src/main/resources/public/index.html
index 66b3f80..3b495f9 100644
--- a/src/main/resources/public/index.html
+++ b/src/main/resources/public/index.html
@@ -5,7 +5,7 @@
     <meta charset="UTF-8">
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title>Авторизатор BitBucked MarkBot</title>
+    <title>Авторизатор BitbucketBot</title>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
     <link href="static/css/signin.css" rel="stylesheet">
 </head>
@@ -20,9 +20,9 @@
         <input type="text" v-model="login" id="login" name="login" class="form-control" placeholder="Username">
         <label for="token" class="sr-only">И еще что то тут...</label>
         <input type="text" v-model="token" id="token" class="form-control" placeholder="Token">
-        <button @click="auth" class="btn btn-lg btn-primary btn-block">Забубенитсья</button>
+        <button @click="auth" class="btn btn-lg btn-primary btn-block" style="margin: 10px">Забубениться</button>
         <span>{{responseMessage}}</span>
-        <p class="mt-5 mb-3 text-muted">© 2020 Made by @DR_Demons for @uppage bitbucked bot</p>
+        <p class="mt-5 mb-3 text-muted">© 2020 Made by @DR_Demons for @uPagge bitbucketbot</p>
     </div>
 </div>
 <script>
@@ -43,7 +43,8 @@
                 const data = {
                     telegramId: this.telegramId,
                     login: this.login,
-                    token: this.token
+                    token: this.token,
+                    responseMessage: this.responseMessage
                 };
                 try {
                     const response = await fetch(url, {
diff --git a/src/main/resources/public/static/css/signin.css b/src/main/resources/public/static/css/signin.css
index d31b609..4523a87 100644
--- a/src/main/resources/public/static/css/signin.css
+++ b/src/main/resources/public/static/css/signin.css
@@ -28,6 +28,7 @@ body {
   font-weight: 400;
 }
 .form-signin .form-control {
+  margin: 10px;
   position: relative;
   box-sizing: border-box;
   height: auto;