From b1d5a85fb5f7ef547cce0ef6a826884e2b9c2bfb Mon Sep 17 00:00:00 2001
From: Rodrigo Souto <rodrigo@colivre.coop.br>
Date: Tue, 19 Aug 2014 12:27:30 -0300
Subject: [PATCH] stoa-plugin: not test ssl connection on Noosfero

---
 plugins/stoa/controllers/stoa_plugin_controller.rb          |  4 ++--
 plugins/stoa/test/functional/stoa_plugin_controller_test.rb | 19 -------------------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/plugins/stoa/controllers/stoa_plugin_controller.rb b/plugins/stoa/controllers/stoa_plugin_controller.rb
index b4248c5..b3a15d7 100644
--- a/plugins/stoa/controllers/stoa_plugin_controller.rb
+++ b/plugins/stoa/controllers/stoa_plugin_controller.rb
@@ -6,7 +6,7 @@ class StoaPluginController < PublicController
   include StoaPlugin::PersonFields
 
   def authenticate
-    if request.ssl? && request.post?
+    if request.post?
       if params[:login].blank?
         person = Person.find_by_usp_id(params[:usp_id])
         login = person ? person.user.login : nil
@@ -22,7 +22,7 @@ class StoaPluginController < PublicController
       end
       render :text => result.to_json
     else
-      render :text => { :error => _('Conection requires SSL certificate and post method.'), :ok => false }.to_json
+      render :text => { :error => _('Conection requires post method.'), :ok => false }.to_json
     end
   end
 
diff --git a/plugins/stoa/test/functional/stoa_plugin_controller_test.rb b/plugins/stoa/test/functional/stoa_plugin_controller_test.rb
index fcc960a..e6959fa 100644
--- a/plugins/stoa/test/functional/stoa_plugin_controller_test.rb
+++ b/plugins/stoa/test/functional/stoa_plugin_controller_test.rb
@@ -24,23 +24,13 @@ class StoaPluginControllerTest < ActionController::TestCase
   attr_accessor :user
 
   should 'not authenticate if method not post' do
-    @request.stubs(:ssl?).returns(true)
     get :authenticate, :login => user.login, :password => '123456'
 
     assert_not_nil json_response['error']
     assert_match /post method/,json_response['error']
   end
 
-  should 'not authenticate if request is not using ssl' do
-    @request.stubs(:ssl?).returns(false)
-    post :authenticate, :login => user.login, :password => '123456'
-
-    assert_not_nil json_response['error']
-    assert_match /SSL/,json_response['error']
-  end
-
   should 'not authenticate if method password is wrong' do
-    @request.stubs(:ssl?).returns(true)
     post :authenticate, :login => user.login, :password => 'wrong_password'
 
     assert_not_nil json_response['error']
@@ -48,7 +38,6 @@ class StoaPluginControllerTest < ActionController::TestCase
   end
 
   should 'authenticate if everything is right' do
-    @request.stubs(:ssl?).returns(true)
     post :authenticate, :login => user.login, :password => '123456'
 
     assert_nil json_response['error']
@@ -56,7 +45,6 @@ class StoaPluginControllerTest < ActionController::TestCase
   end
 
   should 'authenticate with usp_id' do
-    @request.stubs(:ssl?).returns(true)
     post :authenticate, :usp_id => user.person.usp_id.to_s, :password => '123456'
 
     assert_nil json_response['error']
@@ -64,7 +52,6 @@ class StoaPluginControllerTest < ActionController::TestCase
   end
 
   should 'return no fields if fields requested was none' do
-    @request.stubs(:ssl?).returns(true)
     post :authenticate, :login => user.login, :password => '123456', :fields => 'none'
 
     expected_response = {'ok' => true}
@@ -74,7 +61,6 @@ class StoaPluginControllerTest < ActionController::TestCase
   end
 
   should 'return only the essential fields if no fields requested' do
-    @request.stubs(:ssl?).returns(true)
     post :authenticate, :login => user.login, :password => '123456'
     response = json_response.clone
 
@@ -87,7 +73,6 @@ class StoaPluginControllerTest < ActionController::TestCase
   end
 
   should 'return only selected fields' do
-    @request.stubs(:ssl?).returns(true)
     Person.any_instance.stubs(:f1).returns('field1')
     Person.any_instance.stubs(:f2).returns('field2')
     Person.any_instance.stubs(:f3).returns('field3')
@@ -104,7 +89,6 @@ class StoaPluginControllerTest < ActionController::TestCase
   end
 
   should 'not return private fields' do
-    @request.stubs(:ssl?).returns(true)
     Person.any_instance.stubs(:f1).returns('field1')
     Person.any_instance.stubs(:f2).returns('field2')
     Person.any_instance.stubs(:f3).returns('field3')
@@ -121,7 +105,6 @@ class StoaPluginControllerTest < ActionController::TestCase
   end
 
   should 'return essential fields even if they are private' do
-    @request.stubs(:ssl?).returns(true)
     person = user.person
     person.fields_privacy = {:email => 'private'}
     person.save!
@@ -132,7 +115,6 @@ class StoaPluginControllerTest < ActionController::TestCase
   end
 
   should 'return only essential fields when profile is private' do
-    @request.stubs(:ssl?).returns(true)
     Person.any_instance.stubs(:f1).returns('field1')
     Person.any_instance.stubs(:f2).returns('field2')
     Person.any_instance.stubs(:f3).returns('field3')
@@ -153,7 +135,6 @@ class StoaPluginControllerTest < ActionController::TestCase
   end
 
   should 'not crash if usp_id is invalid' do
-    @request.stubs(:ssl?).returns(true)
     assert_nothing_raised do
       post :authenticate, :usp_id => 12321123, :password => '123456'
     end
--
libgit2 0.21.2