From 448e699cd3c56b49dce54f48a5e901de5f549cca Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 14:42:22 -0400
Subject: [PATCH] [O] Optimize login http fetch

---
 src/components/app/app.vue    |  2 +-
 src/components/login/login.ts | 48 ++++++++++++++++-------------------
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/components/app/app.vue b/src/components/app/app.vue
index f04f91d..17879e9 100644
--- a/src/components/app/app.vue
+++ b/src/components/app/app.vue
@@ -1,6 +1,6 @@
 <template>
     <div id="app">
-        <login v-if="showLogin" v-on:login:token="onLogin"></login>
+        <login v-if="showLogin" v-on:login:token="onLogin" :http="http"></login>
         <navigation :courses="courses" v-on:navigation:select="onNavigate"></navigation>
 
         <div id="app-content">
diff --git a/src/components/login/login.ts b/src/components/login/login.ts
index 69a7f35..dcab806 100644
--- a/src/components/login/login.ts
+++ b/src/components/login/login.ts
@@ -1,5 +1,6 @@
-import {Component, Vue} from 'vue-property-decorator';
+import {Component, Prop, Vue} from 'vue-property-decorator';
 import Constants from '@/constants';
+import {HttpUtils} from '@/utils/http-utils';
 
 /**
  * This component handles user login, and obtains data from the server.
@@ -15,6 +16,9 @@ export default class Login extends Vue
     public loading: boolean = false;
     public error: String = '';
 
+    @Prop()
+    public http?: HttpUtils;
+
     /**
      * This is called when the instance is created.
      */
@@ -36,35 +40,27 @@ export default class Login extends Vue
         // Make login button loading
         this.loading = true;
 
-        // Fetch request TODO: Add username and password when the https server is ready.
-        fetch(`${Constants.API_URL}/login`,
-            {method: 'POST', body: JSON.stringify({username: this.username, password: this.password})})
-        .then(res =>
+        // Fetch request
+        (<HttpUtils> this.http).post('/login', {username: this.username, password: this.password})
+        .then(response =>
         {
-            // Get response body text
-            res.text().then(text =>
+            // Check success
+            if (response.success)
             {
-                // Parse response
-                let response = JSON.parse(text);
+                // Save token to cookies
+                this.$cookies.set('va.token', response.data, '7d');
 
-                // Check success
-                if (response.success)
-                {
-                    // Save token to cookies
-                    this.$cookies.set('va.token', response.data, '7d');
+                // Call custom event with token
+                this.$emit('login:token', response.data);
+            }
+            else
+            {
+                // Show error message
+                this.error = response.data;
 
-                    // Call custom event with token
-                    this.$emit('login:token', response.data);
-                }
-                else
-                {
-                    // Show error message
-                    this.error = response.data;
-
-                    // Allow the user to retry
-                    this.loading = false;
-                }
-            })
+                // Allow the user to retry
+                this.loading = false;
+            }
         })
         .catch(err =>
         {