admin/ersteller
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add the module name after the path to the repo and simply name it ersteller"

Browse Source 
This reverts commit a1b93c0eba.
This commit is contained in:
Achim Rohn
2025-11-15 11:38:04 +01:00
parent a1b93c0eba
commit 7c69f163b6
86 changed files with 251 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
authentication/keycloak.go
+10 -10
View File
@@ -2,7 +2,7 @@ package authentication
import (
"context"
"git.gorlug.de/code/golang/ersteller-lib/ersteller"
"git.gorlug.de/code/golang/ersteller-lib"
"github.com/gorilla/sessions"
"github.com/labstack/echo/v4"
"github.com/markbates/goth"
@@ -38,7 +38,7 @@ func RunKeycloakAuth(e *echo.Echo, environment KeycloakEnv, cookieStore *session
// ignore the error for now
openid, err := openidConnect.New(environment.Keycloak.ClientId, environment.Keycloak.ClientSecret, environment.BaseUrl+"/auth/openid-connect/callback", environment.Keycloak.DiscoveryUrl)
if err != nil {
ersteller.Error("Error while initializing OpenID Connect provider: ", err)
ersteller_lib.Error("Error while initializing OpenID Connect provider: ", err)
panic(err)
}
if openid != nil {
@@ -56,12 +56,12 @@ func RunKeycloakAuth(e *echo.Echo, environment KeycloakEnv, cookieStore *session
if userId == -1 {
userId, err = createUser(user, userRepo)
if err != nil {
ersteller.LogError("Failed to create user: %v", err)
ersteller_lib.LogError("Failed to create user: %v", err)
return err
}
ersteller.LogDebug("Created user with id %d", userId)
ersteller_lib.LogDebug("Created user with id %d", userId)
} else {
ersteller.LogError("Failed to get user id: %v", err)
ersteller_lib.LogError("Failed to get user id: %v", err)
return err
}
}
@@ -76,7 +76,7 @@ func RunKeycloakAuth(e *echo.Echo, environment KeycloakEnv, cookieStore *session
// Get the session
session, err := cookieStore.Get(c.Request(), environment.SessionName)
if err != nil {
ersteller.LogError("Failed to get session during logout: %v", err)
ersteller_lib.LogError("Failed to get session during logout: %v", err)
} else {
// Clear session values
session.Values = make(map[interface{}]interface{})
@@ -85,7 +85,7 @@ func RunKeycloakAuth(e *echo.Echo, environment KeycloakEnv, cookieStore *session
// Save the session (this will delete the cookie)
err = session.Save(c.Request(), c.Response())
if err != nil {
ersteller.LogError("Failed to clear session during logout: %v", err)
ersteller_lib.LogError("Failed to clear session during logout: %v", err)
}
}
@@ -105,7 +105,7 @@ func RunKeycloakAuth(e *echo.Echo, environment KeycloakEnv, cookieStore *session
request := c.Request().WithContext(ctx)
// try to get the user without re-authenticating
if gothUser, err := gothic.CompleteUserAuth(c.Response(), c.Request()); err == nil {
ersteller.Debug(gothUser)
ersteller_lib.Debug(gothUser)
return nil
} else {
gothic.BeginAuthHandler(c.Response(), request)
@@ -122,7 +122,7 @@ func createUser(gothUser goth.User, repo UserRepository) (int, error) {
func saveEmailToSessionStore(c echo.Context, sessionStore *sessions.CookieStore, email string, userId int, environment KeycloakEnv) error {
session, err := sessionStore.New(c.Request(), environment.SessionName)
if err != nil {
ersteller.LogError("Failed to create session: %v", err)
ersteller_lib.LogError("Failed to create session: %v", err)
return err
}
session.Values = map[interface{}]interface{}{
@@ -131,7 +131,7 @@ func saveEmailToSessionStore(c echo.Context, sessionStore *sessions.CookieStore,
}
err = session.Save(c.Request(), c.Response())
if err != nil {
ersteller.LogError("Failed to save session: %v", err)
ersteller_lib.LogError("Failed to save session: %v", err)
return err
}
return nil