simple api

admin.go

@@ -3,9 +3,6 @@ package main
 import (
 	"context"
 	"embed"
-	"fmt"
-	"html/template"
-	"io/fs"
 	"net/http"
 	"os/signal"
 	"syscall"
@@ -13,24 +10,11 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/robfig/cron/v3"
-	"github.com/sethvargo/go-password/password"
 	log "github.com/sirupsen/logrus"
 )
 
 type AdminConfig struct {
-	Users   []*User        `json:"users"`
-	Secrets *SecretsConfig `json:"secrets"`
-	Addr    string         `json:"addr"`
-	URL     string         `json:"url"`
-}
-
-type SecretsConfig struct {
-	PasswordPepper    string `json:"password_pepper"`
-	ContextKey        string `json:"context_key"`
-	ContextExpiration int    `json:"context_expiration"`
-	ScryptN           int    `json:"scrypt_n"`
-	ScryptR           int    `json:"scrypt_r"`
-	ScryptP           int    `json:"scrypt_p"`
+	Addr string `json:"addr"`
 }
 
 //go:embed assets
@@ -41,44 +25,12 @@ func NewAdmin() *AdminConfig {
 	defer log.WithFields(log.Fields{}).Debugf("done")
 
 	a := &AdminConfig{
-		Addr:    "0.0.0.0:8080",
-		Secrets: NewSecrets(),
-		Users:   make([]*User, 0),
-		URL:     "https://backup.example.com/",
+		Addr: "0.0.0.0:8080",
 	}
 
 	return a
 }
 
-func NewSecrets() *SecretsConfig {
-	log.WithFields(log.Fields{}).Debugf("starting")
-	defer log.WithFields(log.Fields{}).Debugf("done")
-
-	pepper, _ := password.Generate(20, 5, 0, false, false)
-	ctx, _ := password.Generate(20, 5, 0, false, false)
-
-	return &SecretsConfig{
-		PasswordPepper:    pepper,
-		ContextKey:        ctx,
-		ContextExpiration: 3600,
-		ScryptN:           32768,
-		ScryptR:           8,
-		ScryptP:           1,
-	}
-}
-
-func (a *AdminConfig) NewAdminUser() {
-	log.WithFields(log.Fields{}).Debugf("starting")
-	defer log.WithFields(log.Fields{}).Debugf("done")
-
-	p, _ := password.Generate(20, 5, 0, false, false)
-	u, _ := NewUser("admin", p)
-
-	a.Users = append(a.Users, u)
-
-	log.WithFields(log.Fields{}).Warnf("Admin user password :  %s", p)
-}
-
 func (a *AdminConfig) Run() {
 	log.WithFields(log.Fields{}).Debugf("starting")
 	defer log.WithFields(log.Fields{}).Debugf("done")
@@ -93,46 +45,12 @@ func (a *AdminConfig) Run() {
 
 	r := gin.Default()
 
-	if t, err := template.ParseFS(assets, "assets/templates/*.html"); err != nil {
-		log.WithFields(log.Fields{"call": "template.ParseFS", "error": err}).Errorf("")
-		return
-	} else {
-		r.SetHTMLTemplate(t)
-	}
+	r.GET("/run", ApiRun)
+	r.GET("/run/:app", ApiRunApp)
 
-	r.GET("/", HttpAnyIndex)
-	r.POST("/", HttpAnyIndex)
+	r.GET("/save", ApiSave)
 
-	r.GET("/run", func(c *gin.Context) {
-		cfg.Run()
-		c.JSON(http.StatusOK, gin.H{
-			"message": "done",
-		})
-	})
-
-	r.GET("/save", func(c *gin.Context) {
-		if err := cfg.Save(); err != nil {
-			c.JSON(http.StatusInternalServerError, gin.H{
-				"message": "error",
-			})
-		} else {
-			c.JSON(http.StatusOK, gin.H{
-				"message": "done",
-			})
-		}
-	})
-
-	fsys, _ := fs.Sub(assets, "assets/static")
-	r.StaticFS("/assets", http.FS(fsys))
-
-	protected := r.Group("p", HttpAuth())
-	protected.GET("test", HttpAnyHome)
-	protected.GET("home", HttpAnyHome)
-
-	unprotected := r.Group("u", HttpNoAuth())
-	unprotected.GET("signin", HttpGetSignIn)
-	unprotected.POST("submit", HttpPostSubmit)
-	unprotected.GET("recover", HttpGetRecover)
+	r.GET("/config", ApiConfig)
 
 	srv := &http.Server{
 		Addr:    a.Addr,
@@ -168,15 +86,3 @@ func (a *AdminConfig) Run() {
 	}
 
 }
-
-func FindUserID(user string) (uint64, error) {
-	log.WithFields(log.Fields{}).Debugf("starting")
-	defer log.WithFields(log.Fields{}).Debugf("done")
-
-	for _, v := range cfg.Admin.Users {
-		if v.Username == user {
-			return v.ID, nil
-		}
-	}
-	return 0, fmt.Errorf("no user")
-}