THIS IS A TEST INSTANCE ONLY! REPOSITORIES CAN BE DELETED AT ANY TIME!

Browse Source

fix not respecting landing page setting (#4209)

* fix not respecting landing page setting

* fmt

* add landing page test
tags/v1.5.0-dev
David Schneiderbauer 1 year ago
parent
commit
adba2ad609
3 changed files with 26 additions and 6 deletions
  1. 22
    0
      integrations/setting_test.go
  2. 0
    6
      modules/context/auth.go
  3. 4
    0
      routers/home.go

+ 22
- 0
integrations/setting_test.go View File

@@ -68,3 +68,25 @@ func TestSettingShowUserEmailProfile(t *testing.T) {

setting.UI.ShowUserEmail = showUserEmail
}

func TestSettingLandingPage(t *testing.T) {
prepareTestEnv(t)

landingPage := setting.LandingPageURL

setting.LandingPageURL = setting.LandingPageHome
req := NewRequest(t, "GET", "/")
MakeRequest(t, req, http.StatusOK)

setting.LandingPageURL = setting.LandingPageExplore
req = NewRequest(t, "GET", "/")
resp := MakeRequest(t, req, http.StatusFound)
assert.Equal(t, "/explore", resp.Header().Get("Location"))

setting.LandingPageURL = setting.LandingPageOrganizations
req = NewRequest(t, "GET", "/")
resp = MakeRequest(t, req, http.StatusFound)
assert.Equal(t, "/explore/organizations", resp.Header().Get("Location"))

setting.LandingPageURL = landingPage
}

+ 0
- 6
modules/context/auth.go View File

@@ -37,12 +37,6 @@ func Toggle(options *ToggleOptions) macaron.Handler {
return
}

// Check non-logged users landing page.
if !ctx.IsSigned && ctx.Req.RequestURI == "/" && setting.LandingPageURL != setting.LandingPageHome {
ctx.Redirect(setting.AppSubURL + string(setting.LandingPageURL))
return
}

// Redirect to dashboard if user tries to visit any non-login page.
if options.SignOutRequired && ctx.IsSigned && ctx.Req.RequestURI != "/" {
ctx.Redirect(setting.AppSubURL + "/")

+ 4
- 0
routers/home.go View File

@@ -42,6 +42,10 @@ func Home(ctx *context.Context) {
user.Dashboard(ctx)
}
return
// Check non-logged users landing page.
} else if setting.LandingPageURL != setting.LandingPageHome {
ctx.Redirect(setting.AppSubURL + string(setting.LandingPageURL))
return
}

// Check auto-login.

Loading…
Cancel
Save