From 32eb22e0c6123f710faabbb9a0336fba97d2314f Mon Sep 17 00:00:00 2001
From: Harshavardhana <harsha@minio.io>
Date: Sun, 27 Jan 2019 22:12:30 -0800
Subject: [PATCH] Make sure Token and Expiry can be set properly (#1067)

---
 pkg/credentials/sts_client_grants.go | 19 ++++---------------
 pkg/credentials/sts_web_identity.go  | 19 ++++---------------
 2 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/pkg/credentials/sts_client_grants.go b/pkg/credentials/sts_client_grants.go
index f0a4e8d2c..0ca307ab8 100644
--- a/pkg/credentials/sts_client_grants.go
+++ b/pkg/credentials/sts_client_grants.go
@@ -60,19 +60,8 @@ type ClientGrantsResult struct {
 
 // ClientGrantsToken - client grants token with expiry.
 type ClientGrantsToken struct {
-	token  string
-	expiry int
-}
-
-// Token - access token returned after authenticating client grants.
-func (c *ClientGrantsToken) Token() string {
-	return c.token
-}
-
-// Expiry - expiry for the access token returned after authenticating
-// client grants.
-func (c *ClientGrantsToken) Expiry() string {
-	return fmt.Sprintf("%d", c.expiry)
+	Token  string
+	Expiry int
 }
 
 // A STSClientGrants retrieves credentials from Minio service, and keeps track if
@@ -123,8 +112,8 @@ func getClientGrantsCredentials(clnt *http.Client, endpoint string,
 
 	v := url.Values{}
 	v.Set("Action", "AssumeRoleWithClientGrants")
-	v.Set("Token", accessToken.Token())
-	v.Set("DurationSeconds", accessToken.Expiry())
+	v.Set("Token", accessToken.Token)
+	v.Set("DurationSeconds", fmt.Sprintf("%d", accessToken.Expiry))
 	v.Set("Version", "2011-06-15")
 
 	u, err := url.Parse(endpoint)
diff --git a/pkg/credentials/sts_web_identity.go b/pkg/credentials/sts_web_identity.go
index d924b16c7..81a488711 100644
--- a/pkg/credentials/sts_web_identity.go
+++ b/pkg/credentials/sts_web_identity.go
@@ -53,19 +53,8 @@ type WebIdentityResult struct {
 
 // WebIdentityToken - web identity token with expiry.
 type WebIdentityToken struct {
-	token  string
-	expiry int
-}
-
-// Token - access token returned after authenticating web identity.
-func (c *WebIdentityToken) Token() string {
-	return c.token
-}
-
-// Expiry - expiry for the access token returned after authenticating
-// web identity.
-func (c *WebIdentityToken) Expiry() string {
-	return fmt.Sprintf("%d", c.expiry)
+	Token  string
+	Expiry int
 }
 
 // A STSWebIdentity retrieves credentials from Minio service, and keeps track if
@@ -115,8 +104,8 @@ func getWebIdentityCredentials(clnt *http.Client, endpoint string,
 
 	v := url.Values{}
 	v.Set("Action", "AssumeRoleWithWebIdentity")
-	v.Set("WebIdentityToken", idToken.Token())
-	v.Set("DurationSeconds", idToken.Expiry())
+	v.Set("WebIdentityToken", idToken.Token)
+	v.Set("DurationSeconds", fmt.Sprintf("%d", idToken.Expiry))
 	v.Set("Version", "2011-06-15")
 
 	u, err := url.Parse(endpoint)