Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add full name in response #322

Merged
merged 4 commits into from
Sep 4, 2022
Merged

add full name in response #322

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ef9f4c
add full name in response
shohamroditimemphis Sep 4, 2022
827b699
fix error 500 in mailchimp
shohamroditimemphis Sep 4, 2022
cca4269
add full name to RefreshToken
shohamroditimemphis Sep 4, 2022
7bf4706
Merge branch 'the-new-memphis' of https://github.com/memphisdev/memph…
shohamroditimemphis Sep 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
64 changes: 33 additions & 31 deletions server/memphis_handlers_user_mgmt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -364,6 +363,7 @@ func (umh UserMgmtHandler) Login(c *gin.Context) {
"send_analytics": shouldSendAnalytics,
"env": env,
"namespace": configuration.K8S_NAMESPACE,
"full_name": user.FullName,
})
}

Expand Down Expand Up @@ -418,6 +418,7 @@ func (umh UserMgmtHandler) RefreshToken(c *gin.Context) {
"send_analytics": sendAnalytics,
"env": env,
"namespace": configuration.K8S_NAMESPACE,
"full_name": user.FullName,
})
}

Expand Down Expand Up @@ -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())
}
}
}
Expand Down Expand Up @@ -566,6 +567,7 @@ func (umh UserMgmtHandler) AddUserSignUp(c *gin.Context) {
"send_analytics": shouldSendAnalytics,
"env": env,
"namespace": configuration.K8S_NAMESPACE,
"full_name": newUser.FullName,
})

}
Expand Down