X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6ce635d5d32d5e583c4a271af2309c5af6ac9424..5bcf82d8658d1d9ae389807362f542189d21ec56:/test/integration/oauth_test.rb

diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb
index bcadc21b8..c10699f2a 100644
--- a/test/integration/oauth_test.rb
+++ b/test/integration/oauth_test.rb
@@ -6,6 +6,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
 
   include OAuth::Helper
 
+  def setup
+    stub_hostip_requests
+  end
+
   def test_oauth10_web_app
     client = client_applications(:oauth_web_app)
 
@@ -14,6 +18,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
 
     oauth10_without_callback(client)
     oauth10_with_callback(client, "http://another.web.app.org/callback")
+    oauth10_refused(client)
   end
 
   def test_oauth10_desktop_app
@@ -23,6 +28,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_response :success
 
     oauth10_without_callback(client)
+    oauth10_refused(client)
   end
 
   def test_oauth10a_web_app
@@ -33,6 +39,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
 
     oauth10a_without_callback(client)
     oauth10a_with_callback(client, "http://another.web.app.org/callback")
+    oauth10a_refused(client)
   end
 
   def test_oauth10a_desktop_app
@@ -42,6 +49,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_response :success
 
     oauth10a_without_callback(client)
+    oauth10a_refused(client)
   end
 
   private
@@ -49,6 +57,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def oauth10_without_callback(client)
     token = get_request_token(client)
 
+    get "/oauth/authorize", :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
@@ -57,7 +69,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
       assert_redirected_to "#{client.callback_url}?oauth_token=#{token.token}"
     else
       assert_response :success
-      assert_template "authorize_success"
+      assert_template :authorize_success
     end
     token.reload
     assert_not_nil token.created_at
@@ -86,16 +98,52 @@ class OAuthTest < ActionDispatch::IntegrationTest
 
     post "/oauth/revoke", :token => token.token
     assert_redirected_to oauth_clients_url(token.user.display_name)
-    token = OauthToken.find_by_token(token.token)
+    token = OauthToken.find_by(:token => token.token)
     assert_not_nil token.invalidated_at
 
     signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
     assert_response :unauthorized
   end
 
+  def oauth10_refused(client)
+    token = get_request_token(client)
+
+    get "/oauth/authorize", :oauth_token => token.token
+    assert_response :success
+    assert_template :authorize
+
+    post "/oauth/authorize", :oauth_token => token.token
+    assert_response :success
+    assert_template :authorize_failure
+    assert_select "p", "You have denied application #{client.name} access to your account."
+    token.reload
+    assert_nil token.authorized_at
+    assert_not_nil token.invalidated_at
+
+    get "/oauth/authorize", :oauth_token => token.token
+    assert_response :success
+    assert_template :authorize_failure
+    assert_select "p", "The authorization token is not valid."
+    token.reload
+    assert_nil token.authorized_at
+    assert_not_nil token.invalidated_at
+
+    post "/oauth/authorize", :oauth_token => token.token
+    assert_response :success
+    assert_template :authorize_failure
+    assert_select "p", "The authorization token is not valid."
+    token.reload
+    assert_nil token.authorized_at
+    assert_not_nil token.invalidated_at
+  end
+
   def oauth10_with_callback(client, callback_url)
     token = get_request_token(client)
 
+    get "/oauth/authorize", :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
@@ -128,7 +176,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
 
     post "/oauth/revoke", :token => token.token
     assert_redirected_to oauth_clients_url(token.user.display_name)
-    token = OauthToken.find_by_token(token.token)
+    token = OauthToken.find_by(:token => token.token)
     assert_not_nil token.invalidated_at
 
     signed_get "/api/0.6/gpx/2", :consumer => client, :token => token
@@ -138,6 +186,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def oauth10a_without_callback(client)
     token = get_request_token(client, :oauth_callback => "oob")
 
+    get "/oauth/authorize", :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
@@ -147,7 +199,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
       assert_redirected_to "http://some.web.app.org/callback?oauth_token=#{token.token}&oauth_verifier=#{verifier}"
     else
       assert_response :success
-      assert_template "authorize_success"
+      assert_template :authorize_success
       m = response.body.match("<p>The verification code is ([A-Za-z0-9]+).</p>")
       assert_not_nil m
       verifier = m[1]
@@ -183,7 +235,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
 
     post "/oauth/revoke", :token => token.token
     assert_redirected_to oauth_clients_url(token.user.display_name)
-    token = OauthToken.find_by_token(token.token)
+    token = OauthToken.find_by(:token => token.token)
     assert_not_nil token.invalidated_at
 
     signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
@@ -193,6 +245,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def oauth10a_with_callback(client, callback_url)
     token = get_request_token(client, :oauth_callback => callback_url)
 
+    get "/oauth/authorize", :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
@@ -230,13 +286,45 @@ class OAuthTest < ActionDispatch::IntegrationTest
 
     post "/oauth/revoke", :token => token.token
     assert_redirected_to oauth_clients_url(token.user.display_name)
-    token = OauthToken.find_by_token(token.token)
+    token = OauthToken.find_by(:token => token.token)
     assert_not_nil token.invalidated_at
 
     signed_get "/api/0.6/gpx/2", :consumer => client, :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
+    assert_response :success
+    assert_template :authorize
+
+    post "/oauth/authorize", :oauth_token => token.token
+    assert_response :success
+    assert_template :authorize_failure
+    assert_select "p", "You have denied application #{client.name} access to your account."
+    token.reload
+    assert_nil token.authorized_at
+    assert_not_nil token.invalidated_at
+
+    get "/oauth/authorize", :oauth_token => token.token
+    assert_response :success
+    assert_template :authorize_failure
+    assert_select "p", "The authorization token is not valid."
+    token.reload
+    assert_nil token.authorized_at
+    assert_not_nil token.invalidated_at
+
+    post "/oauth/authorize", :oauth_token => token.token
+    assert_response :success
+    assert_template :authorize_failure
+    assert_select "p", "The authorization token is not valid."
+    token.reload
+    assert_nil token.authorized_at
+    assert_not_nil token.invalidated_at
+  end
+
   def get_request_token(client, options = {})
     signed_get "/oauth/request_token", options.merge(:consumer => client)
     assert_response :success
@@ -245,6 +333,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_not_nil token.created_at
     assert_nil token.authorized_at
     assert_nil token.invalidated_at
+    assert_equal_allowing_nil options[:oauth_callback], token.callback_url
     assert_allowed token, client.permissions
 
     token
@@ -271,7 +360,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def parse_token(response)
     params = CGI.parse(response.body)
 
-    token = OauthToken.find_by_token(params["oauth_token"].first)
+    token = OauthToken.find_by(:token => params["oauth_token"].first)
     assert_equal token.secret, params["oauth_token_secret"].first
 
     token