Merge pull request #100 from TheWisePigeon/59-write-tests-for-keys-store

add CORS configuration

Makefile

@@ -36,4 +36,4 @@ build-css:
 	@npx tailwindcss -i ./assets/app.css -o ./public/output.css --minify
 
 test:
-	@go test -v ./...
+	@go test -p 1 -v ./...

go.mod

@@ -31,6 +31,7 @@ require (
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/go-chi/chi/v5 v5.0.11 // indirect
+	github.com/go-chi/cors v1.2.1 // indirect
 	github.com/gofiber/template v1.8.2 // indirect
 	github.com/gofiber/utils v1.1.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect

go.sum

@@ -35,6 +35,8 @@ github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/go-chi/chi/v5 v5.0.11 h1:BnpYbFZ3T3S1WMpD79r7R5ThWX40TaFB7L31Y8xqSwA=
 github.com/go-chi/chi/v5 v5.0.11/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
+github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
 github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/gofiber/fiber/v2 v2.51.0 h1:JNACcZy5e2tGApWB2QrRpenTWn0fq0hkFm6k0C86gKQ=

internal/store/sessions_test.go

@@ -1,10 +1,16 @@
 package store
 
 import (
+	"os"
 	"testing"
 	"visio/internal/database"
 )
 
+func SessionsMain(m *testing.M) {
+	code := m.Run()
+	os.Exit(code)
+}
+
 func TestSession(t *testing.T) {
 	sessionManager := database.NewSessionManager()
 	t.Run("Create session", func(t *testing.T) {

internal/store/users.go

@@ -3,9 +3,8 @@ package store
 import (
 	"database/sql"
 	"fmt"
-	"visio/internal/types"
-
 	"github.com/jmoiron/sqlx"
+	"visio/internal/types"
 )
 
 type Users struct {

internal/store/users_test.go

@@ -3,17 +3,16 @@ package store
 import (
 	"errors"
 	"fmt"
-	"log"
-	"os"
-	"testing"
-	"time"
-	"visio/internal/types"
-
 	"github.com/jmoiron/sqlx"
 	"github.com/lib/pq"
 	_ "github.com/lib/pq"
 	"github.com/ory/dockertest/v3"
 	"github.com/stretchr/testify/require"
+	"log"
+	"os"
+	"testing"
+	"time"
+	"visio/internal/types"
 )
 
 const (
@@ -82,17 +81,31 @@ func TestMain(m *testing.M) {
 	os.Exit(code)
 }
 
-// TODO: As an improvement, we might consider to use a migration folder
-//
-// github.com/golang-migrate/migrate
 func migrateTestDB(db *sqlx.DB) error {
 	q := `
 create table if not exists users (
-	id text not null primary key,
-	email text not null unique,
-	password_hash text not null,
-	signup_date text not null
-);`
+  id text not null primary key,
+  email text not null unique,
+  password_hash text not null,
+  signup_date text not null
+);
+
+create table if not exists keys (
+  id text not null primary key,
+  user_id text not null references users(id) on delete cascade,
+  prefix text not null unique,
+  key_hash text not null,
+  creation_date text not null
+);
+
+create table if not exists faces (
+  id text not null primary key,
+  label text not null,
+  user_id text not null references users(id) on delete cascade,
+  descriptor text not null,
+  unique (label, user_id)
+);
+`
 	_, err := db.Exec(q)
 	return err
 }
@@ -122,7 +135,10 @@ func TestUsers_Insert(t *testing.T) {
 		// https://www.postgresql.org/docs/current/errcodes-appendix.html
 		require.Equal(t, "unique_violation", pqErr.Code.Name())
 
-		testDB.Exec("TRUNCATE users;")
+		testDB.Exec("delete from users cascade;")
+		if err != nil {
+			fmt.Println(err.Error())
+		}
 	})
 
 	t.Run("success", func(t *testing.T) {
@@ -142,7 +158,7 @@ func TestUsers_Insert(t *testing.T) {
 		})
 		require.NoError(t, err)
 
-		testDB.Exec("TRUNCATE users;")
+		testDB.Exec("delete from users cascade;")
 	})
 }
 
@@ -154,7 +170,7 @@ func TestUsers_GetById(t *testing.T) {
 		require.Nil(t, user)
 		require.Equal(t, err, types.ErrUserNotFound)
 
-		testDB.Exec("TRUNCATE users;")
+		testDB.Exec("delete from users cascade;")
 	})
 
 	t.Run("user exists", func(t *testing.T) {
@@ -174,7 +190,7 @@ func TestUsers_GetById(t *testing.T) {
 		require.Equal(t, user.SignupDate, existingUser.SignupDate)
 		require.NoError(t, err)
 
-		testDB.Exec("TRUNCATE users;")
+		testDB.Exec("delete from users cascade;")
 	})
 }
 
@@ -186,7 +202,7 @@ func TestUsers_GetByEmail(t *testing.T) {
 		require.Nil(t, user)
 		require.Equal(t, err, types.ErrUserNotFound)
 
-		testDB.Exec("TRUNCATE users;")
+		testDB.Exec("delete from users cascade;")
 	})
 
 	t.Run("user exists", func(t *testing.T) {
@@ -206,6 +222,6 @@ func TestUsers_GetByEmail(t *testing.T) {
 		require.Equal(t, user.SignupDate, existingUser.SignupDate)
 		require.NoError(t, err)
 
-		testDB.Exec("TRUNCATE users;")
+		testDB.Exec("delete from users cascade;")
 	})
 }

main.go

@@ -6,6 +6,7 @@ import (
 	"github.com/Kagami/go-face"
 	"github.com/go-chi/chi/v5"
 	chiMiddleware "github.com/go-chi/chi/v5/middleware"
+	"github.com/go-chi/cors"
 	"github.com/joho/godotenv"
 	"log/slog"
 	"net/http"
@@ -49,6 +50,14 @@ func main() {
 	uploadMiddleware := middlewares.NewUploadMiddleware(appLogger)
 
 	r := chi.NewRouter()
+	r.Use(cors.Handler(cors.Options{
+		AllowedOrigins:   []string{"https://*", "http://*"},
+		AllowedMethods:   []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
+		AllowedHeaders:   []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token"},
+		ExposedHeaders:   []string{"Link"},
+		AllowCredentials: false,
+		MaxAge:           300,
+	}))
 	r.Use(chiMiddleware.RequestID)
 
 	r.Get("/public/output.css", func(w http.ResponseWriter, r *http.Request) {
@@ -72,7 +81,7 @@ func main() {
 		r.Post("/auth", authHandler.Authenticate)
 	})
 
-  r.With(authMiddleware.CookieAuth).Delete("/keys", appHandler.RevokeKey)
+	r.With(authMiddleware.CookieAuth).Delete("/keys", appHandler.RevokeKey)
 
 	r.Route("/faces", func(r chi.Router) {
 		r.With(authMiddleware.KeyAuth).With(uploadMiddleware.HandleUploads(1)).Post("/", faceHandler.SaveFace)

schema.sql

@@ -7,7 +7,7 @@ create table if not exists users (
 
 create table if not exists keys (
   id text not null primary key,
-  user_id text not null references users(id),
+  user_id text not null references users(id) on delete cascade,
   prefix text not null unique,
   key_hash text not null,
   creation_date text not null
@@ -16,7 +16,7 @@ create table if not exists keys (
 create table if not exists faces (
   id text not null primary key,
   label text not null,
-  user_id text not null references users(id),
+  user_id text not null references users(id) on delete cascade,
   descriptor text not null,
   unique (label, user_id)
 );