Owen
42e7b2a21c
- Statuses can now be bulk-imported/updated via CSV (Name, Color columns; matches and updates existing statuses by name). New internal/statuses/csv.go, tested. - Icon fields (folder create/rename, item type form) are now a searchable dropdown of the 50 most common Bootstrap Icons instead of a free-text box, via a small reusable .icon-picker widget in app.js/app.css. - CSV asset import is now folder-scoped when triggered from the tree: right-click a folder (or its background) > Import CSV... imports every row directly into that folder, so the CSV needs no Folder column at all, and the option no longer appears at the top level. The original global, Folder-path-aware import (with auto-create-missing-folders) moved to a new admin-only Settings > Import / Export page, alongside the new Statuses import and format examples for both. assets.Import gained ImportOptions.TargetFolderID to drive the folder-scoped mode. - Site Name (Settings > General) now actually renders in the navbar brand and <title>, via a per-App "siteName" template func bound in loadTemplates. The brand is plain text now, not a link to /inventory.
92 lines
2.2 KiB
Go
92 lines
2.2 KiB
Go
// Package web implements the HTTP server: routing, session middleware,
|
|
// template rendering, and all page/API handlers for inventree.
|
|
package web
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"log/slog"
|
|
"net/http"
|
|
"time"
|
|
|
|
"inventree/internal/assets"
|
|
"inventree/internal/auth"
|
|
"inventree/internal/folders"
|
|
"inventree/internal/itemtypes"
|
|
"inventree/internal/settings"
|
|
"inventree/internal/statuses"
|
|
"inventree/internal/users"
|
|
)
|
|
|
|
// App holds every dependency HTTP handlers need: data stores, templates, and
|
|
// server-wide configuration.
|
|
type App struct {
|
|
DB *sql.DB
|
|
|
|
Auth *auth.Store
|
|
Users *users.Store
|
|
Folders *folders.Store
|
|
Assets *assets.Store
|
|
ItemTypes *itemtypes.Store
|
|
Statuses *statuses.Store
|
|
Settings *settings.Store
|
|
|
|
templates *templateSet
|
|
Log *slog.Logger
|
|
|
|
// SecureCookies controls the Secure flag on the session cookie; set
|
|
// true when serving over HTTPS.
|
|
SecureCookies bool
|
|
}
|
|
|
|
// NewApp wires all stores together from a shared database handle.
|
|
func NewApp(db *sql.DB, log *slog.Logger, secureCookies bool) (*App, error) {
|
|
userStore := users.NewStore(db)
|
|
folderStore := folders.NewStore(db)
|
|
settingsStore := settings.NewStore(db)
|
|
|
|
app := &App{
|
|
DB: db,
|
|
Users: userStore,
|
|
Folders: folderStore,
|
|
ItemTypes: itemtypes.NewStore(db),
|
|
Statuses: statuses.NewStore(db),
|
|
Settings: settingsStore,
|
|
Assets: assets.NewStore(db, settingsStore, folderStore),
|
|
Auth: auth.NewStore(db, userStore),
|
|
Log: log,
|
|
SecureCookies: secureCookies,
|
|
}
|
|
|
|
tmpl, err := loadTemplates(app)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
app.templates = tmpl
|
|
|
|
return app, nil
|
|
}
|
|
|
|
// StartSessionJanitor periodically removes expired sessions until ctx (via
|
|
// the returned stop channel) signals shutdown.
|
|
func (a *App) StartSessionJanitor(stop <-chan struct{}) {
|
|
ticker := time.NewTicker(1 * time.Hour)
|
|
go func() {
|
|
defer ticker.Stop()
|
|
for {
|
|
select {
|
|
case <-ticker.C:
|
|
if err := a.Auth.CleanExpired(context.Background()); err != nil {
|
|
a.Log.Warn("session cleanup failed", "error", err)
|
|
}
|
|
case <-stop:
|
|
return
|
|
}
|
|
}
|
|
}()
|
|
}
|
|
|
|
func writeErr(w http.ResponseWriter, status int, msg string) {
|
|
http.Error(w, msg, status)
|
|
}
|