Skip to content

Commit

Permalink
Redirect to profile page if user not logged in when login required
Browse files Browse the repository at this point in the history
  • Loading branch information
kinoppyd committed May 8, 2024
1 parent dd55c39 commit 2acbd16
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 10 deletions.
7 changes: 7 additions & 0 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,13 @@ def set_default_event
request.path_parameters[:event_name] = @event.name
end

def make_sure_user_logged_in
return if @user&.profile

session[:breakout_turbo] = true
redirect_to profile_path, flash: { error: I18n.t('errors.login_required') }
end

def create_and_set_user
@user = User.create!
session[:user_id] = @user.id
Expand Down
1 change: 1 addition & 0 deletions app/controllers/members_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
class MembersController < ApplicationController
class NoPermissionError < StandardError; end

before_action :make_sure_user_logged_in
before_action :set_team
before_action :set_team_profile, except: :create
before_action :define_error_variable
Expand Down
1 change: 1 addition & 0 deletions app/controllers/teams_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
class TeamsController < ApplicationController
class InvalidStateError < StandardError; end

before_action :make_sure_user_logged_in
before_action :set_team, only: %i[show edit update destroy]
before_action :check_user_belongs_to_team, only: %i[show update destroy]

Expand Down
10 changes: 1 addition & 9 deletions app/controllers/triggers_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,12 @@

class TriggersController < ApplicationController
prepend_before_action :set_default_event
before_action :make_sure_user_has_profile
before_action :make_sure_user_logged_in

def show
trigger = Trigger.find(params[:id])
trigger.perform(@user.profile, params[:key])

redirect_to profile_path
end

private

def make_sure_user_has_profile
return if @user&.profile

redirect_to profile_path, flash: { error: I18n.t('errors.login_required') }
end
end
33 changes: 32 additions & 1 deletion test/controllers/teams_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,19 @@ class TeamsControllerTest < ActionDispatch::IntegrationTest
@team = teams(:alpha)
end

test 'should get new' do
test 'should get new with session' do
omniauth_callback_uid(1234) # profile_one
get '/auth/github/callback'

get new_team_url
assert_response :success
end

test 'should not get new without session' do
get new_team_url
assert_redirected_to profile_path
end

test 'should create team and creator profile has admin role' do
team_profiles(:team_profile1).destroy

Expand All @@ -38,6 +46,14 @@ class TeamsControllerTest < ActionDispatch::IntegrationTest
assert_response :forbidden
end

test 'should not create team and redirect to profile if no session' do
assert_no_changes -> { [Team.count, TeamProfile.count] } do
post teams_url, params: { team: { name: 'Charlie' } }
end

assert_redirected_to profile_path
end

test 'should return new page when create with invalid param' do
team_profiles(:team_profile1).destroy

Expand Down Expand Up @@ -76,6 +92,11 @@ class TeamsControllerTest < ActionDispatch::IntegrationTest
assert_response :not_found
end

test 'should not show team if no session' do
get team_url(@team)
assert_redirected_to profile_path
end

test 'should update team' do
omniauth_callback_uid(1234) # profile_one
get '/auth/github/callback'
Expand All @@ -92,6 +113,11 @@ class TeamsControllerTest < ActionDispatch::IntegrationTest
assert_response :forbidden
end

test 'should not update team if no session' do
patch team_url(@team), params: { team: { name: 'Delta' } }
assert_redirected_to profile_path
end

test 'should destroy team' do
omniauth_callback_uid(1234) # profile_one
get '/auth/github/callback'
Expand All @@ -113,4 +139,9 @@ class TeamsControllerTest < ActionDispatch::IntegrationTest

assert_response :forbidden
end

test 'should not destroy team if no session' do
delete team_url(@team)
assert_redirected_to profile_path
end
end
8 changes: 8 additions & 0 deletions test/controllers/triggers_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,12 @@ def setup

assert_redirected_to profile_path
end

test 'no triggered if no session' do
assert_no_difference -> { ProfileTrophy.count } do
get trigger_path(@trigger, key: 'testkey')
end

assert_redirected_to profile_path
end
end

0 comments on commit 2acbd16

Please sign in to comment.