Refactor everything

cmd/main.go

@@ -0,0 +1,51 @@
+package cmd
+
+import (
+	"flag"
+	"fmt"
+	"os"
+
+	"git.a71.su/Andrew71/pye/cmd/serve"
+	"git.a71.su/Andrew71/pye/cmd/verify"
+	"git.a71.su/Andrew71/pye/config"
+)
+
+func Run() {
+	// configFlag := flag.String("config", "", "override config file")
+	// flag.Parse()
+	// if *configFlag != "" {
+		// config.Load()
+	// }
+
+	serveCmd := flag.NewFlagSet("serve", flag.ExitOnError)
+	servePort := serveCmd.Int("port", 0, "override port")
+	serveDb := serveCmd.String("db", "", "override sqlite database")
+
+	verifyCmd := flag.NewFlagSet("verify", flag.ExitOnError)
+
+	if len(os.Args) < 2 {
+		fmt.Println("expected 'serve' or 'verify' subcommands")
+		os.Exit(0)
+	}
+
+	switch os.Args[1] {
+	case "serve":
+		serveCmd.Parse(os.Args[2:])
+		if *servePort != 0 {
+			config.Cfg.Port = *servePort
+		}
+		if *serveDb != "" {
+			config.Cfg.SQLiteFile = *serveDb
+		}
+		serve.Serve()
+	case "verify":
+		verifyCmd.Parse(os.Args[2:])
+		if len(os.Args) != 4 {
+			fmt.Println("Usage: <jwt> <pem file>")
+		}
+		verify.Verify(os.Args[2], os.Args[3])
+	default:
+		fmt.Println("expected 'serve' or 'verify' subcommands")
+		os.Exit(0)
+	}
+}

cmd/serve/main.go

@@ -0,0 +1,32 @@
+package serve
+
+import (
+	"log/slog"
+	"net/http"
+	"strconv"
+
+	"git.a71.su/Andrew71/pye/auth"
+	"git.a71.su/Andrew71/pye/config"
+	"git.a71.su/Andrew71/pye/storage"
+	"git.a71.su/Andrew71/pye/storage/sqlite"
+)
+
+var data storage.Storage
+
+func Serve() {
+	data = sqlite.MustLoadSQLite(config.Cfg.SQLiteFile)
+	
+	router := http.NewServeMux()
+
+	router.HandleFunc("GET /pem", auth.PublicKey)
+
+	router.HandleFunc("POST /register", func(w http.ResponseWriter, r *http.Request) { auth.Register(w, r, data) })
+	router.HandleFunc("POST /login", func(w http.ResponseWriter, r *http.Request) { auth.Login(w, r, data) })
+
+	// Note: likely temporary, possibly to be replaced by a fake "frontend"
+	router.HandleFunc("GET /register", func(w http.ResponseWriter, r *http.Request) { auth.Register(w, r, data) })
+	router.HandleFunc("GET /login", func(w http.ResponseWriter, r *http.Request) { auth.Login(w, r, data) })
+
+	slog.Info("🪐 pye started", "port", config.Cfg.Port)
+	http.ListenAndServe(":"+strconv.Itoa(config.Cfg.Port), router)
+}

cmd/verify/main.go

@@ -0,0 +1,17 @@
+package verify
+
+import (
+	"log/slog"
+	"os"
+
+	"git.a71.su/Andrew71/pye/auth"
+)
+
+func Verify(token, filename string) {
+	key, err := os.ReadFile(filename)
+	if err != nil {
+		slog.Error("error reading file", "error", err, "file", filename)
+	}
+	t, err := auth.VerifyJWT(token, key)
+	slog.Info("result", "token", t, "error", err, "ok", err == nil)
+}