Switched to vestigo router

Also moved db reference to data module; it now starts, but doesn't serve index.html for root yet

src/api/data/data.go

@@ -23,6 +23,9 @@ const (
 		   AND "lastStatus" <> 'Answered'`
 )
 
+// db is a connection to the database for the entire application.
+var db *sql.DB
+
 // Settings holds the PostgreSQL configuration for myPrayerJournal.
 type Settings struct {
 	Host     string `json:"host"`
@@ -35,7 +38,7 @@ type Settings struct {
 /* Data Access */
 
 // Retrieve a basic request
-func retrieveRequest(db *sql.DB, reqID, userID string) (*Request, bool) {
+func retrieveRequest(reqID, userID string) (*Request, bool) {
 	req := Request{}
 	err := db.QueryRow(`
 		SELECT "requestId", "enteredOn"
@@ -79,8 +82,8 @@ func makeJournal(rows *sql.Rows, userID string) []JournalRequest {
 }
 
 // AddHistory creates a history entry for a prayer request, given the status and updated text.
-func AddHistory(db *sql.DB, userID, reqID, status, text string) int {
+func AddHistory(userID, reqID, status, text string) int {
-	if _, ok := retrieveRequest(db, reqID, userID); !ok {
+	if _, ok := retrieveRequest(reqID, userID); !ok {
 		return 404
 	}
 	_, err := db.Exec(`
@@ -97,7 +100,7 @@ func AddHistory(db *sql.DB, userID, reqID, status, text string) int {
 }
 
 // AddNew stores a new prayer request and its initial history record.
-func AddNew(db *sql.DB, userID, text string) (*JournalRequest, bool) {
+func AddNew(userID, text string) (*JournalRequest, bool) {
 	id := cuid.New()
 	now := jsNow()
 	tx, err := db.Begin()
@@ -129,8 +132,8 @@ func AddNew(db *sql.DB, userID, text string) (*JournalRequest, bool) {
 }
 
 // AddNote adds a note to a prayer request.
-func AddNote(db *sql.DB, userID, reqID, note string) int {
+func AddNote(userID, reqID, note string) int {
-	if _, ok := retrieveRequest(db, reqID, userID); !ok {
+	if _, ok := retrieveRequest(reqID, userID); !ok {
 		return 404
 	}
 	_, err := db.Exec(`
@@ -147,7 +150,7 @@ func AddNote(db *sql.DB, userID, reqID, note string) int {
 }
 
 // Answered retrieves all answered requests for the given user.
-func Answered(db *sql.DB, userID string) []JournalRequest {
+func Answered(userID string) []JournalRequest {
 	rows, err := db.Query(currentRequestSQL+
 		`WHERE "userId" = $1
 		   AND "lastStatus" = 'Answered'
@@ -162,7 +165,7 @@ func Answered(db *sql.DB, userID string) []JournalRequest {
 }
 
 // ByID retrieves a journal request by its ID.
-func ByID(db *sql.DB, userID, reqID string) (*JournalRequest, bool) {
+func ByID(userID, reqID string) (*JournalRequest, bool) {
 	req := JournalRequest{}
 	err := db.QueryRow(currentRequestSQL+
 		`WHERE "requestId" = $1
@@ -178,26 +181,27 @@ func ByID(db *sql.DB, userID, reqID string) (*JournalRequest, bool) {
 }
 
 // Connect establishes a connection to the database.
-func Connect(s *Settings) (*sql.DB, bool) {
+func Connect(s *Settings) bool {
 	connStr := fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=disable",
 		s.Host, s.Port, s.User, s.Password, s.DbName)
-	db, err := sql.Open("postgres", connStr)
+	var err error
+	db, err = sql.Open("postgres", connStr)
 	if err != nil {
 		log.Print(err)
-		return nil, false
+		return false
 	}
 	err = db.Ping()
 	if err != nil {
 		log.Print(err)
-		return nil, false
+		return false
 	}
 	log.Printf("Connected to postgres://%s@%s:%d/%s\n", s.User, s.Host, s.Port, s.DbName)
-	return db, true
+	return true
 }
 
 // FullByID retrieves a journal request, including its full history and notes.
-func FullByID(db *sql.DB, userID, reqID string) (*JournalRequest, bool) {
+func FullByID(userID, reqID string) (*JournalRequest, bool) {
-	req, ok := ByID(db, userID, reqID)
+	req, ok := ByID(userID, reqID)
 	if !ok {
 		return nil, false
 	}
@@ -225,12 +229,12 @@ func FullByID(db *sql.DB, userID, reqID string) (*JournalRequest, bool) {
 		log.Print(hRows.Err())
 		return nil, false
 	}
-	req.Notes = NotesByID(db, userID, reqID)
+	req.Notes = NotesByID(userID, reqID)
 	return req, true
 }
 
 // Journal retrieves the current user's active prayer journal.
-func Journal(db *sql.DB, userID string) []JournalRequest {
+func Journal(userID string) []JournalRequest {
 	rows, err := db.Query(journalSQL, userID)
 	if err != nil {
 		log.Print(err)
@@ -241,8 +245,8 @@ func Journal(db *sql.DB, userID string) []JournalRequest {
 }
 
 // NotesByID retrieves the notes for a given prayer request
-func NotesByID(db *sql.DB, userID, reqID string) []Note {
+func NotesByID(userID, reqID string) []Note {
-	if _, ok := retrieveRequest(db, reqID, userID); !ok {
+	if _, ok := retrieveRequest(reqID, userID); !ok {
 		return nil
 	}
 	rows, err := db.Query(`
@@ -276,7 +280,7 @@ func NotesByID(db *sql.DB, userID, reqID string) []Note {
 /* DDL */
 
 // EnsureDB makes sure we have a known state of data structures.
-func EnsureDB(db *sql.DB) {
+func EnsureDB() {
 	tableSQL := func(table string) string {
 		return fmt.Sprintf(`SELECT 1 FROM pg_tables WHERE schemaname='mpj' AND tablename='%s'`, table)
 	}

src/api/routes/handlers.go

@@ -1,13 +1,11 @@
 package routes
 
 import (
-	"database/sql"
 	"encoding/json"
 	"log"
 	"net/http"
 
 	"github.com/danieljsummers/myPrayerJournal/src/api/data"
-	"github.com/julienschmidt/httprouter"
 )
 
 /* Support */
@@ -32,9 +30,9 @@ func sendJSON(w http.ResponseWriter, r *http.Request, result interface{}) {
 
 /* Handlers */
 
-func journal(w http.ResponseWriter, r *http.Request, _ httprouter.Params, db *sql.DB) {
+func journal(w http.ResponseWriter, r *http.Request) {
 	user := r.Context().Value(ContextUserKey)
-	reqs := data.Journal(db, user.(string))
+	reqs := data.Journal(user.(string))
 	if reqs == nil {
 		reqs = []data.JournalRequest{}
 	}

src/api/routes/router.go

@@ -2,13 +2,11 @@ package routes
 
 import (
 	"context"
-	"database/sql"
 	"fmt"
 	"net/http"
-	"time"
 
 	"github.com/auth0-community/go-auth0"
-	"github.com/julienschmidt/httprouter"
+	"github.com/husobee/vestigo"
 	"gopkg.in/square/go-jose.v2"
 )
 
@@ -19,27 +17,14 @@ type AuthConfig struct {
 	ClientSecret string `json:"secret"`
 }
 
-// DBHandler extends httprouter's handler with a DB instance.
-type DBHandler func(http.ResponseWriter, *http.Request, httprouter.Params, *sql.DB)
-
-//type APIHandler func(http.ResponseWriter, *http.Request, httprouter.Params, *sql.DB, string)
-
 // ContextKey is the type of key used in our contexts.
 type ContextKey string
 
 // ContextUserKey is the key for the current user in the context.
 const ContextUserKey ContextKey = "user"
 
-func withDB(next DBHandler, db *sql.DB) httprouter.Handle {
+func withAuth(next http.HandlerFunc, cfg *AuthConfig) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+	return func(w http.ResponseWriter, r *http.Request) {
-		ctx, cancel := context.WithTimeout(context.Background(), time.Duration(60*time.Second))
-		defer cancel()
-		next(w, r.WithContext(ctx), p, db)
-	}
-}
-
-func withAuth(next DBHandler, cfg *AuthConfig) DBHandler {
-	return func(w http.ResponseWriter, r *http.Request, p httprouter.Params, db *sql.DB) {
 		secret := []byte(cfg.ClientSecret)
 		secretProvider := auth0.NewKeyProvider(secret)
 		audience := []string{fmt.Sprintf("https://%s/userinfo", cfg.Domain)}
@@ -61,22 +46,22 @@ func withAuth(next DBHandler, cfg *AuthConfig) DBHandler {
 			}
 			r = r.WithContext(context.WithValue(r.Context(), ContextUserKey, values["sub"]))
 			// TODO pass the user ID (sub) along; this -> doesn't work | r.Header.Add("user-id", token.Claims("sub"))
-			next(w, r, p, db)
+			next(w, r)
 		}
 	}
 
 }
 
 // NewRouter returns a configured router to handle all incoming requests.
-func NewRouter(db *sql.DB, cfg *AuthConfig) *httprouter.Router {
+func NewRouter(cfg *AuthConfig) *vestigo.Router {
-	router := httprouter.New()
+	router := vestigo.NewRouter()
 	for _, route := range routes {
 		if route.IsPublic {
-			router.Handle(route.Method, route.Pattern, withDB(route.Func, db))
+			router.Add(route.Method, route.Pattern, route.Func)
 		} else {
-			router.Handle(route.Method, route.Pattern, withDB(withAuth(route.Func, cfg), db))
+			router.Add(route.Method, route.Pattern, withAuth(route.Func, cfg))
 		}
 	}
-	// router.ServeFiles("/*filepath", http.Dir("/public"))
+	router.Get("/*", http.FileServer(http.Dir("/public")).ServeHTTP)
 	return router
 }

src/api/routes/routes.go

@@ -1,12 +1,16 @@
 // Package routes contains endpoint handlers for the myPrayerJournal API.
 package routes
 
+import (
+	"net/http"
+)
+
 // Route is a route served in the application.
 type Route struct {
 	Name     string
 	Method   string
 	Pattern  string
-	Func     DBHandler
+	Func     http.HandlerFunc
 	IsPublic bool
 }
 

src/my-prayer-journal.go

@@ -39,10 +39,10 @@ func readSettings(f string) *Settings {
 
 func main() {
 	cfg := readSettings("config.json")
-	db, ok := data.Connect(cfg.Data)
+	if ok := data.Connect(cfg.Data); !ok {
-	if !ok {
 		log.Fatal("Unable to connect to database; exiting")
 	}
+	data.EnsureDB()
 	log.Printf("myPrayerJournal API listening on %s", cfg.Web.Port)
-	log.Fatal(http.ListenAndServe(cfg.Web.Port, routes.NewRouter(db, cfg.Auth)))
+	log.Fatal(http.ListenAndServe(cfg.Web.Port, routes.NewRouter(cfg.Auth)))
 }