GNOME.org
 

[libgdata: 1/2] remove deprecated oauth1 authorizer


commit 88819dd997d795e12bb953a343d0493dbdee94bb
Author: Daniel Kolesa <dkolesa igalia com>
Date:   Tue Mar 16 17:22:08 2021 +0100

    remove deprecated oauth1 authorizer

 docs/reference/gdata-docs.xml                      |    1 -
 docs/reference/gdata-sections.txt.in               |   34 -
 gdata/gdata-authorizer.c                           |    2 -
 gdata/gdata-core.symbols                           |   18 -
 gdata/gdata-oauth1-authorizer.c                    | 1497 --------------------
 gdata/gdata-oauth1-authorizer.h                    |  108 --
 gdata/gdata.h                                      |    1 -
 gdata/meson.build                                  |    2 -
 gdata/symbol.map                                   |   18 -
 gdata/tests/calendar.c                             |    2 +-
 gdata/tests/contacts.c                             |    2 +-
 gdata/tests/meson.build                            |    1 -
 gdata/tests/oauth1-authorizer.c                    | 1144 ---------------
 gdata/tests/picasaweb.c                            |    2 +-
 gdata/tests/tasks.c                                |    2 +-
 ...th1-authorizer-interactive-data-bad-credentials |   25 -
 .../oauth1-authorizer-refresh-authorization        |    0
 ...th1-authorizer-request-authentication-uri-async |   25 -
 ...r-request-authentication-uri-async-cancellation |    0
 ...uth1-authorizer-request-authentication-uri-sync |   25 -
 ...er-request-authentication-uri-sync-cancellation |    0
 .../oauth1-authorizer-request-authorization-async  |   25 -
 ...zer-request-authorization-async-bad-credentials |   26 -
 ...orizer-request-authorization-async-cancellation |    0
 .../oauth1-authorizer-request-authorization-sync   |   25 -
 ...izer-request-authorization-sync-bad-credentials |   26 -
 ...horizer-request-authorization-sync-cancellation |    0
 .../setup-oauth1-authorizer-data-authenticated     |   50 -
 .../setup-oauth1-authorizer-interactive-data       |   25 -
 meson.build                                        |    7 -
 meson_options.txt                                  |    5 -
 po/POTFILES.in                                     |    1 -
 32 files changed, 4 insertions(+), 3095 deletions(-)
---
diff --git a/docs/reference/gdata-docs.xml b/docs/reference/gdata-docs.xml
index a071a976..7d25b3f2 100644
--- a/docs/reference/gdata-docs.xml
+++ b/docs/reference/gdata-docs.xml
@@ -56,7 +56,6 @@
                        <xi:include href="xml/gdata-authorization-domain.xml"/>
                        <xi:include href="xml/gdata-client-login-authorizer.xml"/>
                        <xi:include href="xml/gdata-goa-authorizer.xml"><xi:fallback /></xi:include>
-                       <xi:include href="xml/gdata-oauth1-authorizer.xml"/>
                        <xi:include href="xml/gdata-oauth2-authorizer.xml"/>
                </chapter>
 
diff --git a/docs/reference/gdata-sections.txt.in b/docs/reference/gdata-sections.txt.in
index 42139e44..6eb5a5a2 100644
--- a/docs/reference/gdata-sections.txt.in
+++ b/docs/reference/gdata-sections.txt.in
@@ -2391,40 +2391,6 @@ gdata_client_login_authorizer_error_quark
 GDataClientLoginAuthorizerPrivate
 </SECTION>
 
