Download as
Browse Code »

Commit c0b230e9f4e9dcca364abac3305a6d5e73d62bae

Authored by Victor Costa
Committed by Rodrigo Souto
1 parent f19bda31
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

api: accept private_token in header

Showing 2 changed files with 15 additions and 1 deletions   Show diff stats
lib/noosfero/api/helpers.rb
  Diff comments   View file @c0b230e
@@ -9,7 +9,7 @@ module Noosfero @@ -9,7 +9,7 @@ module Noosfero
9 end 9 end
10 10
11 def current_user 11 def current_user
12 - private_token = params[PRIVATE_TOKEN_PARAM].to_s if params 12 + private_token = (params[PRIVATE_TOKEN_PARAM] || headers['Private-Token']).to_s if params
13 @current_user ||= User.find_by_private_token(private_token) 13 @current_user ||= User.find_by_private_token(private_token)
14 @current_user = nil if !@current_user.nil? && @current_user.private_token_expired? 14 @current_user = nil if !@current_user.nil? && @current_user.private_token_expired?
15 @current_user 15 @current_user
test/unit/api/helpers_test.rb
  Diff comments   View file @c0b230e
@@ -5,6 +5,12 @@ class APITest < ActiveSupport::TestCase @@ -5,6 +5,12 @@ class APITest < ActiveSupport::TestCase
5 5
6 include Noosfero::API::APIHelpers 6 include Noosfero::API::APIHelpers
7 7
  8 + def setup
  9 + @headers = {}
  10 + end
  11 +
  12 + attr_accessor :headers
  13 +
8 should 'get the current user with valid token' do 14 should 'get the current user with valid token' do
9 user = create_user('someuser') 15 user = create_user('someuser')
10 user.generate_private_token! 16 user.generate_private_token!
@@ -12,6 +18,13 @@ class APITest < ActiveSupport::TestCase @@ -12,6 +18,13 @@ class APITest < ActiveSupport::TestCase
12 assert_equal user, current_user 18 assert_equal user, current_user
13 end 19 end
14 20
  21 + should 'get the current user with valid token in header' do
  22 + user = create_user('someuser')
  23 + user.generate_private_token!
  24 + headers['Private-Token'] = user.private_token
  25 + assert_equal user, current_user
  26 + end
  27 +
15 should 'not get the current user with expired token' do 28 should 'not get the current user with expired token' do
16 user = create_user('someuser') 29 user = create_user('someuser')
17 user.generate_private_token! 30 user.generate_private_token!
@@ -154,4 +167,5 @@ class APITest < ActiveSupport::TestCase @@ -154,4 +167,5 @@ class APITest < ActiveSupport::TestCase
154 def params= value 167 def params= value
155 @params = value 168 @params = value
156 end 169 end
  170 +
157 end 171 end