Skip to content

Added OAUTH_REDIRECT_URI_USE_BASE_URL env config #1562

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

Open
anderslarssonvbg wants to merge 3 commits into
base: main
Choose a base branch
from
+21 −4
Open

Added OAUTH_REDIRECT_URI_USE_BASE_URL env config #1562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7859b04
Update context_test.go
anderslarssonvbg Jun 2, 2026
7c129e7
Update context.go
anderslarssonvbg Jun 2, 2026
ba3aec6
Update env.go
anderslarssonvbg Jun 2, 2026
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
1 change: 1 addition & 0 deletions app/pkg/env/env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ type config struct {
BaseURL string `env:"BASE_URL"`
Locale string `env:"LOCALE,default=en"`
JWTSecret string `env:"JWT_SECRET,required"`
OauthRedirectUriUseBaseURL bool `env:"OAUTH_REDIRECT_URI_USE_BASE_URL,default=false"`
PostCreationWithTagsEnabled bool `env:"POST_CREATION_WITH_TAGS_ENABLED,default=false"`
AllowAllowedSchemes bool `env:"ALLOW_ALLOWED_SCHEMES,default=true"`
Stripe struct {
Expand Down
5 changes: 3 additions & 2 deletions app/pkg/web/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,11 +619,12 @@ func BaseURL(ctx context.Context) string {

// OAuthBaseURL returns the OAuth base URL used for host-wide OAuth authentication
// For Single Tenant HostMode, BaseURL is the current BaseURL
// For Multi Tenant HostMode, BaseURL is //login.{HOST_DOMAIN}
// For Multi Tenant HostMode, BaseURL is //login.{HOST_DOMAIN} as default
// but if {OAUTH_REDIRECT_URI_USE_BASE_URL} is set (to true), BaseURL is the current BaseURL
func OAuthBaseURL(ctx context.Context) string {
request := ctx.Value(app.RequestCtxKey).(Request)

if env.IsSingleHostMode() {
if env.IsSingleHostMode() || env.Config.OauthRedirectUriUseBaseURL {
return BaseURL(ctx)
}

Expand Down
19 changes: 17 additions & 2 deletions app/pkg/web/context_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,16 +201,31 @@ func TestGetOAuthBaseURL(t *testing.T) {

env.Config.HostMode = "single"
Expect(web.OAuthBaseURL(ctx)).Equals("https://test.fider.io:3000")

env.Config.HostMode = "multi"
env.Config.OauthRedirectUriUseBaseURL = false
Expect(web.OAuthBaseURL(ctx)).Equals("https://login.test.fider.io")

env.Config.HostMode = "multi"
env.Config.OauthRedirectUriUseBaseURL = true
Expect(web.OAuthBaseURL(ctx)).Equals("https://test.fider.io")
}

func TestGetOAuthBaseURL_WithPort(t *testing.T) {
RegisterT(t)

ctx := newGetContext("http://demo.test.fider.io:3000/hello-world", nil)

env.Config.HostMode = "multi"
Expect(web.OAuthBaseURL(ctx)).Equals("http://login.test.fider.io:3000")

env.Config.HostMode = "single"
Expect(web.OAuthBaseURL(ctx)).Equals("https://test.fider.io:3000")

env.Config.HostMode = "multi"
env.Config.OauthRedirectUriUseBaseURL = false
Expect(web.OAuthBaseURL(ctx)).Equals("http://login.test.fider.io:3000")

env.Config.HostMode = "multi"
env.Config.OauthRedirectUriUseBaseURL = true
Expect(web.OAuthBaseURL(ctx)).Equals("http://test.fider.io:3000")

}