X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8a6e8ae128d3cc9a991d119c45b9ddb13e848f97..9fe69b0b7fe1644d1b7408bf0a3aaf32c68c43ac:/test/integration/oauth_test.rb?ds=inline

diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb
index ceee95892..2c473aac5 100644
--- a/test/integration/oauth_test.rb
+++ b/test/integration/oauth_test.rb
@@ -1,19 +1,15 @@
 require "test_helper"
 
 class OAuthTest < ActionDispatch::IntegrationTest
-  fixtures :users, :gpx_files
-  set_fixture_class :gpx_files => Trace
-
   include OAuth::Helper
 
-  def setup
-    stub_hostip_requests
-  end
-
   def test_oauth10_web_app
-    client = create(:client_application, :callback_url => "http://some.web.app.example.org/callback", :user => users(:public_user), :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)
+    client = create(:client_application, :callback_url => "http://some.web.app.example.org/callback", :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)
 
-    post_via_redirect "/login", :username => client.user.email, :password => "test"
+    get "/login"
+    follow_redirect!
+    post "/login", :params => { :username => client.user.email, :password => "test" }
+    follow_redirect!
     assert_response :success
 
     oauth10_without_callback(client)
@@ -22,9 +18,12 @@ class OAuthTest < ActionDispatch::IntegrationTest
   end
 
   def test_oauth10_desktop_app
-    client = create(:client_application, :user => users(:public_user), :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)
+    client = create(:client_application, :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)
 
-    post_via_redirect "/login", :username => client.user.email, :password => "test"
+    get "/login"
+    follow_redirect!
+    post "/login", :params => { :username => client.user.email, :password => "test" }
+    follow_redirect!
     assert_response :success
 
     oauth10_without_callback(client)
@@ -32,9 +31,12 @@ class OAuthTest < ActionDispatch::IntegrationTest
   end
 
   def test_oauth10a_web_app
-    client = create(:client_application, :callback_url => "http://some.web.app.example.org/callback", :user => users(:public_user), :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)
+    client = create(:client_application, :callback_url => "http://some.web.app.example.org/callback", :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)
 
-    post_via_redirect "/login", :username => client.user.email, :password => "test"
+    get "/login"
+    follow_redirect!
+    post "/login", :params => { :username => client.user.email, :password => "test" }
+    follow_redirect!
     assert_response :success
 
     oauth10a_without_callback(client)
@@ -43,9 +45,12 @@ class OAuthTest < ActionDispatch::IntegrationTest
   end
 
   def test_oauth10a_desktop_app
-    client = create(:client_application, :user => users(:public_user), :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)
+    client = create(:client_application, :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)
 
-    post_via_redirect "/login", :username => client.user.email, :password => "test"
+    get "/login"
+    follow_redirect!
+    post "/login", :params => { :username => client.user.email, :password => "test" }
+    follow_redirect!
     assert_response :success
 
     oauth10a_without_callback(client)
@@ -57,13 +62,13 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def oauth10_without_callback(client)
     token = get_request_token(client)
 
-    get "/oauth/authorize", :oauth_token => token.token
+    get "/oauth/authorize", :params => { :oauth_token => token.token }
     assert_response :success
     assert_template :authorize
 
     post "/oauth/authorize",
-         :oauth_token => token.token,
-         :allow_read_prefs => true, :allow_write_prefs => true
+         :params => { :oauth_token => token.token,
+                      :allow_read_prefs => "1", :allow_write_prefs => "1" }
     if client.callback_url
       assert_response :redirect
       assert_redirected_to "#{client.callback_url}?oauth_token=#{token.token}"
@@ -77,7 +82,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_read_prefs]
 
-    signed_get "/oauth/access_token", :consumer => client, :token => token
+    signed_get "/oauth/access_token", :oauth => { :token => token }
     assert_response :success
     token.reload
     assert_not_nil token.created_at
@@ -90,29 +95,29 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_read_prefs]
 
-    signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
+    signed_get "/api/0.6/user/preferences", :oauth => { :token => token }
     assert_response :success
 
-    signed_get "/api/0.6/gpx/2", :consumer => client, :token => token
+    signed_get "/api/0.6/gpx/2", :oauth => { :token => token }
     assert_response :forbidden
 
-    post "/oauth/revoke", :token => token.token
+    post "/oauth/revoke", :params => { :token => token.token }
     assert_redirected_to oauth_clients_url(token.user.display_name)
     token = OauthToken.find_by(:token => token.token)
     assert_not_nil token.invalidated_at
 
-    signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
+    signed_get "/api/0.6/user/preferences", :oauth => { :token => token }
     assert_response :unauthorized
   end
 
   def oauth10_refused(client)
     token = get_request_token(client)
 
