From 7d3ad5a6394a26f34aede96d8055c7c2da970558 Mon Sep 17 00:00:00 2001
From: Jai A <jaiagr+gpg@pm.me>
Date: Sat, 10 Apr 2021 21:54:16 -0700
Subject: [PATCH] Fix issues with privacy settings

---
 components/ads/CookieConsent.vue          | 23 +++++++++++++----------
 modules/analytics/lib/templates/plugin.js |  6 ++++--
 modules/gpt-ads/lib/templates/plugin.js   |  7 +++++--
 pages/dashboard.vue                       |  4 ++++
 pages/dashboard/privacy.vue               | 19 ++++++++++++-------
 privacy-toggles.js                        |  2 +-
 store/consent.js                          |  2 +-
 7 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/components/ads/CookieConsent.vue b/components/ads/CookieConsent.vue
index bb2007e1e..c73279fe9 100644
--- a/components/ads/CookieConsent.vue
+++ b/components/ads/CookieConsent.vue
@@ -13,8 +13,8 @@
           button below:
         </span>
         <div class="actions">
-          <button class="btn button" @click="hide">Accept all</button>
-          <button class="btn brand-button" @click="review">Review</button>
+          <button class="btn button" @click="review">Review</button>
+          <button class="btn brand-button" @click="hide">Accept all</button>
         </div>
       </div>
     </div>
@@ -24,12 +24,7 @@
 <script>
 export default {
   name: 'CookieConsent',
-  data() {
-    return {
-      shown: false,
-    }
-  },
-  mounted() {
+  fetch() {
     // Get informations in the store
     this.$store.dispatch('consent/loadFromCookies', this.$cookies)
     if (
@@ -39,12 +34,20 @@ export default {
       this.shown = true
     }
   },
+  data() {
+    return {
+      shown: false,
+    }
+  },
   methods: {
     hide() {
-      this.shown = false
+      this.$store.commit('consent/set_consent', true)
+      this.$store.commit('consent/add_scope', true)
+      this.$store.commit('consent/remove_scope', true)
+      this.$store.dispatch('consent/save', this.$cookies)
     },
     review() {
-      this.hide()
+      this.shown = false
       this.$router.push('/dashboard/privacy')
     },
   },
diff --git a/modules/analytics/lib/templates/plugin.js b/modules/analytics/lib/templates/plugin.js
index e47512e7d..7182f36c0 100644
--- a/modules/analytics/lib/templates/plugin.js
+++ b/modules/analytics/lib/templates/plugin.js
@@ -9,6 +9,9 @@ function isAnalyticsOn(ctx) {
     // Rely on the client
     cookies = document.cookie;
   }
+
+  if(!cookies) return true;
+
   let processed = {}
   cookies.split(';').forEach((e) => {
     let val = e.trim().split('=');
@@ -27,14 +30,13 @@ export default async function (ctx, inject) {
   const tag = config.tracking_code ?? '<%= options.tracking_code %>';
   const enabled = config.enabled ?? <%= options.enabled  || false %>;
   // Check if the parameters are not changed by runtime config:
-  
+
 
 
   const UNAMI_LIB_TAG_ID = '<%= options.UNAMI_LIB_TAG_ID %>';
 
 
   if (!enabled) {
-    console.log("Analytics are not enabled.")
     return;
   }
 
diff --git a/modules/gpt-ads/lib/templates/plugin.js b/modules/gpt-ads/lib/templates/plugin.js
index 08e313c97..fdad5cac8 100644
--- a/modules/gpt-ads/lib/templates/plugin.js
+++ b/modules/gpt-ads/lib/templates/plugin.js
@@ -1,7 +1,7 @@
 import Vue from 'vue';
 
 function isPersonalizedAdsOn(ctx) {
-  let cookies = null
+  let cookies = []
   if (ctx.req != null) {
     //Server side rendering
     cookies = ctx.req.headers.cookie;
@@ -9,6 +9,9 @@ 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('=')
@@ -102,7 +105,7 @@ export default async function (ctx, inject) {
   };
   injectScript(gptInitScript);
 
-  
+
   const component = require('./component.js');
   Vue.component('<%= options.componentName %>', component.default || component);
 
diff --git a/pages/dashboard.vue b/pages/dashboard.vue
index 2f4dc2301..bfb1afc08 100644
--- a/pages/dashboard.vue
+++ b/pages/dashboard.vue
@@ -29,6 +29,10 @@
             <SettingsIcon />
             Settings
           </nuxt-link>
+          <nuxt-link :to="'/dashboard/privacy'" class="tab last">
+            <SettingsIcon />
+            Privacy Settings
+          </nuxt-link>
         </div>
         <div v-else class="card page-nav">
           <a :href="authUrl" class="tab last">
diff --git a/pages/dashboard/privacy.vue b/pages/dashboard/privacy.vue
index 87cdf6de3..be108170a 100644
--- a/pages/dashboard/privacy.vue
+++ b/pages/dashboard/privacy.vue
@@ -47,20 +47,25 @@
 import scopes from '@/privacy-toggles'
 export default {
   name: 'Privacy',
-  data: () => {
-    const settings = scopes.settings
-    return {
-      scopes: settings,
-    }
-  },
-  mounted() {
+  fetch() {
+    Object.keys(scopes.settings).forEach((key) => {
+      scopes.settings[key].value = scopes.settings[key].default
+    })
+
     this.$store.dispatch('consent/loadFromCookies', this.$cookies)
+
     // Load the allowed scopes from the store
     this.$store.state.consent.scopes_allowed.forEach((scope) => {
       if (this.scopes[scope] != null)
         this.$set(this.scopes[scope], 'value', true)
     })
   },
+  data: () => {
+    const settings = scopes.settings
+    return {
+      scopes: settings,
+    }
+  },
   options: {
     auth: false,
   },
diff --git a/privacy-toggles.js b/privacy-toggles.js
index 04cf9cbcd..45d7981f0 100644
--- a/privacy-toggles.js
+++ b/privacy-toggles.js
@@ -5,7 +5,7 @@ export default {
       description: `Marketing/target cookies are usually used to show you advertisements that meet your interests.
        When you visit another website, your browser's cookie is recognized and selected ads are displayed to you
        based on the information stored in this cookie.`,
-      default: false,
+      default: true,
     },
     analytics: {
       title: 'Analytics',
diff --git a/store/consent.js b/store/consent.js
index 4700b1e27..84641ad23 100644
--- a/store/consent.js
+++ b/store/consent.js
@@ -36,7 +36,7 @@ export const actions = {
     }
     state.commit('set_consent', $cookies.get('modrinth-consent') === true)
     const scopes = $cookies.get('modrinth-scopes')
-    if (scopes == null) return
+    if (!scopes) return
     scopes.split(',').forEach((elem) => {
       state.commit('add_scope', elem)
     })