[gnome-online-accounts/mcatanzaro/oauth1] Drop goaoauthprovider




commit aa960cdb251dd10492ff3a6bde29f2050a4ec5c6
Author: Michael Catanzaro <mcatanzaro redhat com>
Date:   Wed Jun 22 07:58:48 2022 -0500

    Drop goaoauthprovider
    
    OAuth 1 support has been removed from librest. It is now unused since
    the flickr provider was removed, so we can delete it.

 src/goabackend/goaoauthprovider.c | 1649 -------------------------------------
 src/goabackend/goaoauthprovider.h |  143 ----
 src/goabackend/goawebextension.c  |   25 +-
 src/goabackend/meson.build        |    1 -
 4 files changed, 8 insertions(+), 1810 deletions(-)
---
diff --git a/src/goabackend/goawebextension.c b/src/goabackend/goawebextension.c
index a17edf29..a5e6620e 100644
--- a/src/goabackend/goawebextension.c
+++ b/src/goabackend/goawebextension.c
@@ -21,7 +21,6 @@
 
 #include <webkitdom/webkitdom.h>
 
-#include "goaoauthprovider.h"
 #include "goaoauth2provider.h"
 #include "goaoauth2provider-web-extension.h"
 #include "goaprovider.h"
@@ -86,10 +85,8 @@ web_extension_document_loaded_cb (WebKitWebPage *web_page, gpointer user_data)
     {
       WebKitDOMNode *element = webkit_dom_html_collection_item (elements, i);
 
-      if ((GOA_IS_OAUTH_PROVIDER (self->provider)
-           && goa_oauth_provider_is_deny_node (GOA_OAUTH_PROVIDER (self->provider), element))
-          || (GOA_IS_OAUTH2_PROVIDER (self->provider)
-              && goa_oauth2_provider_is_deny_node (GOA_OAUTH2_PROVIDER (self->provider), element)))
+      if (GOA_IS_OAUTH2_PROVIDER (self->provider)
+          && goa_oauth2_provider_is_deny_node (GOA_OAUTH2_PROVIDER (self->provider), element))
         {
           webkit_dom_event_target_add_event_listener (WEBKIT_DOM_EVENT_TARGET (element),
                                                       "click",
@@ -100,24 +97,18 @@ web_extension_document_loaded_cb (WebKitWebPage *web_page, gpointer user_data)
       else if (self->existing_identity != NULL
                && self->existing_identity[0] != '\0'
                && WEBKIT_DOM_IS_HTML_INPUT_ELEMENT (element)
-               && ((GOA_IS_OAUTH_PROVIDER (self->provider)
-                    && goa_oauth_provider_is_identity_node (GOA_OAUTH_PROVIDER (self->provider),
-                                                            WEBKIT_DOM_HTML_INPUT_ELEMENT (element)))
-                   || (GOA_IS_OAUTH2_PROVIDER (self->provider)
-                       && goa_oauth2_provider_is_identity_node (GOA_OAUTH2_PROVIDER (self->provider),
-                                                                WEBKIT_DOM_HTML_INPUT_ELEMENT (element)))))
+               && ((GOA_IS_OAUTH2_PROVIDER (self->provider)
+                   && goa_oauth2_provider_is_identity_node (GOA_OAUTH2_PROVIDER (self->provider),
+                                                            WEBKIT_DOM_HTML_INPUT_ELEMENT (element)))))
         {
           webkit_dom_html_input_element_set_value (WEBKIT_DOM_HTML_INPUT_ELEMENT (element),
                                                    self->existing_identity);
           webkit_dom_html_input_element_set_read_only (WEBKIT_DOM_HTML_INPUT_ELEMENT (element), TRUE);
         }
       else if (WEBKIT_DOM_IS_HTML_INPUT_ELEMENT (element)
-               && ((GOA_IS_OAUTH_PROVIDER (self->provider)
-                   && goa_oauth_provider_is_password_node (GOA_OAUTH_PROVIDER (self->provider),
-                                                           WEBKIT_DOM_HTML_INPUT_ELEMENT (element)))
-                   || (GOA_IS_OAUTH2_PROVIDER (self->provider)
-                       && goa_oauth2_provider_is_password_node (GOA_OAUTH2_PROVIDER (self->provider),
-                                                                WEBKIT_DOM_HTML_INPUT_ELEMENT (element)))))
+               && (GOA_IS_OAUTH2_PROVIDER (self->provider)
+                   && goa_oauth2_provider_is_password_node (GOA_OAUTH2_PROVIDER (self->provider),
+                                                            WEBKIT_DOM_HTML_INPUT_ELEMENT (element))))
         {
           WebKitDOMHTMLFormElement *form;
 
diff --git a/src/goabackend/meson.build b/src/goabackend/meson.build
index 3706d5bf..f5382b34 100644
--- a/src/goabackend/meson.build
+++ b/src/goabackend/meson.build
@@ -3,7 +3,6 @@ libgoa_backend_headers_built = []
 
 libgoa_backend_sources = files(
   'goaoauth2provider.c',
-  'goaoauthprovider.c',
   'goabackendinit.c',
   'goadlnaservermanager.c',
   'goaewsclient.c',


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]