Apply LANDING_PAGE config options for logged in users (go-gitea#2894)

* Extended LANDINGPAGE config variable to logged in users and added switch for 'organizations' in addition to 'home' and 'explore'. * Updated comments. Signed-off-by: Mike Schaffer <[email protected]> * Extended LANDINGPAGE config variable to trigger when user logs in and added switch for 'organizations' in addition to 'home' and 'explore'. Signed-off-by: Mike Schaffer <[email protected]> * Extended LANDINGPAGE config variable to logged in users and added switch for 'organizations' in addition to 'home' and 'explore'. * Updated comments. Signed-off-by: Mike Schaffer <[email protected]> * Extended LANDINGPAGE config variable to trigger when user logs in and added switch for 'organizations' in addition to 'home' and 'explore'. Signed-off-by: Mike Schaffer <[email protected]> * Removed superfluous conditional and correct whitespace. Signed-off-by: Mike Schaffer <[email protected]> * Update app.ini Reverted new line. * Formatting. Signed-off-by: Mike Schaffer <[email protected]>
gfxlabs · Nov 20, 2017 · 7e6c198 · 7e6c198
1 parent c3b6383
commit 7e6c198
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/conf/app.ini b/conf/app.ini
@@ -164,7 +164,7 @@ STATIC_ROOT_PATH =
 APP_DATA_PATH = data
 ; Application level GZIP support
 ENABLE_GZIP = false
-; Landing page for non-logged users, can be "home" or "explore"
+; Landing page, can be "home", "explore", or "organizations"
 LANDING_PAGE = home
 ; Enables git-lfs support. true or false, default is false.
 LFS_START_SERVER = false

diff --git a/modules/setting/setting.go b/modules/setting/setting.go
@@ -56,8 +56,9 @@ type LandingPage string
 
 // enumerates all the landing page types
 const (
-	LandingPageHome    LandingPage = "/"
-	LandingPageExplore LandingPage = "/explore"
+	LandingPageHome          LandingPage = "/"
+	LandingPageExplore       LandingPage = "/explore"
+	LandingPageOrganizations LandingPage = "/explore/organizations"
 )
 
 // MarkupParser defines the external parser configured in ini
@@ -737,6 +738,8 @@ func NewContext() {
 	switch sec.Key("LANDING_PAGE").MustString("home") {
 	case "explore":
 		LandingPageURL = LandingPageExplore
+	case "organizations":
+		LandingPageURL = LandingPageOrganizations
 	default:
 		LandingPageURL = LandingPageHome
 	}

diff --git a/routers/user/auth.go b/routers/user/auth.go
@@ -97,7 +97,7 @@ func checkAutoLogin(ctx *context.Context) bool {
 			ctx.SetCookie("redirect_to", "", -1, setting.AppSubURL)
 			ctx.Redirect(redirectTo)
 		} else {
-			ctx.Redirect(setting.AppSubURL + "/")
+			ctx.Redirect(setting.AppSubURL + string(setting.LandingPageURL))
 		}
 		return true
 	}