From 78d87633f51afa02c354a12819009b6c67f23b7b Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Wed, 22 May 2019 16:05:33 +0900
Subject: [PATCH] Add error handling of `login-complete`

---
 src/components/Preferences/AccountAuth.vue |  6 +++++-
 src/main/Auth.ts                           | 23 +++++++++-------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/components/Preferences/AccountAuth.vue b/src/components/Preferences/AccountAuth.vue
index f536badc..221dffeb 100644
--- a/src/components/Preferences/AccountAuth.vue
+++ b/src/components/Preferences/AccountAuth.vue
@@ -63,7 +63,11 @@ export default class AccountAuth extends Vue {
   public authCode() {
     ipcRenderer.once(
       `login-complete`,
-      (e: Event, account: Account) => {
+      (e: Event, account?: Account, error?: Error) => {
+        if (error != undefined || account === undefined) {
+          console.error(error)
+          return
+        }
         this.$emit('login-complete', account)
       }
     )
diff --git a/src/main/Auth.ts b/src/main/Auth.ts
index 424487d6..1a7ba98b 100644
--- a/src/main/Auth.ts
+++ b/src/main/Auth.ts
@@ -78,19 +78,15 @@ export default class Auth {
       tokenData = await Mastodon.fetchAccessToken(clientId, clientSecret, code, "https://" + instance, redirectUri)
     } catch (err) {
       let error: Error = err
-      event.sender.send(`error`, {
-        id: "ERROR_CONNECTION",
-        message: "Connection error",
-        meta: error
-      })
+      error.name = "ERROR_CONNECTION"
+      event.sender.send(`login-complete`, undefined, error)
       return
     }
 
     if (tokenData.accessToken === undefined) {
-      event.sender.send(`error`, {
-        id: "ERROR_GET_TOKEN",
-        message: "Failed to get access token."
-      })
+      let error = new Error("Failed to get access token.")
+      error.name = "ERROR_GET_TOKEN"
+      event.sender.send(`login-complete`, undefined, error)
       return
     }
 
@@ -117,11 +113,10 @@ export default class Auth {
       let newDoc = await db.insert(docs)
       Client.setAuthClient('http', newDoc.full, client)
       event.sender.send(`login-complete`, newDoc)
-    } catch (error) {
-      event.sender.send(`error`, {
-        id: "ERROR_YOU_TRY_ANOTHER_ACCOUNT",
-        message: "You cannot login already logined account."
-      })
+    } catch (err) {
+      let error = new Error("You cannot login already logined account.")
+      error.name = "ERROR_YOU_TRY_ANOTHER_ACCOUNT"
+      event.sender.send(`login-complete`, undefined, error)
     }
   }
 }