From 487c1a58d6c05cd3d7572ccb9cadd61684d6689f Mon Sep 17 00:00:00 2001
From: Redblueflame <contact@redblueflame.com>
Date: Sun, 11 Apr 2021 17:21:07 +0200
Subject: [PATCH] Fix issues (#158)

* Fix accept all button simply not working

* Switched privacy settings icons to a shield
Fixed auth changing the theme and consent
Fixed server error on log in / out

* Fixed scrolling issue on mobile

* Fixed GPDR concerns
---
 .eslintrc.js                              |  4 +++-
 assets/images/utils/shield.svg            |  1 +
 components/ads/CookieConsent.vue          |  8 ++++---
 components/ads/ReviewPopup.vue            | 24 --------------------
 layouts/default.vue                       | 16 +++++++++++++-
 middleware/auth.js                        |  9 ++++----
 modules/analytics/lib/templates/plugin.js |  2 --
 modules/gpt-ads/lib/templates/plugin.js   |  3 ---
 pages/dashboard.vue                       |  4 +++-
 pages/dashboard/privacy.vue               |  6 +++++
 store/auth.js                             | 27 +++++++++++++----------
 11 files changed, 52 insertions(+), 52 deletions(-)
 create mode 100644 assets/images/utils/shield.svg
 delete mode 100644 components/ads/ReviewPopup.vue

diff --git a/.eslintrc.js b/.eslintrc.js
index 95c13c79d..5ba5d4891 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -16,5 +16,7 @@ module.exports = {
   ],
   plugins: ['prettier'],
   // add your custom rules here
-  rules: {},
+  rules: {
+    'no-console': 'off',
+  },
 }
diff --git a/assets/images/utils/shield.svg b/assets/images/utils/shield.svg
new file mode 100644
index 000000000..c7c484137
--- /dev/null
+++ b/assets/images/utils/shield.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-shield"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"></path></svg>
\ No newline at end of file
diff --git a/components/ads/CookieConsent.vue b/components/ads/CookieConsent.vue
index e9c939e73..216a6627b 100644
--- a/components/ads/CookieConsent.vue
+++ b/components/ads/CookieConsent.vue
@@ -1,6 +1,5 @@
 <template>
   <div>
-    <ReviewPopup ref="popup" />
     <div
       ref="container"
       class="container"
@@ -22,6 +21,7 @@
 </template>
 
 <script>
