Changes based on PR review

Author: nkshah2

recipe/dashboard/api/utils.go

@@ -64,8 +64,10 @@ func GetUserForRecipeId(userId string, recipeId string) (user dashboardmodels.Us
 			userToReturn.FirstName = ""
 			userToReturn.LastName = ""
 			userToReturn.Email = response.Email
-			userToReturn.ThirdParty.Id = response.ThirdParty.ID
-			userToReturn.ThirdParty.UserId = response.ThirdParty.UserID
+			userToReturn.ThirdParty = &dashboardmodels.ThirdParty{
+				Id: response.ThirdParty.ID,
+				UserId: response.ThirdParty.UserID,
+			}
 		}
 
 		if userToReturn == (dashboardmodels.UserType{}) {
@@ -77,8 +79,10 @@ func GetUserForRecipeId(userId string, recipeId string) (user dashboardmodels.Us
 				userToReturn.FirstName = ""
 				userToReturn.LastName = ""
 				userToReturn.Email = tpepResponse.Email
-				userToReturn.ThirdParty.Id = tpepResponse.ThirdParty.ID
-				userToReturn.ThirdParty.UserId = tpepResponse.ThirdParty.UserID
+				userToReturn.ThirdParty = &dashboardmodels.ThirdParty{
+					Id: tpepResponse.ThirdParty.ID,
+					UserId: tpepResponse.ThirdParty.UserID,
+				}
 			}
 		}
 	} else if recipeId == passwordless.RECIPE_ID {
@@ -133,9 +137,9 @@ func IsRecipeInitialised(recipeId string) bool {
 		}
 
 		if !isRecipeInitialised {
-			_, tpepErr := thirdpartyemailpassword.GetRecipeInstanceOrThrowError()
+			_, err := thirdpartyemailpassword.GetRecipeInstanceOrThrowError()
 
-			if tpepErr == nil {
+			if err == nil {
 				isRecipeInitialised = true
 			}
 		}
@@ -147,9 +151,9 @@ func IsRecipeInitialised(recipeId string) bool {
 		}
 
 		if !isRecipeInitialised {
-			_, tppErr := thirdpartypasswordless.GetRecipeInstanceOrThrowError()
+			_, err := thirdpartypasswordless.GetRecipeInstanceOrThrowError()
 
-			if tppErr == nil {
+			if err == nil {
 				isRecipeInitialised = true
 			}
 		}
@@ -161,17 +165,17 @@ func IsRecipeInitialised(recipeId string) bool {
 		}
 
 		if !isRecipeInitialised {
-			_, tpepErr := thirdpartyemailpassword.GetRecipeInstanceOrThrowError()
+			_, err := thirdpartyemailpassword.GetRecipeInstanceOrThrowError()
 
-			if tpepErr == nil {
+			if err == nil {
 				isRecipeInitialised = true
 			}
 		}
 
 		if !isRecipeInitialised {
-			_, tpepErr := thirdpartypasswordless.GetRecipeInstanceOrThrowError()
+			_, err := thirdpartypasswordless.GetRecipeInstanceOrThrowError()
 
-			if tpepErr == nil {
+			if err == nil {
 				isRecipeInitialised = true
 			}
 		}

recipe/dashboard/dashboardmodels/models.go

@@ -31,8 +31,8 @@ type OverrideStruct struct {
 }
 
 type ThirdParty struct {
-	Id     string `json:"id,omitempty"`
-	UserId string `json:"userId,omitempty"`
+	Id     string `json:"id"`
+	UserId string `json:"userId"`
 }
 
 type UserType struct {
@@ -41,6 +41,6 @@ type UserType struct {
 	FirstName  string     `json:"firstName,omitempty"`
 	LastName   string     `json:"lastName,omitempty"`
 	Email      string     `json:"email,omitempty"`
-	ThirdParty ThirdParty `json:"thirdParty,omitempty"`
+	ThirdParty *ThirdParty `json:"thirdParty,omitempty"`
 	Phone      string     `json:"phoneNumber,omitempty"`
 }