Merge pull request #82 from LF-Engineering/username-aff-bug

Fix identity by username bug

Author: Obaro

affiliation/dto.go

@@ -76,6 +76,11 @@ type UniqueIdentityFullProfile struct {
 	UUID        string          `json:"uuid,omitempty"`
 }
 
+// ProfileByUsernameResponse ...
+type ProfileByUsernameResponse struct {
+	Profile []*UniqueIdentityFullProfile `json:"profiles"`
+}
+
 // Enrollments ...
 type Enrollments struct {
 	Organization *Organization `json:"organization,omitempty"`

affiliation/identity.go

@@ -42,7 +42,7 @@ type SlackProvider interface {
 
 // Auth0ClientProvider ...
 type Auth0ClientProvider interface {
-	GetToken() (string, error)
+	GetToken(validateTokenRequired bool) (string, error)
 }
 
 // Affiliation struct
@@ -81,7 +81,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 +128,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 +156,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 +201,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 +231,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 +341,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
@@ -360,28 +360,33 @@ func (a *Affiliation) GetProfileByUsername(username string, projectSlug string)
 		return nil, errors.New("user not found")
 	}
 
-	var profile UniqueIdentityFullProfile
-	err = json.Unmarshal(res, &profile)
+	var response ProfileByUsernameResponse
+	err = json.Unmarshal(res, &response)
 	if err != nil {
 		return nil, err
 	}
+
+	profile := response.Profile[0]
 	var identity AffIdentity
 
 	for _, value := range profile.Identities {
 		if value.Source == "github" {
 			profileIdentity := value
 			identity.UUID = profileIdentity.UUID
-			if profileIdentity.Name != nil {
-				identity.Name = *profileIdentity.Name
-			} else {
-				identity.Name = unknown
-			}
-
 			if profileIdentity.Email != nil {
 				identity.Email = *profileIdentity.Email
 			}
 
 			identity.ID = &profileIdentity.ID
+
+			if profile.Profile != nil {
+				identity.IsBot = profile.Profile.IsBot
+				identity.Name = *profile.Profile.Name
+			} else if profileIdentity.Name != nil {
+				identity.Name = *profileIdentity.Name
+			} else {
+				identity.Name = unknown
+			}
 		}
 	}
 
@@ -393,10 +398,6 @@ func (a *Affiliation) GetProfileByUsername(username string, projectSlug string)
 
 	identity.Username = username
 
-	if profile.Profile != nil {
-		identity.IsBot = profile.Profile.IsBot
-	}
-
 	if profile.Enrollments == nil {
 		identity.OrgName = &unknown
 		identity.MultiOrgNames = make([]string, 0)

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

@@ -17,7 +17,7 @@ import (
 
 // Auth0ClientProvider ...
 type Auth0ClientProvider interface {
-	GetToken() (string, error)
+	GetToken(validateTokenRequired bool) (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()
+	token, err := o.auth0Client.GetToken(true)
 	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()
+	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(validateTokenRequired bool) (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()
+	token, err := u.auth0Client.GetToken(true)
 	if err != nil {
 		log.Println("users.List", err)
 		return nil, err