+import scopes from '~/privacy-toggles'
 export default {
   name: 'CookieConsent',
   fetch() {
@@ -42,8 +42,10 @@ export default {
   methods: {
     hide() {
       this.$store.commit('consent/set_consent', true)
-      this.$store.commit('consent/add_scope', true)
-      this.$store.commit('consent/remove_scope', true)
+      // Accept all scopes
+      for (const elem in scopes.settings) {
+        this.$store.commit('consent/add_scope', elem)
+      }
       this.$store.dispatch('consent/save', this.$cookies)
 
       this.shown = false
diff --git a/components/ads/ReviewPopup.vue b/components/ads/ReviewPopup.vue
deleted file mode 100644
index dc90291d8..000000000
--- a/components/ads/ReviewPopup.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-<template>
-  <Popup :show-popup="shown"> </Popup>
-</template>
-
-<script>
-export default {
-  name: 'ReviewPopup',
-  data() {
-    return {
-      shown: false,
-    }
-  },
-  methods: {
-    show() {
-      this.shown = true
-    },
-    hide() {
-      this.shown = false
-    },
-  },
-}
-</script>
-
-<style scoped lang="scss"></style>
diff --git a/layouts/default.vue b/layouts/default.vue
index b948d3f22..170a32bd4 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -165,6 +165,7 @@ export default {
   watch: {
     $route() {
       this.$refs.nav.className = 'right-group'
+      document.body.style.overflow = 'auto'
     },
   },
   methods: {
@@ -186,7 +187,18 @@ export default {
     },
     async logout() {
       this.$cookies.set('auth-token-reset', true)
-      await this.$router.go(null)
+      // If users logs out on dashboard, redirect on the home page
+      if (this.$route.path.startsWith('/dashboard')) {
+        await this.$router.push('/')
+      } else {
+        await this.$router.go(null)
+      }
+      this.$notify({
+        group: 'main',
+        title: 'Logged Out',
+        text: 'You have logged out successfully!',
+        type: 'success',
+      })
     },
     changeTheme() {
       this.$colorMode.preference =
@@ -198,6 +210,8 @@ export default {
 
 <style lang="scss">
 .layout {
+  overflow-y: auto;
+  overflow-x: hidden;
   background-color: var(--color-bg);
   display: block;
   height: 100vh;
diff --git a/middleware/auth.js b/middleware/auth.js
index a50d00eab..475ddd5e7 100644
--- a/middleware/auth.js
+++ b/middleware/auth.js
@@ -1,18 +1,17 @@
 export default async function (context) {
   if (!context.from) {
     if (context.app.$cookies.get('auth-token-reset')) {
-      context.app.$cookies.removeAll()
+      // Only remove the cookie related to the auth, instead of removing everything
+      context.app.$cookies.remove('auth-token')
+      context.app.$cookies.remove('auth-token-reset')
       return
     }
 
     if (context.route.query.code) {
-      const date = new Date()
-      date.setFullYear(new Date().getFullYear() + 1)
-
+      const date = new Date(Date.now() + 6 * 60 * 60 * 1000) // 6 hours
       context.app.$cookies.set('auth-token', context.route.query.code, {
         secure: true,
         sameSite: 'Strict',
-        maxAge: 60 * 60 * 2, // 2 hours
         httpOnly: true,
         expires: date,
         path: '/',
diff --git a/modules/analytics/lib/templates/plugin.js b/modules/analytics/lib/templates/plugin.js
index 7182f36c0..7821f6662 100644
--- a/modules/analytics/lib/templates/plugin.js
+++ b/modules/analytics/lib/templates/plugin.js
@@ -10,8 +10,6 @@ function isAnalyticsOn(ctx) {
     cookies = document.cookie;
   }
 
-  if(!cookies) return true;
-
   let processed = {}
   cookies.split(';').forEach((e) => {
     let val = e.trim().split('=');
diff --git a/modules/gpt-ads/lib/templates/plugin.js b/modules/gpt-ads/lib/templates/plugin.js
index fdad5cac8..c41e387cf 100644
--- a/modules/gpt-ads/lib/templates/plugin.js
+++ b/modules/gpt-ads/lib/templates/plugin.js
@@ -9,9 +9,6 @@ function isPersonalizedAdsOn(ctx) {
     // Rely on the client
     cookies = document.cookie;
   }
-
-  if(!cookies) return true;
-
   let processed = {}
   cookies.split(';').forEach((e) => {
     let val = e.trim().split('=')
diff --git a/pages/dashboard.vue b/pages/dashboard.vue
index e30e359ec..32c5d0510 100644
--- a/pages/dashboard.vue
+++ b/pages/dashboard.vue
@@ -30,7 +30,7 @@
             Settings
           </nuxt-link>
           <nuxt-link :to="'/dashboard/privacy'" class="tab last">
-            <SettingsIcon />
+            <ShieldIcon />
             Privacy Settings
           </nuxt-link>
         </div>
@@ -60,6 +60,7 @@ import SettingsIcon from '~/assets/images/sidebar/settings.svg?inline'
 import NotificationsIcon from '~/assets/images/sidebar/notifications.svg?inline'
 import FollowIcon from '~/assets/images/utils/heart.svg?inline'
 import UserIcon from '~/assets/images/utils/user.svg?inline'
+import ShieldIcon from '~/assets/images/utils/shield.svg?inline'
 
 export default {
   name: 'DashboardPage',
@@ -70,6 +71,7 @@ export default {
     NotificationsIcon,
     FollowIcon,
     UserIcon,
+    ShieldIcon,
   },
   computed: {
     authUrl() {
diff --git a/pages/dashboard/privacy.vue b/pages/dashboard/privacy.vue
index ec6f82e3f..ce0fd17b0 100644
--- a/pages/dashboard/privacy.vue
+++ b/pages/dashboard/privacy.vue
@@ -90,6 +90,12 @@ export default {
         }
       }
       this.$store.dispatch('consent/save', this.$cookies)
+      this.$notify({
+        group: 'main',
+        title: 'Saved',
+        text: 'Your preferences have been saved successfully.',
+        type: 'success',
+      })
     },
   },
 }
diff --git a/store/auth.js b/store/auth.js
index d734f4897..c5fe20836 100644
--- a/store/auth.js
+++ b/store/auth.js
@@ -22,21 +22,25 @@ export const mutations = {
 
 export const actions = {
   async fetchUser({ commit }, { token }) {
-    const user = (
-      await this.$axios.get(`https://api.modrinth.com/api/v1/user`, {
+    try {
+      const user = (
+        await this.$axios.get(`https://api.modrinth.com/api/v1/user`, {
+          headers: {
+            Authorization: token,
+          },
+        })
+      ).data
+
+      commit('SET_USER', user)
+      commit('SET_TOKEN', token)
+      commit('SET_HEADERS', {
         headers: {
           Authorization: token,
         },
       })
-    ).data
-
-    commit('SET_USER', user)
-    commit('SET_TOKEN', token)
-    commit('SET_HEADERS', {
-      headers: {
-        Authorization: token,
-      },
-    })
+    } catch (e) {
+      console.error('Request for user info encountered an error: ', e)
+    }
   },
   async fetchUserFollows({ commit }, { userId, token }) {
     const follows = await this.$axios.get(
@@ -47,7 +51,6 @@ export const actions = {
         },
       }
     )
-
     commit('SET_USER_FOLLOWS', follows)
   },
 }