From be1f216eaa0690799b00f84dbc0af54c15412dec Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Sun, 8 Dec 2019 14:27:42 +0000 Subject: [PATCH] renames --- cmd/wasmc/api.go | 17 -------- cmd/wasmc/main.go | 30 ------------- cmd/wasmcloud/api.go | 20 ++++++--- cmd/{wasmc => wasmcloud}/config.go | 0 cmd/{wasmc => wasmcloud}/login.go | 0 cmd/wasmcloud/main.go | 58 ++++++++----------------- cmd/{wasmc => wasmcloud}/namegen.go | 0 cmd/{wasmc => wasmcloud}/whoami.go | 0 cmd/wasmcloudd/api.go | 11 +++++ cmd/{wasmcloud => wasmcloudd}/auth.go | 0 cmd/{wasmcloud => wasmcloudd}/html.go | 0 cmd/wasmcloudd/main.go | 54 +++++++++++++++++++++++ cmd/{wasmcloud => wasmcloudd}/models.go | 0 13 files changed, 95 insertions(+), 95 deletions(-) delete mode 100644 cmd/wasmc/api.go delete mode 100644 cmd/wasmc/main.go rename cmd/{wasmc => wasmcloud}/config.go (100%) rename cmd/{wasmc => wasmcloud}/login.go (100%) rename cmd/{wasmc => wasmcloud}/namegen.go (100%) rename cmd/{wasmc => wasmcloud}/whoami.go (100%) create mode 100644 cmd/wasmcloudd/api.go rename cmd/{wasmcloud => wasmcloudd}/auth.go (100%) rename cmd/{wasmcloud => wasmcloudd}/html.go (100%) create mode 100644 cmd/wasmcloudd/main.go rename cmd/{wasmcloud => wasmcloudd}/models.go (100%) diff --git a/cmd/wasmc/api.go b/cmd/wasmc/api.go deleted file mode 100644 index f2fba7a..0000000 --- a/cmd/wasmc/api.go +++ /dev/null @@ -1,17 +0,0 @@ -package main - -import "net/http" - -var apiConfig *Config - -func withAPI(req *http.Request) { - if apiConfig == nil { - var err error - apiConfig, err = loadConfig() - if err != nil { - panic(err) - } - } - - req.AddCookie(&http.Cookie{Name: "wasmcloud-token", Value: apiConfig.Token}) -} diff --git a/cmd/wasmc/main.go b/cmd/wasmc/main.go deleted file mode 100644 index fb70f13..0000000 --- a/cmd/wasmc/main.go +++ /dev/null @@ -1,30 +0,0 @@ -package main - -import ( - "context" - "flag" - "os" - "path/filepath" - - "github.com/google/subcommands" -) - -var ( - apiServer = flag.String("api-server", "http://wasmcloud.kahless.cetacean.club:3002", "default API server") - configLocation = flag.String("config", filepath.Join(os.Getenv("HOME"), ".wasmc.json"), "default config location") -) - -func main() { - subcommands.Register(subcommands.HelpCommand(), "") - subcommands.Register(subcommands.FlagsCommand(), "") - subcommands.Register(subcommands.CommandsCommand(), "") - subcommands.Register(&loginCmd{}, "") - subcommands.Register(&whoamiCmd{}, "") - subcommands.Register(namegenCmd{}, "") - subcommands.ImportantFlag("api-server") - subcommands.ImportantFlag("config") - - flag.Parse() - ctx := context.Background() - os.Exit(int(subcommands.Execute(ctx))) -} diff --git a/cmd/wasmcloud/api.go b/cmd/wasmcloud/api.go index 9ea3891..f2fba7a 100644 --- a/cmd/wasmcloud/api.go +++ b/cmd/wasmcloud/api.go @@ -1,11 +1,17 @@ package main -import ( - "encoding/json" - "net/http" -) +import "net/http" -func apiWhoami(w http.ResponseWriter, r *http.Request, u *User) { - w.Header().Set("Content-Type", "application/json") - json.NewEncoder(w).Encode(u) +var apiConfig *Config + +func withAPI(req *http.Request) { + if apiConfig == nil { + var err error + apiConfig, err = loadConfig() + if err != nil { + panic(err) + } + } + + req.AddCookie(&http.Cookie{Name: "wasmcloud-token", Value: apiConfig.Token}) } diff --git a/cmd/wasmc/config.go b/cmd/wasmcloud/config.go similarity index 100% rename from cmd/wasmc/config.go rename to cmd/wasmcloud/config.go diff --git a/cmd/wasmc/login.go b/cmd/wasmcloud/login.go similarity index 100% rename from cmd/wasmc/login.go rename to cmd/wasmcloud/login.go diff --git a/cmd/wasmcloud/main.go b/cmd/wasmcloud/main.go index bd5aeac..fb70f13 100644 --- a/cmd/wasmcloud/main.go +++ b/cmd/wasmcloud/main.go @@ -1,54 +1,30 @@ package main import ( + "context" "flag" - "log" - "net/http" - "time" + "os" + "path/filepath" - "github.com/facebookgo/flagenv" - "github.com/gorilla/mux" - "github.com/jinzhu/gorm" - _ "github.com/mattn/go-sqlite3" + "github.com/google/subcommands" ) var ( - port = flag.String("port", "3002", "TCP port to listen on") - databaseURL = flag.String("database-url", "./wasmcloud.db", "database URL") - databaseKind = flag.String("database-kind", "sqlite3", "database kind") - defaultTokenLifetime = flag.Duration("default-token-lifetime", 500*24*time.Hour, "default token lifetime") - - db *gorm.DB + apiServer = flag.String("api-server", "http://wasmcloud.kahless.cetacean.club:3002", "default API server") + configLocation = flag.String("config", filepath.Join(os.Getenv("HOME"), ".wasmc.json"), "default config location") ) func main() { - flagenv.Parse() + subcommands.Register(subcommands.HelpCommand(), "") + subcommands.Register(subcommands.FlagsCommand(), "") + subcommands.Register(subcommands.CommandsCommand(), "") + subcommands.Register(&loginCmd{}, "") + subcommands.Register(&whoamiCmd{}, "") + subcommands.Register(namegenCmd{}, "") + subcommands.ImportantFlag("api-server") + subcommands.ImportantFlag("config") + flag.Parse() - - gormDB, err := gorm.Open(*databaseKind, *databaseURL) - if err != nil { - log.Fatal(err) - } - - log.Println("migrating") - gormDB.AutoMigrate(User{}, Token{}, Stream{}, Handler{}) - db = gormDB - - rtr := mux.NewRouter() - - // auth - rtr.HandleFunc("/register", registerUser) - rtr.HandleFunc("/login", loginUser) - rtr.HandleFunc("/logout", logoutUser) - - // pages - rtr.HandleFunc("/", unauthenticatedShowAPage("index")) - rtr.HandleFunc("/control/", authenticatedShowAPage("controlindex")) - - rtr.HandleFunc("/api/whoami", makeHandler(true, apiWhoami)) - - rtr.PathPrefix("/static/").Handler(http.FileServer(http.Dir("."))) - - log.Printf("listening on http://wasmcloud.kahless.cetacean.club:%s", *port) - http.ListenAndServe(":"+*port, rtr) + ctx := context.Background() + os.Exit(int(subcommands.Execute(ctx))) } diff --git a/cmd/wasmc/namegen.go b/cmd/wasmcloud/namegen.go similarity index 100% rename from cmd/wasmc/namegen.go rename to cmd/wasmcloud/namegen.go diff --git a/cmd/wasmc/whoami.go b/cmd/wasmcloud/whoami.go similarity index 100% rename from cmd/wasmc/whoami.go rename to cmd/wasmcloud/whoami.go diff --git a/cmd/wasmcloudd/api.go b/cmd/wasmcloudd/api.go new file mode 100644 index 0000000..9ea3891 --- /dev/null +++ b/cmd/wasmcloudd/api.go @@ -0,0 +1,11 @@ +package main + +import ( + "encoding/json" + "net/http" +) + +func apiWhoami(w http.ResponseWriter, r *http.Request, u *User) { + w.Header().Set("Content-Type", "application/json") + json.NewEncoder(w).Encode(u) +} diff --git a/cmd/wasmcloud/auth.go b/cmd/wasmcloudd/auth.go similarity index 100% rename from cmd/wasmcloud/auth.go rename to cmd/wasmcloudd/auth.go diff --git a/cmd/wasmcloud/html.go b/cmd/wasmcloudd/html.go similarity index 100% rename from cmd/wasmcloud/html.go rename to cmd/wasmcloudd/html.go diff --git a/cmd/wasmcloudd/main.go b/cmd/wasmcloudd/main.go new file mode 100644 index 0000000..bd5aeac --- /dev/null +++ b/cmd/wasmcloudd/main.go @@ -0,0 +1,54 @@ +package main + +import ( + "flag" + "log" + "net/http" + "time" + + "github.com/facebookgo/flagenv" + "github.com/gorilla/mux" + "github.com/jinzhu/gorm" + _ "github.com/mattn/go-sqlite3" +) + +var ( + port = flag.String("port", "3002", "TCP port to listen on") + databaseURL = flag.String("database-url", "./wasmcloud.db", "database URL") + databaseKind = flag.String("database-kind", "sqlite3", "database kind") + defaultTokenLifetime = flag.Duration("default-token-lifetime", 500*24*time.Hour, "default token lifetime") + + db *gorm.DB +) + +func main() { + flagenv.Parse() + flag.Parse() + + gormDB, err := gorm.Open(*databaseKind, *databaseURL) + if err != nil { + log.Fatal(err) + } + + log.Println("migrating") + gormDB.AutoMigrate(User{}, Token{}, Stream{}, Handler{}) + db = gormDB + + rtr := mux.NewRouter() + + // auth + rtr.HandleFunc("/register", registerUser) + rtr.HandleFunc("/login", loginUser) + rtr.HandleFunc("/logout", logoutUser) + + // pages + rtr.HandleFunc("/", unauthenticatedShowAPage("index")) + rtr.HandleFunc("/control/", authenticatedShowAPage("controlindex")) + + rtr.HandleFunc("/api/whoami", makeHandler(true, apiWhoami)) + + rtr.PathPrefix("/static/").Handler(http.FileServer(http.Dir("."))) + + log.Printf("listening on http://wasmcloud.kahless.cetacean.club:%s", *port) + http.ListenAndServe(":"+*port, rtr) +} diff --git a/cmd/wasmcloud/models.go b/cmd/wasmcloudd/models.go similarity index 100% rename from cmd/wasmcloud/models.go rename to cmd/wasmcloudd/models.go