Added Album functions and modified all functions to use RestApi(everything untested)

SpotifyESP32.cpp

@@ -12,6 +12,7 @@ namespace Spotify_types{
   String TYPE_PLAYLIST = "playlist";
 }
 
+
 Spotify::Spotify(char* refresh_token, char* redirect_uri, char* client_id, char* client_secret,bool debug_on){
   _retry = 0;
   _refresh_token = refresh_token;
@@ -20,19 +21,23 @@ Spotify::Spotify(char* refresh_token, char* redirect_uri, char* client_id, char*
   _client_secret = client_secret;
   _debug_on = debug_on;
 }
-response Spotify::currently_playing(){
+
+
+response Spotify::RestApiGet(char rest_url[_size_of_possibly_large_char]){
   response response_obj;
   init_response(&response_obj);
+
   HTTPClient http;
-  http.begin("https://api.spotify.com/v1/me/player/currently-playing",_spotify_root_ca);
+  http.begin(rest_url,_spotify_root_ca);
   http.addHeader("Accept", "application/json");
   http.addHeader("Content-Type", "application/json");
   http.addHeader("Authorization","Bearer "+String(_access_token));
- 
   int http_code = http.GET();
+
   response_obj.status_code = http_code;
+
   if(_debug_on){
-    Serial.print("GET currently_playing status: ");
+    Serial.print("GET status: ");
     Serial.println(http_code);
     Serial.print(" Reply: ");
     Serial.println(http.getString());
@@ -49,590 +54,253 @@ response Spotify::currently_playing(){
   }
   http.end();
   _retry = 0;
+
   return response_obj;
-  
 }
-response Spotify::current_playback_state(){
+response Spotify::RestApiPut(char rest_url[100], String payload){
   response response_obj;
   init_response(&response_obj);
+
   HTTPClient http;
-  http.begin("https://api.spotify.com/v1/me/player",_spotify_root_ca);
+  http.begin(rest_url,_spotify_root_ca);
   http.addHeader("Accept", "application/json");
   http.addHeader("Content-Type", "application/json");
   http.addHeader("Authorization","Bearer "+String(_access_token));
- 
+
-  int http_code = http.GET();
+  http.addHeader("content-Length", String(payload.length()));
+  int http_code=http.PUT(payload);
+
   response_obj.status_code = http_code;
+  String reply = "";
+  DynamicJsonDocument doc(2000);
+
+  if(http.getSize()>0){
+    reply = http.getString();
+    deserializeJson(doc, reply);
+  }
+
   if(_debug_on){
-    Serial.print("GET current_playback_state status: ");
+    //TODO: Add rexex ([^\/]+$) to extract last text (pause/play etc.) from uri and put into debug info
+    Serial.print("PUT status: ");
     Serial.println(http_code);
     Serial.print(" Reply: ");
-    Serial.println(http.getString());
+    Serial.println(reply);
   }
-  if ((http_code >=200)&&(http_code<=299)){
+  if ((http_code >= 200)&&(http_code <= 299)){
-    String response = http.getString();
+    response_obj.reply = "Success";    
-    response_obj.reply = response;
   }
   else if(_retry<=3){
-    _retry++;
+    String message = doc["error"]["message"].as<String>();
-    if(get_token()){
+    if(message == "Only valid bearer authentication supported"){
-      response_obj = current_playback_state();
+      _retry++;
+      if(get_token()){
+        response_obj = RestApiPut(rest_url);
+      }
+    }
+    else{
+      response_obj.reply = message;
     }
   }
   http.end();
   _retry = 0;
-  return response_obj;
 
+  return response_obj;
 }
-response Spotify::play_uri(String track_uri){
+response Spotify::RestApiPost(char rest_url[100], String payload){
   response response_obj;
   init_response(&response_obj);
 
   HTTPClient http;
-  http.begin("https://api.spotify.com/v1/me/player/play",_spotify_root_ca);
+  http.begin(rest_url,_spotify_root_ca);
   http.addHeader("Accept", "application/json");
   http.addHeader("Content-Type", "application/json");
   http.addHeader("Authorization","Bearer "+String(_access_token));
+
+  
+  http.addHeader("content-Length", String(payload.length()));
+  int http_code=http.POST(payload);
+
+  response_obj.status_code = http_code;
+  String reply = "";
+  DynamicJsonDocument doc(2000);
+
+  if(http.getSize()>0){
+    reply = http.getString();
+    deserializeJson(doc, reply);
+  }
+
+  if(_debug_on){
+    //TODO: Add rexex ([^\/]+$) to extract last text (pause/play etc.) from uri and put into debug info
+    Serial.print("PUT start_playback status: ");
+    Serial.println(http_code);
+    Serial.print(" Reply: ");
+    Serial.println(reply);
+  }
+  if ((http_code >= 200)&&(http_code <= 299)){
+    response_obj.reply = "Success";    
+  }
+  else if(_retry<=3){
+    String message = doc["error"]["message"].as<String>();
+    if(message == "Only valid bearer authentication supported"){
+      _retry++;
+      if(get_token()){
+        response_obj = RestApiPost(rest_url);
+      }
+    }
+    else{
+      response_obj.reply = message;
+    }
+  }
+  http.end();
+  _retry = 0;
+
+  return response_obj;
+}
+//Untested
+response Spotify::RestApiDelete(char rest_url[100], String payload){
+  response response_obj;
+  init_response(&response_obj);
+
+  HTTPClient http;
+  http.begin(rest_url, _spotify_root_ca);
+  http.addHeader("Accept", "application/json");
+  http.addHeader("Content-Type", "application/json");
+  http.addHeader("Authorization", "Bearer " + String(_access_token));
+
+  int http_code = http.sendRequest("DELETE", payload); 
+
+  response_obj.status_code = http_code;
+  String reply = "";
+  DynamicJsonDocument doc(2000);
+
+  if (http.getSize() > 0) {
+    reply = http.getString();
+    deserializeJson(doc, reply);
+  }
+
+  if (_debug_on) {
+    // TODO: Add regex ([^\/]+$) to extract last text (pause/play etc.) from uri and put into debug info
+    Serial.print("DELETE status: ");
+    Serial.println(http_code);
+    Serial.print(" Reply: ");
+    Serial.println(reply);
+  }
+
+  if ((http_code >= 200) && (http_code <= 299)) {
+    response_obj.reply = "Success";
+  } else if (_retry <= 3) {
+    String message = doc["error"]["message"].as<String>();
+    if (message == "Only valid bearer authentication supported") {
+      _retry++;
+      if (get_token()) {
+        response_obj = RestApiDelete(rest_url); 
+      }
+    } else {
+      response_obj.reply = message;
+    }
+  }
+
+  http.end();
+  _retry = 0;
+
+  return response_obj;
+
+}
+//Player
+response Spotify::currently_playing(){
+  char link[] = "https://api.spotify.com/v1/me/player/currently-playing";
+  return RestApiGet(link);
+}
+response Spotify::current_playback_state(){
+  char link[] = "https://api.spotify.com/v1/me/player";
+  return RestApiGet(link);
+}
+response Spotify::play_uri(String track_uri){
+  char link[] = "https://api.spotify.com/v1/me/player/play";
+  
   String payload;
   if(track_uri.startsWith("spotify:track:")){
-    payload= "{\"uris\":[\"" + track_uri + "\"]}";
+    payload = "{\"uris\":[\"" + track_uri + "\"]}";
   }
   else{
     payload = "{\"context_uri\":\"" + track_uri + "\",\"offset\":{\"position\":0}}";
   }
-  http.addHeader("content-Length", String(payload.length()));
+  return RestApiPut(link, payload);
-  int http_code=http.PUT(payload);
-
-  response_obj.status_code = http_code;
-  String reply = "";
-  DynamicJsonDocument doc(2000);
-
-  if(http.getSize()>0){
-    reply = http.getString();
-    deserializeJson(doc, reply);
-  }
-  
-  
-  if(_debug_on){
-    Serial.print("PUT play status: ");
-    Serial.print(http_code);
-    Serial.print(" Reply: ");
-    Serial.println(reply);
-  }
-  if ((http_code >= 200)&&(http_code <= 299)){
-    response_obj.reply = "Success";    
-  }
-  else if(_retry<=3){
-    String message = doc["error"]["message"].as<String>();
-    if(message == "Only valid bearer authentication supported"){
-      _retry++;
-      if(get_token()){
-        response_obj = play_uri(track_uri);
-      }
-    }
-    else{
-      response_obj.reply = message;
-    }
-  }
-  http.end();
-  _retry = 0;
-  return response_obj;
 }
 response Spotify::start_playback(){
-  response response_obj;
+  char url[] = "https://api.spotify.com/v1/me/player/play";
-  init_response(&response_obj);
 
-  HTTPClient http;
+  return RestApiPut(url);
-  http.begin("https://api.spotify.com/v1/me/player/play",_spotify_root_ca);
-  http.addHeader("Accept", "application/json");
-  http.addHeader("Content-Type", "application/json");
-  http.addHeader("Authorization","Bearer "+String(_access_token));
-
-  String payload= "";
-  http.addHeader("content-Length", String(payload.length()));
-  int http_code=http.PUT(payload);
-
-  response_obj.status_code = http_code;
-  String reply = "";
-  DynamicJsonDocument doc(2000);
-
-  if(http.getSize()>0){
-    reply = http.getString();
-    deserializeJson(doc, reply);
-  }
-  
-  
-  if(_debug_on){
-    Serial.print("PUT start_playback status: ");
-    Serial.print(http_code);
-    Serial.print(" Reply: ");
-    Serial.println(reply);
-  }
-  if ((http_code >= 200)&&(http_code <= 299)){
-    response_obj.reply = "Success";    
-  }
-  else if(_retry<=3){
-    String message = doc["error"]["message"].as<String>();
-    if(message == "Only valid bearer authentication supported"){
-      _retry++;
-      if(get_token()){
-        response_obj = start_playback();
-      }
-    }
-    else{
-      response_obj.reply = message;
-    }
-  }
-  http.end();
-  _retry = 0;
-  return response_obj;
 }
 response Spotify::pause_playback(){
-  response response_obj;
+  char url[] = "https://api.spotify.com/v1/me/player/pause";
-  init_response(&response_obj);
-
-  HTTPClient http;
-  http.begin("https://api.spotify.com/v1/me/player/pause",_spotify_root_ca);
-  http.addHeader("Accept", "application/json");
-  http.addHeader("Content-Type", "application/json");
-  http.addHeader("Authorization","Bearer "+String(_access_token));
-
-  String payload= "";
-  http.addHeader("content-Length", String(payload.length()));
-  int http_code=http.PUT(payload);
-
-  response_obj.status_code = http_code;
-  String reply = "";
-  DynamicJsonDocument doc(2000);
-
-  if(http.getSize()>0){
-    reply = http.getString();
-    deserializeJson(doc, reply);
-  }
-  
-  
-  if(_debug_on){
-    Serial.print("PUT pause status: ");
-    Serial.print(http_code);
-    Serial.print(" Reply: ");
-    Serial.println(reply);
-  }
-  if ((http_code >= 200)&&(http_code <= 299)){
-    response_obj.reply = "Success";    
-  }
-  else if(_retry<=3){
-    String message = doc["error"]["message"].as<String>();
-    if(message == "Only valid bearer authentication supported"){
-      _retry++;
-      if(get_token()){
-        response_obj = pause_playback();
-      }
-    }
-    else{
-      response_obj.reply = message;
-    }
-  }
-  http.end();
-  _retry = 0;
-  return response_obj;
 
+  return RestApiPut(url);
 }
 response Spotify::skip(){
-  response response_obj;
+  char url[] = "https://api.spotify.com/v1/me/player/next";
-  init_response(&response_obj);
-  String url = "https://api.spotify.com/v1/me/player/next";
 
-  HTTPClient http;
+  return RestApiPost(url);
-  http.begin(url, _spotify_root_ca);
-  http.addHeader("Accept", "application/json");
-  http.addHeader("Content-Type", "application/json");
-  http.addHeader("Authorization","Bearer "+String(_access_token));
-
-  String payload= "";
-  http.addHeader("content-Length", String(payload.length()));
-  int http_code=http.POST(payload);
-
-  response_obj.status_code = http_code;
-  String reply = "";
-  DynamicJsonDocument doc(2000);
-
-  if(http.getSize()>0){
-    reply = http.getString();
-    deserializeJson(doc, reply);
-  }
-  
-  if(_debug_on){
-    Serial.print("PUT skip status: ");
-    Serial.print(http_code);
-    Serial.print(" Reply: ");
-    Serial.println(reply);
-  }
-  if ((http_code >= 200)&&(http_code <= 299)){
-    response_obj.reply = "Success";    
-  }
-  else if(_retry<=3){
-    String message = doc["error"]["message"].as<String>();
-    if(message == "Only valid bearer authentication supported"){
-      _retry++;
-      if(get_token()){
-        response_obj = skip();
-      }
-    }
-    else{
-      response_obj.reply = message;
-    }
-  }
-  http.end();
-  _retry = 0;
-  return response_obj;
 }
 response Spotify::previous(){
-  response response_obj;
+  char url[] = "https://api.spotify.com/v1/me/player/previous";
-  init_response(&response_obj);
-  String url = "https://api.spotify.com/v1/me/player/previous";
-
-  HTTPClient http;
-  http.begin(url, _spotify_root_ca);
-  http.addHeader("Accept", "application/json");
-  http.addHeader("Content-Type", "application/json");
-  http.addHeader("Authorization","Bearer "+String(_access_token));
-
-  String payload= "";
-  http.addHeader("content-Length", String(payload.length()));
-  int http_code=http.POST(payload);
-
-  response_obj.status_code = http_code;
-  String reply = "";
-  DynamicJsonDocument doc(2000);
-
-  if(http.getSize()>0){
-    reply = http.getString();
-    deserializeJson(doc, reply);
-  }
   
-  if(_debug_on){
+  return RestApiPost(url);
-    Serial.print("PUT previous status: ");
-    Serial.print(http_code);
-    Serial.print(" Reply: ");
-    Serial.println(reply);
-  }
-  if ((http_code >= 200)&&(http_code <= 299)){
-    response_obj.reply = "Success";    
-  }
-  else if(_retry<=3){
-    String message = doc["error"]["message"].as<String>();
-    if(message == "Only valid bearer authentication supported"){
-      _retry++;
-      if(get_token()){
-        response_obj = previous();
-      }
-    }
-    else{
-      response_obj.reply = message;
-    }
-  }
-  http.end();
-  _retry = 0;
-  return response_obj;
 
 }
 response Spotify::available_devices(){
-  response response_obj;
+  char url[] = "https://api.spotify.com/v1/me/player/previous";
-  init_response(&response_obj);
+
-  HTTPClient http;
+  return RestApiGet(url);
-  http.begin("https://api.spotify.com/v1/me/player/devices",_spotify_root_ca);
-  http.addHeader("Accept", "application/json");
-  http.addHeader("Content-Type", "application/json");
-  http.addHeader("Authorization","Bearer "+String(_access_token));
- 
-  int http_code = http.GET();
-  response_obj.status_code = http_code;
-  if(_debug_on){
-    Serial.print("GET current_device status: ");
-    Serial.println(http_code);
-    Serial.print(" Reply: ");
-    Serial.println(http.getString());
-  }
-  if ((http_code >=200)&&(http_code<=299)){
-    String response = http.getString();
-    response_obj.reply = response;
-  }
-  else if(_retry<=3){
-    _retry++;
-    if(get_token()){
-      response_obj = available_devices();
-    }
-  }
-  http.end();
-  _retry = 0;
-  return response_obj;
 }
 response Spotify::recently_played_tracks(int limit){
-  response response_obj;
-  init_response(&response_obj);
-  HTTPClient http;
   String url = "https://api.spotify.com/v1/me/player/recently-played";
   url += "?limit="+String(limit);
-  http.begin(url,_spotify_root_ca);
+
-  http.addHeader("Accept", "application/json");
+  char url_char_array[100]; 
-  http.addHeader("Content-Type", "application/json");
+  url.toCharArray(url_char_array, sizeof(url_char_array));
-  http.addHeader("Authorization","Bearer "+String(_access_token));
+
- 
+  return RestApiGet(url_char_array);
-  int http_code = http.GET();
-  response_obj.status_code = http_code;
-  String response = http.getString();
-  if(_debug_on){
-    Serial.print("GET recently_played_tracks status: ");
-    Serial.println(http_code);
-    Serial.print(" Reply: ");
-    Serial.println(response);
-  }
-  if ((http_code >=200)&&(http_code<=299)){
-    
-    response_obj.reply = response;
-  }
-  else if(_retry<=3){
-    _retry++;
-    if(get_token()){
-      response_obj = recently_played_tracks(limit);
-    }
-  }
-  http.end();
-  _retry = 0;
-  return response_obj;
 }
 response Spotify::get_queue(){
-  response response_obj;
+  char url[] = "https://api.spotify.com/v1/me/player/queue";
-  init_response(&response_obj);
-  HTTPClient http;
-  http.begin("https://api.spotify.com/v1/me/player/queue",_spotify_root_ca);
-  http.addHeader("Accept", "application/json");
-  http.addHeader("Content-Type", "application/json");
-  http.addHeader("Authorization","Bearer "+String(_access_token));
  
-  int http_code = http.GET();
+  return RestApiGet(url);
-  response_obj.status_code = http_code;
-  if(_debug_on){
-    Serial.print("GET get_queue status: ");
-    Serial.println(http_code);
-    Serial.print(" Reply: ");
-    Serial.println(http.getString());
-  }
-  if ((http_code >=200)&&(http_code<=299)){
-    String response = http.getString();
-    response_obj.reply = response;
-  }
-  else if(_retry<=3){
-    _retry++;
-    if(get_token()){
-      response_obj = get_queue();
-    }
-  }
-  http.end();
-  _retry = 0;
-  return response_obj;
 }
 response Spotify::transfer_playback(String device_id){
-  response response_obj;
+  char url[] = "https://api.spotify.com/v1/me/player";
-  init_response(&response_obj);
-
-  HTTPClient http;
-  http.begin("https://api.spotify.com/v1/me/player",_spotify_root_ca);
-  http.addHeader("Accept", "application/json");
-  http.addHeader("Content-Type", "application/json");
-  http.addHeader("Authorization","Bearer "+String(_access_token));
-
   String payload= "{\"device_ids\":[\"" + device_id + "\"]}";
-
-  int http_code=http.PUT(payload);
-
-  response_obj.status_code = http_code;
-  String reply = "";
-  DynamicJsonDocument doc(2000);
-
-  if(http.getSize()>0){
-    reply = http.getString();
-    deserializeJson(doc, reply);
-  }
   
-  if(_debug_on){
+  return RestApiPut(url, payload);
-    Serial.print("PUT play status: ");
-    Serial.print(http_code);
-    Serial.print(" Reply: ");
-    Serial.println(reply);
-  }
-  if ((http_code >= 200)&&(http_code <= 299)){
-    response_obj.reply = "Success";    
-  }
-  else if(_retry<=3){
-    String message = doc["error"]["message"].as<String>();
-    if(message == "Only valid bearer authentication supported"){
-      _retry++;
-      if(get_token()){
-        response_obj = transfer_playback(device_id);
-      }
-    }
-    else{
-      response_obj.reply = message;
-    }
-  }
-  http.end();
-  _retry = 0;
-  return response_obj;
 }
 response Spotify::seek_to_position(int time_ms){
-  response response_obj;
-  init_response(&response_obj);
   String url = "https://api.spotify.com/v1/me/player/seek";
   url += "?position_ms="+String(time_ms);
 
-  HTTPClient http;
+  char url_char_array[100]; 
-  http.begin(url, _spotify_root_ca);
+  url.toCharArray(url_char_array, sizeof(url_char_array));
-  http.addHeader("Accept", "application/json");
-  http.addHeader("Content-Type", "application/json");
-  http.addHeader("Authorization","Bearer "+String(_access_token));
 
-  String payload= "";
+  return RestApiPut(url_char_array);
-  http.addHeader("content-Length", String(payload.length()));
-  int http_code=http.PUT(payload);
-
-  response_obj.status_code = http_code;
-  String reply = "";
-  DynamicJsonDocument doc(2000);
-
-  if(http.getSize()>0){
-    reply = http.getString();
-    deserializeJson(doc, reply);
-  }
-  
-  if(_debug_on){
-    Serial.print("PUT seek_to_position status: ");
-    Serial.print(http_code);
-    Serial.print(" Reply: ");
-    Serial.println(reply);
-  }
-  if ((http_code >= 200)&&(http_code <= 299)){
-    response_obj.reply = "Success";    
-  }
-  else if(_retry<=3){
-    String message = doc["error"]["message"].as<String>();
-    if(message == "Only valid bearer authentication supported"){
-      _retry++;
-      if(get_token()){
-        response_obj = seek_to_position(time_ms);
-      }
-    }
-    else{
-      response_obj.reply = message;
-    }
-  }
-  http.end();
-  _retry = 0;
-  return response_obj;
 }
 response Spotify::repeat_mode(String mode){
-  response response_obj;
-  init_response(&response_obj);
   String url = "https://api.spotify.com/v1/me/player/repeat";
   url += "?state="+mode;
 
-  HTTPClient http;
+  char url_char_array[100]; 
-  http.begin(url, _spotify_root_ca);
+  url.toCharArray(url_char_array, sizeof(url_char_array));
-  http.addHeader("Accept", "application/json");
-  http.addHeader("Content-Type", "application/json");
-  http.addHeader("Authorization","Bearer "+String(_access_token));
 
-  String payload= "";
+  return RestApiPut(url_char_array);
-  http.addHeader("content-Length", String(payload.length()));
-  int http_code=http.PUT(payload);
-
-  response_obj.status_code = http_code;
-  String reply = "";
-  DynamicJsonDocument doc(2000);
-
-  if(http.getSize()>0){
-    reply = http.getString();
-    deserializeJson(doc, reply);
-  }
-  
-  if(_debug_on){
-    Serial.print("PUT repeat status: ");
-    Serial.print(http_code);
-    Serial.print(" Reply: ");
-    Serial.println(reply);
-  }
-  if ((http_code >= 200)&&(http_code <= 299)){
-    response_obj.reply = "Success";    
-  }
-  else if(_retry<=3){
-    String message = doc["error"]["message"].as<String>();
-    if(message == "Only valid bearer authentication supported"){
-      _retry++;
-      if(get_token()){
-        response_obj = repeat_mode(mode);
-      }
-    }
-    else{
-      response_obj.reply = message;
-    }
-  }
-  http.end();
-  _retry = 0;
-  return response_obj;
 }
 response Spotify::set_volume(int value){
-  response response_obj;
-  init_response(&response_obj);
   String url = "https://api.spotify.com/v1/me/player/volume";
   url += "?volume_percent="+String(value);
 
-  HTTPClient http;
+  char url_char_array[100]; 
-  http.begin(url, _spotify_root_ca);
+  url.toCharArray(url_char_array, sizeof(url_char_array));
-  http.addHeader("Accept", "application/json");
-  http.addHeader("Content-Type", "application/json");
-  http.addHeader("Authorization","Bearer "+String(_access_token));
 
-  String payload= "";
+  return RestApiPut(url_char_array);
-  http.addHeader("content-Length", String(payload.length()));
-  int http_code=http.PUT(payload);
-
-  response_obj.status_code = http_code;
-  String reply = "";
-  DynamicJsonDocument doc(2000);
-
-  if(http.getSize()>0){
-    reply = http.getString();
-    deserializeJson(doc, reply);
-  }
-  
-  if(_debug_on){
-    Serial.print("PUT set_volume status: ");
-    Serial.print(http_code);
-    Serial.print(" Reply: ");
-    Serial.println(reply);
-  }
-  if ((http_code >= 200)&&(http_code <= 299)){
-    response_obj.reply = "Success";    
-  }
-  else if(_retry<=3){
-    String message = doc["error"]["message"].as<String>();
-    if(message == "Only valid bearer authentication supported"){
-      _retry++;
-      if(get_token()){
-        response_obj = set_volume(value);
-      }
-    }
-    else{
-      response_obj.reply = message;
-    }
-  }
-  http.end();
-  _retry = 0;
-  return response_obj;
 }
 response Spotify::shuffle(bool mode){
-  response response_obj;
-  init_response(&response_obj);
   String state;
   if(mode){
     state = "true";
@@ -643,50 +311,10 @@ response Spotify::shuffle(bool mode){
   String url = "https://api.spotify.com/v1/me/player/shuffle";
   url += "?state=" + state;
 
-  HTTPClient http;
+  char url_char_array[100]; 
-  http.begin(url, _spotify_root_ca);
+  url.toCharArray(url_char_array, sizeof(url_char_array));
-  http.addHeader("Accept", "application/json");
-  http.addHeader("Content-Type", "application/json");
-  http.addHeader("Authorization","Bearer "+String(_access_token));
 
-  String payload= "";
+  return RestApiPut(url_char_array);
-  http.addHeader("content-Length", String(payload.length()));
-
-  int http_code=http.PUT(payload);
-  
-  response_obj.status_code = http_code;
-  String reply = "";
-  DynamicJsonDocument doc(2000);
-
-  if(http.getSize()>0){
-    reply = http.getString();
-    deserializeJson(doc, reply);
-  }
-  
-  if(_debug_on){
-    Serial.print("PUT shuffle status: ");
-    Serial.print(http_code);
-    Serial.print(" Reply: ");
-    Serial.println(reply);
-  }
-  if ((http_code >= 200)&&(http_code <= 299)){
-    response_obj.reply = "Success";    
-  }
-  else if(_retry<=3){
-    String message = doc["error"]["message"].as<String>();
-    if(message == "Only valid bearer authentication supported"){
-      _retry++;
-      if(get_token()){
-        response_obj = shuffle(mode);
-      }
-    }
-    else{
-      response_obj.reply = message;
-    }
-  }
-  http.end();
-  _retry = 0;
-  return response_obj;
 }
 response Spotify::add_to_queue(String context_uri){
   response response_obj;
@@ -694,49 +322,80 @@ response Spotify::add_to_queue(String context_uri){
   String url = "https://api.spotify.com/v1/me/player/queue";
   url += "?uri="+urlEncode(context_uri);
 
-  HTTPClient http;
+  char url_char_array[100]; 
-  http.begin(url, _spotify_root_ca);
+  url.toCharArray(url_char_array, sizeof(url_char_array));
-  http.addHeader("Accept", "application/json");
-  http.addHeader("Content-Type", "application/json");
-  http.addHeader("Authorization","Bearer "+String(_access_token));
 
-  String payload= "";
+  return RestApiPut(url_char_array);
-  http.addHeader("content-Length", String(payload.length()));
+}
-  int http_code=http.POST(payload);
+//Albums
+response Spotify::get_album(String id){
+  String url = "https://api.spotify.com/v1/albums";
+  url += "/" + id;
 
-  response_obj.status_code = http_code;
+  char url_char_array[100]; 
-  String reply = "";
+  url.toCharArray(url_char_array, sizeof(url_char_array));
-  DynamicJsonDocument doc(2000);
 
-  if(http.getSize()>0){
+  return RestApiGet(url_char_array);
-    reply = http.getString();
+}
-    deserializeJson(doc, reply);
+response Spotify::get_albums(String ids){
-  }
+  String url = "https://api.spotify.com/v1/albums";
-  
+  url  += "?ids=" + ids;
-  if(_debug_on){
+
-    Serial.print("PUT add_to_queue status: ");
+  char url_char_array[_size_of_possibly_large_char]; 
-    Serial.print(http_code);
+  url.toCharArray(url_char_array, sizeof(url_char_array));
-    Serial.print(" Reply: ");
+
-    Serial.println(reply);
+  return RestApiGet(url_char_array);
-  }
+
-  if ((http_code >= 200)&&(http_code <= 299)){
+}
-    response_obj.reply = "Success";    
+response Spotify::get_album_tracks(String id, int limit, int offset){
-  }
+  String url = "https://api.spotify.com/v1/albums/";
-  else if(_retry<=3){
+  url += id + "/tracks?limit=" + String(limit) + "&offset=" + String(offset);
-    String message = doc["error"]["message"].as<String>();
+
-    if(message == "Only valid bearer authentication supported"){
+  char url_char_array[100]; 
-      _retry++;
+  url.toCharArray(url_char_array, sizeof(url_char_array));
-      if(get_token()){
+
-        response_obj = add_to_queue(context_uri);
+  return RestApiGet(url_char_array);
-      }
+
-    }
+}
-    else{
+response Spotify::get_users_saved_albums(int limit, int offset){
-      response_obj.reply = message;
+  String url = "https://api.spotify.com/v1/me/albums";
-    }
+  url += "?limit=" + String(limit) + "&offset=" + String(offset);
-  }
+
-  http.end();
+  char url_char_array[100]; 
-  _retry = 0;
+  url.toCharArray(url_char_array, sizeof(url_char_array));
-  return response_obj;
+
+  return RestApiPut(url_char_array);
+
+}
+response Spotify::save_albums_for_current_user(String ids){
+  char url[] = "https://api.spotify.com/v1/me/albums";
+  String json = comma_separated_string_to_json(ids);
+
+  return RestApiPut(url, json);
+}
+response Spotify::remove_users_saved_albums(String ids){
+  char url[] = "https://api.spotify.com/v1/me/albums";
+  String json = comma_separated_string_to_json(ids);
+
+  return RestApiDelete(url, json);
+}
+response Spotify::check_useres_saved_albums(String ids){
+  String url = "https://api.spotify.com/v1/me/albums/contains";
+  url  += "?ids=" + ids;
+
+  char url_char_array[_size_of_possibly_large_char]; 
+  url.toCharArray(url_char_array, sizeof(url_char_array));
+
+  return RestApiGet(url_char_array);
+}
+response Spotify::get_new_releases(String country, int limit, int offset){
+  String url = "https://api.spotify.com/v1/browse/new-releases";
+  url  += "?country=" + country + "&limit=" + String(limit) + "&offset=" + String(offset);
+
+  char url_char_array[100]; 
+  url.toCharArray(url_char_array, sizeof(url_char_array));
+
+  return RestApiGet(url_char_array);
 }
 void Spotify::init_response(response* response_obj){
   response_obj -> status_code = -1;
@@ -836,7 +495,21 @@ String Spotify::current_artist_names(){
   }
   return artist_names;
 }
+bool Spotify::is_playing(){
+  bool is_playing = true;
+  response data = currently_playing();
+  if((data.status_code>=200)&&(data.status_code<=299)){
+    DynamicJsonDocument doc(10000);
+    deserializeJson(doc,data.reply);
+    is_playing = doc["is_playing"].as<bool>();
+  }
+  return is_playing;
+}
 String Spotify::convert_id_to_uri(String id, String type){
   String uri = "spotify:"+type+":"+id;
   return uri;
+}
+String Spotify::comma_separated_string_to_json(String list){
+  //TODO
+  return list;
 }

SpotifyESP32.h

@@ -28,6 +28,7 @@ void print_response(response response_obj);
 class Spotify {
   public:
     Spotify(char* refresh_token, char* redirect_uri, char* client_id, char* client_secret, bool debug_on);
+    //Player
     response currently_playing();
     response play_uri(String track_uri);
     response start_playback();
@@ -44,16 +45,109 @@ class Spotify {
     response transfer_playback(String device_id);
     response set_volume(int value);
     response add_to_queue(String context_uri);
-    //These Are simplified versions of the previous ones
+    //Albums
+    response get_album(String id);
+    response get_albums(String ids);
+    response get_album_tracks(String id, int limit, int offset);
+    response get_users_saved_albums(int limit, int offset);
+    response save_albums_for_current_user(String ids);
+    response remove_users_saved_albums(String ids);
+    response check_useres_saved_albums(String ids);
+    response get_new_releases(String country, int limit, int offset);
+    //Artists
+    response get_artist(String id);
+    response get_several_artists(String ids);
+    response get_artist_albums(String id);
+    response get_artist_top_tracks(String id);
+    response get_artist_related_artist(String id);
+    //Audiobooks
+    response get_audiobook(String id);
+    response get_several_audiobooks(String ids);
+    response get_audiobook_chapters(String id);
+    response get_users_audiobooks(int limit, int offset);
+    response save_audiobooks_for_current_user(String ids);
+    response remove_audiobooks_for_current_user(String id);
+    response check_users_saved_audiobooks(String ids);
+    //Categories
+    response get_several_browse_categories(String country, String locale, int limit, int offset);
+    response get_single_browse_category(String category_id, String country, String locale);
+    //Chapters
+    response get_chapter(String id);
+    response get_several_chapters(String ids);
+    //Episodes
+    response get_episode(String id);
+    response get_several_episodes(String ids);
+    response get_users_saved_episodes(int limit, int offset);
+    response save_episodes_for_current_user(String ids);
+    response remove_episodes_for_current_user(String id);
+    response check_users_saved_episodes(String ids);
+    //Genres
+    response get_available_genre_seeds();
+    //Markets
+    response get_available_markets();
+    //Playlists
+    response get_playlist(String playlist_id, String fields, String additional_type);
+    response change_playlist_details(String playlist_id, String name, bool is_public, bool is_collaborative, String description);
+    response get_playlist_items(String playlist_id, String fields, String additional_types, int limit, int offset);
+    response update_playlist_items(String playlist_id, String uris, int range_start,int insert_before,int range_length, String snapshot_id);
+    response add_items_to_playlist(String playlist_id, String uris, int position);
+    response remove_playlist_items(String playlist_id, String uris, String snapshot_id);
+    response get_current_users_playlists(int limit, int offset);
+    response get_user_playlists(String user_id,int limit, int offset);
+    response create_playlist(String user_id, String name, bool is_public, bool is_collaborative, String description);
+    response get_featured_playlists(String country, String locale, String timestamp,int limit, int offset);
+    response get_category_playlists(String category_id, String country, int limit, int offset);
+    response get_playlist_cover_image(String playlist_id);
+    response add_custom_playlist_cover_image(String playlist_id, String data);
+    //Search
+    response search(String q, String type, int limit, int offset);
+    //Shows
+    response get_show(String id);
+    response get_several_shows(String ids);
+    response get_show_episodes(String id, int limit, int offset);
+    response get_users_saved_shows(int limit, int offset);
+    response save_shows_for_current_user(String ids);
+    response remove_shows_for_current_user(String id);
+    response check_users_saved_shows(String ids);
+    //Tracks
+    response get_track(String track_id);
+    response get_several_tracks();
+    response get_user_saved_tracks();
+    response save_tracks_for_current_user();
+    response remove_user_saved_tracks();
+    response check_user_saved_tracks();
+    response get_tracks_audio_features();
+    response get_track_audio_features();
+    response get_track_audio_analysis();
+    response get_recommendations();
+    //Users
+    response get_current_user_profile();
+    response get_user_top_items();
+    response get_user_profile();
+    response follow_playlist();
+    response unfollow_playlist();
+    response get_followed_artists();
+    response follow_artists_or_users();
+    response unfollow_artists_or_users();
+    response check_if_user_follows_artists_or_users();
+    response check_if_users_follow_playlist();
+    //Simplified versions of the above
     String current_track_name();
     String current_track_id();
     String current_device_id();
     String current_artist_names();
     String convert_id_to_uri(String id, String type);
+    String comma_separated_string_to_json(String list);
+    bool is_playing();
 
   private:
+    static const int _size_of_possibly_large_char = 600;
     bool get_token();
     void init_response(response* response_obj);
+    response RestApiGet(char rest_url[_size_of_possibly_large_char]);
+    response RestApiPut(char rest_url[100], String payload = "");
+    response RestApiPost(char rest_url[100], String payload = "");
+    response RestApiDelete(char rest_url[100], String payload = "");
     char* _refresh_token;
     char* _redirect_uri;
     char* _client_id;