[30898] Fix script_name reference to auth provider link

No idea why that is not respected by omniauth, but the same is happening
for the top menu bar

https://community.openproject.com/wp/30898
pull/7622/head
Oliver Günther 5 years ago
parent fe6b672bfe
commit 1d235e0e9d
No known key found for this signature in database
GPG Key ID: A3A8BDAD7C0C552C
  1. 2
      app/views/hooks/login/_auth_provider.html.erb
  2. 2
      modules/auth_plugins/app/views/hooks/login/_providers.html.erb
  3. 53
      modules/auth_plugins/spec/features/auth_provider_spec.rb
  4. 6
      modules/auth_plugins/spec/views/hooks/login/_providers.html.erb_spec.rb

@ -29,7 +29,7 @@ See docs/COPYRIGHT.rdoc for more details.
<% unless Rails.env.production? %>
<%
opts = {}
opts = { script_name: OpenProject::Configuration.rails_relative_url_root }
if params['back_url']
opts[:origin] = params['back_url']

@ -33,7 +33,7 @@ See doc/COPYRIGHT.rdoc for more details.
<% OpenProject::Plugins::AuthPlugin.providers.each do |pro| %>
<%
opts = {}
opts = { script_name: OpenProject::Configuration.rails_relative_url_root }
if params['back_url']
opts[:origin] = params['back_url']

@ -0,0 +1,53 @@
#-- copyright
# OpenProject is a project management system.
# Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License version 3.
#
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
# Copyright (C) 2006-2013 Jean-Philippe Lang
# Copyright (C) 2010-2013 the ChiliProject Team
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# See doc/COPYRIGHT.rdoc for more details.
#++
require 'spec_helper'
describe 'rendering the login buttons', js: true do
let(:providers) do
[
{ name: 'mock_auth' }
]
end
before do
allow(OpenProject::Plugins::AuthPlugin).to receive(:providers).and_return(providers)
end
describe 'in a public project', with_settings: { login_required: false } do
let(:public_project) { FactoryBot.build(:project, is_public: true) }
it 'renders correctly' do
visit project_path(public_project)
page.find('a.login').click
item = page.find('a.auth-provider', text: 'mock_auth')
expect(item[:href]).to end_with '/auth/mock_auth'
end
end
end

@ -51,4 +51,10 @@ describe 'rendering the login buttons for all providers' do
it 'should show the test_auth button with the given display_name as its label' do
expect(rendered).to match /#{providers[1][:display_name]}/
end
context 'with relative url root', with_config: { rails_relative_url_root: '/foobar' } do
it 'renders correctly' do
expect(rendered).to include '/foobar/auth/mock_auth'
end
end
end

Loading…
Cancel
Save