Cache /userinfo for a bit

1 files changed, 9 insertions, 1 deletions

diff --git a/pkg/auth/oidc.go b/pkg/auth/oidc.go
index 674332e..e8afdd3 100644
--- a/pkg/auth/oidc.go
+++ b/pkg/auth/oidc.go
@@ -137,9 +137,16 @@ func (p *OIDCAuthProvider) CompleteJourney(ctx context.Context, authCode string,
 }
 
 func (p *OIDCAuthProvider) UpdateUserInfo(ctx context.Context, session *session.UserSession) error {
+	session.UserInfoMutex.Lock()
+	defer session.UserInfoMutex.Unlock()
+
+	if session.TeamID != "" && session.TeamName != "" && session.UserInfoExpires.Unix() > time.Now().Unix() {
+		return nil
+	}
+
 	userInfo, err := p.oidcProvider.UserInfo(ctx, session.OAuthTokenSource)
 	if err != nil {
-		return ErrInvalidToken
+		return err
 	}
 
 	var claims struct {
@@ -157,6 +164,7 @@ func (p *OIDCAuthProvider) UpdateUserInfo(ctx context.Context, session *session.
 	session.Name = claims.Name
 	session.TeamID = claims.TeamID
 	session.TeamName = claims.TeamName
+	session.UserInfoExpires = time.Now().Add(1 * time.Minute)
 
 	return nil
 }