feat(signup): began work on new / alternate signup flow that includes email verification, #2353

pkg/api/dtos/user.go

@@ -1,5 +1,9 @@
 package dtos
 
+type SignUpForm struct {
+	Email string `json:"email" binding:"Required"`
+}
+
 type AdminCreateUserForm struct {
 	Email    string `json:"email"`
 	Login    string `json:"login"`

pkg/api/org_invite.go

@@ -171,7 +171,7 @@ func CompleteInvite(c *middleware.Context, completeInvite dtos.CompleteInviteFor
 
 	user := cmd.Result
 
-	bus.Publish(&events.UserSignedUp{
+	bus.Publish(&events.SignUpCompleted{
 		Id:    user.Id,
 		Name:  user.Name,
 		Email: user.Email,
@@ -199,7 +199,7 @@ func CompleteInvite(c *middleware.Context, completeInvite dtos.CompleteInviteFor
 
 	loginUserWithUser(&user, c)
 
-	metrics.M_Api_User_SignUp.Inc(1)
+	metrics.M_Api_User_SignUpCompleted.Inc(1)
 	metrics.M_Api_User_SignUpInvite.Inc(1)
 
 	return ApiSuccess("User created and logged in")

pkg/api/signup.go

@@ -1,38 +1,48 @@
 package api
 
 import (
+	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/events"
 	"github.com/grafana/grafana/pkg/metrics"
 	"github.com/grafana/grafana/pkg/middleware"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util"
 )
 
 // POST /api/user/signup
-func SignUp(c *middleware.Context, cmd m.CreateUserCommand) Response {
+func SignUp(c *middleware.Context, form dtos.SignUpForm) Response {
 	if !setting.AllowUserSignUp {
 		return ApiError(401, "User signup is disabled", nil)
 	}
 
-	cmd.Login = cmd.Email
-
-	if err := bus.Dispatch(&cmd); err != nil {
-		return ApiError(500, "failed to create user", err)
+	existing := m.GetUserByLoginQuery{LoginOrEmail: form.Email}
+	if err := bus.Dispatch(&existing); err == nil {
+		return ApiError(401, "User with same email address already exists", nil)
 	}
 
-	user := cmd.Result
+	cmd := m.CreateTempUserCommand{}
+	cmd.OrgId = -1
+	cmd.Email = form.Email
+	cmd.Status = m.TmpUserSignUpStarted
+	cmd.InvitedByUserId = c.UserId
+	cmd.Code = util.GetRandomString(10)
+	cmd.RemoteAddr = c.Req.RemoteAddr
 
-	bus.Publish(&events.UserSignedUp{
-		Id:    user.Id,
-		Name:  user.Name,
-		Email: user.Email,
-		Login: user.Login,
-	})
+	if err := bus.Dispatch(&cmd); err != nil {
+		return ApiError(500, "Failed to create signup", err)
+	}
 
-	loginUserWithUser(&user, c)
+	// user := cmd.Resu
 
-	metrics.M_Api_User_SignUp.Inc(1)
+	bus.Publish(&events.UserSignedUp{Email: form.Email})
 
+	//
+	// loginUserWithUser(&user, c)
+	//
+	//
+
+	metrics.M_Api_User_SignUpStarted.Inc(1)
 	return ApiSuccess("User created and logged in")
 }