-<SECTION>
-<FILE>gdata-oauth1-authorizer</FILE>
-<TITLE>GDataOAuth1Authorizer</TITLE>
-GDataOAuth1Authorizer
-GDataOAuth1AuthorizerClass
-gdata_oauth1_authorizer_new
-gdata_oauth1_authorizer_new_for_authorization_domains
-gdata_oauth1_authorizer_request_authentication_uri
-gdata_oauth1_authorizer_request_authentication_uri_async
-gdata_oauth1_authorizer_request_authentication_uri_finish
-gdata_oauth1_authorizer_request_authorization
-gdata_oauth1_authorizer_request_authorization_async
-gdata_oauth1_authorizer_request_authorization_finish
-gdata_oauth1_authorizer_get_application_name
-gdata_oauth1_authorizer_get_locale
-gdata_oauth1_authorizer_set_locale
-gdata_oauth1_authorizer_get_proxy_uri
-gdata_oauth1_authorizer_set_proxy_uri
-gdata_oauth1_authorizer_get_proxy_resolver
-gdata_oauth1_authorizer_set_proxy_resolver
-gdata_oauth1_authorizer_get_timeout
-gdata_oauth1_authorizer_set_timeout
-<SUBSECTION Standard>
-GDATA_TYPE_OAUTH1_AUTHORIZER
-GDATA_OAUTH1_AUTHORIZER
-GDATA_OAUTH1_AUTHORIZER_CLASS
-GDATA_IS_OAUTH1_AUTHORIZER
-GDATA_IS_OAUTH1_AUTHORIZER_CLASS
-GDATA_OAUTH1_AUTHORIZER_GET_CLASS
-gdata_oauth1_authorizer_get_type
-<SUBSECTION Private>
-GDataOAuth1AuthorizerPrivate
-</SECTION>
-
 @COMMENT@<SECTION>
 @COMMENT@<FILE>gdata-goa-authorizer</FILE>
 @COMMENT@<TITLE>GDataGoaAuthorizer</TITLE>
diff --git a/gdata/gdata-authorizer.c b/gdata/gdata-authorizer.c
index ca8002a9..fbfff764 100644
--- a/gdata/gdata-authorizer.c
+++ b/gdata/gdata-authorizer.c
@@ -40,8 +40,6 @@
  * <itemizedlist>
  *  <listitem>#GDataClientLoginAuthorizer for
  *    <ulink type="http" 
url="http://code.google.com/apis/accounts/docs/AuthForInstalledApps.html";>ClientLogin</ulink> 
(deprecated)</listitem>
- *  <listitem>#GDataOAuth1Authorizer for
- *    <ulink type="http" url="http://code.google.com/apis/accounts/docs/OAuthForInstalledApps.html";>OAuth 
1.0</ulink> (deprecated)</listitem>
  *  <listitem>#GDataOAuth2Authorizer for
  *    <ulink type="http" url="https://developers.google.com/accounts/docs/OAuth2InstalledApp";>OAuth 
2.0</ulink> (preferred)</listitem>
  * </itemizedlist>
diff --git a/gdata/gdata-core.symbols b/gdata/gdata-core.symbols
index 606df7c3..2cf2e3ce 100644
--- a/gdata/gdata-core.symbols
+++ b/gdata/gdata-core.symbols
@@ -924,24 +924,6 @@ gdata_documents_service_get_spreadsheet_authorization_domain
 gdata_picasaweb_service_get_primary_authorization_domain
 gdata_youtube_service_get_primary_authorization_domain
 gdata_service_get_authorization_domains
-gdata_oauth1_authorizer_get_type
-gdata_oauth1_authorizer_new
-gdata_oauth1_authorizer_new_for_authorization_domains
-gdata_oauth1_authorizer_request_authentication_uri
-gdata_oauth1_authorizer_request_authentication_uri_async
-gdata_oauth1_authorizer_request_authentication_uri_finish
-gdata_oauth1_authorizer_request_authorization
-gdata_oauth1_authorizer_request_authorization_async
-gdata_oauth1_authorizer_request_authorization_finish
-gdata_oauth1_authorizer_get_application_name
-gdata_oauth1_authorizer_get_locale
-gdata_oauth1_authorizer_set_locale
-gdata_oauth1_authorizer_get_proxy_uri
-gdata_oauth1_authorizer_set_proxy_uri
-gdata_oauth1_authorizer_get_proxy_resolver
-gdata_oauth1_authorizer_set_proxy_resolver
-gdata_oauth1_authorizer_get_timeout
-gdata_oauth1_authorizer_set_timeout
 gdata_calendar_query_get_max_attendees
 gdata_calendar_query_set_max_attendees
 gdata_calendar_query_show_deleted
