Merge pull request #59 from containerish/cleanup

fix: initial user signup fix
containerish · Nov 2, 2021 · ac6a928 · ac6a928
2 parents b107b4b + 6fde7ff
commit ac6a928
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/auth/signup.go b/auth/signup.go
@@ -160,7 +160,6 @@ func (a *auth) SignUp(ctx echo.Context) error {
 	if err := u.Validate(a.store); err != nil {
 		return ctx.JSON(http.StatusBadRequest, echo.Map{
 			"error": err.Error(),
-			"msg":   "bananas",
 		})
 	}
 

diff --git a/cache/register_for_beta.go b/cache/register_for_beta.go
@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"regexp"
 
+	"github.com/dgraph-io/badger/v3"
 	"github.com/labstack/echo/v4"
 )
 
@@ -59,17 +60,19 @@ func (ds *dataStore) RegisterForBeta(ctx echo.Context) error {
 	key := []byte("email")
 	var value BetaRegister
 	list, err := ds.Get([]byte("email"))
-
-	if err != nil {
+	if err != nil || err == badger.ErrKeyNotFound {
 		value.Emails = []string{body["email"]}
 		if err := ds.Set(key, value.Bytes()); err != nil {
 			return ctx.JSON(http.StatusInternalServerError, echo.Map{
 				"error": err.Error(),
 			})
 		}
+		return ctx.JSON(http.StatusOK, echo.Map{
+			"message": "Success",
+		})
 	}
 
-	if err := json.Unmarshal(list, &value); err != nil {
+	if err = json.Unmarshal(list, &value); err != nil {
 		return ctx.JSON(http.StatusInternalServerError, echo.Map{
 			"error": err.Error(),
 		})
@@ -97,10 +100,11 @@ func (ds *dataStore) RegisterForBeta(ctx echo.Context) error {
 
 func (ds *dataStore) GetAllEmail(ctx echo.Context) error {
 	bz, err := ds.Get([]byte("email"))
-	if err != nil {
+	if err != nil && err != badger.ErrKeyNotFound {
 		return ctx.JSON(http.StatusInternalServerError, echo.Map{
 			"error": "couldn't get them all",
 		})
 	}
+
 	return ctx.JSONBlob(http.StatusOK, bz)
 }