From 7ef4ea7079ab7ae04ceee08ae782eede2ae6e957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Mon, 22 Oct 2018 13:32:00 +0200
Subject: [PATCH 1/4] Soundcloud updates for private lists testing

---
 server/public/assets/html/callback.html |  1 +
 server/public/assets/js/callback.js     | 57 ++++++++++++++---
 server/public/assets/js/listeners.js    | 81 +++++++++++++++++++++++++
 3 files changed, 131 insertions(+), 8 deletions(-)
diff --git a/server/public/assets/html/callback.html b/server/public/assets/html/callback.html
index 364b88cb..1ed07fe8 100755
--- a/server/public/assets/html/callback.html
+++ b/server/public/assets/html/callback.html
@@ -2,6 +2,7 @@
 <html>
 <head>
   <title>Zoff OAuth Callback</title>
+  <script src="https://connect.soundcloud.com/sdk/sdk-3.3.0.js"></script>
   <script type="text/javascript" src="/assets/dist/callback.min.js"></script>
   <meta charset="UTF-8"/>
   <style>
diff --git a/server/public/assets/js/callback.js b/server/public/assets/js/callback.js
index 53b47925..1bdcdce2 100755
--- a/server/public/assets/js/callback.js
+++ b/server/public/assets/js/callback.js
@@ -20,6 +20,31 @@ window.addEventListener("load", function() {
 
         //window.opener.callback(query);
         window.location.href = "https://accounts.google.com/o/oauth2/v2/auth?client_id=" + client_id + "&response_type=" + response + "&state=" + state + "&redirect_uri=" + redirect + "&scope=" + scope;
+    } else if(query.soundcloud) {
+        /*
+        SC.initialize({
+          client_id: api_key.soundcloud,
+          redirect_uri: 'https://zoff.me/api/oauth'
+        });
+
+        // initiate auth popup
+        console.log("asd ok", api_key.soundcloud);
+        SC.connect().then(function() {
+          return SC.get('/me');
+        }).then(function(me) {
+            console.log(me);
+          //alert('Hello, ' + me.username);
+      }).catch(function(e) {
+          console.log(e);
+      });*/
+
+      var redirect_uri = encodeURIComponent("https://zoff.me/api/oauth");
+      var response_type = "code";
+      var scope = "non-expiring";
+      var state = query.nonce;
+      var url = "https://soundcloud.com/connect?client_id=" + api_key.soundcloud + "&redirect_uri=" + redirect_uri + "&state=" + state + "&display=page&response_type=code&scope=" + scope;
+      //console.log(url);
+      window.location.href = url;
     } else {
         var query_parameters = getQueryHash(window.location.hash);
         window.opener.callback(query_parameters);
@@ -27,14 +52,30 @@ window.addEventListener("load", function() {
 });
 
 function getQueryHash(url) {
-    var temp_arr = url.substring(1).split("&");
-    var done_obj = {};
-    var splitted;
-    for(var i in temp_arr) {
-        splitted = temp_arr[i].split("=");
-        if(splitted.length == 2) {
-            done_obj[splitted[0]] = splitted[1];
+    if(window.location.search.length > 0) {
+        if(url.substring(url.length - 1) == "#") {
+            url = url.substring(0, url.length - 1);
         }
+        var temp_arr = url.substring(1).split("&");
+        var done_obj = {};
+        var splitted;
+        for(var i in temp_arr) {
+            splitted = temp_arr[i].split("=");
+            if(splitted.length == 2) {
+                done_obj[splitted[0]] = splitted[1];
+            }
+        }
+        return done_obj;
+    } else {
+        var temp_arr = url.substring(1).split("&");
+        var done_obj = {};
+        var splitted;
+        for(var i in temp_arr) {
+            splitted = temp_arr[i].split("=");
+            if(splitted.length == 2) {
+                done_obj[splitted[0]] = splitted[1];
+            }
+        }
+        return done_obj;
     }
-    return done_obj;
 }
diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js
index 0259e71b..0bc853fa 100755
--- a/server/public/assets/js/listeners.js
+++ b/server/public/assets/js/listeners.js
@@ -82,6 +82,8 @@ var chat_active = false;
 var chat_unseen = false;
 var blinking = false;
 var from_frontpage = false;
+var access_token_data_soundcloud = {};
+var soundcloud_window;
 var access_token_data = {};
 var spotify_authenticated = false;
 var not_import_html = "";
@@ -1081,6 +1083,85 @@ function addDynamicListeners() {
             },
             error: function(data) {
                 console.log(data);
+                Helper.addClass(".playlist_loader_soundcloud", "hide");
+                Helper.removeClass("#listImportSoundCloud", "hide");
+                if(data.status == 404) {
+                    var nonce = Helper.randomString(29);
+                    window.callback = function(data) {
+                        access_token_data_soundcloud = data;
+                        if(access_token_data_soundcloud.state == nonce){
+                            soundcloud_authenticated = true;
+                            Helper.ajax({
+                                type: "POST",
+                                headers: {
+                                    "Content-Type": "application/json"
+                                },
+                                url: "https://api.soundcloud.com/resolve/?url=" + document.querySelector("#import_soundcloud").value + "&limit=1&client_id=" + api_key.soundcloud + "&oauth_token=" + access_token_data_soundcloud.code + "&format=json&_status_code_map[200]=200",
+                                success: function(data){
+                                    try {
+                                        var jsonData = JSON.parse(data);
+                                        var tracks = jsonData.tracks;
+                                        document.querySelector("#import_soundcloud").value = "";
+                                        var addList = [];
+                                        for(var i = 0; i < tracks.length; i++) {
+                                            var song = tracks[i];
+                                            var title=song.title;
+                                            if(title.indexOf(song.user.username) == -1) {
+                                                title = song.user.username +  " - " + title;
+                                            }
+                                            if(!song.streamable) {
+                                                var not_added_song = document.createElement("div");
+                                                not_added_song.innerHTML = not_import_html;
+
+                                                not_added_song.querySelector(".extra-add-text").innerText = title;
+                                                not_added_song.querySelector(".extra-add-text").setAttribute("title", title);
+                                                not_added_song.querySelector(".extra-button-search").setAttribute("data-text", title);
+                                                document.querySelector(".not-imported-container").insertAdjacentHTML("beforeend", not_added_song.innerHTML);
+                                                Helper.removeClass(".not-imported", "hide");
+                                                continue;
+                                            }
+                                            var duration=Math.floor(song.duration / 1000);
+                                            //var secs=Search.durationToSeconds(duration);
+                                            var secs = duration;
+                                            if(longsongs == undefined) longsongs = true;
+                                            if((longsongs != undefined && !longsongs) || secs<720){
+
+                                                var id=song.id;
+                                                //duration = duration.replace("PT","").replace("H","h ").replace("M","m ").replace("S","s");
+                                                var thumb=song.artwork_url;
+                                                //var thumb = null;
+                                                if(thumb == null) thumb = song.waveform_url;
+
+                                                var songElement = {id: song.id, title: title, duration: secs, source: "soundcloud", thumbnail: thumb};
+
+                                                addList.push(songElement);
+                                            }
+                                        }
+                                        if(addList.length > 0) {
+                                            socket.emit("addPlaylist", {channel: chan.toLowerCase(), songs: addList});
+                                        }
+                                        Helper.addClass(".playlist_loader_soundcloud", "hide");
+                                        Helper.removeClass("#listImportSoundCloud", "hide");
+                                        //{id: song.id, title: enc_title, duration: duration, source: "youtube", thumbnail: "https://img.youtube.com/vi/" + song.id + "/mqdefault.jpg"}
+                                    } catch(e) {
+                                        console.error(e);
+                                        Helper.addClass(".playlist_loader_soundcloud", "hide");
+                                        Helper.removeClass("#listImportSoundCloud", "hide");
+                                    }
+                                },
+                                error: function(e) {
+                                    console.error(e);
+                                }
+                            });
+                        } else {
+                            access_token_data_soundcloud = {};
+                            console.error("States doesn't match");
+                        }
+                        soundcloud_window.close();
+                        window.callback = "";
+                    };
+                    soundcloud_window = window.open("/api/oauth#soundcloud=true&nonce=" + nonce, "", "width=600, height=600");
+                }
             }
         });
     });

