X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c00dd8c7125cdac05af2515d5563a35a252987b0..ef7f3d800cbdd49b692df10d312e5fd880e2e938:/test/integration/oauth_test.rb

diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb
index 9c37ff739..610c7f4e1 100644
--- a/test/integration/oauth_test.rb
+++ b/test/integration/oauth_test.rb
@@ -1,15 +1,15 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
-class OAuthTest < ActionController::IntegrationTest
-  fixtures :users, :client_applications
+class OAuthTest < ActionDispatch::IntegrationTest
+  fixtures :users, :client_applications, :gpx_files
 
   include OAuth::Helper
 
   def test_oauth10_web_app
     client = client_applications(:oauth_web_app)
 
-    post_via_redirect "/login", 
-      :username => client.user.email, :password => "test"
+    post_via_redirect "/login",
+                      :username => client.user.email, :password => "test"
     assert_response :success
 
     signed_get "/oauth/request_token", :consumer => client
@@ -21,16 +21,16 @@ class OAuthTest < ActionController::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, client.permissions
 
-    post "/oauth/authorize", 
-      :oauth_token => token.token, 
-      :allow_read_prefs => true, :allow_write_prefs => true
+    post "/oauth/authorize",
+         :oauth_token => token.token,
+         :allow_read_prefs => true, :allow_write_prefs => true
     assert_response :redirect
     assert_redirected_to "http://some.web.app.org/callback?oauth_token=#{token.token}"
     token.reload
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at
-    assert_allowed token, [ :allow_read_prefs ]
+    assert_allowed token, [:allow_read_prefs]
 
     signed_get "/oauth/access_token", :consumer => client, :token => token
     assert_response :success
@@ -43,7 +43,18 @@ class OAuthTest < ActionController::IntegrationTest
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at
-    assert_allowed token, [ :allow_read_prefs ]
+    assert_allowed token, [:allow_read_prefs]
+
+    signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
+    assert_response :success
+
+    post "/oauth/revoke", :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
+    assert_response :unauthorized
 
     signed_get "/oauth/request_token", :consumer => client
     assert_response :success
@@ -54,17 +65,17 @@ class OAuthTest < ActionController::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, client.permissions
 
-    post "/oauth/authorize", 
-      :oauth_token => token.token, 
-      :oauth_callback => "http://another.web.app.org/callback", 
-      :allow_write_api => true, :allow_read_gpx => true
+    post "/oauth/authorize",
+         :oauth_token => token.token,
+         :oauth_callback => "http://another.web.app.org/callback",
+         :allow_write_api => true, :allow_read_gpx => true
     assert_response :redirect
     assert_redirected_to "http://another.web.app.org/callback?oauth_token=#{token.token}"
     token.reload
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at
-    assert_allowed token, [ :allow_write_api, :allow_read_gpx ]
+    assert_allowed token, [:allow_write_api, :allow_read_gpx]
 
     signed_get "/oauth/access_token", :consumer => client, :token => token
     assert_response :success
@@ -77,14 +88,25 @@ class OAuthTest < ActionController::IntegrationTest
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at
-    assert_allowed token, [ :allow_write_api, :allow_read_gpx ]
+    assert_allowed token, [:allow_write_api, :allow_read_gpx]
+
+    signed_get "/api/0.6/gpx/2", :consumer => client, :token => token
+    assert_response :success
+
+    post "/oauth/revoke", :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
+    assert_response :unauthorized
   end
 
   def test_oauth10_desktop_app
     client = client_applications(:oauth_desktop_app)
 
-    post_via_redirect "/login", 
-      :username => client.user.email, :password => "test"
+    post_via_redirect "/login",
+                      :username => client.user.email, :password => "test"
     assert_response :success
 
     signed_get "/oauth/request_token", :consumer => client
@@ -96,16 +118,16 @@ class OAuthTest < ActionController::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, client.permissions
 
-    post "/oauth/authorize", 
-      :oauth_token => token.token, 
-      :allow_read_prefs => true, :allow_write_prefs => true
+    post "/oauth/authorize",
+         :oauth_token => token.token,
+         :allow_read_prefs => true, :allow_write_prefs => true
     assert_response :success
     assert_template "authorize_success"
     token.reload
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at
-    assert_allowed token, [ :allow_read_prefs ]
+    assert_allowed token, [:allow_read_prefs]
 
     signed_get "/oauth/access_token", :consumer => client, :token => token
     assert_response :success
@@ -118,18 +140,29 @@ class OAuthTest < ActionController::IntegrationTest
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at
-    assert_allowed token, [ :allow_read_prefs ]
+    assert_allowed token, [:allow_read_prefs]
+
+    signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
+    assert_response :success
+
+    post "/oauth/revoke", :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
+    assert_response :unauthorized
   end
 
   def test_oauth10a_web_app
     client = client_applications(:oauth_web_app)
 
     post_via_redirect "/login",
-      :username => client.user.email, :password => "test"
+                      :username => client.user.email, :password => "test"
     assert_response :success
 
     signed_get "/oauth/request_token",
-      :consumer => client, :oauth_callback => "oob"
+               :consumer => client, :oauth_callback => "oob"
     assert_response :success
     token = parse_token(response)
     assert_instance_of RequestToken, token
@@ -139,8 +172,8 @@ class OAuthTest < ActionController::IntegrationTest
     assert_allowed token, client.permissions
 
     post "/oauth/authorize",
-      :oauth_token => token.token,
-      :allow_read_prefs => true, :allow_write_prefs => true
+         :oauth_token => token.token,
+         :allow_read_prefs => true, :allow_write_prefs => true
     assert_response :redirect
     verifier = parse_verifier(response)
     assert_redirected_to "http://some.web.app.org/callback?oauth_token=#{token.token}&oauth_verifier=#{verifier}"
