From c2df29b686fd68e7b5459612435d795e1bc8e350 Mon Sep 17 00:00:00 2001
From: Alex Kozack <cawa-93@users.noreply.github.com>
Date: Thu, 27 May 2021 18:00:33 +0300
Subject: [PATCH] =?UTF-8?q?feat:=20=D0=9F=D0=B5=D1=80=D0=B5=D0=B4=D0=B5?=
 =?UTF-8?q?=D0=BB=D0=B0=D0=BD=20=D0=B2=D0=BD=D0=B5=D1=88=D0=BD=D0=B8=D0=B9?=
 =?UTF-8?q?=20=D0=B2=D0=B8=D0=B4=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=86=D1=8B=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B5=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/renderer/src/App.vue                 |   4 -
 .../src/components/OptionAnime365.vue         | 102 ++++++++++++++++++
 .../renderer/src/components/OptionsPage.vue   |  76 ++-----------
 .../renderer/src/components/ShikiOauth.vue    |  72 ++++++++++---
 packages/renderer/src/use/openExternal.ts     |  16 +++
 packages/renderer/src/utils/shikimori-api.ts  |   5 +-
 .../utils/videoProvider/providers/anime365.ts |   2 +-
 7 files changed, 187 insertions(+), 90 deletions(-)
 create mode 100644 packages/renderer/src/components/OptionAnime365.vue
 create mode 100644 packages/renderer/src/use/openExternal.ts

diff --git a/packages/renderer/src/App.vue b/packages/renderer/src/App.vue
index e9a8c477..964c771b 100644
--- a/packages/renderer/src/App.vue
+++ b/packages/renderer/src/App.vue
@@ -71,8 +71,4 @@ main {
   flex-grow: 1;
   overflow: auto;
 }
-
-a {
-  color: inherit;
-}
 </style>
diff --git a/packages/renderer/src/components/OptionAnime365.vue b/packages/renderer/src/components/OptionAnime365.vue
new file mode 100644
index 00000000..8961a712
--- /dev/null
+++ b/packages/renderer/src/components/OptionAnime365.vue
@@ -0,0 +1,102 @@
+<template>
+  <form
+    class="card"
+    @submit.prevent="saveAccessTokenOption"
+  >
+    <div class="card-body">
+      <p>
+        Для доступа к видео необходимо подключить ваш аккаунт видео-провайдера
+        <a
+          href="https://smotret-anime.online/users/login"
+          @click.prevent="openExternal"
+        >Anime.365</a>.
+      </p>
+      <label
+        for="anime365-access-token"
+        class="form-label"
+      >Ключ доступа к Anime.365</label>
+      <input
+        id="anime365-access-token"
+        v-model="SmAccessToken"
+        :disabled="isLoading"
+        type="password"
+        class="form-control"
+        aria-describedby="anime365-access-token-help"
+      >
+      <div
+        id="anime365-access-token-help"
+        class="form-text"
+      >
+        Чтобы получить ключ доступа авторизуйтесь в браузере и
+        <strong><a
+          href="https://smotret-anime.online/api/accessToken?app=play-shikimori-online"
+          @click.prevent="openExternal"
+        >
+          перейдите по этой ссылке
+        </a>
+        </strong>
+      </div>
+      <div class="d-flex flex-row-reverse">
+        <button
+          :disabled="isLoading"
+          type="submit"
+          class="btn btn-success"
+        >
+          <span
+            v-if="isLoading"
+            class="spinner-border spinner-border-sm"
+            role="status"
+            aria-hidden="true"
+          />
+          Сохранить
+        </button>
+      </div>
+    </div>
+  </form>
+</template>
+
+<script lang="ts">
+import {defineComponent, ref} from 'vue';
+import {clearAccessToken, getAccessToken, saveAccessToken} from '/@/utils/videoProvider/providers/anime365';
+import {openExternalElement} from '/@/use/openExternal';
+
+
+export default defineComponent({
+  name: 'OptionAnime365',
+  setup() {
+
+
+    const SmAccessToken = ref(getAccessToken() || '');
+
+
+    const isLoading = ref(false);
+    const saveAccessTokenOption = async () => {
+      isLoading.value = true;
+
+      if (SmAccessToken.value.trim()) {
+        try {
+          const access_token = JSON.parse(SmAccessToken.value).data.access_token;
+
+          if (access_token) {
+            saveAccessToken(access_token);
+            SmAccessToken.value = access_token;
+          }
+        } catch (e) {
+          saveAccessToken(SmAccessToken.value);
+        }
+      } else {
+        SmAccessToken.value = '';
+        clearAccessToken();
+      }
+
+      isLoading.value = false;
+    };
+
+    return {openExternal: openExternalElement, SmAccessToken, saveAccessTokenOption, isLoading};
+  },
+});
+</script>
+
+<style scoped>
+
+</style>
diff --git a/packages/renderer/src/components/OptionsPage.vue b/packages/renderer/src/components/OptionsPage.vue
index d7e32ee6..ac0c75c7 100644
--- a/packages/renderer/src/components/OptionsPage.vue
+++ b/packages/renderer/src/components/OptionsPage.vue
@@ -1,73 +1,8 @@
 <template>
