Merge branch 'api' of gitlab.com:participa/noosfero into api

Ábner Silva de Oliveira
2 parents 38d1534c 5091bf0b
Showing 4 changed files with 10 additions and 15 deletions Show diff stats
lib/noosfero/api/entities.rb
lib/noosfero/api/helpers.rb
lib/noosfero/api/session.rb
test/unit/api/helpers_test.rb
@@ -116,7 +116,7 @@ module Noosfero
         expose :permissions do |user, options|
           output = {}
           user.person.role_assignments.map do |role_assigment|
-            if role_assigment.resource.respond_to?(:identifier)
+            if role_assigment.resource.respond_to?(:identifier) && !role_assigment.role.nil?
               output[role_assigment.resource.identifier] = role_assigment.role.permissions
             end
           end
@@ -275,8 +275,7 @@
       #              captcha_helpers           #
       ##########################################
-      def test_captcha(remote_ip, params, _environment = nil)
-        environment ||= _environment
+      def test_captcha(remote_ip, params, environment)
         d = environment.api_captcha_settings
         return true unless d[:enabled] == true
@@ -293,7 +292,7 @@
           end
         end
         if d[:provider] == 'serpro'
-          d[:verify_uri] ||= 'http://captcha2.servicoscorporativos.serpro.gov.br/captchavalidar/1.0.0/validar'
+          raise ArgumentError, "Environment api_captcha_settings verify_uri not defined" if d[:verify_uri].nil?
           return verify_serpro_captcha(d[:serpro_client_id], params[:txtToken_captcha_serpro_gov_br], params[:captcha_text], d[:verify_uri])
         end
         raise ArgumentError, "Environment api_captcha_settings provider not defined"
@@ -41,7 +41,7 @@ module Noosfero
         attrs = attributes_for_keys [:email, :login, :password, :password_confirmation] + environment.signup_person_fields
         remote_ip = (request.respond_to?(:remote_ip) && request.remote_ip) || (env && env['REMOTE_ADDR'])
-        if not test_captcha(remote_ip, params, environment) == true
+        unless test_captcha(remote_ip, params, environment) == true
           render_api_error!(_('Please solve the test in order to register.'), 401)
           return
         end
@@ -164,8 +164,7 @@ class APIHelpersTest &lt; ActiveSupport::TestCase
   should 'do not test captcha when there are no settings' do
     environment = Environment.new
-    stubs(:environment).returns(environment)
-    assert test_captcha("127.0.0.1", {})
+    assert test_captcha("127.0.0.1", {}, environment)
   end
   should 'do not test captcha when captcha is disabled on settings' do
@@ -173,8 +172,7 @@ class APIHelpersTest &lt; ActiveSupport::TestCase
     environment.api_captcha_settings = {
         enabled: false,
     }
-    stubs(:environment).returns(environment)
-    assert test_captcha("127.0.0.1", {})
+    assert test_captcha("127.0.0.1", {}, environment)
   end
   should 'fail display recaptcha v1' do
@@ -187,8 +185,7 @@ class APIHelpersTest &lt; ActiveSupport::TestCase
         public_key:   '6LdsWAcTAAAAAChTUUD6yu9fCDhdIZzNd7F53zf-',
         verify_uri:   'https://www.google.com/recaptcha/api/verify',
     }
-    stubs(:environment).returns(environment)
-    assert_equal test_captcha("127.0.0.1", {}), "Missing captcha data"
+    assert_equal test_captcha("127.0.0.1", {}, environment), "Missing captcha data"
   end
   should 'fail display recaptcha v2' do
@@ -201,8 +198,7 @@ class APIHelpersTest &lt; ActiveSupport::TestCase
         public_key:   '6LdsWAcTAAAAAChTUUD6yu9fCDhdIZzNd7F53zf-',
         verify_uri:   'https://www.google.com/recaptcha/api/siteverify',
     }
-    stubs(:environment).returns(environment)
-    assert_equal test_captcha("127.0.0.1", {}), "Missing captcha data"
+    assert_equal test_captcha("127.0.0.1", {}, environment), "Missing captcha data"
   end
   should 'fail display Serpro captcha' do
@@ -211,9 +207,9 @@ class APIHelpersTest &lt; ActiveSupport::TestCase
         enabled: true,
         provider: 'serpro',
         serpro_client_id:  '0000000000000000',
+        verify_uri:   'http://localhost/api/verify',
     }
-    stubs(:environment).returns(environment)
-    assert_equal test_captcha("127.0.0.1", {}), "Missing captcha data"
+    assert_equal test_captcha("127.0.0.1", {}, environment), "Missing captcha data"
   end
   should 'render not_found if endpoint is unavailable' do
	@@ -116,7 +116,7 @@ module Noosfero		@@ -116,7 +116,7 @@ module Noosfero
116	expose :permissions do \|user, options\|	116	expose :permissions do \|user, options\|
117	output = {}	117	output = {}
118	user.person.role_assignments.map do \|role_assigment\|	118	user.person.role_assignments.map do \|role_assigment\|
119	- if role_assigment.resource.respond_to?(:identifier)	119	+ if role_assigment.resource.respond_to?(:identifier) && !role_assigment.role.nil?
120	output[role_assigment.resource.identifier] = role_assigment.role.permissions	120	output[role_assigment.resource.identifier] = role_assigment.role.permissions
121	end	121	end
122	end	122	end
	@@ -41,7 +41,7 @@ module Noosfero		@@ -41,7 +41,7 @@ module Noosfero
41	attrs = attributes_for_keys [:email, :login, :password, :password_confirmation] + environment.signup_person_fields	41	attrs = attributes_for_keys [:email, :login, :password, :password_confirmation] + environment.signup_person_fields
42	remote_ip = (request.respond_to?(:remote_ip) && request.remote_ip) \|\| (env && env['REMOTE_ADDR'])	42	remote_ip = (request.respond_to?(:remote_ip) && request.remote_ip) \|\| (env && env['REMOTE_ADDR'])
43		43
44	- if not test_captcha(remote_ip, params, environment) == true	44	+ unless test_captcha(remote_ip, params, environment) == true
45	render_api_error!(_('Please solve the test in order to register.'), 401)	45	render_api_error!(_('Please solve the test in order to register.'), 401)
46	return	46	return
47	end	47	end