better handling if account is partially signed up

Author: tbocek

controller.go

@@ -317,6 +317,9 @@ func signup(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
+	//check if user exists than was not activated yet. In that case, resend the email and don't try to insert
+	//the user, as this would fail due to constraints
+
 	err = insertUser(cred.Email, calcPw, emailToken, refreshToken, flowType, timeNow())
 	if err != nil {
 		writeErr(w, http.StatusBadRequest, "invalid_request", "blocked", "ERR-signup-07, insert user failed: %v", err)

db.go

@@ -55,8 +55,11 @@ func insertUser(email string, pwRaw []byte, emailToken string, refreshToken stri
 		s1 := base32.StdEncoding.EncodeToString(pwRaw)
 		pw = &s1
 	}
-	stmt, err := db.Prepare(`INSERT INTO auth (email, password, email_token, refresh_token, flow_type, created_at) 
-								   VALUES ($1, $2, $3, $4, $5, $6)`)
+	stmt, err := db.Prepare(`INSERT INTO auth as a (email, password, email_token, refresh_token, flow_type, created_at) 
+								   VALUES ($1, $2, $3, $4, $5, $6)
+								   ON CONFLICT (email) DO
+								     UPDATE SET password=$2, email_token = $3
+								     WHERE a.email_token IS NOT NULL`)
 	if err != nil {
 		return fmt.Errorf("prepare INSERT INTO auth for %v statement failed: %v", email, err)
 	}

main_test.go

@@ -65,25 +65,22 @@ func TestSignupWrongEmail(t *testing.T) {
 	shutdown()
 }
 
-func TestSignupTwice(t *testing.T) {
+func TestSignupTwiceWorking(t *testing.T) {
 	shutdown := mainTest(testParams...)
 	resp := doSignup("[email protected]", "testtest")
-	resp.Body.Close()
 	resp = doSignup("[email protected]", "testtest")
 
-	bodyBytes, _ := ioutil.ReadAll(resp.Body)
-	bodyString := string(bodyBytes)
-
-	assert.Equal(t, http.StatusBadRequest, resp.StatusCode)
-	assert.True(t, strings.Index(bodyString, "ERR-signup-07") > 0)
+	assert.Equal(t, http.StatusOK, resp.StatusCode)
 
 	resp.Body.Close()
 	shutdown()
 }
 
-func TestSignupWrong(t *testing.T) {
+func TestSignupTwiceNotWorking(t *testing.T) {
 	shutdown := mainTest(testParams...)
 	resp := doSignup("[email protected]", "testtest")
+	token := token("[email protected]")
+	resp = doConfirm("[email protected]", token)
 	resp = doSignup("[email protected]", "testtest")
 
 	bodyBytes, _ := ioutil.ReadAll(resp.Body)