-  <form
-    @submit.prevent="saveAccessTokenOption"
-  >
-    <label>
-      Ключ доступа к Anime.365<br>
-      <input
-        v-model="SmAccessToken"
-        required
-        type="text"
-      >
-    </label>
-    <p>
-      <a
-        class="help-text"
-        @click.prevent="openDialog"
-      >
-        Как получить ключ доступа?
-      </a>
-    </p>
-    <button type="submit">
-      Сохранить
-    </button>
-  </form>
-
-
-  <dialog ref="helpDialog">
-    <ol>
-      <li>
-        Авторизуйтесь в браузере на сайте:
-        <a
-          href="https://smotret-anime.online/users/login"
-          @click.prevent="openExternal"
-        >
-          Anime.365
-        </a>
-      </li>
-      <li>
-        Скопируйте в поле ниже код полученный по
-        <a
-          href="https://smotret-anime.online/api/accessToken?app=play-shikimori-online"
-          @click.prevent="openExternal"
-        >
-          этой ссылке
-        </a>
-      </li>
-
-      <li>
-        <label>
-          Введите текст от Anime.365:<br>
-          <textarea
-            v-model="jsonData"
-            autofocus
-          />
-        </label>
-      </li>
-      <li>
-        <label>
-          Ваш ключ доступа:<br>
-          <input
-            :value="parsedAccessToken"
-            type="text"
-            readonly
-          >
-        </label>
-      </li>
-    </ol>
-  </dialog>
-
-  <shiki-oauth />
+  <div class="container p-3">
+    <option-anime365 class="mb-3" />
+    <shiki-oauth />
+  </div>
 </template>
 
 <script lang="ts">
@@ -76,10 +11,11 @@ import {useElectron} from '/@/use/electron';
 import {onClickOutside, useTitle} from '@vueuse/core';
 import {getAccessToken, saveAccessToken} from '/@/utils/videoProvider/providers/anime365';
 import ShikiOauth from '/@/components/ShikiOauth.vue';
