Rename AccessTokenBased to OAuth2Based and set it from the OAuth2 base class

Signed-off-by: David Zeuthen <davidz@redhat.com>

3 files changed, 48 insertions, 49 deletions

diff --git a/doc/goa-docs.xml b/doc/goa-docs.xml
index 618255e..da159f0 100644
--- a/doc/goa-docs.xml
+++ b/doc/goa-docs.xml
@@ -102,7 +102,7 @@
       <xi:include href="../src/goa/goa-generated-doc-org.gnome.OnlineAccounts.Account.xml"/>
       <xi:include href="../src/goa/goa-generated-doc-org.gnome.OnlineAccounts.GoogleAccount.xml"/>
       <xi:include href="../src/goa/goa-generated-doc-org.gnome.OnlineAccounts.FacebookAccount.xml"/>
-      <xi:include href="../src/goa/goa-generated-doc-org.gnome.OnlineAccounts.AccessTokenBased.xml"/>
+      <xi:include href="../src/goa/goa-generated-doc-org.gnome.OnlineAccounts.OAuth2Based.xml"/>
     </chapter>
   </part>
 
@@ -116,7 +116,7 @@
       <xi:include href="xml/GoaAccount.xml"/>
       <xi:include href="xml/GoaGoogleAccount.xml"/>
       <xi:include href="xml/GoaFacebookAccount.xml"/>
-      <xi:include href="xml/GoaAccessTokenBased.xml"/>
+      <xi:include href="xml/GoaOAuth2Based.xml"/>
   </part>
 
   <part id="ref-backend-library">
diff --git a/doc/goa-sections.txt b/doc/goa-sections.txt
index 0a7320e..9df5258 100644
--- a/doc/goa-sections.txt
+++ b/doc/goa-sections.txt
@@ -51,12 +51,12 @@ goa_object_get_manager
 goa_object_get_account
 goa_object_get_google_account
 goa_object_get_facebook_account
-goa_object_get_access_token_based
+goa_object_get_oauth2_based
 goa_object_peek_manager
 goa_object_peek_account
 goa_object_peek_google_account
 goa_object_peek_facebook_account
-goa_object_peek_access_token_based
+goa_object_peek_oauth2_based
 GoaObjectProxy
 GoaObjectProxyClass
 goa_object_proxy_new
@@ -67,7 +67,7 @@ goa_object_skeleton_set_manager
 goa_object_skeleton_set_account
 goa_object_skeleton_set_google_account
 goa_object_skeleton_set_facebook_account
-goa_object_skeleton_set_access_token_based
+goa_object_skeleton_set_oauth2_based
 <SUBSECTION Standard>
 goa_object_get_type
 goa_object_proxy_get_type
@@ -246,47 +246,47 @@ goa_facebook_account_skeleton_get_type
 </SECTION>
 
 <SECTION>
-<FILE>GoaAccessTokenBased</FILE>
-GoaAccessTokenBased
-GoaAccessTokenBasedIface
-goa_access_token_based_interface_info
-goa_access_token_based_call_get_access_token
-goa_access_token_based_call_get_access_token_finish
-goa_access_token_based_call_get_access_token_sync
-goa_access_token_based_complete_get_access_token
-GoaAccessTokenBasedProxy
-GoaAccessTokenBasedProxyClass
-goa_access_token_based_proxy_new
-goa_access_token_based_proxy_new_finish
-goa_access_token_based_proxy_new_sync
-goa_access_token_based_proxy_new_for_bus
-goa_access_token_based_proxy_new_for_bus_finish
-goa_access_token_based_proxy_new_for_bus_sync
-GoaAccessTokenBasedSkeleton
-GoaAccessTokenBasedSkeletonClass
-goa_access_token_based_skeleton_new
+<FILE>GoaOAuth2Based</FILE>
+GoaOAuth2Based
+GoaOAuth2BasedIface
+goa_oauth2_based_interface_info
+goa_oauth2_based_call_get_access_token
+goa_oauth2_based_call_get_access_token_finish
+goa_oauth2_based_call_get_access_token_sync
+goa_oauth2_based_complete_get_access_token
+GoaOAuth2BasedProxy
+GoaOAuth2BasedProxyClass
+goa_oauth2_based_proxy_new
+goa_oauth2_based_proxy_new_finish
+goa_oauth2_based_proxy_new_sync
+goa_oauth2_based_proxy_new_for_bus
+goa_oauth2_based_proxy_new_for_bus_finish
+goa_oauth2_based_proxy_new_for_bus_sync
+GoaOAuth2BasedSkeleton
+GoaOAuth2BasedSkeletonClass
+goa_oauth2_based_skeleton_new
 <SUBSECTION Standard>
