Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

We shouldn't require users or SSL on the frontend. #2076

Merged
merged 1 commit into from
Dec 12, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions authentication/spec/requests/refinery/sessions_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ module Refinery

before do
FactoryGirl.create(:refinery_user, :username => "ugisozols",
:password => "123456",
:password_confirmation => "123456")
:password => "123456",
:password_confirmation => "123456")

visit refinery.login_path
end
Expand Down
11 changes: 11 additions & 0 deletions core/lib/refinery/admin/base_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ module BaseController
included do
layout :layout?

send :before_filter, :require_refinery_users!
send :before_filter, :force_ssl!

before_filter :authenticate_refinery_user!, :restrict_plugins, :restrict_controller
after_filter :store_location?, :only => [:index] # for redirect_back_or_default

Expand All @@ -25,6 +28,10 @@ def searching?

protected

def force_ssl!
redirect_to :protocol => 'https' if Refinery::Core.force_ssl && !request.ssl?
end

def group_by_date(records)
new_records = []

Expand All @@ -37,6 +44,10 @@ def group_by_date(records)
new_records
end

def require_refinery_users!
redirect_to refinery.signup_path if just_installed? && controller_name != 'users'
end

def restrict_plugins
current_length = (plugins = current_refinery_user.authorized_plugins).length

Expand Down
14 changes: 0 additions & 14 deletions core/lib/refinery/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ module ApplicationController

send :include, Refinery::Crud # basic create, read, update and delete methods

send :before_filter, :refinery_user_required?, :if => :admin?

send :before_filter, :force_ssl?, :if => :admin?

if Refinery::Core.rescue_not_found
send :rescue_from, ActiveRecord::RecordNotFound,
::AbstractController::ActionNotFound,
Expand Down Expand Up @@ -62,10 +58,6 @@ def login?

protected

def force_ssl?
redirect_to :protocol => 'https' if !request.ssl? && Refinery::Core.force_ssl
end

# use a different model for the meta information.
def present(model)
@meta = presenter_for(model).new(model)
Expand All @@ -78,11 +70,5 @@ def presenter_for(model, default=BasePresenter)
rescue NameError
default
end

def refinery_user_required?
if just_installed? && controller_name != 'users'
redirect_to refinery.signup_path
end
end
end
end
20 changes: 20 additions & 0 deletions core/spec/controllers/refinery/admin/dummy_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,26 @@ module Admin
get :index
end
end

describe "force_ssl!" do
before do
controller.stub(:require_refinery_users!).and_return(false)
end

it "is false so standard HTTP is used" do
Refinery::Core.stub(:force_ssl).and_return(false)
controller.should_not_receive(:redirect_to).with(:protocol => 'https')

get :index
end

it "is true so HTTPS is used" do
Refinery::Core.stub(:force_ssl).and_return(true)
controller.should_receive(:redirect_to).with(:protocol => 'https')

get :index
end
end
end
end
end
Expand Down
32 changes: 0 additions & 32 deletions core/spec/lib/refinery/application_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,38 +48,6 @@ def index
end
end

describe "force_ssl" do
before do
controller.stub(:admin?).and_return(true)
controller.stub(:refinery_user_required?).and_return(false)
end

it "is false so standard HTTP is used" do
Refinery::Core.stub(:force_ssl).and_return(false)

get :index

response.should_not be_redirect
end

it "is true so HTTPS is used" do
Refinery::Core.stub(:force_ssl).and_return(true)

get :index

response.should be_redirect
end

it "is true but HTTPS is not used because admin? is false" do
controller.stub(:admin?).and_return(false)
Refinery::Core.stub(:force_ssl).and_return(true)

get :index

response.should_not be_redirect
end
end

describe "#presenter_for" do
it "returns BasePresenter for nil" do
controller.send(:presenter_for, nil).should eq(BasePresenter)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def mock_user(roles)
end

before do
controller.should_receive(:refinery_user_required?).and_return false
controller.should_receive(:require_refinery_users!).and_return false
controller.should_receive(:authenticate_refinery_user!).and_return true
controller.should_receive(:restrict_plugins).and_return true
controller.should_receive(:allow_controller?).and_return controller_permission
Expand Down