From a000b9e1317b807301050358fd6d33b36cdd7556 Mon Sep 17 00:00:00 2001 From: Eion Robb Date: Sun, 16 Oct 2016 12:37:34 +1300 Subject: Only use the refresh token to login if we've allowed saving the password Fixes issue #481 --- skypeweb/libskypeweb.c | 2 +- skypeweb/skypeweb_login.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/skypeweb/libskypeweb.c b/skypeweb/libskypeweb.c index ad05a5d..822c6f6 100644 --- a/skypeweb/libskypeweb.c +++ b/skypeweb/libskypeweb.c @@ -322,7 +322,7 @@ skypeweb_login(PurpleAccount *account) sa->messages_host = g_strdup(SKYPEWEB_DEFAULT_MESSAGES_HOST); sa->url_datas = NULL; - if (purple_account_get_string(account, "refresh-token", NULL)) { + if (purple_account_get_string(account, "refresh-token", NULL) && purple_account_get_remember_password(account)) { skypeweb_refresh_token_login(sa); } else { skypeweb_begin_oauth_login(sa); diff --git a/skypeweb/skypeweb_login.c b/skypeweb/skypeweb_login.c index 6aaed84..dc14d14 100644 --- a/skypeweb/skypeweb_login.c +++ b/skypeweb/skypeweb_login.c @@ -50,7 +50,9 @@ skypeweb_login_did_auth(PurpleUtilFetchUrlData *url_data, gpointer user_data, co sa->skype_token = refresh_token; skypeweb_update_cookies(sa, url_text); - purple_account_set_string(sa->account, "refresh-token", g_hash_table_lookup(sa->cookie_table, "refresh-token")); + if (purple_account_get_remember_password(sa->account)) { + purple_account_set_string(sa->account, "refresh-token", g_hash_table_lookup(sa->cookie_table, "refresh-token")); + } skypeweb_do_all_the_things(sa); } -- cgit v1.2.3