+import OptionAnime365 from '/@/components/OptionAnime365.vue';
 
 export default defineComponent({
   name: 'OptionsPage',
-  components: {ShikiOauth},
+  components: {OptionAnime365, ShikiOauth},
   setup() {
     //
     // Заголовок страницы
diff --git a/packages/renderer/src/components/ShikiOauth.vue b/packages/renderer/src/components/ShikiOauth.vue
index df9bd0e8..c042db8d 100644
--- a/packages/renderer/src/components/ShikiOauth.vue
+++ b/packages/renderer/src/components/ShikiOauth.vue
@@ -1,32 +1,71 @@
 <template>
-  <p>
-    <button @click="login">
-      Авторизоваться
-    </button>
-    Вы вошли как {{ userName }}
-  </p>
+  <section class="card p-3">
+    <p>
+      Если вы подключите ваш аккаунт Шикимори, то прогресс просмотра В этом приложении будет автоматически
+      синхронизироваться с вашими списками на Шикимори
+    </p>
+    <p class="d-flex flex-row-reverse gap-2 align-items-center">
+      <template v-if="isLoading">
+        <span
+          v-if="isLoading"
+          class="spinner-border spinner-border-sm"
+          role="status"
+          aria-hidden="true"
+        />
+      </template>
+      <template v-else>
+        <template v-if="profile">
+          <button
+            class="btn btn-danger"
+            @click="logOut"
+          >
+            Отключить
+          </button>
+          <span>
+            Подключенный аккаунт Шикимори:
+            <strong><a
+              :href="profile.url"
+              @click.prevent="openExternalElement"
+            >{{ profile.nickname }}</a></strong>
+          </span>
+        </template>
+        <button
+          v-else
+          class="btn btn-dark"
+          @click="login"
+        >
+          Подключить аккаунт Шикимори
+        </button>
+      </template>
+    </p>
+  </section>
 </template>
 
 <script lang="ts">
 import {defineComponent, ref} from 'vue';
 import {useElectron} from '/@/use/electron';
-import * as shiki from '/@/utils/shikimori-api';
+import type {ShikiUser} from '/@/utils/shikimori-api';
+import {clearCredentials, getAuthUrl, getUser, refreshCredentials} from '/@/utils/shikimori-api';
 import {showErrorMessage} from '/@/utils/dialogs';
 import {useRouter} from 'vue-router';
+import {openExternalElement} from '/@/use/openExternal';
 
 
 export default defineComponent({
   name: 'ShikiOauth',
   setup() {
     const {openURL} = useElectron();
-    const login = () => openURL(shiki.getAuthUrl());
+    const login = () => openURL(getAuthUrl());
 
-    const userName = ref('');
+    const isLoading = ref(true);
+    const profile = ref<ShikiUser | null>(null);
 
     const updateName = async () => {
-      const data = await shiki.getUser();
-      if (data) {
-        userName.value = data.nickname;
+      isLoading.value = true;
+      try {
+        profile.value = await getUser();
+      } finally {
+        isLoading.value = false;
       }
     };
 
@@ -34,7 +73,7 @@ export default defineComponent({
     if (code) {
       const router = useRouter();
       router.replace({query: {}});
-      shiki.refreshCredentials({type: 'authorization_code', code})
+      refreshCredentials({type: 'authorization_code', code})
         .then(() => {
           updateName();
         })
@@ -53,8 +92,13 @@ export default defineComponent({
       updateName();
     }
 
+    const logOut = () => {
+      clearCredentials();
+      profile.value = null;
+    };
+
 
-    return {login, userName};
+    return {login, profile, isLoading, openExternalElement, logOut};
   },
 });
 </script>
diff --git a/packages/renderer/src/use/openExternal.ts b/packages/renderer/src/use/openExternal.ts
new file mode 100644
index 00000000..efc7ed95
--- /dev/null
+++ b/packages/renderer/src/use/openExternal.ts
@@ -0,0 +1,16 @@
+import {useElectron} from '/@/use/electron';
+
+
+const {openURL} = useElectron();
+export const openExternalElement = (event: MouseEvent) => {
+  if (!event.target) {
+    return;
+  }
+
+  const target = event.target as HTMLAnchorElement;
+  if (!target.href) {
+    return;
+  }
+
+  openURL(target.href);
+};
diff --git a/packages/renderer/src/utils/shikimori-api.ts b/packages/renderer/src/utils/shikimori-api.ts
index 8741424b..4d89ccea 100644
--- a/packages/renderer/src/utils/shikimori-api.ts
+++ b/packages/renderer/src/utils/shikimori-api.ts
@@ -69,6 +69,9 @@ function isValidCredentials(data: unknown): data is Credentials {
     && 'created_at' in data;
 }
 
+export function clearCredentials(): void {
+  return localStorage.removeItem('shiki-token');
+}
 
 function saveCredentials(credentials: unknown): void {
   if (!isValidCredentials(credentials)) {
@@ -149,7 +152,7 @@ export function getUserRate(seriesId: number): Promise<ShikiUserRate | null> {
 }
 
 
-interface ShikiUser {
+export interface ShikiUser {
   id: number
   nickname: string,
   avatar: string
diff --git a/packages/renderer/src/utils/videoProvider/providers/anime365.ts b/packages/renderer/src/utils/videoProvider/providers/anime365.ts
index 9fd4dbdd..621a0e24 100644
--- a/packages/renderer/src/utils/videoProvider/providers/anime365.ts
+++ b/packages/renderer/src/utils/videoProvider/providers/anime365.ts
@@ -245,6 +245,6 @@ export function saveAccessToken(token?: string): void {
 }
 
 
-function clearAccessToken() {
+export function clearAccessToken() {
   return localStorage.removeItem(ACCESS_TOKEN_STORAGE_KEY);
 }