From 406764ea120fff96ee363834344d8e4667b4d6e9 Mon Sep 17 00:00:00 2001
From: Troplo <troplo@flowinity.com>
Date: Fri, 9 Apr 2021 19:59:33 +1000
Subject: [PATCH] Fix auth

---
 src/App.vue               | 42 ++++++++++++++-------------------------
 src/components/Badges.vue | 15 ++++++++++----
 src/main.js               |  2 ++
 src/views/Teams.vue       | 18 +++--------------
 src/views/Users.vue       |  1 +
 5 files changed, 32 insertions(+), 46 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index b225f00..a4a9206 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -20,34 +20,28 @@ export default {
     Footer,
   },
   mounted() {
-    const jwt = JSON.parse(localStorage.getItem("token"));
-    const wind = JSON.parse(localStorage.getItem("wind404"));
-
-    if (jwt) {
-      this.$store.commit("setToken", jwt);
+    if (JSON.parse(localStorage.getItem("token"))) {
+      this.$store.commit("setToken", JSON.parse(localStorage.getItem("token")));
     }
-
+    if (JSON.parse(localStorage.getItem("wind404"))) {
+      var wind = JSON.parse(localStorage.getItem("wind404"));
+    } else {
+      // eslint-disable-next-line no-redeclare
+      var wind = false;
+    }
+    this.$store.commit("setWind", wind);
     Object.assign(axios.defaults, {
       headers: { Authorization: this.$store.state.user.token },
     });
-
-    if (wind) {
-      this.$store.commit("setWind", wind);
-    } else {
-      this.$store.commit("setWind", wind);
-    }
-
     if (this.$store.state.debug) {
       this.$buefy.snackbar.open({
         message: this.$t("errors.devBuild"),
         type: "is-warning",
       });
     }
-
-    if (this.$store.state.user.username) {
-      this.axios
+    this.axios
         .get(
-          process.env.VUE_APP_APIENDPOINT +
+            process.env.VUE_APP_APIENDPOINT +
             process.env.VUE_APP_APIVERSION +
             "/" +
             "userinfo"
@@ -63,20 +57,14 @@ export default {
           this.$store.commit("setDescription", res.data.description);
           this.$store.commit("setExecutive", res.data.executive);
         })
-        .catch(() => {
-          this.$buefy.snackbar.open({
-            message: this.$t("errors.down"),
-            type: "is-warning",
-          });
-        });
-
+      if (this.$store.state.user.username) {
         this.axios.get(
-          process.env.VUE_APP_APIENDPOINT +
+            process.env.VUE_APP_APIENDPOINT +
             process.env.VUE_APP_APIVERSION +
             "/" +
             "awards/eligibility"
-        );
-    }
+        )
+      }
   },
 };
 </script>
diff --git a/src/components/Badges.vue b/src/components/Badges.vue
index fb269f2..3910f59 100644
--- a/src/components/Badges.vue
+++ b/src/components/Badges.vue
@@ -45,7 +45,8 @@
     <b-tag v-if="system" class="is-success" rounded>{{ $t('badges.system') }}</b-tag>&nbsp;
     <b-tag v-if="hidden" rounded>{{ $t('badges.hidden') }}</b-tag>&nbsp;
     <b-tag v-if="verified" rounded><i class="fas fa-check"></i>&nbsp;Verified</b-tag>
-    <b-button @click="modal()" v-if="$store.state.user.admin & !noPlus" class="is-info tag" rounded><i class="fas fa-plus"></i></b-button>
+    <b-button @click="modal(user)" v-if="$store.state.user.admin & user" class="is-info tag" rounded><i class="fas fa-plus"></i></b-button>
+    <b-button @click="modal(team)" v-if="$store.state.user.admin & team" class="is-info tag" rounded><i class="fas fa-plus"></i></b-button>
   </span>
 </template>
 <script>
@@ -53,15 +54,21 @@ import AjaxErrorHandler from ".././assets/js/errorHandler";
 
 export default {
   name: 'UserBadges',
-  props: ['admin', 'booster', 'bot', 'hidden', 'banned', 'system', 'username', 'noPlus', 'verified'],
+  props: ['admin', 'booster', 'bot', 'hidden', 'banned', 'system', 'username', 'user', 'verified', 'team'],
   data() {
     return {
       modifyUserModal: false
     }
   },
   methods: {
-    modal() {
-      this.modifyUserModal = true
+    modal(type) {
+      if(type === 'user') {
+        this.modifyUserModal = true
+      } else if(type === 'team') {
+        console.log('Debug: Feature not implemented')
+      } else {
+        this.modifyUserModal = true
+      }
     },
     modifyUser() {
       this.axios
diff --git a/src/main.js b/src/main.js
index d9e1a69..8b8046d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -32,6 +32,8 @@ Vue.use(Buefy);
 Vue.config.productionTip = false;
 Vue.prototype.$snackbar = Snackbar;
 
+axios.defaults.headers.common["Authorization"] = localStorage.getItem("token")
+
 // BBCode Configuration
 VMdEditor.lang.use("en-US", enUS);
 hljsTheme.extend((md, hljs) => {
diff --git a/src/views/Teams.vue b/src/views/Teams.vue
index 85bbc2a..0fa4fb9 100644
--- a/src/views/Teams.vue
+++ b/src/views/Teams.vue
@@ -23,23 +23,11 @@
             >
               <div class="box">
                 <h1 class="title">
-                  {{ user.username }}&nbsp;<Badges
-                    :verified="user.verified"
+                  <router-link :to="'/t/' + user.username" style="text-decoration: none; color: inherit;">{{ user.username }}</router-link>&nbsp;<Badges
+                    :verified="user.verified" :team="true"
                 ></Badges>
                 </h1>
-                <img
-                    :src="
-                    'https://cdn.kaverti.com/user/avatars/full/' +
-                    user.picture +
-                    '.png'
-                  "
-                /><br />
-                <b-button
-                    tag="router-link"
-                    :to="'/u/' + user.username"
-                    class="is-centered is-info"
-                >View Team</b-button
-                >
+                PLACEHOLDER IMAGE<br />
               </div>
             </div>
           </Pagination>
diff --git a/src/views/Users.vue b/src/views/Users.vue
index 85e94d4..5ca5c7b 100644
--- a/src/views/Users.vue
+++ b/src/views/Users.vue
@@ -30,6 +30,7 @@
                     :admin="user.admin"
                     :booster="user.booster"
                     :bot="user.bot"
+                    :user="true"
                   ></Badges>
                 </h1>
                 <img