-GOA_ACCESS_TOKEN_BASED
-GOA_ACCESS_TOKEN_BASED_GET_IFACE
-GOA_ACCESS_TOKEN_BASED_PROXY
-GOA_ACCESS_TOKEN_BASED_PROXY_CLASS
-GOA_ACCESS_TOKEN_BASED_PROXY_GET_CLASS
-GOA_ACCESS_TOKEN_BASED_SKELETON
-GOA_ACCESS_TOKEN_BASED_SKELETON_CLASS
-GOA_ACCESS_TOKEN_BASED_SKELETON_GET_CLASS
-GOA_IS_ACCESS_TOKEN_BASED
-GOA_IS_ACCESS_TOKEN_BASED_PROXY
-GOA_IS_ACCESS_TOKEN_BASED_PROXY_CLASS
-GOA_IS_ACCESS_TOKEN_BASED_SKELETON
-GOA_IS_ACCESS_TOKEN_BASED_SKELETON_CLASS
-GOA_TYPE_ACCESS_TOKEN_BASED
-GOA_TYPE_ACCESS_TOKEN_BASED_PROXY
-GOA_TYPE_ACCESS_TOKEN_BASED_SKELETON
-GoaAccessTokenBasedProxyPrivate
-GoaAccessTokenBasedSkeletonPrivate
-goa_access_token_based_get_type
-goa_access_token_based_proxy_get_type
-goa_access_token_based_skeleton_get_type
+GOA_OAUTH2_BASED
+GOA_OAUTH2_BASED_GET_IFACE
+GOA_OAUTH2_BASED_PROXY
+GOA_OAUTH2_BASED_PROXY_CLASS
+GOA_OAUTH2_BASED_PROXY_GET_CLASS
+GOA_OAUTH2_BASED_SKELETON
+GOA_OAUTH2_BASED_SKELETON_CLASS
+GOA_OAUTH2_BASED_SKELETON_GET_CLASS
+GOA_IS_OAUTH2_BASED
+GOA_IS_OAUTH2_BASED_PROXY
+GOA_IS_OAUTH2_BASED_PROXY_CLASS
+GOA_IS_OAUTH2_BASED_SKELETON
+GOA_IS_OAUTH2_BASED_SKELETON_CLASS
+GOA_TYPE_OAUTH2_BASED
+GOA_TYPE_OAUTH2_BASED_PROXY
+GOA_TYPE_OAUTH2_BASED_SKELETON
+GoaOAuth2BasedProxyPrivate
+GoaOAuth2BasedSkeletonPrivate
+goa_oauth2_based_get_type
+goa_oauth2_based_proxy_get_type
+goa_oauth2_based_skeleton_get_type
 </SECTION>
 
 <SECTION>
@@ -347,9 +347,6 @@ goa_backend_provider_get_name
 goa_backend_provider_build_object
 goa_backend_provider_add_account
 goa_backend_provider_refresh_account
-goa_backend_provider_get_access_token_supported
-goa_backend_provider_get_access_token
-goa_backend_provider_get_access_token_finish
 goa_backend_provider_store_credentials
 goa_backend_provider_store_credentials_finish
 goa_backend_provider_lookup_credentials
@@ -380,6 +377,8 @@ goa_backend_oauth2_provider_get_client_id
 goa_backend_oauth2_provider_get_client_secret
 goa_backend_oauth2_provider_get_identity_sync
 goa_backend_oauth2_provider_get_identity_from_object
+goa_backend_oauth2_provider_get_access_token
+goa_backend_oauth2_provider_get_access_token_finish
 <SUBSECTION Standard>
 GOA_BACKEND_OAUTH2_PROVIDER
 GOA_BACKEND_OAUTH2_PROVIDER_CLASS
diff --git a/doc/goa.types b/doc/goa.types
index 4ab5896..5ecfc41 100644
--- a/doc/goa.types
+++ b/doc/goa.types
@@ -18,4 +18,4 @@ goa_object_manager_client_get_type
 goa_object_get_type
 goa_object_proxy_get_type
 goa_object_skeleton_get_type
-goa_access_token_based_get_type
+goa_oauth2_based_get_type