Move GdataOAuth1 to GapiOAuth1

astrada · Nov 19, 2011 · a3a96f1 · a3a96f1
1 parent d850495
commit a3a96f1
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/src/gapi/_tags b/src/gapi/_tags
@@ -8,4 +8,5 @@ true : dtypes, warn_A, warn_e, warn_z, warn_error_A, warn_error_e, warn_error_z
 <gapiConfig.*> : pkg_curl
 <gapiConversation.*> : pkg_netstring, pkg_curl, pkg_extlib
 <gapiClientLogin.*> : pkg_netstring, pkg_curl, pkg_extlib, pkg_str
+<gapiOAuth1.*> : pkg_netstring, pkg_curl, pkg_extlib, pkg_str, pkg_cryptokit
 
diff --git a/src/gapi/gapi.mllib b/src/gapi/gapi.mllib
@@ -6,4 +6,5 @@ GapiConfig
 GapiConversation
 GapiAuthResponse
 GapiClientLogin
+GapiOAuth1
 
diff --git a/src/gdata/gdataOAuth1.ml → src/gapi/gapiOAuth1.ml b/src/gdata/gdataOAuth1.ml → src/gapi/gapiOAuth1.ml
diff --git a/src/gdata/gdataOAuth1.mli → src/gapi/gapiOAuth1.mli b/src/gdata/gdataOAuth1.mli → src/gapi/gapiOAuth1.mli
diff --git a/src/gdata/_tags b/src/gdata/_tags
@@ -2,7 +2,6 @@ true : dtypes, warn_A, warn_e, warn_z, warn_error_A, warn_error_e, warn_error_z
 
 # Packages deps
 <gdataUtils.*> : pkg_xmlm
-<gdataOAuth1.*> : pkg_netstring, pkg_curl, pkg_extlib, pkg_str, pkg_cryptokit
 <gdataOAuth2.*> : pkg_netstring, pkg_curl, pkg_cryptokit, \
                   pkg_extlib, pkg_json-wheel
 <gdataAuth.*> : pkg_netstring, pkg_extlib

diff --git a/src/gdata/gdata.mllib b/src/gdata/gdata.mllib
@@ -8,7 +8,6 @@ GdataCalendarService
 GdataComments
 GdataCore
 GdataMonad
-GdataOAuth1
 GdataOAuth2
 GdataRequest
 GdataService

diff --git a/src/gdata/gdataAuth.ml b/src/gdata/gdataAuth.ml
@@ -37,7 +37,7 @@ let generate_authorization_header
                token = token;
                secret = secret } ->
         let params = Option.get oauth1_params in
-        let oauth_fields_to_sign = GdataOAuth1.build_oauth_fields_to_sign
+        let oauth_fields_to_sign = GapiOAuth1.build_oauth_fields_to_sign
                                      ~oauth_token:token
                                      consumer_key
                                      signature_method in
@@ -49,7 +49,7 @@ let generate_authorization_header
           with Not_found -> [] in
         let base_neturl = Neturl.remove_from_url ~query:true neturl in
         let base_url = Neturl.string_of_url base_neturl in
-        let signature = GdataOAuth1.generate_signature
+        let signature = GapiOAuth1.generate_signature
                           params.http_method
                           base_url
                           (oauth_fields_to_sign
@@ -59,7 +59,7 @@ let generate_authorization_header
                           consumer_secret
                           secret
         in
-          Some (GdataOAuth1.generate_oauth_header
+          Some (GapiOAuth1.generate_oauth_header
                   oauth_fields_to_sign
                   signature)
     | OAuth2 { oauth2_token = token } ->

diff --git a/src/test/testAuth.ml b/src/test/testAuth.ml
@@ -30,7 +30,7 @@ let test_oauth1_request_token () =
        let oauth_consumer_key = get "oa1_cons_key" in
        let oauth_callback = get "oa1_callback" in
        let (response, _) =
-         GdataOAuth1.get_request_token
+         GapiOAuth1.get_request_token
            ~xoauth_displayname
            ~consumer_secret
            ~oauth_consumer_key
@@ -52,7 +52,7 @@ let test_oauth1_request_token () =
            | _ -> failwith "Not supported OAuth1 response")
 
 let test_oauth1_authorize_url () =
-  let url = GdataOAuth1.authorize_token_url
+  let url = GapiOAuth1.authorize_token_url
               ~hd:"default"
               ~hl:"en"
               "dummy_request_token" in
@@ -69,7 +69,7 @@ let test_invalid_oauth1_access_token () =
        assert_raises
          (Failure "Error: The token is invalid. (HTTP response code: 400)")
          (fun () ->
-            GdataOAuth1.get_access_token
+            GapiOAuth1.get_access_token
               ~consumer_secret
               ~oauth_consumer_key
               ~oauth_token:"dummy access token"
@@ -86,7 +86,7 @@ let test_oauth1_token_info () =
        let oauth_token = get "oa1_token" in
        let oauth_secret = get "oa1_secret" in
        let (response, _) =
-         GdataOAuth1.get_token_info
+         GapiOAuth1.get_token_info
            ~consumer_secret
            ~oauth_consumer_key
            ~oauth_token
@@ -115,7 +115,7 @@ let test_oauth1_revoke_invalid_token () =
          assert_raises
            (Failure "Error: <HTML><HEAD><TITLE>Invalid AuthSub token.</TITLE></HEAD><BODY BGCOLOR=\"#FFFFFF\" TEXT=\"#000000\"><H1>Invalid AuthSub token.</H1><H2>Error 403</H2></BODY></HTML> (HTTP response code: 403)")
            (fun () ->
-              GdataOAuth1.revoke_token
+              GapiOAuth1.revoke_token
                 ~consumer_secret
                 ~oauth_consumer_key
                 ~oauth_token:"dummy token"