@@ -148,13 +181,13 @@ class OAuthTest < ActionController::IntegrationTest
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at
-    assert_allowed token, [ :allow_read_prefs ]
+    assert_allowed token, [:allow_read_prefs]
 
     signed_get "/oauth/access_token", :consumer => client, :token => token
     assert_response :unauthorized
 
     signed_get "/oauth/access_token",
-      :consumer => client, :token => token, :oauth_verifier => verifier
+               :consumer => client, :token => token, :oauth_verifier => verifier
     assert_response :success
     token.reload
     assert_not_nil token.created_at
@@ -165,11 +198,22 @@ class OAuthTest < ActionController::IntegrationTest
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at
-    assert_allowed token, [ :allow_read_prefs ]
+    assert_allowed token, [:allow_read_prefs]
+
+    signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
+    assert_response :success
+
+    post "/oauth/revoke", :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
+    assert_response :unauthorized
 
     signed_get "/oauth/request_token",
-      :consumer => client,
-      :oauth_callback => "http://another.web.app.org/callback"
+               :consumer => client,
+               :oauth_callback => "http://another.web.app.org/callback"
     assert_response :success
     token = parse_token(response)
     assert_instance_of RequestToken, token
@@ -179,8 +223,8 @@ class OAuthTest < ActionController::IntegrationTest
     assert_allowed token, client.permissions
 
     post "/oauth/authorize",
-      :oauth_token => token.token,
-      :allow_write_api => true, :allow_read_gpx => true
+         :oauth_token => token.token,
+         :allow_write_api => true, :allow_read_gpx => true
     assert_response :redirect
     verifier = parse_verifier(response)
     assert_redirected_to "http://another.web.app.org/callback?oauth_token=#{token.token}&oauth_verifier=#{verifier}"
@@ -188,13 +232,13 @@ class OAuthTest < ActionController::IntegrationTest
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at
-    assert_allowed token, [ :allow_write_api, :allow_read_gpx ]
+    assert_allowed token, [:allow_write_api, :allow_read_gpx]
 
     signed_get "/oauth/access_token", :consumer => client, :token => token
     assert_response :unauthorized
 
     signed_get "/oauth/access_token",
-      :consumer => client, :token => token, :oauth_verifier => verifier
+               :consumer => client, :token => token, :oauth_verifier => verifier
     assert_response :success
     token.reload
     assert_not_nil token.created_at
@@ -205,18 +249,29 @@ class OAuthTest < ActionController::IntegrationTest
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at
-    assert_allowed token, [ :allow_write_api, :allow_read_gpx ]
+    assert_allowed token, [:allow_write_api, :allow_read_gpx]
+
+    signed_get "/api/0.6/gpx/2", :consumer => client, :token => token
+    assert_response :success
+
+    post "/oauth/revoke", :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
+    assert_response :unauthorized
   end
 
   def test_oauth10a_desktop_app
     client = client_applications(:oauth_desktop_app)
 
-    post_via_redirect "/login", 
-      :username => client.user.email, :password => "test"
+    post_via_redirect "/login",
+                      :username => client.user.email, :password => "test"
     assert_response :success
 
     signed_get "/oauth/request_token",
-      :consumer => client, :oauth_callback => "oob"
+               :consumer => client, :oauth_callback => "oob"
     assert_response :success
     token = parse_token(response)
     assert_instance_of RequestToken, token
@@ -225,25 +280,25 @@ class OAuthTest < ActionController::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, client.permissions
 
-    post "/oauth/authorize", 
-      :oauth_token => token.token, 
-      :allow_read_prefs => true, :allow_write_prefs => true
+    post "/oauth/authorize",
+         :oauth_token => token.token,
+         :allow_read_prefs => true, :allow_write_prefs => true
     assert_response :success
     assert_template "authorize_success"
-    m = response.body.match("<p>The verification code is ([A-Za-z0-9]+)</p>")
+    m = response.body.match("<p>The verification code is ([A-Za-z0-9]+).</p>")
     assert_not_nil m
     verifier = m[1]
     token.reload
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at
-    assert_allowed token, [ :allow_read_prefs ]
+    assert_allowed token, [:allow_read_prefs]
 
     signed_get "/oauth/access_token", :consumer => client, :token => token
     assert_response :unauthorized
 
     signed_get "/oauth/access_token",
-      :consumer => client, :token => token, :oauth_verifier => verifier
+               :consumer => client, :token => token, :oauth_verifier => verifier
     assert_response :success
     token.reload
     assert_not_nil token.created_at
@@ -254,15 +309,26 @@ class OAuthTest < ActionController::IntegrationTest
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at
-    assert_allowed token, [ :allow_read_prefs ]
+    assert_allowed token, [:allow_read_prefs]
+
+    signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
+    assert_response :success
+
+    post "/oauth/revoke", :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
+    assert_response :unauthorized
   end
 
-private
+  private
 
   def signed_get(uri, options)
     uri = URI.parse(uri)
     uri.scheme ||= "http"
-    uri.host ||= host
+    uri.host ||= "www.example.com"
 
     helper = OAuth::Client::Helper.new(nil, options)
 
@@ -290,7 +356,7 @@ private
     params = CGI.parse(URI.parse(response.location).query)
 
     assert_not_nil params["oauth_verifier"]
-    assert_present params["oauth_verifier"].first
+    assert params["oauth_verifier"].first.present?
 
     params["oauth_verifier"].first
   end