From a42e34081907818e5d51067a152d9aece36ad37f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Mon, 22 Oct 2018 13:33:26 +0200
Subject: [PATCH 2/4] Printing data back

---
 server/public/assets/js/listeners.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js
index 0bc853fa..9ae38eed 100755
--- a/server/public/assets/js/listeners.js
+++ b/server/public/assets/js/listeners.js
@@ -1089,6 +1089,7 @@ function addDynamicListeners() {
                     var nonce = Helper.randomString(29);
                     window.callback = function(data) {
                         access_token_data_soundcloud = data;
+                        console.log(access_token_data_soundcloud, nonce);
                         if(access_token_data_soundcloud.state == nonce){
                             soundcloud_authenticated = true;
                             Helper.ajax({

From 88bb45f390ae6cedddecbdb62e5d7d5632a91c57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Mon, 22 Oct 2018 13:35:04 +0200
Subject: [PATCH 3/4] Fixed callback code to reflect search also

---
 server/public/assets/js/callback.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/public/assets/js/callback.js b/server/public/assets/js/callback.js
index 1bdcdce2..cd4ad5b6 100755
--- a/server/public/assets/js/callback.js
+++ b/server/public/assets/js/callback.js
@@ -46,7 +46,12 @@ window.addEventListener("load", function() {
       //console.log(url);
       window.location.href = url;
     } else {
-        var query_parameters = getQueryHash(window.location.hash);
+        var query_parameters;
+        if(window.location.search.length > 0) {
+            query_parameters = getQueryHash(window.location.search);
+        } else {
+            query_parameters = getQueryHash(window.location.hash);
+        }
         window.opener.callback(query_parameters);
     }
 });

From 32a741b147ba13a16dc76d819265b2d9294a28a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Mon, 22 Oct 2018 14:33:54 +0200
Subject: [PATCH 4/4] Updated panel some

---
 server/public/assets/css/style.css            |   6 +-
 server/public/assets/js/listeners.js          | 106 +++++-------------
 .../public/partials/channel/panel.handlebars  |   7 +-
 3 files changed, 35 insertions(+), 84 deletions(-)

diff --git a/server/public/assets/css/style.css b/server/public/assets/css/style.css
index 42df5db0..ab77793e 100755
--- a/server/public/assets/css/style.css
+++ b/server/public/assets/css/style.css
@@ -386,7 +386,7 @@ li.disabled span {
     color: white !important;
 }
 
-.import-spotify-auth, .import-youtube, .export-spotify-auth, .export-youtube, .exported-playlist, .import-zoff, .import-soundcloud{
+.import-spotify-auth, .import-youtube, .export-spotify-auth, .export-youtube, .exported-playlist, .import-zoff, .import-soundcloud, .export-soundcloud{
     color:white !important;
     height:40px !important;
     line-height: 40px !important;
@@ -394,11 +394,11 @@ li.disabled span {
     width: 76%;
 }
 
-.import-soundcloud, .import-soundcloud:active, .import-soundcloud:visited {
+.import-soundcloud, .import-soundcloud:active, .import-soundcloud:visited, .export-soundcloud:visited {
     background: #f96200;
 }
 
-.import-soundcloud:hover {
+.import-soundcloud:hover, .export-soundcloud:hover {
     background: #f97f30;
 }
 
diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js
index 9ae38eed..19752ccd 100755
--- a/server/public/assets/js/listeners.js
+++ b/server/public/assets/js/listeners.js
@@ -952,6 +952,29 @@ function addDynamicListeners() {
         }
     });
 
+    addListener("click", ".export-soundcloud", function(event) {
+        this.preventDefault();
+        var nonce = Helper.randomString(29);
+        Helper.removeClass("#playlist_loader_export", "hide");
+        Helper.addClass(".soundcloud_export_button", "hide");
+        window.callback = function(data) {
+            access_token_data_soundcloud = data;
+            if(access_token_data_soundcloud.state == nonce){
+                soundcloud_authenticated = true;
+                Helper.removeClass("#playlist_loader_export", "hide");
+                Helper.addClass(".soundcloud_export_button", "hide");
+            } else {
+                access_token_data_soundcloud = {};
+                console.error("States doesn't match");
+                Helper.addClass("#playlist_loader_export", "hide");
+                Helper.removeClass(".soundcloud_export_button", "hide");
+            }
+            soundcloud_window.close();
+            window.callback = "";
+        };
+        soundcloud_window = window.open("/api/oauth#soundcloud=true&nonce=" + nonce, "", "width=600, height=600");
+    })
+
     addListener("click", ".export-spotify-auth", function(event){
         this.preventDefault();
         var nonce = Helper.randomString(29);
@@ -1019,7 +1042,7 @@ function addDynamicListeners() {
         document.querySelector("#import_soundcloud").focus();
     });
 
-    addListener("submit", "#listImportSoundCloud", function(event) {
+    /*addListener("submit", "#listImportSoundCloud", function(event) {
         this.preventDefault();
         Helper.removeClass(".playlist_loader_soundcloud", "hide");
         Helper.addClass("#listImportSoundCloud", "hide");
@@ -1085,87 +1108,10 @@ function addDynamicListeners() {
                 console.log(data);
                 Helper.addClass(".playlist_loader_soundcloud", "hide");
                 Helper.removeClass("#listImportSoundCloud", "hide");
-                if(data.status == 404) {
-                    var nonce = Helper.randomString(29);
-                    window.callback = function(data) {
-                        access_token_data_soundcloud = data;
-                        console.log(access_token_data_soundcloud, nonce);
-                        if(access_token_data_soundcloud.state == nonce){
-                            soundcloud_authenticated = true;
-                            Helper.ajax({
-                                type: "POST",
-                                headers: {
-                                    "Content-Type": "application/json"
-                                },
-                                url: "https://api.soundcloud.com/resolve/?url=" + document.querySelector("#import_soundcloud").value + "&limit=1&client_id=" + api_key.soundcloud + "&oauth_token=" + access_token_data_soundcloud.code + "&format=json&_status_code_map[200]=200",
-                                success: function(data){
-                                    try {
-                                        var jsonData = JSON.parse(data);
-                                        var tracks = jsonData.tracks;
-                                        document.querySelector("#import_soundcloud").value = "";
-                                        var addList = [];
-                                        for(var i = 0; i < tracks.length; i++) {
-                                            var song = tracks[i];
-                                            var title=song.title;
-                                            if(title.indexOf(song.user.username) == -1) {
-                                                title = song.user.username +  " - " + title;
-                                            }
-                                            if(!song.streamable) {
-                                                var not_added_song = document.createElement("div");
-                                                not_added_song.innerHTML = not_import_html;
-
-                                                not_added_song.querySelector(".extra-add-text").innerText = title;
-                                                not_added_song.querySelector(".extra-add-text").setAttribute("title", title);
-                                                not_added_song.querySelector(".extra-button-search").setAttribute("data-text", title);
-                                                document.querySelector(".not-imported-container").insertAdjacentHTML("beforeend", not_added_song.innerHTML);
-                                                Helper.removeClass(".not-imported", "hide");
-                                                continue;
-                                            }
-                                            var duration=Math.floor(song.duration / 1000);
-                                            //var secs=Search.durationToSeconds(duration);
-                                            var secs = duration;
-                                            if(longsongs == undefined) longsongs = true;
-                                            if((longsongs != undefined && !longsongs) || secs<720){
-
-                                                var id=song.id;
-                                                //duration = duration.replace("PT","").replace("H","h ").replace("M","m ").replace("S","s");
-                                                var thumb=song.artwork_url;
-                                                //var thumb = null;
-                                                if(thumb == null) thumb = song.waveform_url;
-
-                                                var songElement = {id: song.id, title: title, duration: secs, source: "soundcloud", thumbnail: thumb};
-
-                                                addList.push(songElement);
-                                            }
-                                        }
-                                        if(addList.length > 0) {
-                                            socket.emit("addPlaylist", {channel: chan.toLowerCase(), songs: addList});
-                                        }
-                                        Helper.addClass(".playlist_loader_soundcloud", "hide");
-                                        Helper.removeClass("#listImportSoundCloud", "hide");
-                                        //{id: song.id, title: enc_title, duration: duration, source: "youtube", thumbnail: "https://img.youtube.com/vi/" + song.id + "/mqdefault.jpg"}
-                                    } catch(e) {
-                                        console.error(e);
-                                        Helper.addClass(".playlist_loader_soundcloud", "hide");
-                                        Helper.removeClass("#listImportSoundCloud", "hide");
-                                    }
-                                },
-                                error: function(e) {
-                                    console.error(e);
-                                }
-                            });
-                        } else {
-                            access_token_data_soundcloud = {};
-                            console.error("States doesn't match");
-                        }
-                        soundcloud_window.close();
-                        window.callback = "";
-                    };
-                    soundcloud_window = window.open("/api/oauth#soundcloud=true&nonce=" + nonce, "", "width=600, height=600");
-                }
+                toast("If the list is private, you have to add the secret code at the end");
             }
         });
-    });
+    });*/
 
     addListener("submit", "#listImportSpotify", function(event){
         this.preventDefault();
diff --git a/server/public/partials/channel/panel.handlebars b/server/public/partials/channel/panel.handlebars
index 054a8a20..b25330d2 100755
--- a/server/public/partials/channel/panel.handlebars
+++ b/server/public/partials/channel/panel.handlebars
@@ -203,7 +203,7 @@
                         <form action="#" id="listImportSoundCloud">
                             <i class="material-icons import-icon">playlist_add</i>
                             <input title="Input SoundCloud-playlist url here!" placeholder="Enter SoundCloud-list url" id="import_soundcloud" type="text" class="validate" autocomplete="off" />
-                            <p class="soundcloud-disclaimer">Private lists won't work with imports yet, due to our API-key being limited at the time being. Sorry for any inconvinience.</p>
+                            <p class="soundcloud-disclaimer">If you want to add a private list, remember to add the secret token at the end!</p>
                         </form>
                         <div id="playlist_loader_soundcloud" class="valign playlist_loader_padding hide">
                             <div class="preloader-wrapper small active">
@@ -266,6 +266,11 @@
                         </a>
                     </div>
                 </li>
+                <li class="white-bg">
+                    <div class="input-field field-settings">
+                        <p class="soundcloud-disclaimer">Exporting to SoundCloud is in the works.</p>
+                    </div>
+                </li>
                 <li class="exported-list-container white-bg hide">
                     <div class="valign playlist_loader_padding">
                         <div class="row">
