Adjust variable naming

This commit is contained in:
Andrew-71 2024-10-13 17:18:53 +03:00
parent c3334faa9e
commit 78056d8b48
10 changed files with 45 additions and 41 deletions

View file

@ -25,14 +25,14 @@ var (
)
func initConfig() {
logging.LogInit(*debugMode)
config.MustLoadConfig(cfgFile)
logging.Load(*debugMode)
config.MustLoad(cfgFile)
if cfgDb != "" {
config.Cfg.SQLiteFile = cfgDb
}
auth.MustLoadKey()
storage.Data = sqlite.MustLoadSQLite(config.Cfg.SQLiteFile)
storage.Data = sqlite.MustLoad(config.Cfg.SQLiteFile)
}
func init() {

View file

@ -35,7 +35,7 @@ func serveAuth(cmd *cobra.Command, args []string) {
r.Use(middleware.RealIP)
r.Use(middleware.Logger, middleware.CleanPath, middleware.StripSlashes)
r.Get("/pem", auth.PublicKey)
r.Get("/pem", auth.ServePublicKey)
r.Post("/register", auth.Register)
r.Post("/login", auth.Login)

View file

@ -41,14 +41,14 @@ func verifyFunc(cmd *cobra.Command, args []string) {
var err error
if verifyFile == "" {
fmt.Println("No PEM file supplied, assuming local")
t, err = auth.VerifyLocalJWT(verifyToken)
t, err = auth.VerifyLocal(verifyToken)
} else {
key, err_k := os.ReadFile(verifyFile)
if err_k != nil {
slog.Error("error reading file", "error", err, "file", verifyFile)
return
}
t, err = auth.VerifyJWT(verifyToken, key)
t, err = auth.Verify(verifyToken, key)
}
slog.Debug("result", "token", t, "error", err, "ok", err == nil)
if err == nil {