MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-11-25 12:06:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

[httpd/spotify] Redirect to admin.html, remove old oauth interface

Browse Source
This commit is contained in:
chme
2017-08-28 21:14:35 +02:00
parent e4e5fd5d59
commit ecfea82234
3 changed files with 52 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/spotify.c
View File

@@ -1824,30 +1824,30 @@ spotify_oauth_interface(struct evbuffer *evbuf, const char *redirect_uri)
}
/* Thread: httpd */
void
spotify_oauth_callback(struct evbuffer *evbuf, struct evkeyvalq *param, const char *redirect_uri)
int
spotify_oauth_callback(struct evkeyvalq *param, const char *redirect_uri, char **errmsg)
{
const char *code;
const char *err;
char *user = NULL;
int ret;
*errmsg = NULL;
code = evhttp_find_header(param, "code");
if (!code)
{
evbuffer_add_printf(evbuf, "Error: Didn't receive a code from Spotify\n");
return;
*errmsg = safe_asprintf("Error: Didn't receive a code from Spotify");
return -1;
}
DPRINTF(E_DBG, L_SPOTIFY, "Received OAuth code: %s\n", code);
evbuffer_add_printf(evbuf, "<p>Requesting access token from Spotify...\n");
ret = spotifywebapi_token_get(code, redirect_uri, &user, &err);
if (ret < 0)
{
evbuffer_add_printf(evbuf, "failed</p>\n<p>Error: %s</p>\n", err);
return;
*errmsg = safe_asprintf("Error: %s", err);
return -1;
}
// Received a valid access token
@@ -1866,11 +1866,9 @@ spotify_oauth_callback(struct evbuffer *evbuf, struct evkeyvalq *param, const ch
// Trigger scan after successful access to spotifywebapi
library_exec_async(webapi_scan, NULL);
evbuffer_add_printf(evbuf, "ok, all done</p>\n");
listener_notify(LISTENER_SPOTIFY);
return;
return 0;
}
static void