github/wonderwall
1
0
Fork 0
mirror of https://github.com/nais/wonderwall.git synced 2026-05-09 18:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(openid): clean up client and provider

Browse Source
This commit is contained in:
Trong Huu Nguyen
2022-09-02 18:08:36 +02:00
parent 92ee6313c5
commit 08eefbf1d5
16 changed files with 62 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/handler/api/login/login.go
View File

@@ -12,7 +12,6 @@ import (
"github.com/nais/wonderwall/pkg/cookie"
"github.com/nais/wonderwall/pkg/crypto"
errorhandler "github.com/nais/wonderwall/pkg/handler/error"
"github.com/nais/wonderwall/pkg/loginstatus"
logentry "github.com/nais/wonderwall/pkg/middleware"
"github.com/nais/wonderwall/pkg/openid"
openidclient "github.com/nais/wonderwall/pkg/openid/client"
@@ -27,11 +26,10 @@ type Source interface {
GetCookieOptsPathAware(r *http.Request) cookie.Options
GetCrypter() crypto.Crypter
GetErrorHandler() errorhandler.Handler
GetLoginstatus() *loginstatus.Loginstatus
}
func Handler(src Source, w http.ResponseWriter, r *http.Request) {
login, err := src.GetClient().Login(r, src.GetLoginstatus())
login, err := src.GetClient().Login(r)
if err != nil {
if errors.Is(err, openidclient.InvalidSecurityLevelError) || errors.Is(err, openidclient.InvalidLocaleError) {
src.GetErrorHandler().BadRequest(w, r, err)

3
pkg/handler/api/logincallback/logincallback.go
View File

@@ -29,7 +29,6 @@ type Source interface {
GetCrypter() crypto.Crypter
GetErrorHandler() errorhandler.Handler
GetLoginstatus() *loginstatus.Loginstatus
GetProvider() openidclient.OpenIDProvider
GetSessions() *session.Handler
GetSessionConfig() config.Session
}
@@ -48,7 +47,7 @@ func Handler(src Source, w http.ResponseWriter, r *http.Request) {
return
}
loginCallback, err := src.GetClient().LoginCallback(r, src.GetProvider(), loginCookie)
loginCallback, err := src.GetClient().LoginCallback(r, loginCookie)
if err != nil {
src.GetErrorHandler().InternalError(w, r, err)
return