Skip to content

Commit

Permalink
fix(keycloak): user redirection on KC login (#5184)
Browse files Browse the repository at this point in the history
* fix(keycloak): user redirection on KC login

* fix specs
  • Loading branch information
scouillard authored May 15, 2023
1 parent 9b48e32 commit f402ad5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion app/controllers/external_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def create_user
cookies.delete(:location)
return redirect_to redirect_location if redirect_location&.match?('\A\/rooms\/\w{3}-\w{3}-\w{3}-\w{3}\/join\z')

redirect_to '/rooms'
redirect_to '/'
rescue StandardError => e
Rails.logger.error("Error during authentication: #{e}")
redirect_to '/?error=SignupError'
Expand Down
10 changes: 5 additions & 5 deletions spec/controllers/external_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
get :create_user, params: { provider: 'openid_connect' }

expect(session[:session_token]).to eq(User.find_by(email: OmniAuth.config.mock_auth[:openid_connect][:info][:email]).session_token)
expect(response).to redirect_to('/rooms')
expect(response).to redirect_to('/')
end

it 'assigns the User role to the user' do
Expand Down Expand Up @@ -95,7 +95,7 @@
}
get :create_user, params: { provider: 'openid_connect' }

expect(response).to redirect_to('/rooms')
expect(response).to redirect_to('/')
end

it 'doesnt redirect if it doesnt match a room joins format check 2' do
Expand All @@ -107,7 +107,7 @@
}
get :create_user, params: { provider: 'openid_connect' }

expect(response).to redirect_to('/rooms')
expect(response).to redirect_to('/')
end

it 'doesnt redirect if it doesnt match a room joins format check 3' do
Expand All @@ -119,7 +119,7 @@
}
get :create_user, params: { provider: 'openid_connect' }

expect(response).to redirect_to('/rooms')
expect(response).to redirect_to('/')
end

it 'deletes the cookie after reading' do
Expand Down Expand Up @@ -215,7 +215,7 @@
create(:user, external_id: OmniAuth.config.mock_auth[:openid_connect][:uid])

expect { get :create_user, params: { provider: 'openid_connect' } }.not_to raise_error
expect(response).to redirect_to('/rooms')
expect(response).to redirect_to('/')
end

it 'returns an InviteInvalid error if no invite is passed' do
Expand Down

0 comments on commit f402ad5

Please sign in to comment.