diff --git a/authentication/keycloak.go b/authentication/keycloak.go index ce95de5..f1e144d 100644 --- a/authentication/keycloak.go +++ b/authentication/keycloak.go @@ -36,7 +36,7 @@ func RunKeycloakAuth(e *echo.Echo, environment KeycloakEnv, cookieStore *session // OpenID Connect is based on OpenID Connect Auto Discovery URL (https://openid.net/specs/openid-connect-discovery-1_0-17.html) // because the OpenID Connect provider initialize itself in the New(), it can return an error which should be handled or ignored // ignore the error for now - openid, err := openidConnect.New(environment.Keycloak.CLientId, environment.Keycloak.ClientSecret, environment.BaseUrl+"/auth/openid-connect/callback", environment.Keycloak.DiscoveryUrl) + openid, err := openidConnect.New(environment.Keycloak.ClientId, environment.Keycloak.ClientSecret, environment.BaseUrl+"/auth/openid-connect/callback", environment.Keycloak.DiscoveryUrl) if err != nil { ersteller_lib.Error("Error while initializing OpenID Connect provider: ", err) panic(err) diff --git a/authentication/login_page.go b/authentication/login_page.go index 8930a9f..c6b1eaa 100644 --- a/authentication/login_page.go +++ b/authentication/login_page.go @@ -1,34 +1,29 @@ package authentication import ( + "ersteller-lib" "github.com/labstack/echo/v4" "maragu.dev/gomponents" . "maragu.dev/gomponents/html" - "salezenify/google" - "salezenify/html_components/components" - "salezenify/html_components/route" - "salezenify/layout" - "salezenify/user" ) const LoginPath = "/login" type LoginPage struct { - createPage layout.CreatePageFunc - LoginRoute route.GetRoute + createPage ersteller_lib.CreatePageFunc + LoginRoute ersteller_lib.GetRoute + googleLoginUrl string } -func NewLoginPage(e *echo.Echo, createPage layout.CreatePageFunc) *LoginPage { - page := &LoginPage{createPage: createPage} - page.LoginRoute = route.NewGetRoute(LoginPath, page.Render).Add(e) +func NewLoginPage(e *echo.Echo, createPage ersteller_lib.CreatePageFunc, googleLoginUrl string) *LoginPage { + page := &LoginPage{createPage: createPage, googleLoginUrl: googleLoginUrl} + page.LoginRoute = ersteller_lib.NewGetRoute(LoginPath, page.Render).Add(e) return page } func (l *LoginPage) Render(c echo.Context) error { - return l.createPage(c, layout.PageWebsiteMetaData{ - WebsiteMetaData: components.WebsiteMetaData{ - Title: "Login", - }, + return l.createPage(c, ersteller_lib.PageWebsiteMetaData{ + Title: "Login", HideNavigation: true, }, l.getLoginPage()) } @@ -37,9 +32,8 @@ func (l *LoginPage) getLoginPage() gomponents.Group { return []gomponents.Node{ P( A( - Href(user.OpenIdConnectPath), + Href(OpenIdConnectPath), Button( - Class(components.ButtonClass()), Type("button"), gomponents.Text("Login"), ), @@ -47,9 +41,8 @@ func (l *LoginPage) getLoginPage() gomponents.Group { ), P( A( - Href(google.GoogleLogin), + Href(l.googleLoginUrl), Button( - Class(components.ButtonClass()), Type("button"), gomponents.Text("Google Login"), ),