From 3d65913dff6bd2eeb7326b27d22a73e87f95c3b2 Mon Sep 17 00:00:00 2001
From: "xTCry [Vladislav Kh]" <wolt6@mail.ru>
Date: Mon, 7 Sep 2020 20:29:30 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D0=B0=D0=B2=D1=82=D0=BE=D1=80=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=D1=81=D1=8F=20=D1=87?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B7=20token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/auth/AuthForm.vue | 67 ++++++++++++++++++++++++++++----
 src/components/auth/index.js     | 15 +++++++
 src/lang/ru.js                   |  1 +
 3 files changed, 76 insertions(+), 7 deletions(-)

diff --git a/src/components/auth/AuthForm.vue b/src/components/auth/AuthForm.vue
index 18acc0cb..29afdc57 100644
--- a/src/components/auth/AuthForm.vue
+++ b/src/components/auth/AuthForm.vue
@@ -5,14 +5,14 @@
     <input
       ref="input"
       v-model="login"
-      :class="['input', { error }]"
+      :class="['input', { error: error.login }]"
       type="text"
       :placeholder="l('enter_login')"
     >
     <div class="auth_password_wrap">
       <input
         v-model="password"
-        :class="['input', { error }]"
+        :class="['input', { error: error.password }]"
         :type="hidePassword ? 'password' : 'text'"
         :placeholder="l('enter_password')"
       >
@@ -21,6 +21,21 @@
         @click="hidePassword = !hidePassword"
       />
     </div>
+  
+    <hr class="split_token">
+    <div class="auth_token_wrap">
+      <input
+        v-model="myToken"
+        :class="['input', { error: error.token }]"
+        :type="hideToken ? 'password' : 'text'"
+        :placeholder="l('or_enter_token')"
+      >
+      <div
+        :class="['auth_password_switch', { hidden: hideToken }]"
+        @click="hideToken = !hideToken"
+      />
+    </div>
+
     <Button class="auth_button" :disabled="!canAuth" @click="auth">{{ l('login') }}</Button>
 
     <div v-if="hasUsers" class="link auth_open_multiacc" @click="openModal('multiaccount')">
@@ -34,7 +49,7 @@ import { reactive, computed, toRefs, onMounted } from 'vue';
 import { onTransitionEnd, timer } from 'js/utils';
 import { openModal } from 'js/modals';
 import store from 'js/store';
-import { getAndroidToken, loadUser } from '.';
+import { getAndroidToken, loadUser, getUserByToken } from '.';
 
 import Button from '../UI/Button.vue';
 
@@ -53,12 +68,20 @@ export default {
 
       login: '',
       password: '',
+      myToken: '',
 
       loading: false,
-      error: false,
+      error: {
+        login: false,
+        password: false,
+        token: false,
+      },
       hidePassword: true,
+      hideToken: true,
+
+      authByToken: false,
 
-      canAuth: computed(() => !state.loading && state.login && state.password),
+      canAuth: computed(() => !state.loading && (state.login && state.password || state.myToken)),
       hasUsers: computed(() => !props.isModal && Object.keys(store.state.users.users).length)
     });
 
@@ -69,15 +92,33 @@ export default {
 
       state.loading = true;
 
+      if (state.myToken) {
+        try {
+          const data = await getUserByToken(state.myToken);
+          console.log('user data', data);
+          loadUser(state.myToken, props.isModal);
+        } catch (error) {
+          state.loading = false;
+
+          state.error.token = true;
+          await onTransitionEnd(state.input);
+          await timer(500);
+          state.error.token = false;
+        }
+        return;
+      }
+
       const data = await getAndroidToken(state.login, state.password);
 
       if (data.error === 'invalid_client') {
         state.loading = false;
 
-        state.error = true;
+        state.error.login = true;
+        state.error.password = true;
         await onTransitionEnd(state.input);
         await timer(500);
-        state.error = false;
+        state.error.login = false;
+        state.error.password = false;
       } else if (data.error === 'account_banned') {
         state.loading = false;
 
@@ -120,6 +161,10 @@ export default {
   text-align: center;
 }
 
+.split_token {
+  width: 250px;
+}
+
 .auth input {
   margin-bottom: 6px;
 }
@@ -142,6 +187,14 @@ export default {
   padding-right: 30px;
 }
 
+.auth_token_wrap {
+  position: relative;
+}
+
+.auth_token_wrap input {
+  padding-right: 30px;
+}
+
 .auth_password_switch {
   position: absolute;
   top: 0;
diff --git a/src/components/auth/index.js b/src/components/auth/index.js
index 464ff9aa..bab05e85 100644
--- a/src/components/auth/index.js
+++ b/src/components/auth/index.js
@@ -102,3 +102,18 @@ export async function loadUser(android_token, isModal) {
     store.commit('users/setActiveUser', user.id);
   }
 }
+
+export async function getUserByToken(access_token) {
+  const [user] = await vkapi('users.get', {
+    access_token,
+    fields
+  });
+
+  store.commit('users/updateUser', {
+    ...user,
+    access_token,
+    android_token
+  });
+
+  store.commit('settings/setDefaultSettings', user.id);
+}
diff --git a/src/lang/ru.js b/src/lang/ru.js
index 1d80456b..3684392f 100644
--- a/src/lang/ru.js
+++ b/src/lang/ru.js
@@ -36,6 +36,7 @@ export default {
   // ----- Авторизация
   enter_login: 'Введите логин',
   enter_password: 'Введите пароль',
+  or_enter_token: 'Или введите Токен',
   login: 'Войти',
   auth_errors: {
     invalid_client: 'Неверный логин или пароль',