oauth: let's rename vocab to oauth1

Because there is a competing OAuth 2.0 protocol which is different. So
this rename should reduce confusion.

diff --git a/extra/oauth/authors.txt b/extra/oauth/authors.txt
deleted file mode 100644 (file)
index 1901f27..0000000
--- a/extra/oauth/authors.txt
+++ /dev/null
@@ -1 +0,0 @@
-Slava Pestov

diff --git a/extra/oauth/oauth-tests.factor b/extra/oauth/oauth-tests.factor
deleted file mode 100644 (file)
index e4ccf39..0000000
--- a/extra/oauth/oauth-tests.factor
+++ /dev/null
@@ -1,26 +0,0 @@
-USING: oauth oauth.private tools.test accessors kernel assocs
-strings namespaces urls ;
-IN: oauth.tests
-
-{ "%26&b" } [ "&" "b" hmac-key ] unit-test
-{ "%26&" } [ "&" f hmac-key ] unit-test
-
-{ "B&http%3A%2F%2Ftwitter.com%2F&a%3Db" } [
-    URL" http://twitter.com"
-    "B"
-    { { "a" "b" } }
-    signature-base-string
-] unit-test
-
-{ "0EieqbHx0FJ/RtFskmRj9/TDpqo=" } [
-    "ABC" "DEF" <token> consumer-token set
-
-    URL" http://twitter.com"
-    <request-token-params>
-        12345 >>timestamp
-        54321 >>nonce
-    <request-token-request>
-    post-data>>
-    "oauth_signature" of
-    >string
-] unit-test

