feat(invite): progress on invite feature, #2353

pkg/api/api.go

@@ -22,7 +22,7 @@ func Register(r *macaron.Macaron) {
 	r.Post("/login", bind(dtos.LoginCommand{}), wrap(LoginPost))
 	r.Get("/login/:name", OAuthLogin)
 	r.Get("/login", LoginView)
-	r.Get("/invite", Index)
+	r.Get("/invite/:code", Index)
 
 	// authed views
 	r.Get("/profile/", reqSignedIn, Index)

pkg/api/dtos/invite.go

@@ -10,9 +10,10 @@ type AddInviteForm struct {
 }
 
 type InviteInfo struct {
-	Email    string `json:"email"`
-	Name     string `json:"name"`
-	Username string `json:"username"`
+	Email     string `json:"email"`
+	Name      string `json:"name"`
+	Username  string `json:"username"`
+	InvitedBy string `json:"invitedBy"`
 }
 
 type CompleteInviteForm struct {

pkg/api/org_invite.go

@@ -78,7 +78,7 @@ func AddOrgInvite(c *middleware.Context, inviteDto dtos.AddInviteForm) Response
 				"OrgName":     c.OrgName,
 				"Email":       c.Email,
 				"LinkUrl":     setting.ToAbsUrl("invite/" + cmd.Code),
-				"InvitedBy":   util.StringsFallback2(c.Name, c.Email),
+				"InvitedBy":   util.StringsFallback3(c.Name, c.Email, c.Login),
 			},
 		}
 
@@ -114,13 +114,14 @@ func GetInviteInfoByCode(c *middleware.Context) Response {
 		return ApiError(500, "Failed to get invite", err)
 	}
 
-	info := dtos.InviteInfo{
-		Email:    query.Result.Email,
-		Name:     query.Result.Name,
-		Username: query.Result.Email,
-	}
+	invite := query.Result
 
-	return Json(200, &info)
+	return Json(200, dtos.InviteInfo{
+		Email:     invite.Email,
+		Name:      invite.Name,
+		Username:  invite.Email,
+		InvitedBy: util.StringsFallback3(invite.InvitedByName, invite.InvitedByLogin, invite.InvitedByEmail),
+	})
 }
 
 func CompleteInvite(c *middleware.Context, completeInvite dtos.CompleteInviteForm) Response {