From 45a0b0a179bbcb9d59f089cc7c2a9d2a8c0c6537 Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Mon, 1 Aug 2022 14:28:56 +0200
Subject: [PATCH] add unauthenticated subscriptions

---
 src/components/FeedPage.vue          | 11 +---------
 src/components/ImportPage.vue        | 33 +++++++++++++++-------------
 src/components/SubscriptionsPage.vue |  9 +++++++-
 src/main.js                          | 13 +++++++++++
 4 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/src/components/FeedPage.vue b/src/components/FeedPage.vue
index 404a986c..fea59f56 100644
--- a/src/components/FeedPage.vue
+++ b/src/components/FeedPage.vue
@@ -1,7 +1,7 @@
 <template>
     <h1 v-t="'titles.feed'" class="font-bold text-center my-4" />
 
-    <button v-if="authenticated" class="btn mr-2" @click="exportHandler">
+    <button class="btn mr-2" @click="exportHandler">
         <router-link to="/subscriptions">Subscriptions</router-link>
     </button>
 
@@ -85,15 +85,6 @@ export default {
                 this.loadMoreVideos();
             }
         },
-        getUnauthenticatedChannels() {
-            const localSubscriptions = this.getLocalSubscriptions();
-            var channels = "";
-            localSubscriptions.forEach((element, index) => {
-                channels += element;
-                if (localSubscriptions.size != index) channels += ",";
-            });
-            return channels;
-        },
     },
 };
 </script>
diff --git a/src/components/ImportPage.vue b/src/components/ImportPage.vue
index dcc354b0..5f274cd9 100644
--- a/src/components/ImportPage.vue
+++ b/src/components/ImportPage.vue
@@ -69,7 +69,6 @@ export default {
         },
     },
     activated() {
-        if (!this.authenticated) this.$router.push("/login");
         document.title = "Import - Piped";
     },
     methods: {
@@ -132,21 +131,25 @@ export default {
             });
         },
         handleImport() {
-            this.fetchJson(
-                this.authApiUrl() + "/import",
-                {
-                    override: this.override,
-                },
-                {
-                    method: "POST",
-                    headers: {
-                        Authorization: this.getAuthToken(),
+            if (this.authenticated) {
+                this.fetchJson(
+                    this.authApiUrl() + "/import",
+                    {
+                        override: this.override,
                     },
-                    body: JSON.stringify(this.subscriptions),
-                },
-            ).then(json => {
-                if (json.message === "ok") window.location = "/feed";
-            });
+                    {
+                        method: "POST",
+                        headers: {
+                            Authorization: this.getAuthToken(),
+                        },
+                        body: JSON.stringify(this.subscriptions),
+                    },
+                ).then(json => {
+                    if (json.message === "ok") window.location = "/feed";
+                });
+            } else {
+                this.importSubscriptionsLocally(this.subscriptions);
+            }
         },
     },
 };
diff --git a/src/components/SubscriptionsPage.vue b/src/components/SubscriptionsPage.vue
index 793e8288..d96bfee5 100644
--- a/src/components/SubscriptionsPage.vue
+++ b/src/components/SubscriptionsPage.vue
@@ -49,7 +49,14 @@ export default {
                 this.subscriptions = json;
                 this.subscriptions.forEach(subscription => (subscription.subscribed = true));
             });
-        else this.$router.push("/login");
+        else {
+            this.fetchJson(this.authApiUrl() + "/subscriptions/unauthenticated", null, {
+                channels: this.getUnauthenticatedChannels(),
+            }).then(json => {
+                this.subscriptions = json;
+                this.subscriptions.forEach(subscription => (subscription.subscribed = true));
+            });
+        }
     },
     activated() {
         document.title = "Subscriptions - Piped";
diff --git a/src/main.js b/src/main.js
index f8ef6287..6b270a78 100644
--- a/src/main.js
+++ b/src/main.js
@@ -215,6 +215,19 @@ const mixin = {
             else localSubscriptions.push(channelId);
             localStorage.setItem("localSubscriptions", JSON.stringify(localSubscriptions));
         },
+        getUnauthenticatedChannels() {
+            const localSubscriptions = this.getLocalSubscriptions();
+            var channels = "";
+            localSubscriptions.forEach((element, index) => {
+                channels += element;
+                if (localSubscriptions.size != index) channels += ",";
+            });
+            return channels;
+        },
+        importSubscriptionsLocally(newChannels) {
+            const subscriptions = this.getLocalSubscriptions().concat(newChannels);
+            localStorage.setItem("localSubscriptions"), JSON.stringify(subscriptions);
+        },
     },
     computed: {
         theme() {