diff --git a/extra/oauth/oauth.factor b/extra/oauth/oauth.factor
deleted file mode 100644 (file)
index f0a3c28..0000000
--- a/extra/oauth/oauth.factor
+++ /dev/null
@@ -1,166 +0,0 @@
-! Copyright (C) 2010 Slava Pestov.
-! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs base64 calendar checksums.hmac
-checksums.sha combinators fry http http.client kernel locals
-make math math.parser namespaces present random sequences
-sorting strings urls urls.encoding urls.private ;
-IN: oauth
-
-SYMBOL: consumer-token
-
-TUPLE: token key secret user-data ;
-
-: <token> ( key secret -- token )
-    token new
-        swap >>secret
-        swap >>key ;
-
-<PRIVATE
-
-TUPLE: token-params
-consumer-token
-timestamp
-nonce ;
-
-: new-token-params ( class -- params )
-    new
-        consumer-token get >>consumer-token
-        now timestamp>unix-time >integer >>timestamp
-        16 random-bytes bytes>hex-string >>nonce ; inline
-
-: present-base-url ( url -- string )
-    [
-        [ unparse-protocol ]
-        [ path>> url-encode % ] bi
-    ] "" make ;
-
-:: signature-base-string ( url request-method params -- string )
-    [
-        request-method % "&" %
-        url present-base-url url-encode-full % "&" %
-        params assoc>query url-encode-full %
-        url query>> [ assoc>query "&" prepend url-encode-full % ] when*
-    ] "" make ;
-
-: hmac-key ( consumer-secret token-secret -- key )
-    [ url-encode-full ] [ "" or url-encode-full ] bi* "&" glue ;
-
-: make-token-params ( params quot -- assoc )
-    '[
-        "1.0" "oauth_version" ,,
-        "HMAC-SHA1" "oauth_signature_method" ,,
-
-        _
-        [
-            [ consumer-token>> key>> "oauth_consumer_key" ,, ]
-            [ timestamp>> "oauth_timestamp" ,, ]
-            [ nonce>> "oauth_nonce" ,, ]
-            tri
-        ] bi
-    ] H{ } make ; inline
-
-:: sign-params ( url request-method consumer-token request-token params -- signed-params )
-    params sort-keys :> params
-    url request-method params signature-base-string :> sbs
-    consumer-token secret>> request-token dup [ secret>> ] when hmac-key :> key
-    sbs key sha1 hmac-bytes >base64 >string :> signature
-    params { "oauth_signature" signature } prefix ;
-
-: extract-user-data ( assoc -- assoc' )
-    [
-        drop
-        { "oauth_token" "oauth_token_secret" } member? not
-    ] assoc-filter ;
-
-: parse-token ( response data -- token )
-    nip
-    query>assoc
-    [ [ "oauth_token" ] dip at ]
-    [ [ "oauth_token_secret" ] dip at ]
-    [ extract-user-data ]
-    tri
-    [ <token> ] dip >>user-data ;
-
-PRIVATE>
-
-TUPLE: request-token-params < token-params
-{ callback-url initial: "oob" } ;
-
-: <request-token-params> ( -- params )
-    request-token-params new-token-params ;
-
-<PRIVATE
-
-:: <token-request> ( url consumer-token request-token params -- request )
-    url "POST" consumer-token request-token params sign-params
-    url
-    <post-request> ;
-
-: make-request-token-params ( params -- assoc )
-    [ callback-url>> "oauth_callback" ,, ] make-token-params ;
-
-: <request-token-request> ( url params -- request )
-    [ consumer-token>> f ] [ make-request-token-params ] bi
-    <token-request> ;
-
-PRIVATE>
-
-: obtain-request-token ( url params -- token )
-    <request-token-request> http-request parse-token ;
-
-TUPLE: access-token-params < token-params request-token verifier ;
-
-: <access-token-params> ( -- params )
-    access-token-params new-token-params ;
-
-<PRIVATE
-
-: make-access-token-params ( params -- assoc )
-    [
-        [ request-token>> key>> "oauth_token" ,, ]
-        [ verifier>> "oauth_verifier" ,, ]
-        bi
-    ] make-token-params ;
-
-: <access-token-request> ( url params -- request )
-    [ consumer-token>> ]
-    [ request-token>> ]
-    [ make-access-token-params ] tri
-    <token-request> ;
-
-PRIVATE>
-
-: obtain-access-token ( url params -- token )
-    <access-token-request> http-request parse-token ;
-
-SYMBOL: access-token
-
-TUPLE: oauth-request-params < token-params access-token ;
-
-: <oauth-request-params> ( -- params )
-    oauth-request-params new-token-params
-        access-token get >>access-token ;
-
-<PRIVATE
-
-:: signed-oauth-request-params ( request params -- params )
-    request url>>
-    request method>>
-    params consumer-token>>
-    params access-token>>
-    params
-    [
-        access-token>> key>> "oauth_token" ,,
-        request post-data>> %%
-    ] make-token-params
-    sign-params ;
-
-: build-auth-string ( params -- string )
-    [ [ present url-encode-full ] bi@ "\"" "\"" surround "=" glue ] { } assoc>map
-    ", " join "OAuth realm=\"\", " prepend ;
-
-PRIVATE>
-
-: set-oauth ( request params -- request )
-    dupd signed-oauth-request-params build-auth-string
-    "Authorization" set-header ;

diff --git a/extra/oauth1/authors.txt b/extra/oauth1/authors.txt
new file mode 100644 (file)
index 0000000..1901f27
--- /dev/null
+++ b/extra/oauth1/authors.txt
@@ -0,0 +1 @@
+Slava Pestov

diff --git a/extra/oauth1/oauth1-tests.factor b/extra/oauth1/oauth1-tests.factor
new file mode 100644 (file)
index 0000000..49a0c17
--- /dev/null
+++ b/extra/oauth1/oauth1-tests.factor
@@ -0,0 +1,26 @@
+USING: oauth1 oauth1.private tools.test accessors kernel assocs
+strings namespaces urls ;
+IN: oauth1.tests
+
+{ "%26&b" } [ "&" "b" hmac-key ] unit-test
+{ "%26&" } [ "&" f hmac-key ] unit-test
+
+{ "B&http%3A%2F%2Ftwitter.com%2F&a%3Db" } [
+    URL" http://twitter.com"
+    "B"
+    { { "a" "b" } }
+    signature-base-string
+] unit-test
+
+{ "0EieqbHx0FJ/RtFskmRj9/TDpqo=" } [
+    "ABC" "DEF" <token> consumer-token set
+
+    URL" http://twitter.com"
+    <request-token-params>
+        12345 >>timestamp
+        54321 >>nonce
+    <request-token-request>
+    post-data>>
+    "oauth_signature" of
+    >string
+] unit-test

diff --git a/extra/oauth1/oauth1.factor b/extra/oauth1/oauth1.factor
new file mode 100644 (file)
index 0000000..03d98f5
--- /dev/null
+++ b/extra/oauth1/oauth1.factor
@@ -0,0 +1,166 @@
+! Copyright (C) 2010 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: accessors assocs base64 calendar checksums.hmac
+checksums.sha combinators fry http http.client kernel locals
+make math math.parser namespaces present random sequences
+sorting strings urls urls.encoding urls.private ;
+IN: oauth1
+
+SYMBOL: consumer-token
+
+TUPLE: token key secret user-data ;
+
+: <token> ( key secret -- token )
+    token new
+        swap >>secret
+        swap >>key ;
+
+<PRIVATE
+
+TUPLE: token-params
+consumer-token
+timestamp
+nonce ;
+
+: new-token-params ( class -- params )
+    new
+        consumer-token get >>consumer-token
+        now timestamp>unix-time >integer >>timestamp
+        16 random-bytes bytes>hex-string >>nonce ; inline
+
+: present-base-url ( url -- string )
+    [
+        [ unparse-protocol ]
+        [ path>> url-encode % ] bi
+    ] "" make ;
+
+:: signature-base-string ( url request-method params -- string )
+    [
+        request-method % "&" %
+        url present-base-url url-encode-full % "&" %
+        params assoc>query url-encode-full %
+        url query>> [ assoc>query "&" prepend url-encode-full % ] when*
+    ] "" make ;
+
+: hmac-key ( consumer-secret token-secret -- key )
+    [ url-encode-full ] [ "" or url-encode-full ] bi* "&" glue ;
+
+: make-token-params ( params quot -- assoc )
+    '[
+        "1.0" "oauth_version" ,,
+        "HMAC-SHA1" "oauth_signature_method" ,,
+
+        _
+        [
+            [ consumer-token>> key>> "oauth_consumer_key" ,, ]
+            [ timestamp>> "oauth_timestamp" ,, ]
+            [ nonce>> "oauth_nonce" ,, ]
+            tri
+        ] bi
+    ] H{ } make ; inline
+
+:: sign-params ( url request-method consumer-token request-token params -- signed-params )
+    params sort-keys :> params
+    url request-method params signature-base-string :> sbs
+    consumer-token secret>> request-token dup [ secret>> ] when hmac-key :> key
+    sbs key sha1 hmac-bytes >base64 >string :> signature
+    params { "oauth_signature" signature } prefix ;
+
+: extract-user-data ( assoc -- assoc' )
+    [
+        drop
+        { "oauth_token" "oauth_token_secret" } member? not
+    ] assoc-filter ;
+
+: parse-token ( response data -- token )
+    nip
+    query>assoc
+    [ [ "oauth_token" ] dip at ]
+    [ [ "oauth_token_secret" ] dip at ]
+    [ extract-user-data ]
+    tri
+    [ <token> ] dip >>user-data ;
+
+PRIVATE>
+
+TUPLE: request-token-params < token-params
+{ callback-url initial: "oob" } ;
+
+: <request-token-params> ( -- params )
+    request-token-params new-token-params ;
+
+<PRIVATE
+
+:: <token-request> ( url consumer-token request-token params -- request )
+    url "POST" consumer-token request-token params sign-params
+    url
+    <post-request> ;
+
+: make-request-token-params ( params -- assoc )
+    [ callback-url>> "oauth_callback" ,, ] make-token-params ;
+
+: <request-token-request> ( url params -- request )
+    [ consumer-token>> f ] [ make-request-token-params ] bi
+    <token-request> ;
+
+PRIVATE>
+
+: obtain-request-token ( url params -- token )
+    <request-token-request> http-request parse-token ;
+
+TUPLE: access-token-params < token-params request-token verifier ;
+
+: <access-token-params> ( -- params )
+    access-token-params new-token-params ;
+
+<PRIVATE
+
+: make-access-token-params ( params -- assoc )
+    [
+        [ request-token>> key>> "oauth_token" ,, ]
+        [ verifier>> "oauth_verifier" ,, ]
+        bi
+    ] make-token-params ;
+
+: <access-token-request> ( url params -- request )
+    [ consumer-token>> ]
+    [ request-token>> ]
+    [ make-access-token-params ] tri
+    <token-request> ;
+
+PRIVATE>
+
+: obtain-access-token ( url params -- token )
+    <access-token-request> http-request parse-token ;
+
+SYMBOL: access-token
+
+TUPLE: oauth-request-params < token-params access-token ;
+
+: <oauth-request-params> ( -- params )
+    oauth-request-params new-token-params
+        access-token get >>access-token ;
+
+<PRIVATE
+
+:: signed-oauth-request-params ( request params -- params )
+    request url>>
+    request method>>
+    params consumer-token>>
+    params access-token>>
+    params
+    [
+        access-token>> key>> "oauth_token" ,,
+        request post-data>> %%
+    ] make-token-params
+    sign-params ;
+
+: build-auth-string ( params -- string )
+    [ [ present url-encode-full ] bi@ "\"" "\"" surround "=" glue ] { } assoc>map
+    ", " join "OAuth realm=\"\", " prepend ;
+
+PRIVATE>
+
+: set-oauth ( request params -- request )
+    dupd signed-oauth-request-params build-auth-string
+    "Authorization" set-header ;

diff --git a/extra/twitter/twitter.factor b/extra/twitter/twitter.factor
index 043ec736298e67f89847df1112c4b8a1b4868a56..13e2d902089b170de302a34e794240650c1c6be9 100644 (file)
--- a/extra/twitter/twitter.factor
+++ b/extra/twitter/twitter.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs combinators hashtables http
 http.client json.reader kernel macros make namespaces sequences
-io.sockets.secure fry oauth urls ;
+io.sockets.secure fry oauth1 urls ;
 IN: twitter
 
 ! Configuration