-    get "/oauth/authorize", :oauth_token => token.token
+    get "/oauth/authorize", :params => { :oauth_token => token.token }
     assert_response :success
     assert_template :authorize
 
-    post "/oauth/authorize", :oauth_token => token.token
+    post "/oauth/authorize", :params => { :oauth_token => token.token }
     assert_response :success
     assert_template :authorize_failure
     assert_select "p", "You have denied application #{client.name} access to your account."
@@ -120,7 +125,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.authorized_at
     assert_not_nil token.invalidated_at
 
-    get "/oauth/authorize", :oauth_token => token.token
+    get "/oauth/authorize", :params => { :oauth_token => token.token }
     assert_response :success
     assert_template :authorize_failure
     assert_select "p", "The authorization token is not valid."
@@ -128,7 +133,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.authorized_at
     assert_not_nil token.invalidated_at
 
-    post "/oauth/authorize", :oauth_token => token.token
+    post "/oauth/authorize", :params => { :oauth_token => token.token }
     assert_response :success
     assert_template :authorize_failure
     assert_select "p", "The authorization token is not valid."
@@ -140,13 +145,13 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def oauth10_with_callback(client, callback_url)
     token = get_request_token(client)
 
-    get "/oauth/authorize", :oauth_token => token.token
+    get "/oauth/authorize", :params => { :oauth_token => token.token }
     assert_response :success
     assert_template :authorize
 
     post "/oauth/authorize",
-         :oauth_token => token.token, :oauth_callback => callback_url,
-         :allow_write_api => true, :allow_read_gpx => true
+         :params => { :oauth_token => token.token, :oauth_callback => callback_url,
+                      :allow_write_api => "1", :allow_read_gpx => "1" }
     assert_response :redirect
     assert_redirected_to "#{callback_url}?oauth_token=#{token.token}"
     token.reload
@@ -155,7 +160,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_write_api, :allow_read_gpx]
 
-    signed_get "/oauth/access_token", :consumer => client, :token => token
+    signed_get "/oauth/access_token", :oauth => { :token => token }
     assert_response :success
     token.reload
     assert_not_nil token.created_at
@@ -168,31 +173,32 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_write_api, :allow_read_gpx]
 
-    signed_get "/api/0.6/gpx/2", :consumer => client, :token => token
+    trace = create(:trace, :user => client.user)
+    signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token }
     assert_response :success
 
-    signed_get "/api/0.6/user/details", :consumer => client, :token => token
+    signed_get "/api/0.6/user/details", :oauth => { :token => token }
     assert_response :forbidden
 
-    post "/oauth/revoke", :token => token.token
+    post "/oauth/revoke", :params => { :token => token.token }
     assert_redirected_to oauth_clients_url(token.user.display_name)
     token = OauthToken.find_by(:token => token.token)
     assert_not_nil token.invalidated_at
 
-    signed_get "/api/0.6/gpx/2", :consumer => client, :token => token
+    signed_get "/api/0.6/gpx/2", :oauth => { :token => token }
     assert_response :unauthorized
   end
 
   def oauth10a_without_callback(client)
     token = get_request_token(client, :oauth_callback => "oob")
 
-    get "/oauth/authorize", :oauth_token => token.token
+    get "/oauth/authorize", :params => { :oauth_token => token.token }
     assert_response :success
     assert_template :authorize
 
     post "/oauth/authorize",
-         :oauth_token => token.token,
-         :allow_read_prefs => true, :allow_write_prefs => true
+         :params => { :oauth_token => token.token,
+                      :allow_read_prefs => "1", :allow_write_prefs => "1" }
     if client.callback_url
       assert_response :redirect
       verifier = parse_verifier(response)
@@ -210,11 +216,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_read_prefs]
 
-    signed_get "/oauth/access_token", :consumer => client, :token => token
+    signed_get "/oauth/access_token", :oauth => { :token => token }
     assert_response :unauthorized
 
-    signed_get "/oauth/access_token",
-               :consumer => client, :token => token, :oauth_verifier => verifier
+    signed_get "/oauth/access_token", :oauth => { :token => token, :oauth_verifier => verifier }
     assert_response :success
     token.reload
     assert_not_nil token.created_at
@@ -227,31 +232,32 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_read_prefs]
 
-    signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
+    signed_get "/api/0.6/user/preferences", :oauth => { :token => token }
     assert_response :success
 
-    signed_get "/api/0.6/gpx/2", :consumer => client, :token => token
+    trace = create(:trace, :user => client.user)
+    signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token }
     assert_response :forbidden
 
-    post "/oauth/revoke", :token => token.token
+    post "/oauth/revoke", :params => { :token => token.token }
     assert_redirected_to oauth_clients_url(token.user.display_name)
     token = OauthToken.find_by(:token => token.token)
     assert_not_nil token.invalidated_at
 
