5 Commits
2 changed files with 11 additions and 4 deletions

No files matched your search

+4 -2
View File
@@ -48,7 +48,7 @@ func Configure(r *gin.Engine, app_url string, default_redirect string, stubs_on_
if issuer == "" || clientID == "" || clientSecret == "" { if issuer == "" || clientID == "" || clientSecret == "" {
if stubs_on_unconfigured { if stubs_on_unconfigured {
log.Println("[JHID] WARNING: OIDC not set up due to missing environment variables. Falling back to stubs") log.Println("[JHID] WARNING: OIDC not set up due to missing environment variables. Falling back to stubs")
startStubs(r) startStubs(r, check_middleware)
return return
} else { } else {
log.Fatal("[JHID] One or more requried environment variables are missing. See docs for more information") log.Fatal("[JHID] One or more requried environment variables are missing. See docs for more information")
@@ -72,10 +72,10 @@ func Configure(r *gin.Engine, app_url string, default_redirect string, stubs_on_
r.GET("/auth/v2/login", loginHandler) r.GET("/auth/v2/login", loginHandler)
r.GET("/auth/v2/verify", callbackHandler) r.GET("/auth/v2/verify", callbackHandler)
check_finalizer := func(ctx *gin.Context) { ctx.JSON(200, gin.H{"success": "true"}) }
if check_middleware == nil { if check_middleware == nil {
r.GET("/auth/v2/check", EnsureLogin(false), check_finalizer) r.GET("/auth/v2/check", EnsureLogin(false), check_finalizer)
} else { } else {
log.Println("[JHID] Custom check middleware enabled")
r.GET("/auth/v2/check", EnsureLogin(false), check_middleware, check_finalizer) r.GET("/auth/v2/check", EnsureLogin(false), check_middleware, check_finalizer)
} }
r.GET("/auth/v2/logout", logoutHandler) r.GET("/auth/v2/logout", logoutHandler)
@@ -83,6 +83,8 @@ func Configure(r *gin.Engine, app_url string, default_redirect string, stubs_on_
log.Println("[JHID] Configured successfully") log.Println("[JHID] Configured successfully")
} }
func check_finalizer(ctx *gin.Context) { ctx.JSON(200, gin.H{"success": "true"}) }
func ErrorHandler() gin.HandlerFunc { func ErrorHandler() gin.HandlerFunc {
return func(c *gin.Context) { return func(c *gin.Context) {
c.Next() c.Next()
+7 -2
View File
@@ -7,10 +7,15 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
func startStubs(r *gin.Engine) { func startStubs(r *gin.Engine, check_middleware func(c *gin.Context)) {
r.GET("/auth/v2/login", stubsHandler) r.GET("/auth/v2/login", stubsHandler)
r.GET("/auth/v2/verify", stubsHandler) r.GET("/auth/v2/verify", stubsHandler)
r.GET("/auth/v2/check", EnsureLogin(false), func(ctx *gin.Context) { ctx.JSON(200, gin.H{"success": "true"}) }) if check_middleware == nil {
r.GET("/auth/v2/check", EnsureLogin(false), check_finalizer)
} else {
log.Println("[JHID] Custom check middleware enabled")
r.GET("/auth/v2/check", EnsureLogin(false), check_middleware, check_finalizer)
}
r.GET("/auth/v2/logout", logoutHandler) r.GET("/auth/v2/logout", logoutHandler)
} }