work in progress do no use for production

Evandro Junior
1 parent d620ea76
Showing 4 changed files with 42 additions and 28 deletions Show diff stats
lib/noosfero/api/helpers.rb
lib/noosfero/api/session.rb
test/unit/api/helpers_test.rb
test/unit/api/session_test.rb
@@ -216,8 +216,13 @@ require &#39;grape&#39;
         render_api_error!(_('Method Not Allowed'), 405)
       end
-      def render_api_error!(message, status)
-        error!({'message' => message, :code => status}, status)
+      # Message will be logged and shown to user
+      # javascript_console_message is supposed to be executed as console.log()
+      def render_api_error!(user_message, _status, log_message = nil, javascript_console_message = nil)
+        message_hash = {'message' => user_message, :code => status}
+        message_hash[:javascript_console_message] = javascript_console_message if javascript_console_message.present?
+        status(_status || namespace_inheritable(:default_error_status))
+        throw :error, message: "#{user_message} #{log_message}", status: _status, headers: headers
       end
       def render_api_errors!(messages)
@@ -284,10 +289,15 @@ require &#39;grape&#39;
       def test_captcha(remote_ip, params, environment)
         d = environment.api_captcha_settings
         return true unless d[:enabled] == true
+        msg_cve = _('Captcha validation error')
+        msg_eacs = 'Environment api_captcha_settings'
         if d[:provider] == 'google'
-          raise ArgumentError, "Environment api_captcha_settings private_key not defined" if d[:private_key].nil?
-          raise ArgumentError, "Environment api_captcha_settings version not defined" unless d[:version] == 1 || d[:version] == 2
+          render_api_error!(msg_cve, status, javascript_console_message = nil)
+
+
+          return log_ret_error_msg(msg_cve,"#{msg_eacs} private_key not defined") if d[:private_key].nil?
+          return log_ret_error_msg(msg_cve,"#{msg_eacs} version not defined") unless d[:version] == 1 || d[:version] == 2
           if d[:version]  == 1
             d[:verify_uri] ||= 'https://www.google.com/recaptcha/api/verify'
             return verify_recaptcha_v1(remote_ip, d[:private_key], d[:verify_uri], params[:recaptcha_challenge_field], params[:recaptcha_response_field])
@@ -298,20 +308,15 @@ require &#39;grape&#39;
           end
         end
         if d[:provider] == 'serpro'
-          #raise ArgumentError, "Environment api_captcha_settings verify_uri not defined" if d[:verify_uri].nil?
-          if d[:verify_uri].nil?
-            msg="Environment api_captcha_settings verify_uri not defined"
-            log msg
-            return client_message(_('Captcha validation error'), msg)
-          end
+          return log_ret_error_msg(msg_cve,"#{msg_eacs} 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"
+        return log_ret_error_msg(msg_cve,"#{msg_eacs} provider not defined") 
       end
       def verify_recaptcha_v1(remote_ip, private_key, api_recaptcha_verify_uri, recaptcha_challenge_field, recaptcha_response_field)
         if recaptcha_challenge_field == nil || recaptcha_response_field == nil
-          return _('Missing captcha data')
+          return log_ret_error_msg(_('Captcha validation error'), _('Missing captcha data'))
         end
         verify_hash = {
@@ -374,14 +379,13 @@ require &#39;grape&#39;
           body = http.request(request).body
         rescue Exception => e
           log_exception(e)
-          return client_message(_('Internal captcha validation error'),"Serpro captcha error: #{e.message}")
+          return error_message(_('Internal captcha validation error'),"Serpro captcha error: #{e.message}")
         end
         return _("Wrong captcha text, please try again") if body == 0
         return _("Token not found") if body == 2
         body == '1' ? true : body
       end
-
       # custom_message[:prepend2log] -> Prepend2log gives more details to the application log
       def log_exception(e, prepend_message2log=nil)
         logger = Logger.new(File.join(Rails.root, 'log', "#{ENV['RAILS_ENV'] || 'production'}_api.log"))
@@ -391,13 +395,6 @@ require &#39;grape&#39;
         logger.error e
       end
-      # message[:user_message] -> Displays the message directly to user
-      # message[:console_message] -> Displays the message to the javascript console
-      def client_message(user_message, console_message)
-        message = {single_message: true, user_message: user_message, console_message: console_message}
-        message.to_json if message.present?
-      end
-
       def log(message)
         logger = Logger.new(File.join(Rails.root, 'log', "#{ENV['RAILS_ENV'] || 'production'}_api.log"))
         logger.formatter = GrapeLogging::Formatters::Default.new
@@ -40,13 +40,7 @@ module Noosfero
         unique_attributes! User, [:email, :login]
         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'])
-
-        result = test_captcha(remote_ip, params, environment)
-        unless result == true
-          render_api_error!(result, 401)
-          return
-        end
-
+        test_captcha(remote_ip, params, environment)
         user = User.new(attrs)
         if  user.save
           user.activate
@@ -57,6 +51,11 @@ module Noosfero
           render_api_error!(message, 400)
         end
       end
+
+      post "/error" do
+        render_api_error!("show on screen", 400, "this is the log message", "go to JS")
+      end
+
     end
   end
 end
@@ -252,6 +252,20 @@ class APIHelpersTest &lt; ActiveSupport::TestCase
   end
+  # def render_api_error!(user_message, status, log_message = nil, javascript_console_message = nil)
+  #   message_hash = {'message' => user_message, :code => status}
+  #   message_hash[:javascript_console_message] = javascript_console_message if javascript_console_message.present?
+  #   self.status(status || namespace_inheritable(:default_error_status))
+  #   throw :error, message: message_hash, status: self.status, headers: headers
+  # end
+
+
+  should 'display user message' do
+    r=render_api_error!('Error to the user', '403', 'detailed log_message', 'show this on user\'s javascript console')
+    puts r.inspect
+    tsil
+  end
+
   protected
   def error!(info, status)
@@ -55,5 +55,9 @@ class SessionTest &lt; ActiveSupport::TestCase
     assert_equal "Serpro captcha error: getaddrinfo: Name or service not known", JSON.parse(message)['console_message']
   end
+  should 'show erro' do
+    puts (post("/api/v1/error")).inspect
+  end
+
 end
	@@ -252,6 +252,20 @@ class APIHelpersTest < ActiveSupport::TestCase		@@ -252,6 +252,20 @@ class APIHelpersTest < ActiveSupport::TestCase
252	end	252	end
253		253
254		254
		255	+ # def render_api_error!(user_message, status, log_message = nil, javascript_console_message = nil)
		256	+ # message_hash = {'message' => user_message, :code => status}
		257	+ # message_hash[:javascript_console_message] = javascript_console_message if javascript_console_message.present?
		258	+ # self.status(status \|\| namespace_inheritable(:default_error_status))
		259	+ # throw :error, message: message_hash, status: self.status, headers: headers
		260	+ # end
		261	+
		262	+
		263	+ should 'display user message' do
		264	+ r=render_api_error!('Error to the user', '403', 'detailed log_message', 'show this on user\'s javascript console')
		265	+ puts r.inspect
		266	+ tsil
		267	+ end
		268	+
255	protected	269	protected
256		270
257	def error!(info, status)	271	def error!(info, status)