diff options
Diffstat (limited to 'internal/oidc')
| -rw-r--r-- | internal/oidc/handlecallback.go | 3 | ||||
| -rw-r--r-- | internal/oidc/idp.go | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/internal/oidc/handlecallback.go b/internal/oidc/handlecallback.go index 2fbdc9309..98a6b0669 100644 --- a/internal/oidc/handlecallback.go +++ b/internal/oidc/handlecallback.go @@ -22,10 +22,11 @@ import ( "context" "errors" "fmt" + "github.com/sirupsen/logrus" ) func (i *idp) HandleCallback(ctx context.Context, code string) (*Claims, error) { - l := i.log.WithField("func", "HandleCallback") + l := logrus.WithField("func", "HandleCallback") if code == "" { return nil, errors.New("code was empty string") } diff --git a/internal/oidc/idp.go b/internal/oidc/idp.go index 9a615997c..3032d15d5 100644 --- a/internal/oidc/idp.go +++ b/internal/oidc/idp.go @@ -23,7 +23,6 @@ import ( "fmt" "github.com/coreos/go-oidc/v3/oidc" - "github.com/sirupsen/logrus" "github.com/superseriousbusiness/gotosocial/internal/config" "golang.org/x/oauth2" ) @@ -49,14 +48,13 @@ type idp struct { oauth2Config oauth2.Config provider *oidc.Provider oidcConf *oidc.Config - log *logrus.Logger } -// NewIDP returns a new IDP configured with the given config and logger. +// NewIDP returns a new IDP configured with the given config. // If the passed config contains a nil value for the OIDCConfig, or OIDCConfig.Enabled // is set to false, then nil, nil will be returned. If OIDCConfig.Enabled is true, // then the other OIDC config fields must also be set. -func NewIDP(ctx context.Context, config *config.Config, log *logrus.Logger) (IDP, error) { +func NewIDP(ctx context.Context, config *config.Config) (IDP, error) { // oidc isn't enabled so we don't need to do anything if config.OIDCConfig == nil || !config.OIDCConfig.Enabled { @@ -116,6 +114,5 @@ func NewIDP(ctx context.Context, config *config.Config, log *logrus.Logger) (IDP oauth2Config: oauth2Config, oidcConf: oidcConf, provider: provider, - log: log, }, nil } |