From 83304691c74232943c181f63644f0fa3885ea116 Mon Sep 17 00:00:00 2001
From: Enda Phelan <ephelan@redhat.com>
Date: Mon, 12 Apr 2021 11:48:58 +0100
Subject: [PATCH] fix: MAS-SSO token refresh was not enabled

The MAS-SSO token refresh logic was commented out.
This likely happened by a mistake.
---
 pkg/connection/keycloak_connection.go | 34 +++++++++++++--------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkg/connection/keycloak_connection.go b/pkg/connection/keycloak_connection.go
index 441c740e8..302436aed 100644
--- a/pkg/connection/keycloak_connection.go
+++ b/pkg/connection/keycloak_connection.go
@@ -94,23 +94,23 @@ func (c *KeycloakConnection) RefreshTokens(ctx context.Context) (err error) {
 		}
 	}
 
-	// if c.connectionConfig.RequireMASAuth {
-	// 	// nolint:govet
-	// 	refreshedMasTk, err := c.masKeycloakClient.RefreshToken(ctx, c.MASToken.RefreshToken, c.clientID, "", c.masRealm)
-	// 	if err != nil {
-	// 		return &MasAuthError{err}
-	// 	}
-	// 	if refreshedMasTk.AccessToken != c.MASToken.AccessToken {
-	// 		c.MASToken.AccessToken = refreshedMasTk.AccessToken
-	// 		cfg.MasAccessToken = refreshedMasTk.AccessToken
-	// 		cfgChanged = true
-	// 	}
-	// 	if refreshedMasTk.RefreshToken != c.MASToken.RefreshToken {
-	// 		c.MASToken.RefreshToken = refreshedMasTk.RefreshToken
-	// 		cfg.MasRefreshToken = refreshedMasTk.RefreshToken
-	// 		cfgChanged = true
-	// 	}
-	// }
+	if c.connectionConfig.RequireMASAuth {
+		// nolint:govet
+		refreshedMasTk, err := c.masKeycloakClient.RefreshToken(ctx, c.MASToken.RefreshToken, c.clientID, "", c.masRealm)
+		if err != nil {
+			return &MasAuthError{err}
+		}
+		if refreshedMasTk.AccessToken != c.MASToken.AccessToken {
+			c.MASToken.AccessToken = refreshedMasTk.AccessToken
+			cfg.MasAccessToken = refreshedMasTk.AccessToken
+			cfgChanged = true
+		}
+		if refreshedMasTk.RefreshToken != c.MASToken.RefreshToken {
+			c.MASToken.RefreshToken = refreshedMasTk.RefreshToken
+			cfg.MasRefreshToken = refreshedMasTk.RefreshToken
+			cfgChanged = true
+		}
+	}
 
 	if !cfgChanged {
 		return nil