You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
57 lines
2.7 KiB
57 lines
2.7 KiB
diff -up evolution-data-server-3.22.7/calendar/backends/caldav/e-cal-backend-caldav.c.caldav-oauth2-refresh-deadlock evolution-data-server-3.22.7/calendar/backends/caldav/e-cal-backend-caldav.c |
|
--- evolution-data-server-3.22.7/calendar/backends/caldav/e-cal-backend-caldav.c.caldav-oauth2-refresh-deadlock 2017-03-20 10:07:46.000000000 +0100 |
|
+++ evolution-data-server-3.22.7/calendar/backends/caldav/e-cal-backend-caldav.c 2017-04-10 10:58:07.970110715 +0200 |
|
@@ -362,6 +362,7 @@ caldav_ensure_bearer_auth_usage (ECalBac |
|
|
|
static gboolean |
|
caldav_setup_bearer_auth (ECalBackendCalDAV *cbdav, |
|
+ gboolean is_in_authenticate, |
|
ESoupAuthBearer *bearer, |
|
GCancellable *cancellable, |
|
GError **error) |
|
@@ -381,7 +382,8 @@ caldav_setup_bearer_auth (ECalBackendCal |
|
|
|
if (success) { |
|
e_soup_auth_bearer_set_access_token (bearer, access_token, expires_in_seconds); |
|
- caldav_ensure_bearer_auth_usage (cbdav, bearer); |
|
+ if (!is_in_authenticate) |
|
+ caldav_ensure_bearer_auth_usage (cbdav, bearer); |
|
} |
|
|
|
g_free (access_token); |
|
@@ -419,7 +421,7 @@ caldav_maybe_prepare_bearer_auth (ECalBa |
|
g_free (auth_method); |
|
|
|
if (cbdav->priv->using_bearer_auth) { |
|
- success = caldav_setup_bearer_auth (cbdav, cbdav->priv->using_bearer_auth, cancellable, error); |
|
+ success = caldav_setup_bearer_auth (cbdav, FALSE, cbdav->priv->using_bearer_auth, cancellable, error); |
|
} else { |
|
ESourceWebdav *extension; |
|
SoupAuth *soup_auth; |
|
@@ -432,7 +434,7 @@ caldav_maybe_prepare_bearer_auth (ECalBa |
|
E_TYPE_SOUP_AUTH_BEARER, |
|
SOUP_AUTH_HOST, soup_uri->host, NULL); |
|
|
|
- success = caldav_setup_bearer_auth (cbdav, E_SOUP_AUTH_BEARER (soup_auth), cancellable, error); |
|
+ success = caldav_setup_bearer_auth (cbdav, FALSE, E_SOUP_AUTH_BEARER (soup_auth), cancellable, error); |
|
if (success) |
|
cbdav->priv->using_bearer_auth = g_object_ref (soup_auth); |
|
|
|
@@ -1134,7 +1136,7 @@ soup_authenticate_bearer (SoupSession *s |
|
{ |
|
GError *local_error = NULL; |
|
|
|
- caldav_setup_bearer_auth (cbdav, E_SOUP_AUTH_BEARER (auth), NULL, &local_error); |
|
+ caldav_setup_bearer_auth (cbdav, TRUE, E_SOUP_AUTH_BEARER (auth), NULL, &local_error); |
|
|
|
/* Stash the error to be picked up by caldav_credentials_required_sync(). |
|
* There's no way to explicitly propagate a GError directly |
|
@@ -1266,7 +1268,7 @@ send_and_handle_redirection (ECalBackend |
|
e_soup_auth_bearer_is_expired (cbdav->priv->using_bearer_auth)) { |
|
GError *local_error = NULL; |
|
|
|
- if (!caldav_setup_bearer_auth (cbdav, cbdav->priv->using_bearer_auth, cancellable, &local_error)) { |
|
+ if (!caldav_setup_bearer_auth (cbdav, FALSE, cbdav->priv->using_bearer_auth, cancellable, &local_error)) { |
|
if (local_error) { |
|
soup_message_set_status_full (msg, SOUP_STATUS_BAD_REQUEST, local_error->message); |
|
g_propagate_error (error, local_error);
|
|
|