Compare commits
No commits in common. 'c9' and 'i9' have entirely different histories.
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,46 @@
|
||||
From 7fa904c3240b16929c7262912b750d48536d07bf Mon Sep 17 00:00:00 2001
|
||||
From: Alexey Berezhok <alexey.berezhok@softline.com>
|
||||
Date: Tue, 19 Sep 2023 17:37:54 +0300
|
||||
Subject: [PATCH] Fix bug when yandex account added not through goa
|
||||
|
||||
---
|
||||
src/libedataserver/e-oauth2-service-yandex.c | 9 ++++++++-
|
||||
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/libedataserver/e-oauth2-service-yandex.c b/src/libedataserver/e-oauth2-service-yandex.c
|
||||
index 64ac387..492c826 100644
|
||||
--- a/src/libedataserver/e-oauth2-service-yandex.c
|
||||
+++ b/src/libedataserver/e-oauth2-service-yandex.c
|
||||
@@ -127,6 +127,13 @@ eos_yandex_get_refresh_uri (EOAuth2Service *service,
|
||||
return "https://oauth.yandex.ru/token";
|
||||
}
|
||||
|
||||
+static const gchar *
|
||||
+eos_yandex_get_redirect_uri (EOAuth2Service *service,
|
||||
+ ESource *source)
|
||||
+{
|
||||
+ return "http://localhost";
|
||||
+}
|
||||
+
|
||||
static void
|
||||
eos_yandex_prepare_authentication_uri_query (EOAuth2Service *service,
|
||||
ESource *source,
|
||||
@@ -139,7 +146,6 @@ eos_yandex_prepare_authentication_uri_query (EOAuth2Service *service,
|
||||
g_return_if_fail (uri_query != NULL);
|
||||
|
||||
e_oauth2_service_util_set_to_form (uri_query, "scope", YANDEX_SCOPE);
|
||||
- e_oauth2_service_util_set_to_form (uri_query, "include_granted_scopes", "false");
|
||||
}
|
||||
|
||||
static gboolean
|
||||
@@ -199,6 +205,7 @@ e_oauth2_service_yandex_oauth2_service_init (EOAuth2ServiceInterface *iface)
|
||||
iface->get_client_secret = eos_yandex_get_client_secret;
|
||||
iface->get_authentication_uri = eos_yandex_get_authentication_uri;
|
||||
iface->get_refresh_uri = eos_yandex_get_refresh_uri;
|
||||
+ iface->get_redirect_uri = eos_yandex_get_redirect_uri;
|
||||
iface->prepare_authentication_uri_query = eos_yandex_prepare_authentication_uri_query;
|
||||
iface->extract_authorization_code = eos_yandex_extract_authorization_code;
|
||||
}
|
||||
--
|
||||
2.39.1
|
||||
|
@ -0,0 +1,49 @@
|
||||
From 068343a45680d6b1dd94830e32e6dc0caa8898bb Mon Sep 17 00:00:00 2001
|
||||
From: Milan Crha <mcrha@redhat.com>
|
||||
Date: Thu, 11 Jan 2024 14:27:24 +0000
|
||||
Subject: [PATCH] Enable HTML5 database and local storage features for web view
|
||||
|
||||
Some pages may require this to work properly, thus enable it.
|
||||
|
||||
Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/515
|
||||
Modified-by: Alex Burmashev <alexander.burmashev@oracle.com>
|
||||
---
|
||||
src/libedataserverui/e-credentials-prompter-impl-oauth2.c | 7 +++++--
|
||||
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/libedataserverui/e-credentials-prompter-impl-oauth2.c b/src/libedataserverui/e-credentials-prompter-impl-oauth2.c
|
||||
index df1c096..4aba6ae 100644
|
||||
--- a/src/libedataserverui/e-credentials-prompter-impl-oauth2.c
|
||||
+++ b/src/libedataserverui/e-credentials-prompter-impl-oauth2.c
|
||||
@@ -575,6 +575,7 @@ e_credentials_prompter_impl_oauth2_show_dialog (ECredentialsPrompterImplOAuth2 *
|
||||
ECredentialsPrompter *prompter;
|
||||
WebKitSettings *webkit_settings;
|
||||
WebKitWebContext *web_context;
|
||||
+ WebKitCookieManager *cookie_manager;
|
||||
gchar *title, *uri;
|
||||
GString *info_markup;
|
||||
gint row = 0;
|
||||
@@ -725,9 +726,9 @@ e_credentials_prompter_impl_oauth2_show_dialog (ECredentialsPrompterImplOAuth2 *
|
||||
webkit_settings = webkit_settings_new_with_settings (
|
||||
"auto-load-images", TRUE,
|
||||
"default-charset", "utf-8",
|
||||
- "enable-html5-database", FALSE,
|
||||
"enable-dns-prefetching", FALSE,
|
||||
- "enable-html5-local-storage", FALSE,
|
||||
+ "enable-html5-database", TRUE,
|
||||
+ "enable-html5-local-storage", TRUE,
|
||||
"enable-offline-web-application-cache", FALSE,
|
||||
"enable-page-cache", FALSE,
|
||||
"enable-plugins", FALSE,
|
||||
@@ -735,6 +736,8 @@ e_credentials_prompter_impl_oauth2_show_dialog (ECredentialsPrompterImplOAuth2 *
|
||||
NULL);
|
||||
|
||||
web_context = webkit_web_context_new ();
|
||||
+ cookie_manager = webkit_web_context_get_cookie_manager (web_context);
|
||||
+ webkit_cookie_manager_set_accept_policy (cookie_manager, WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS);
|
||||
webkit_web_context_set_sandbox_enabled (web_context, TRUE);
|
||||
|
||||
widget = g_object_new (WEBKIT_TYPE_WEB_VIEW,
|
||||
--
|
||||
2.39.3
|
||||
|
Loading…
Reference in new issue