feat(signup): progress on new signup flow, #2353

pkg/api/org_invite.go

@@ -111,13 +111,8 @@ func inviteExistingUserToOrg(c *middleware.Context, user *m.User, inviteDto *dto
 }
 
 func RevokeInvite(c *middleware.Context) Response {
-	cmd := m.UpdateTempUserStatusCommand{
-		Code:   c.Params(":code"),
-		Status: m.TmpUserRevoked,
-	}
-
-	if err := bus.Dispatch(&cmd); err != nil {
-		return ApiError(500, "Failed to update invite status", err)
+	if ok, rsp := updateTempUserStatus(c.Params(":code"), m.TmpUserRevoked); !ok {
+		return rsp
 	}
 
 	return ApiSuccess("Invite revoked")
@@ -169,36 +164,55 @@ func CompleteInvite(c *middleware.Context, completeInvite dtos.CompleteInviteFor
 		return ApiError(500, "failed to create user", err)
 	}
 
-	user := cmd.Result
+	user := &cmd.Result
 
 	bus.Publish(&events.SignUpCompleted{
 		Name:  user.NameOrFallback(),
 		Email: user.Email,
 	})
 
-	// add to org
-	addOrgUserCmd := m.AddOrgUserCommand{OrgId: invite.OrgId, UserId: user.Id, Role: invite.Role}
-	if err := bus.Dispatch(&addOrgUserCmd); err != nil {
-		if err != m.ErrOrgUserAlreadyAdded {
-			return ApiError(500, "Error while trying to create org user", err)
-		}
+	if ok, rsp := applyUserInvite(user, invite, true); !ok {
+		return rsp
 	}
 
-	// set org to active
-	if err := bus.Dispatch(&m.SetUsingOrgCommand{OrgId: invite.OrgId, UserId: user.Id}); err != nil {
-		return ApiError(500, "Failed to set org as active", err)
-	}
-
-	// update temp user status
-	updateTmpUserCmd := m.UpdateTempUserStatusCommand{Code: invite.Code, Status: m.TmpUserCompleted}
-	if err := bus.Dispatch(&updateTmpUserCmd); err != nil {
-		return ApiError(500, "Failed to update invite status", err)
-	}
-
-	loginUserWithUser(&user, c)
+	loginUserWithUser(user, c)
 
 	metrics.M_Api_User_SignUpCompleted.Inc(1)
 	metrics.M_Api_User_SignUpInvite.Inc(1)
 
 	return ApiSuccess("User created and logged in")
 }
+
+func updateTempUserStatus(code string, status m.TempUserStatus) (bool, Response) {
+	// update temp user status
+	updateTmpUserCmd := m.UpdateTempUserStatusCommand{Code: code, Status: status}
+	if err := bus.Dispatch(&updateTmpUserCmd); err != nil {
+		return false, ApiError(500, "Failed to update invite status", err)
+	}
+
+	return true, nil
+}
+
+func applyUserInvite(user *m.User, invite *m.TempUserDTO, setActive bool) (bool, Response) {
+	// add to org
+	addOrgUserCmd := m.AddOrgUserCommand{OrgId: invite.OrgId, UserId: user.Id, Role: invite.Role}
+	if err := bus.Dispatch(&addOrgUserCmd); err != nil {
+		if err != m.ErrOrgUserAlreadyAdded {
+			return false, ApiError(500, "Error while trying to create org user", err)
+		}
+	}
+
+	// update temp user status
+	if ok, rsp := updateTempUserStatus(invite.Code, m.TmpUserCompleted); !ok {
+		return false, rsp
+	}
+
+	if setActive {
+		// set org to active
+		if err := bus.Dispatch(&m.SetUsingOrgCommand{OrgId: invite.OrgId, UserId: user.Id}); err != nil {
+			return false, ApiError(500, "Failed to set org as active", err)
+		}
+	}
+
+	return true, nil
+}

pkg/api/signup.go

@@ -81,20 +81,41 @@ func SignUpStep2(c *middleware.Context, form dtos.SignUpStep2Form) Response {
 		return ApiError(500, "Failed to create user", err)
 	}
 
-	user := createUserCmd.Result
+	// publish signup event
+	user := &createUserCmd.Result
 
 	bus.Publish(&events.SignUpCompleted{
 		Email: user.Email,
 		Name:  user.NameOrFallback(),
 	})
 
+	// update tempuser
+	updateTempUserCmd := m.UpdateTempUserStatusCommand{
+		Code:   tempUser.Code,
+		Status: m.TmpUserCompleted,
+	}
+
+	if err := bus.Dispatch(&updateTempUserCmd); err != nil {
+		return ApiError(500, "Failed to update temp user", err)
+	}
+
 	// check for pending invites
 	invitesQuery := m.GetTempUsersQuery{Email: tempUser.Email, Status: m.TmpUserInvitePending}
 	if err := bus.Dispatch(&invitesQuery); err != nil {
 		return ApiError(500, "Failed to query database for invites", err)
 	}
 
-	loginUserWithUser(&user, c)
+	apiResponse := util.DynMap{"message": "User sign up completed succesfully", "code": "redirect-to-landing-page"}
+
+	for _, invite := range invitesQuery.Result {
+		if ok, rsp := applyUserInvite(user, invite, false); !ok {
+			return rsp
+		}
+		apiResponse["code"] = "redirect-to-select-org"
+	}
+
+	loginUserWithUser(user, c)
 	metrics.M_Api_User_SignUpCompleted.Inc(1)
-	return Json(200, util.DynMap{"status": "SignUpCreated"})
+
+	return Json(200, apiResponse)
 }