DA-4596: remove original code to have param for validating token

Signed-off-by: Ajinkya Nahar <[email protected]>

Author: Ajinkya Nahar

auth0/token.go

@@ -75,7 +75,7 @@ func NewAuth0Client(env,
 }
 
 // GetToken ...
-func (a *ClientProvider) GetToken(input bool) (string, error) {
+func (a *ClientProvider) GetToken() (string, error) {
 	authToken, err := a.getCachedToken()
 	if err != nil {
 		log.Println(err)
@@ -86,22 +86,13 @@ func (a *ClientProvider) GetToken(input bool) (string, error) {
 		return authToken, errors.New("cached token is empty")
 	}
 
-	if input {
-		// check token validity
-		ok, _, err := a.isValid(authToken, false)
-		if err != nil {
-			log.Println(err)
-			return "", err
-		}
-
-		if ok {
-			return authToken, nil
-		}
-
-		return authToken, errors.New("cached token is not valid")
+	// check token validity
+	ok, _, err := a.isValid(authToken, false)
+	if ok && err == nil {
+		return authToken, nil
 	}
 
-	return authToken, nil
+	return authToken, errors.New("cached token is not valid")
 }
 
 func (a *ClientProvider) generateToken() (string, error) {

orgs/mocks/auth0_client_provider.go

@@ -17,7 +17,7 @@ import (
 
 // Auth0ClientProvider ...
 type Auth0ClientProvider interface {
-	GetToken(validateTokenRequired bool) (string, error)
+	GetToken() (string, error)
 }
 
 // HTTPClientProvider ...
@@ -62,7 +62,7 @@ func (o *Org) SearchOrganization(name string, pageSize string, offset string) (*
 		log.Println("SearchOrganization: name param is empty")
 		return nil, errors.New("SearchOrganization: name param is empty")
 	}
-	token, err := o.auth0Client.GetToken(true)
+	token, err := o.auth0Client.GetToken()
 	if err != nil {
 		log.Println(err)
 		return nil, err
@@ -98,7 +98,7 @@ func (o *Org) LookupOrganization(name string) (*Organization, error) {
 		log.Println("LookupOrganization: name param is empty")
 		return nil, errors.New("LookupOrganization: name param is empty")
 	}
-	token, err := o.auth0Client.GetToken(true)
+	token, err := o.auth0Client.GetToken()
 	if err != nil {
 		log.Println(err)
 		return nil, err

orgs/mocks/es_client_provider.go

@@ -17,7 +17,7 @@ import (
 
 // Auth0ClientProvider ...
 type Auth0ClientProvider interface {
-	GetToken(validateTokenRequired bool) (string, error)
+	GetToken() (string, error)
 }
 
 // HTTPClientProvider ...
@@ -58,7 +58,7 @@ type Client struct {
 
 // List ...
 func (u *Client) List(email string, pageSize string, offset string) (*ListResponse, error) {
-	token, err := u.auth0Client.GetToken(true)
+	token, err := u.auth0Client.GetToken()
 	if err != nil {
 		log.Println("users.List", err)
 		return nil, err