feat(treasurechest): #64 implement hirarchical treasure chests
This commit was merged in pull request #65.
This commit is contained in:
55
main_test.go
55
main_test.go
@@ -881,35 +881,39 @@ func TestIntegrationAuth(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
db, basePath, ctx := setupIntegrationTest(t)
|
||||
userId := uuid.New()
|
||||
|
||||
pass := service.GetHashPassword("password", []byte("salt"))
|
||||
_, err := db.Exec(`
|
||||
INSERT INTO user (user_id, email, email_verified, is_admin, password, salt, created_at)
|
||||
VALUES (?, "mail@mail.de", FALSE, FALSE, ?, ?, datetime())`, userId, pass, []byte("salt"))
|
||||
userId, csrfToken, sessionId := createValidUserSession(t, db, ctx, basePath, "")
|
||||
|
||||
sessionId := "session-id"
|
||||
assert.Nil(t, err)
|
||||
_, err = db.Exec(`
|
||||
INSERT INTO session (session_id, user_id, created_at, expires_at)
|
||||
VALUES (?, ?, datetime(), datetime("now", "+1 day"))`, sessionId, userId)
|
||||
assert.Nil(t, err)
|
||||
|
||||
req, err := http.NewRequestWithContext(ctx, "GET", basePath+"/auth/delete-account", nil)
|
||||
formData := url.Values{
|
||||
"name": {"Name"},
|
||||
"csrf-token": {csrfToken},
|
||||
}
|
||||
req, err := http.NewRequestWithContext(ctx, "POST", basePath+"/account/new", strings.NewReader(formData.Encode()))
|
||||
assert.Nil(t, err)
|
||||
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||
req.Header.Set("Cookie", "id="+sessionId)
|
||||
req.Header.Set("HX-Request", "true")
|
||||
resp, err := httpClient.Do(req)
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, http.StatusOK, resp.StatusCode)
|
||||
|
||||
html, err := html.Parse(resp.Body)
|
||||
formData = url.Values{
|
||||
"name": {"Name"},
|
||||
"csrf-token": {csrfToken},
|
||||
}
|
||||
req, err = http.NewRequestWithContext(ctx, "POST", basePath+"/treasurechest/new", strings.NewReader(formData.Encode()))
|
||||
assert.Nil(t, err)
|
||||
csrfToken := findCsrfToken(html)
|
||||
assert.NotEqual(t, "", csrfToken)
|
||||
formData := url.Values{
|
||||
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||
req.Header.Set("Cookie", "id="+sessionId)
|
||||
req.Header.Set("HX-Request", "true")
|
||||
resp, err = httpClient.Do(req)
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, http.StatusOK, resp.StatusCode)
|
||||
|
||||
formData = url.Values{
|
||||
"password": {"password"},
|
||||
"csrf-token": {csrfToken},
|
||||
}
|
||||
|
||||
req, err = http.NewRequestWithContext(ctx, "POST", basePath+"/api/auth/delete-account", strings.NewReader(formData.Encode()))
|
||||
assert.Nil(t, err)
|
||||
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||
@@ -933,6 +937,9 @@ func TestIntegrationAuth(t *testing.T) {
|
||||
err = db.QueryRow("SELECT COUNT(*) FROM account WHERE user_id = ?", userId).Scan(&rows)
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, 0, rows)
|
||||
err = db.QueryRow("SELECT COUNT(*) FROM treasure_chest WHERE user_id = ?", userId).Scan(&rows)
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, 0, rows)
|
||||
})
|
||||
})
|
||||
|
||||
@@ -1669,7 +1676,7 @@ func TestIntegrationAccount(t *testing.T) {
|
||||
|
||||
db, basePath, ctx := setupIntegrationTest(t)
|
||||
|
||||
csrfToken, sessionId := createValidUserSession(t, db, ctx, basePath, "")
|
||||
_, csrfToken, sessionId := createValidUserSession(t, db, ctx, basePath, "")
|
||||
|
||||
// Insert
|
||||
expectedName := "My great Account"
|
||||
@@ -1738,8 +1745,8 @@ func TestIntegrationAccount(t *testing.T) {
|
||||
|
||||
db, basePath, ctx := setupIntegrationTest(t)
|
||||
|
||||
csrfToken1, sessionId1 := createValidUserSession(t, db, ctx, basePath, "1")
|
||||
_, sessionId2 := createValidUserSession(t, db, ctx, basePath, "2")
|
||||
_, csrfToken1, sessionId1 := createValidUserSession(t, db, ctx, basePath, "1")
|
||||
_, _, sessionId2 := createValidUserSession(t, db, ctx, basePath, "2")
|
||||
|
||||
expectedName1 := "Account 1"
|
||||
|
||||
@@ -1767,7 +1774,7 @@ func TestIntegrationAccount(t *testing.T) {
|
||||
t.Parallel()
|
||||
db, basePath, ctx := setupIntegrationTest(t)
|
||||
|
||||
csrfToken, sessionId := createValidUserSession(t, db, ctx, basePath, "")
|
||||
_, csrfToken, sessionId := createValidUserSession(t, db, ctx, basePath, "")
|
||||
|
||||
data := map[string]int{
|
||||
"<": 400,
|
||||
@@ -1802,7 +1809,7 @@ func TestIntegrationAccount(t *testing.T) {
|
||||
})
|
||||
}
|
||||
|
||||
func createValidUserSession(t *testing.T, db *sqlx.DB, ctx context.Context, basePath string, add string) (string, string) {
|
||||
func createValidUserSession(t *testing.T, db *sqlx.DB, ctx context.Context, basePath string, add string) (uuid.UUID, string, string) {
|
||||
userId := uuid.New()
|
||||
sessionId := "session-id" + add
|
||||
pass := service.GetHashPassword("password", []byte("salt"))
|
||||
@@ -1823,7 +1830,7 @@ func createValidUserSession(t *testing.T, db *sqlx.DB, ctx context.Context, base
|
||||
VALUES (?, ?, ?, ?, datetime(), datetime("now", "+1 day"))`, csrfToken, userId, sessionId, types.TokenTypeCsrf)
|
||||
assert.Nil(t, err)
|
||||
|
||||
return csrfToken, sessionId
|
||||
return userId, csrfToken, sessionId
|
||||
}
|
||||
|
||||
func createAnonymousSession(t *testing.T, ctx context.Context, basePath string) (string, string) {
|
||||
|
||||
Reference in New Issue
Block a user