From 5544e5f7d58d45670f0e703bf952c4fc7fcd5302 Mon Sep 17 00:00:00 2001 From: Guy Lewin Date: Thu, 20 Feb 2020 18:10:23 +0200 Subject: [PATCH] style: export shared logic from SetLogin and SetPing to a common generateAccessToken() method in oidc.go --- models/auth/oidc.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/models/auth/oidc.go b/models/auth/oidc.go index 35c2c1e3..fb68a96e 100644 --- a/models/auth/oidc.go +++ b/models/auth/oidc.go @@ -43,13 +43,17 @@ func NewOidcAuthSetter(clientId string, clientSecret string, audience string, to } } -func (auth *OidcAuthProvider) SetLogin(loginMsg *msg.Login) (err error) { +func (auth *OidcAuthProvider) generateAccessToken() (accessToken string, err error) { tokenObj, err := auth.tokenGenerator.Token(context.Background()) if err != nil { - return fmt.Errorf("couldn't generate OIDC token for login: %v", err) + return "", fmt.Errorf("couldn't generate OIDC token for login: %v", err) } - loginMsg.PrivilegeKey = tokenObj.AccessToken - return nil + return tokenObj.AccessToken, nil +} + +func (auth *OidcAuthProvider) SetLogin(loginMsg *msg.Login) (err error) { + loginMsg.PrivilegeKey, err = auth.generateAccessToken() + return err } func (auth *OidcAuthProvider) SetPing(pingMsg *msg.Ping) (err error) { @@ -57,12 +61,8 @@ func (auth *OidcAuthProvider) SetPing(pingMsg *msg.Ping) (err error) { return nil } - tokenObj, err := auth.tokenGenerator.Token(context.Background()) - if err != nil { - return fmt.Errorf("couldn't generate OIDC token for ping: %v", err) - } - pingMsg.PrivilegeKey = tokenObj.AccessToken - return nil + pingMsg.PrivilegeKey, err = auth.generateAccessToken() + return err } type OidcAuthConsumer struct {