Add input flag to GetToken

Signed-off-by: Ikoh Obaro <obaro.ikohpgs@stu.cu.edu.ng>

Author: obaroikoh

affiliation/identity.go

@@ -17,6 +17,11 @@ var (
 	emailRegex = regexp.MustCompile("^[a-zA-Z0-9.!#$%&'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$")
 )
 
+const (
+	TRUE  = true
+	FALSE = false
+)
+
 // Affiliations interface
 type Affiliations interface {
 	AddIdentity(identity *Identity) bool
@@ -42,7 +47,7 @@ type SlackProvider interface {
 
 // Auth0ClientProvider ...
 type Auth0ClientProvider interface {
-	GetToken() (string, error)
+	GetToken(input bool) (string, error)
 }
 
 // Affiliation struct
@@ -81,7 +86,7 @@ func (a *Affiliation) AddIdentity(identity *Identity) bool {
 		log.Println("AddIdentity: Identity is nil")
 		return false
 	}
-	token, err := a.auth0ClientProvider.GetToken()
+	token, err := a.auth0ClientProvider.GetToken(TRUE)
 	if err != nil {
 		log.Println(err)
 	}
@@ -128,7 +133,7 @@ func (a *Affiliation) GetIdentity(uuid string) *Identity {
 		log.Println("GetIdentity: uuid is empty")
 		return nil
 	}
-	token, err := a.auth0ClientProvider.GetToken()
+	token, err := a.auth0ClientProvider.GetToken(TRUE)
 	if err != nil {
 		log.Println(err)
 	}
@@ -156,7 +161,7 @@ func (a *Affiliation) GetOrganizations(uuid, projectSlug string) *[]Enrollment {
 	if uuid == "" || projectSlug == "" {
 		return nil
 	}
-	token, err := a.auth0ClientProvider.GetToken()
+	token, err := a.auth0ClientProvider.GetToken(TRUE)
 	if err != nil {
 		log.Println(err)
 	}
@@ -201,7 +206,7 @@ func (a *Affiliation) GetProfile(uuid, projectSlug string) *ProfileResponse {
 	if uuid == "" || projectSlug == "" {
 		return nil
 	}
-	token, err := a.auth0ClientProvider.GetToken()
+	token, err := a.auth0ClientProvider.GetToken(TRUE)
 	if err != nil {
 		log.Println(err)
 	}
@@ -231,7 +236,7 @@ func (a *Affiliation) GetIdentityByUser(key string, value string) (*AffIdentity,
 		nilKeyOrValueErr := "GetIdentityByUser: key or value is null"
 		return nil, fmt.Errorf(nilKeyOrValueErr)
 	}
-	token, err := a.auth0ClientProvider.GetToken()
+	token, err := a.auth0ClientProvider.GetToken(TRUE)
 	if err != nil {
 		log.Println(err)
 		return nil, err
@@ -341,7 +346,7 @@ func (a *Affiliation) GetProfileByUsername(username string, projectSlug string)
 		return nil, fmt.Errorf(nilKeyOrValueErr)
 	}
 
-	token, err := a.auth0ClientProvider.GetToken()
+	token, err := a.auth0ClientProvider.GetToken(FALSE)
 	if err != nil {
 		log.Println(err)
 		return nil, err

auth0/token.go

@@ -4,11 +4,12 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/LF-Engineering/dev-analytics-libraries/elastic"
 	"log"
 	"strings"
 	"time"
 
+	"github.com/LF-Engineering/dev-analytics-libraries/elastic"
+
 	"github.com/dgrijalva/jwt-go"
 )
 
@@ -74,7 +75,7 @@ func NewAuth0Client(env,
 }
 
 // GetToken ...
-func (a *ClientProvider) GetToken() (string, error) {
+func (a *ClientProvider) GetToken(input bool) (string, error) {
 	authToken, err := a.getCachedToken()
 	if err != nil {
 		log.Println(err)
@@ -84,14 +85,21 @@ func (a *ClientProvider) GetToken() (string, error) {
 	if authToken == "" {
 		return authToken, errors.New("cached token is empty")
 	}
+	if input {
+		// check token validity
+		ok, _, err := a.isValid(authToken)
+		if err != nil {
+			log.Println(err)
+			return "", err
+		}
 
-	// check token validity
-	ok, _, err := a.isValid(authToken)
-	if ok {
-		return authToken, nil
-	}
+		if ok {
+			return authToken, nil
+		}
 
-	return authToken, errors.New("cached token is not valid")
+		return authToken, errors.New("cached token is not valid")
+	}
+	return authToken, nil
 }
 
 func (a *ClientProvider) generateToken() (string, error) {

orgs/mocks/auth0_client_provider.go

@@ -15,9 +15,13 @@ import (
 	"github.com/LF-Engineering/dev-analytics-libraries/http"
 )
 
+const (
+	TRUE = true
+)
+
 // Auth0ClientProvider ...
 type Auth0ClientProvider interface {
-	GetToken() (string, error)
+	GetToken(input bool) (string, error)
 }
 
 // HTTPClientProvider ...
@@ -62,7 +66,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()
+	token, err := o.auth0Client.GetToken(TRUE)
 	if err != nil {
 		log.Println(err)
 		return nil, err
@@ -98,7 +102,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()
+	token, err := o.auth0Client.GetToken(TRUE)
 	if err != nil {
 		log.Println(err)
 		return nil, err

orgs/organization.go

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