Improve router base.go

routers/authz_filter.go

@@ -37,8 +37,6 @@ func getUsername(ctx *context.Context) (username string) {
 		}
 	}()
 
-	// bug in Beego: this call will panic when file session store is empty
-	// so we catch the panic
 	username = ctx.Input.Session("username").(string)
 
 	if username == "" {

routers/auto_signin_filter.go

@@ -22,25 +22,6 @@ import (
 	"github.com/casbin/casdoor/util"
 )
 
-func getSessionUser(ctx *context.Context) string {
-	user := ctx.Input.CruSession.Get("username")
-	if user == nil {
-		return ""
-	}
-
-	return user.(string)
-}
-
-func setSessionUser(ctx *context.Context, user string) {
-	err := ctx.Input.CruSession.Set("username", user)
-	if err != nil {
-		panic(err)
-	}
-
-	// https://github.com/beego/beego/issues/3445#issuecomment-455411915
-	ctx.Input.CruSession.SessionRelease(ctx.ResponseWriter)
-}
-
 func AutoSigninFilter(ctx *context.Context) {
 	//if getSessionUser(ctx) != "" {
 	//	return

routers/base.go

@@ -62,3 +62,22 @@ func getUsernameByClientIdSecret(ctx *context.Context) string {
 
 	return fmt.Sprintf("app/%s", application.Name)
 }
+
+func getSessionUser(ctx *context.Context) string {
+	user := ctx.Input.CruSession.Get("username")
+	if user == nil {
+		return ""
+	}
+
+	return user.(string)
+}
+
+func setSessionUser(ctx *context.Context, user string) {
+	err := ctx.Input.CruSession.Set("username", user)
+	if err != nil {
+		panic(err)
+	}
+
+	// https://github.com/beego/beego/issues/3445#issuecomment-455411915
+	ctx.Input.CruSession.SessionRelease(ctx.ResponseWriter)
+}