diff --git a/gdata/gdata.h b/gdata/gdata.h
index 0858accd..b285e806 100644
--- a/gdata/gdata.h
+++ b/gdata/gdata.h
@@ -38,7 +38,6 @@
 #include <gdata/gdata-authorizer.h>
 #include <gdata/gdata-authorization-domain.h>
 #include <gdata/gdata-client-login-authorizer.h>
-#include <gdata/gdata-oauth1-authorizer.h>
 #include <gdata/gdata-oauth2-authorizer.h>
 #ifdef GOA_API_IS_SUBJECT_TO_CHANGE
 /* You need to define GOA_API_IS_SUBJECT_TO_CHANGE in order to use the GOA authoriser. */
diff --git a/gdata/meson.build b/gdata/meson.build
index a42bae71..ff14f81f 100644
--- a/gdata/meson.build
+++ b/gdata/meson.build
@@ -34,7 +34,6 @@ headers = files(
   'gdata-download-stream.h',
   'gdata-entry.h',
   'gdata-feed.h',
-  'gdata-oauth1-authorizer.h',
   'gdata-oauth2-authorizer.h',
   'gdata-parsable.h',
   'gdata-query.h',
@@ -59,7 +58,6 @@ sources += files(
   'gdata-download-stream.c',
   'gdata-entry.c',
   'gdata-feed.c',
-  'gdata-oauth1-authorizer.c',
   'gdata-oauth2-authorizer.c',
   'gdata-parsable.c',
   'gdata-parser.c',
diff --git a/gdata/symbol.map b/gdata/symbol.map
index 9b9c8de1..2c0f308c 100644
--- a/gdata/symbol.map
+++ b/gdata/symbol.map
@@ -779,24 +779,6 @@ global:
        gdata_media_thumbnail_get_type;
        gdata_media_thumbnail_get_uri;
        gdata_media_thumbnail_get_width;
-       gdata_oauth1_authorizer_get_application_name;
-       gdata_oauth1_authorizer_get_locale;
-       gdata_oauth1_authorizer_get_proxy_resolver;
-       gdata_oauth1_authorizer_get_proxy_uri;
-       gdata_oauth1_authorizer_get_timeout;
-       gdata_oauth1_authorizer_get_type;
-       gdata_oauth1_authorizer_new;
-       gdata_oauth1_authorizer_new_for_authorization_domains;
-       gdata_oauth1_authorizer_request_authentication_uri;
-       gdata_oauth1_authorizer_request_authentication_uri_async;
-       gdata_oauth1_authorizer_request_authentication_uri_finish;
-       gdata_oauth1_authorizer_request_authorization;
-       gdata_oauth1_authorizer_request_authorization_async;
-       gdata_oauth1_authorizer_request_authorization_finish;
-       gdata_oauth1_authorizer_set_locale;
-       gdata_oauth1_authorizer_set_proxy_resolver;
-       gdata_oauth1_authorizer_set_proxy_uri;
-       gdata_oauth1_authorizer_set_timeout;
        gdata_oauth2_authorizer_build_authentication_uri;
        gdata_oauth2_authorizer_dup_refresh_token;
        gdata_oauth2_authorizer_get_client_id;
diff --git a/gdata/tests/calendar.c b/gdata/tests/calendar.c
index 87fb0b81..cd2ad667 100644
--- a/gdata/tests/calendar.c
+++ b/gdata/tests/calendar.c
@@ -1461,7 +1461,7 @@ mock_server_notify_resolver_cb (GObject *object, GParamSpec *pspec, gpointer use
 }
 
 /* Set up a global GDataAuthorizer to be used for all the tests. Unfortunately,
- * the Google Calendar API is limited to OAuth1 and OAuth2 authorisation, so
+ * the Google Calendar API is limited to OAuth2 authorisation, so
  * this requires user interaction when online.
  *
  * If not online, use a dummy authoriser. */
diff --git a/gdata/tests/contacts.c b/gdata/tests/contacts.c
index b6f4de2d..59698898 100644
--- a/gdata/tests/contacts.c
+++ b/gdata/tests/contacts.c
@@ -2547,7 +2547,7 @@ mock_server_notify_resolver_cb (GObject *object, GParamSpec *pspec, gpointer use
 }
 
 /* Set up a global GDataAuthorizer to be used for all the tests. Unfortunately,
- * the Google Contacts API is effectively limited to OAuth1 and OAuth2
+ * the Google Contacts API is effectively limited to OAuth2
  * authorisation, so this requires user interaction when online.
  *
  * If not online, use a dummy authoriser. */
diff --git a/gdata/tests/meson.build b/gdata/tests/meson.build
index 05184deb..22648ea8 100644
--- a/gdata/tests/meson.build
+++ b/gdata/tests/meson.build
@@ -23,7 +23,6 @@ tests = {
     'should_fail': true,
   },
   'general': {},
-  'oauth1-authorizer': {},
   'oauth2-authorizer': {},
   'perf': {},
   'picasaweb': {
diff --git a/gdata/tests/picasaweb.c b/gdata/tests/picasaweb.c
index 19978e3c..b218aa7f 100644
--- a/gdata/tests/picasaweb.c
+++ b/gdata/tests/picasaweb.c
@@ -2074,7 +2074,7 @@ mock_server_notify_resolver_cb (GObject *object, GParamSpec *pspec, gpointer use
 }
 
 /* Set up a global GDataAuthorizer to be used for all the tests. Unfortunately,
- * the Google PicasaWeb API is limited to OAuth1 and OAuth2 authorisation, so
+ * the Google PicasaWeb API is limited to OAuth2 authorisation, so
  * this requires user interaction when online.
  *
  * If not online, use a dummy authoriser. */
diff --git a/gdata/tests/tasks.c b/gdata/tests/tasks.c
index 6f3073ad..9ea0ed27 100644
--- a/gdata/tests/tasks.c
+++ b/gdata/tests/tasks.c
@@ -1303,7 +1303,7 @@ mock_server_notify_resolver_cb (GObject *object, GParamSpec *pspec,
 }
 
 /* Set up a global GDataAuthorizer to be used for all the tests. Unfortunately,
- * the Google Tasks API is limited to OAuth1 and OAuth2 authorisation, so this
+ * the Google Tasks API is limited to OAuth2 authorisation, so this
  * requires user interaction when online.
  *
  * If not online, use a dummy authoriser. */
diff --git a/meson.build b/meson.build
index a5ec8ef3..5021f380 100644
--- a/meson.build
+++ b/meson.build
@@ -93,13 +93,6 @@ gdata_private_deps = [
   dependency('gthread-2.0'),
 ]
 
-oauth_dep = dependency('oauth', version: '>= 0.9.4', required: get_option('oauth1'))
-enable_oauth1 = oauth_dep.found()
-if enable_oauth1
-  gdata_private_deps += oauth_dep
-endif
-config_h.set('ENABLE_OAUTH1', enable_oauth1)
-
 libsoup_dep = dependency('libsoup-2.4', version: '>= 2.42.0')
 gdata_deps += libsoup_dep
 # libsoup 2.47.3 is needed for the new SoupServer API; but it contained a bug in
diff --git a/meson_options.txt b/meson_options.txt
index 19bfd95c..73565981 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -13,11 +13,6 @@ option('goa',
   value: 'enabled',
   description: 'enable Gnome Online Accounts (goa) support')
 
-option('oauth1',
-  type: 'feature',
-  value: 'disabled',
-  description: 'enable OAuth 1.0 support (deprecated)')
-
 option('always_build_tests',
   type: 'boolean',
   value: true,
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2e259b41..160a57ee 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,7 +7,6 @@ gdata/gdata-commentable.c
 gdata/gdata-download-stream.c
 gdata/gdata-entry.c
 gdata/gdata-feed.c
-gdata/gdata-oauth1-authorizer.c
 gdata/gdata-oauth2-authorizer.c
 gdata/gdata-parsable.c
 gdata/gdata-parser.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]