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.

Sign up for GitHub

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

Jump to bottom

Fix double slash in redirect URL redirect location #1515

Merged
merged 5 commits into from
Mar 17, 2023
Merged

Fix double slash in redirect URL redirect location #1515

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
487b489
Fix double slash in redirect URL redirect location
AndrewDryga Mar 17, 2023
3e24c0d
Ensure external_url always has trailing slash and stop using Path.join()
AndrewDryga Mar 17, 2023
9c8f644
run formatter
AndrewDryga Mar 17, 2023
2da2c1f
Change credo setting
AndrewDryga Mar 17, 2023
a2a7c4a
Also fix trailing slash in code sample
AndrewDryga Mar 17, 2023
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
9 changes: 7 additions & 2 deletions apps/fz_http/lib/fz_http/auth.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@ defmodule FzHttp.Auth do

def fetch_oidc_provider_config(provider_id) do
with {:ok, provider} <- fetch_provider(:openid_connect_providers, provider_id) do
external_url = FzHttp.Config.fetch_env!(:fz_http, :external_url)
redirect_uri = provider.redirect_uri || "#{external_url}/auth/oidc/#{provider.id}/callback/"
redirect_uri =
if provider.redirect_uri do
provider.redirect_uri
else
external_url = FzHttp.Config.fetch_env!(:fz_http, :external_url)
Path.join(external_url, "auth/oidc/#{provider.id}/callback/")
end

{:ok,
%{
Expand Down
2 changes: 1 addition & 1 deletion apps/fz_http/test/fz_http/auth_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ defmodule FzHttp.AuthTest do
client_id: attrs["client_id"],
client_secret: attrs["client_secret"],
discovery_document_uri: attrs["discovery_document_uri"],
redirect_uri: "http://foo.bar.com//auth/oidc/google/callback/",
redirect_uri: "http://foo.bar.com/auth/oidc/google/callback/",
response_type: attrs["response_type"],
scope: attrs["scope"]
}}
Expand Down