Merge pull request #322 from memphisdev/signup-endpoint

add full name in response
superstreamlabs · Sep 4, 2022 · 7632774 · 7632774
2 parents 43f8e57 + 7bf4706
commit 7632774
Showing 1 changed file with 33 additions and 31 deletions.
diff --git a/server/memphis_handlers_user_mgmt.go b/server/memphis_handlers_user_mgmt.go
@@ -310,7 +310,6 @@ func (umh UserMgmtHandler) Login(c *gin.Context) {
 	if !ok {
 		return
 	}
-
 	username := strings.ToLower(body.Username)
 	authenticated, user, err := authenticateUser(username, body.Password)
 	if err != nil {
@@ -364,6 +363,7 @@ func (umh UserMgmtHandler) Login(c *gin.Context) {
 		"send_analytics":    shouldSendAnalytics,
 		"env":               env,
 		"namespace":         configuration.K8S_NAMESPACE,
+		"full_name":         user.FullName,
 	})
 }
 
@@ -418,6 +418,7 @@ func (umh UserMgmtHandler) RefreshToken(c *gin.Context) {
 		"send_analytics":    sendAnalytics,
 		"env":               env,
 		"namespace":         configuration.K8S_NAMESPACE,
+		"full_name":		 user.FullName,
 	})
 }
 
@@ -477,38 +478,38 @@ func (umh UserMgmtHandler) AddUserSignUp(c *gin.Context) {
 		mailchimpList, err := mailchimpClient.GetList(mailchimpListID, nil)
 		if err != nil {
 			serv.Debugf("getList in mailchimp error: " + err.Error())
-		}
-
-		mailchimpReq := &gochimp3.MemberRequest{
-			EmailAddress: username,
-			Status:       "subscribed",
-			Tags:         tag,
-		}
-		_, err = mailchimpList.CreateMember(mailchimpReq)
-		if err != nil {
-			data, err := json.Marshal(err)
-			if err != nil {
-				serv.Debugf("Error: " + err.Error())
-			}
-			var mailChimpErr MailChimpErr
-			if err = json.Unmarshal([]byte(data), &mailChimpErr); err != nil {
-				serv.Debugf("Error: " + err.Error())
+		}else{
+			mailchimpReq := &gochimp3.MemberRequest{
+				EmailAddress: username,
+				Status:       "subscribed",
+				Tags:         tag,
 			}
-			mailChimpReqSearch := &gochimp3.SearchMembersQueryParams{
-				Query: body.Username,
-			}
-			if data != nil {
-				if mailChimpErr.Title == "Member Exists" && mailChimpErr.Status == 400 {
-					res, err := mailchimpList.SearchMembers(mailChimpReqSearch)
-					if err != nil {
-						serv.Debugf("Failed to search member in mailChimp: " + err.Error())
-					}
-					_, err = mailchimpList.UpdateMember(res.ExactMatches.Members[0].ID, mailchimpReq)
-					if err != nil {
-						serv.Debugf("Failed to update member in mailChimp: " + err.Error())
+			_, err = mailchimpList.CreateMember(mailchimpReq)
+			if err != nil {
+				data, err := json.Marshal(err)
+				if err != nil {
+					serv.Debugf("Error: " + err.Error())
+				}
+				var mailChimpErr MailChimpErr
+				if err = json.Unmarshal([]byte(data), &mailChimpErr); err != nil {
+					serv.Debugf("Error: " + err.Error())
+				}
+				mailChimpReqSearch := &gochimp3.SearchMembersQueryParams{
+					Query: body.Username,
+				}
+				if data != nil {
+					if mailChimpErr.Title == "Member Exists" && mailChimpErr.Status == 400 {
+						res, err := mailchimpList.SearchMembers(mailChimpReqSearch)
+						if err != nil {
+							serv.Debugf("Failed to search member in mailChimp: " + err.Error())
+						}
+						_, err = mailchimpList.UpdateMember(res.ExactMatches.Members[0].ID, mailchimpReq)
+						if err != nil {
+							serv.Debugf("Failed to update member in mailChimp: " + err.Error())
+						}
+					} else{
+						serv.Debugf("Failed to subscribe in mailChimp: " + err.Error())
 					}
-				} else {
-					serv.Debugf("Failed to subscribe in mailChimp: " + err.Error())
 				}
 			}
 		}
@@ -566,6 +567,7 @@ func (umh UserMgmtHandler) AddUserSignUp(c *gin.Context) {
 			"send_analytics":    shouldSendAnalytics,
 			"env":               env,
 			"namespace":         configuration.K8S_NAMESPACE,
+			"full_name":         newUser.FullName,
 		})
 
 	}