fix!: user func assignment, defaultRedirect store

handlers.go

@@ -102,6 +102,8 @@ func callbackHandler(c *gin.Context) {
 
 	if userFunc != nil {
 		userFunc(claims.Uid, claims.Name, claims.Email)
+	} else {
+		log.Println("[JHID] WARNING: No user function defined")
 	}
 
 	// Clear session data of oauth related state
@@ -122,6 +124,14 @@ func callbackHandler(c *gin.Context) {
 	}
 }
 
+func logoutHandler(c *gin.Context) {
+	session := sessions.Default(c)
+	session.Clear()
+	session.Save()
+}
+
+// Ensure that a user is currently logged in.
+// If redirectFail is set, then if not, the user is redirected.
 func EnsureLogin(redirectFail bool) func(c *gin.Context) {
 	return (func(c *gin.Context) {
 		session := sessions.Default(c)

main.go

@@ -20,18 +20,22 @@ func createRandomString(n int) (string, error) {
 	return base64.URLEncoding.EncodeToString(s), nil
 }
 
+type UserFunc func(userid string, name string, email string)
+
 var (
 	config          oauth2.Config
-	userFunc        func(userid string, name string, email string)
+	userFunc        UserFunc
 	verifier        oidc.IDTokenVerifier
 	defaultRedirect string
 )
 
-// Configure and set up the login SDK.
+// Configure and set up the login SDK. The user_function is used to create or update a user
-func Configure(r *gin.Engine, app_url string, default_redirect string, stubs_on_unconfigured bool) {
+func Configure(r *gin.Engine, app_url string, default_redirect string, user_function UserFunc, stubs_on_unconfigured bool) {
 	issuer := os.Getenv("OIDC_ISSUER")
 	clientID := os.Getenv("OIDC_CLIENT_ID")
 	clientSecret := os.Getenv("OIDC_CLIENT_SECRET")
+	defaultRedirect = default_redirect
+	userFunc = user_function
 
 	if issuer == "" || clientID == "" || clientSecret == "" {
 		if stubs_on_unconfigured {
@@ -45,7 +49,6 @@ func Configure(r *gin.Engine, app_url string, default_redirect string, stubs_on_
 
 	provider, err := oidc.NewProvider(context.Background(), issuer)
 	verifier = *provider.Verifier(&oidc.Config{ClientID: clientID})
-	defaultRedirect = default_redirect
 
 	if err != nil {
 		log.Fatal("[JHID] Provider resolution failed with error", err)
@@ -62,6 +65,7 @@ func Configure(r *gin.Engine, app_url string, default_redirect string, stubs_on_
 	r.GET("/auth/v2/login", loginHandler)
 	r.GET("/auth/v2/verify", callbackHandler)
 	r.GET("/auth/v2/check", EnsureLogin(false), func(ctx *gin.Context) { ctx.JSON(200, gin.H{"success": "true"}) })
+	r.GET("/auth/v2/logout", logoutHandler)
 
 	log.Println("[JHID] Configured successfully")
 }

public/autherror.tmpl

@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
     <head>
         <!-- NOTE: You should definitely host this yourself! (and you can adjust the style that way, too!) -->

public/oidcerror.tmpl

@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
     <head>
         <!-- NOTE: You should definitely host this yourself! (and you can adjust the style that way, too!) -->

public/style.css

@@ -36,6 +36,7 @@ a {
     padding: 10px;
     border-radius: 10px;
     cursor: pointer;
+    text-decoration: none;
 }
 
 .error-msg {

stubs.go

@@ -1,6 +1,8 @@
 package oidclogin
 
 import (
+	"log"
+
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
 )
@@ -9,18 +11,25 @@ func startStubs(r *gin.Engine) {
 	r.GET("/auth/v2/login", 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"}) })
+	r.GET("/auth/v2/logout", logoutHandler)
 }
 
 func stubsHandler(c *gin.Context) {
 	redir := c.Query("returnTo")
 	session := sessions.Default(c)
+	if userFunc != nil {
 		userFunc("stubs", "Stubs User", "example@example.com")
+	} else {
+		log.Println("[JHID] WARNING: No user function defined")
+	}
 	session.Set("jhid_auth", true)
 	session.Set("jhid_uid", "stubs")
 	session.Save()
 	if redir != "" {
+		log.Println("[JHID] Redirecting to ", redir)
 		c.Redirect(307, redir)
 	} else {
+		log.Println("[JHID] Redirecting to ", defaultRedirect, " (default redirect)")
 		c.Redirect(307, defaultRedirect)
 	}
 }