-    signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
+    signed_get "/api/0.6/user/preferences", :oauth => { :token => token }
     assert_response :unauthorized
   end
 
   def oauth10a_with_callback(client, callback_url)
     token = get_request_token(client, :oauth_callback => callback_url)
 
-    get "/oauth/authorize", :oauth_token => token.token
+    get "/oauth/authorize", :params => { :oauth_token => token.token }
     assert_response :success
     assert_template :authorize
 
     post "/oauth/authorize",
-         :oauth_token => token.token,
-         :allow_write_api => true, :allow_read_gpx => true
+         :params => { :oauth_token => token.token,
+                      :allow_write_api => "1", :allow_read_gpx => "1" }
     assert_response :redirect
     verifier = parse_verifier(response)
     assert_redirected_to "#{callback_url}?oauth_token=#{token.token}&oauth_verifier=#{verifier}"
@@ -261,11 +267,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_write_api, :allow_read_gpx]
 
-    signed_get "/oauth/access_token", :consumer => client, :token => token
+    signed_get "/oauth/access_token", :oauth => { :token => token }
     assert_response :unauthorized
 
-    signed_get "/oauth/access_token",
-               :consumer => client, :token => token, :oauth_verifier => verifier
+    signed_get "/oauth/access_token", :oauth => { :token => token, :oauth_verifier => verifier }
     assert_response :success
     token.reload
     assert_not_nil token.created_at
@@ -278,29 +283,30 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_write_api, :allow_read_gpx]
 
-    signed_get "/api/0.6/gpx/2", :consumer => client, :token => token
+    trace = create(:trace, :user => client.user)
+    signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token }
     assert_response :success
 
-    signed_get "/api/0.6/user/details", :consumer => client, :token => token
+    signed_get "/api/0.6/user/details", :oauth => { :token => token }
     assert_response :forbidden
 
-    post "/oauth/revoke", :token => token.token
+    post "/oauth/revoke", :params => { :token => token.token }
     assert_redirected_to oauth_clients_url(token.user.display_name)
     token = OauthToken.find_by(:token => token.token)
     assert_not_nil token.invalidated_at
 
-    signed_get "/api/0.6/gpx/2", :consumer => client, :token => token
+    signed_get "/api/0.6/gpx/2", :oauth => { :token => token }
     assert_response :unauthorized
   end
 
   def oauth10a_refused(client)
     token = get_request_token(client, :oauth_callback => "oob")
 
-    get "/oauth/authorize", :oauth_token => token.token
+    get "/oauth/authorize", :params => { :oauth_token => token.token }
     assert_response :success
     assert_template :authorize
 
-    post "/oauth/authorize", :oauth_token => token.token
+    post "/oauth/authorize", :params => { :oauth_token => token.token }
     assert_response :success
     assert_template :authorize_failure
     assert_select "p", "You have denied application #{client.name} access to your account."
@@ -308,7 +314,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.authorized_at
     assert_not_nil token.invalidated_at
 
-    get "/oauth/authorize", :oauth_token => token.token
+    get "/oauth/authorize", :params => { :oauth_token => token.token }
     assert_response :success
     assert_template :authorize_failure
     assert_select "p", "The authorization token is not valid."
@@ -316,7 +322,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.authorized_at
     assert_not_nil token.invalidated_at
 
-    post "/oauth/authorize", :oauth_token => token.token
+    post "/oauth/authorize", :params => { :oauth_token => token.token }
     assert_response :success
     assert_template :authorize_failure
     assert_select "p", "The authorization token is not valid."
@@ -326,7 +332,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
   end
 
   def get_request_token(client, options = {})
-    signed_get "/oauth/request_token", options.merge(:consumer => client)
+    signed_get "/oauth/request_token", :oauth => options.merge(:consumer => client)
     assert_response :success
     token = parse_token(response)
     assert_instance_of RequestToken, token
@@ -339,24 +345,6 @@ class OAuthTest < ActionDispatch::IntegrationTest
     token
   end
 
-  def signed_get(uri, options)
-    uri = URI.parse(uri)
-    uri.scheme ||= "http"
-    uri.host ||= "www.example.com"
-
-    helper = OAuth::Client::Helper.new(nil, options)
-
-    request = OAuth::RequestProxy.proxy(
-      "method" => "GET",
-      "uri" => uri,
-      "parameters" => helper.oauth_parameters
-    )
-
-    request.sign!(options)
-
-    get request.signed_uri
-  end
-
   def parse_token(response)
     params = CGI.parse(response.body)
 
@@ -370,7 +358,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     params = CGI.parse(URI.parse(response.location).query)
 
     assert_not_nil params["oauth_verifier"]
-    assert params["oauth_verifier"].first.present?
+    assert_predicate params["oauth_verifier"].first, :present?
 
     params["oauth_verifier"].first
   end