Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6885319333 | ||
|
|
6666125a8a | ||
|
|
42466c7b40 | ||
|
|
f7863fd4d2 |
@@ -1,4 +1,2 @@
|
|||||||
*.log
|
*.log
|
||||||
.env
|
.env
|
||||||
web/*/node_modules/
|
|
||||||
web/*/.next/
|
|
||||||
|
|||||||
@@ -64,9 +64,6 @@ Keine Änderungen ermittelbar.
|
|||||||
## 2026-08-27 17:28 – 17:29 (1m)
|
## 2026-08-27 17:28 – 17:29 (1m)
|
||||||
**Beschreibung:** Claude Code Session
|
**Beschreibung:** Claude Code Session
|
||||||
**Projekt:** code
|
**Projekt:** code
|
||||||
## 2026-08-28 21:44 – 21:44 (0m)
|
|
||||||
**Beschreibung:** Claude Code Session
|
|
||||||
**Projekt:** nexarch
|
|
||||||
|
|
||||||
### Commits
|
### Commits
|
||||||
Keine Commits in dieser Session.
|
Keine Commits in dieser Session.
|
||||||
@@ -130,60 +127,25 @@ Keine Commits in dieser Session.
|
|||||||
- internal/config/config.go | 29 +++++++++++++++++++++++++++++
|
- internal/config/config.go | 29 +++++++++++++++++++++++++++++
|
||||||
- internal/db/db.go | 11 +++++++++++
|
- internal/db/db.go | 11 +++++++++++
|
||||||
- migrations/0001_tenant_registry.sql | 10 ++++++++++
|
- migrations/0001_tenant_registry.sql | 10 ++++++++++
|
||||||
- web/shl/README.md | 45 +++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
- web/shl/__tests__/Dialog.test.tsx | 38 ++++++++++++++++++++++++++++++++++++++
|
|
||||||
- web/shl/__tests__/tokens.test.ts | 39 +++++++++++++++++++++++++++++++++++++++
|
|
||||||
- web/shl/components/Dialog.tsx | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
- web/shl/components/FormElements.tsx | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
- web/shl/components/Shell.tsx | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
- web/shl/components/Table.tsx | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
- web/shl/components/Toast.tsx | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
- web/shl/i18n/i18n.tsx | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
- web/shl/index.ts | 25 +++++++++++++++++++++++++
|
|
||||||
- web/shl/package.json | 23 +++++++++++++++++++++++
|
|
||||||
- web/shl/theme/ThemeProvider.tsx | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
- web/shl/tokens/tokens.ts | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
- web/shl/tsconfig.json | 18 ++++++++++++++++++
|
|
||||||
|
|
||||||
---
|
---
|
||||||
## 2026-08-28 21:51 – 21:57 (5m)
|
## 2026-08-28 23:20 – 23:26 (6m)
|
||||||
**Beschreibung:** Claude Code Session
|
**Beschreibung:** Claude Code Session
|
||||||
**Projekt:** nexarch
|
**Projekt:** nexarch
|
||||||
|
|
||||||
### Commits
|
### Commits
|
||||||
- 3c226da SHL-01: fix — vitest jsdom-environment + jest-dom-Setup (3 Dialog-Tests schlugen ohne DOM fehl)
|
- 42466c7 IAM-13: oidc-provider-fuer-drittanwendungen (client-registrierung, authorization-code-flow, jwks ueber API-05-schluessel)
|
||||||
|
|
||||||
### Geänderte Dateien
|
### Geänderte Dateien
|
||||||
- web/shl/package.json | 2 ++
|
- internal/oidc/authcode.go | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
- web/shl/vitest.config.ts | 8 ++++++++
|
- internal/oidc/client.go | 167 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
- web/shl/vitest.setup.ts | 1 +
|
- internal/oidc/provider.go | 251 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- internal/oidc/provider_test.go | 294 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
- migrations/tenant/0003_oidc_provider.down.sql | 2 ++
|
||||||
|
- migrations/tenant/0003_oidc_provider.up.sql | 28 +++++++++++++++++++
|
||||||
|
|
||||||
---
|
---
|
||||||
## 2026-08-28 23:45 – 23:51 (5m)
|
## 2026-08-28 23:26 – 23:26 (0m)
|
||||||
**Beschreibung:** Claude Code Session
|
|
||||||
**Projekt:** code
|
|
||||||
|
|
||||||
### Commits
|
|
||||||
- b27a640 CFG-04: benachrichtigungs-einstellungen-oberflaeche (handler+tests fuer notifyprefs, web/notifications next.js-frontend auf shl-01)
|
|
||||||
- 81ff8c1 Merge branch 'feature/shl-01-ui-shell-design-system-zentral' into feature/cfg-04-benachrichtigungs-einstellungen-oberflaeche
|
|
||||||
- 22b3349 Merge branch 'feature/iam-02-login-session-jwt-grundgeruest' into feature/cfg-04-benachrichtigungs-einstellungen-oberflaeche
|
|
||||||
- 2df3f93 CFG-04: backend teil 1 — internal/notifyprefs (praeferenz-store + enqueueifallowed-filter vor dispatcher)
|
|
||||||
|
|
||||||
### Geänderte Dateien
|
|
||||||
- internal/notifyprefs/handler.go | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
- internal/notifyprefs/handler_test.go | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
- internal/notifyprefs/prefs_test.go | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
- web/notifications/app/layout.tsx | 30 ++++++++++++++++++++++++++++++
|
|
||||||
- web/notifications/app/overview/page.tsx | 43 +++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
- web/notifications/app/page.tsx | 5 +++++
|
|
||||||
- web/notifications/app/settings/page.tsx | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
- web/notifications/lib/api.ts | 45 +++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
- web/notifications/next.config.mjs | 5 +++++
|
|
||||||
- web/notifications/package.json | 22 ++++++++++++++++++++++
|
|
||||||
- web/notifications/tsconfig.json | 21 +++++++++++++++++++++
|
|
||||||
|
|
||||||
---
|
|
||||||
## 2026-08-28 23:51 – 23:51 (0m)
|
|
||||||
**Beschreibung:** Claude Code Session
|
**Beschreibung:** Claude Code Session
|
||||||
**Projekt:** code
|
**Projekt:** code
|
||||||
|
|
||||||
@@ -191,20 +153,15 @@ Keine Commits in dieser Session.
|
|||||||
Keine Commits in dieser Session.
|
Keine Commits in dieser Session.
|
||||||
|
|
||||||
### Geänderte Dateien
|
### Geänderte Dateien
|
||||||
- internal/notifyprefs/handler.go | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
- internal/oidc/authcode.go | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
- internal/notifyprefs/handler_test.go | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
- internal/oidc/client.go | 167 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
- internal/notifyprefs/prefs_test.go | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
- internal/oidc/provider.go | 251 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
- web/notifications/app/layout.tsx | 30 ++++++++++++++++++++++++++++++
|
- internal/oidc/provider_test.go | 294 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
- web/notifications/app/overview/page.tsx | 43 +++++++++++++++++++++++++++++++++++++++++++
|
- migrations/tenant/0003_oidc_provider.down.sql | 2 ++
|
||||||
- web/notifications/app/page.tsx | 5 +++++
|
- migrations/tenant/0003_oidc_provider.up.sql | 28 +++++++++++++++++++
|
||||||
- web/notifications/app/settings/page.tsx | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
- web/notifications/lib/api.ts | 45 +++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
- web/notifications/next.config.mjs | 5 +++++
|
|
||||||
- web/notifications/package.json | 22 ++++++++++++++++++++++
|
|
||||||
- web/notifications/tsconfig.json | 21 +++++++++++++++++++++
|
|
||||||
|
|
||||||
---
|
---
|
||||||
## 2026-08-28 23:52 – 23:52 (0m)
|
## 2026-08-28 23:26 – 23:26 (0m)
|
||||||
**Beschreibung:** Claude Code Session
|
**Beschreibung:** Claude Code Session
|
||||||
**Projekt:** code
|
**Projekt:** code
|
||||||
|
|
||||||
@@ -212,16 +169,6 @@ Keine Commits in dieser Session.
|
|||||||
Keine Commits in dieser Session.
|
Keine Commits in dieser Session.
|
||||||
|
|
||||||
### Geänderte Dateien
|
### Geänderte Dateien
|
||||||
- internal/notifyprefs/handler.go | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
- DEVLOG.md | 32 ++++++++++++++++++++++++++++++++
|
||||||
- internal/notifyprefs/handler_test.go | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
- internal/notifyprefs/prefs_test.go | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
- web/notifications/app/layout.tsx | 30 ++++++++++++++++++++++++++++++
|
|
||||||
- web/notifications/app/overview/page.tsx | 43 +++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
- web/notifications/app/page.tsx | 5 +++++
|
|
||||||
- web/notifications/app/settings/page.tsx | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
- web/notifications/lib/api.ts | 45 +++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
- web/notifications/next.config.mjs | 5 +++++
|
|
||||||
- web/notifications/package.json | 22 ++++++++++++++++++++++
|
|
||||||
- web/notifications/tsconfig.json | 21 +++++++++++++++++++++
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -1,88 +0,0 @@
|
|||||||
package cfgservice
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"sync"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
// DefaultCacheTTL ist die dokumentierte Cache-Invalidierungszeit
|
|
||||||
// (Akzeptanzkriterium 2 / Pruefung 2 in diesem Ticket bezieht sich auf die
|
|
||||||
// Aenderungsnachvollziehbarkeit — die Cache-Frist selbst folgt demselben
|
|
||||||
// Muster wie internal/flag.DefaultCacheTTL).
|
|
||||||
const DefaultCacheTTL = 5 * time.Second
|
|
||||||
|
|
||||||
type cacheEntry struct {
|
|
||||||
value Value
|
|
||||||
expiresAt time.Time
|
|
||||||
}
|
|
||||||
|
|
||||||
// Service ist die Leseseite mit Vorrangregel (Akzeptanzkriterium 1:
|
|
||||||
// Tenant-Override vor Global-Default) und lokalem TTL-Cache.
|
|
||||||
type Service struct {
|
|
||||||
store *Store
|
|
||||||
ttl time.Duration
|
|
||||||
|
|
||||||
mu sync.RWMutex
|
|
||||||
cache map[string]cacheEntry // Schluessel: key + "\x00" + tenantSlug
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewService(store *Store, ttl time.Duration) *Service {
|
|
||||||
if ttl <= 0 {
|
|
||||||
ttl = DefaultCacheTTL
|
|
||||||
}
|
|
||||||
return &Service{store: store, ttl: ttl, cache: make(map[string]cacheEntry)}
|
|
||||||
}
|
|
||||||
|
|
||||||
func cacheKey(key, tenantSlug string) string {
|
|
||||||
return key + "\x00" + tenantSlug
|
|
||||||
}
|
|
||||||
|
|
||||||
// Resolve liefert den Konfigurationswert fuer einen Tenant: ein
|
|
||||||
// Tenant-spezifischer Override hat Vorrang vor dem globalen Default
|
|
||||||
// (Akzeptanzkriterium 1 / Pruefung 1). tenantSlug == "" wertet nur den
|
|
||||||
// globalen Wert aus.
|
|
||||||
func (s *Service) Resolve(ctx context.Context, tenantSlug, key string) (Value, error) {
|
|
||||||
ck := cacheKey(key, tenantSlug)
|
|
||||||
|
|
||||||
s.mu.RLock()
|
|
||||||
entry, exists := s.cache[ck]
|
|
||||||
fresh := exists && time.Now().Before(entry.expiresAt)
|
|
||||||
s.mu.RUnlock()
|
|
||||||
if fresh {
|
|
||||||
return entry.value, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
v, err := s.resolveUncached(ctx, tenantSlug, key)
|
|
||||||
if err != nil {
|
|
||||||
return Value{}, err
|
|
||||||
}
|
|
||||||
|
|
||||||
s.mu.Lock()
|
|
||||||
s.cache[ck] = cacheEntry{value: v, expiresAt: time.Now().Add(s.ttl)}
|
|
||||||
s.mu.Unlock()
|
|
||||||
return v, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Service) resolveUncached(ctx context.Context, tenantSlug, key string) (Value, error) {
|
|
||||||
if tenantSlug != "" {
|
|
||||||
v, err := s.store.Get(ctx, key, tenantSlug)
|
|
||||||
if err == nil {
|
|
||||||
return v, nil
|
|
||||||
}
|
|
||||||
if !errors.Is(err, ErrNotFound) {
|
|
||||||
return Value{}, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return s.store.Get(ctx, key, GlobalScope)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Invalidate erzwingt beim naechsten Resolve-Aufruf ein sofortiges Neuladen
|
|
||||||
// fuer einen bestimmten (key, tenantSlug) statt auf den TTL-Ablauf zu warten
|
|
||||||
// — analog internal/flag.Service.Invalidate.
|
|
||||||
func (s *Service) Invalidate(key, tenantSlug string) {
|
|
||||||
s.mu.Lock()
|
|
||||||
delete(s.cache, cacheKey(key, tenantSlug))
|
|
||||||
s.mu.Unlock()
|
|
||||||
}
|
|
||||||
@@ -1,114 +0,0 @@
|
|||||||
package cfgservice
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 1 + Pruefung 1: Tenant-Override hat Vorrang vor
|
|
||||||
// Global-Default, automatisiert getestet.
|
|
||||||
func TestService_TenantOverrideTakesPrecedenceOverGlobal(t *testing.T) {
|
|
||||||
store, cleanup := setupStoreTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
if _, err := store.Set(ctx, "test_precedence_key", GlobalScope, "global-wert"); err != nil {
|
|
||||||
t.Fatalf("set global: %v", err)
|
|
||||||
}
|
|
||||||
if _, err := store.Set(ctx, "test_precedence_key", "test_acme", "tenant-wert"); err != nil {
|
|
||||||
t.Fatalf("set tenant: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
svc := NewService(store, time.Hour)
|
|
||||||
|
|
||||||
got, err := svc.Resolve(ctx, "test_acme", "test_precedence_key")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("resolve mit override: %v", err)
|
|
||||||
}
|
|
||||||
if got.Value != "tenant-wert" {
|
|
||||||
t.Fatalf("erwartet tenant-override, habe %q", got.Value)
|
|
||||||
}
|
|
||||||
|
|
||||||
gotOther, err := svc.Resolve(ctx, "test_anderer_tenant", "test_precedence_key")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("resolve ohne override: %v", err)
|
|
||||||
}
|
|
||||||
if gotOther.Value != "global-wert" {
|
|
||||||
t.Fatalf("erwartet global-default fuer tenant ohne override, habe %q", gotOther.Value)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 2 + Pruefung 2: Cache-Invalidierung nach
|
|
||||||
// Konfigurationsaenderung innerhalb dokumentierter Zeit gemessen.
|
|
||||||
func TestService_CacheInvalidationTiming(t *testing.T) {
|
|
||||||
store, cleanup := setupStoreTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
const ttl = 150 * time.Millisecond
|
|
||||||
if _, err := store.Set(ctx, "test_ttl_key", GlobalScope, "alt"); err != nil {
|
|
||||||
t.Fatalf("set: %v", err)
|
|
||||||
}
|
|
||||||
svc := NewService(store, ttl)
|
|
||||||
|
|
||||||
v, err := svc.Resolve(ctx, "", "test_ttl_key")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("resolve: %v", err)
|
|
||||||
}
|
|
||||||
if v.Value != "alt" {
|
|
||||||
t.Fatalf("erwartet 'alt', habe %q", v.Value)
|
|
||||||
}
|
|
||||||
|
|
||||||
changedAt := time.Now()
|
|
||||||
if _, err := store.Set(ctx, "test_ttl_key", GlobalScope, "neu"); err != nil {
|
|
||||||
t.Fatalf("set: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
v, err = svc.Resolve(ctx, "", "test_ttl_key")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("resolve direkt nach aenderung: %v", err)
|
|
||||||
}
|
|
||||||
if v.Value != "alt" {
|
|
||||||
t.Fatalf("cache haette den alten wert liefern sollen, habe %q", v.Value)
|
|
||||||
}
|
|
||||||
|
|
||||||
deadline := changedAt.Add(ttl + 100*time.Millisecond)
|
|
||||||
for time.Now().Before(deadline) {
|
|
||||||
v, err := svc.Resolve(ctx, "", "test_ttl_key")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("resolve: %v", err)
|
|
||||||
}
|
|
||||||
if v.Value == "neu" {
|
|
||||||
t.Logf("aenderung wurde nach %s wirksam (ziel: innerhalb %s + toleranz)", time.Since(changedAt), ttl)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
time.Sleep(10 * time.Millisecond)
|
|
||||||
}
|
|
||||||
t.Fatalf("aenderung wurde nicht innerhalb von %s wirksam", deadline.Sub(changedAt))
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestService_InvalidateForcesImmediateRefresh(t *testing.T) {
|
|
||||||
store, cleanup := setupStoreTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
if _, err := store.Set(ctx, "test_invalidate_key", GlobalScope, "alt"); err != nil {
|
|
||||||
t.Fatalf("set: %v", err)
|
|
||||||
}
|
|
||||||
svc := NewService(store, time.Hour)
|
|
||||||
_, _ = svc.Resolve(ctx, "", "test_invalidate_key")
|
|
||||||
|
|
||||||
if _, err := store.Set(ctx, "test_invalidate_key", GlobalScope, "neu"); err != nil {
|
|
||||||
t.Fatalf("set: %v", err)
|
|
||||||
}
|
|
||||||
svc.Invalidate("test_invalidate_key", "")
|
|
||||||
|
|
||||||
v, err := svc.Resolve(ctx, "", "test_invalidate_key")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("resolve: %v", err)
|
|
||||||
}
|
|
||||||
if v.Value != "neu" {
|
|
||||||
t.Fatalf("erwartet sofort sichtbaren neuen wert nach Invalidate, habe %q", v.Value)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,129 +0,0 @@
|
|||||||
// Package cfgservice implementiert Core CFG-01: den zentralen Dienst fuer
|
|
||||||
// globale und tenant-spezifische Konfigurationswerte mit Versionierung und
|
|
||||||
// Cache-Invalidierung. Andere Module lesen Konfiguration AUSSCHLIESSLICH
|
|
||||||
// ueber dieses Paket (Akzeptanzkriterium 3), niemals ueber eigene Tabellen.
|
|
||||||
package cfgservice
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5"
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
)
|
|
||||||
|
|
||||||
// GlobalScope ist der reservierte Scope-Wert fuer globale Defaults — jeder
|
|
||||||
// andere Scope-Wert ist ein Tenant-Slug (Akzeptanzkriterium 1).
|
|
||||||
const GlobalScope = "global"
|
|
||||||
|
|
||||||
var ErrNotFound = errors.New("cfgservice: kein wert fuer diesen key gefunden")
|
|
||||||
|
|
||||||
type Value struct {
|
|
||||||
Key string
|
|
||||||
Scope string
|
|
||||||
Value string
|
|
||||||
Version int
|
|
||||||
}
|
|
||||||
|
|
||||||
type HistoryEntry struct {
|
|
||||||
Key string
|
|
||||||
Scope string
|
|
||||||
Value string
|
|
||||||
Version int
|
|
||||||
}
|
|
||||||
|
|
||||||
// Store ist die Schreib-/Verwaltungsseite. Set schreibt IMMER sowohl den
|
|
||||||
// aktuellen Stand (config_values) als auch einen Historieneintrag
|
|
||||||
// (config_value_history) in derselben Transaktion — eine Aenderung ohne
|
|
||||||
// Versionshistorie ist strukturell ausgeschlossen (Akzeptanzkriterium 2).
|
|
||||||
type Store struct {
|
|
||||||
pool *pgxpool.Pool
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewStore(pool *pgxpool.Pool) *Store {
|
|
||||||
return &Store{pool: pool}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set schreibt einen neuen Wert fuer (key, scope) und erhoeht die Version um 1
|
|
||||||
// (Version 1 bei erstmaligem Setzen).
|
|
||||||
func (s *Store) Set(ctx context.Context, key, scope, value string) (Value, error) {
|
|
||||||
if scope == "" {
|
|
||||||
return Value{}, errors.New("cfgservice: scope darf nicht leer sein")
|
|
||||||
}
|
|
||||||
|
|
||||||
tx, err := s.pool.Begin(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return Value{}, fmt.Errorf("transaktion starten: %w", err)
|
|
||||||
}
|
|
||||||
defer func() { _ = tx.Rollback(ctx) }()
|
|
||||||
|
|
||||||
var currentVersion int
|
|
||||||
err = tx.QueryRow(ctx, `SELECT version FROM config_values WHERE key = $1 AND scope = $2`, key, scope).Scan(¤tVersion)
|
|
||||||
if err != nil && !errors.Is(err, pgx.ErrNoRows) {
|
|
||||||
return Value{}, fmt.Errorf("aktuelle version lesen: %w", err)
|
|
||||||
}
|
|
||||||
newVersion := currentVersion + 1
|
|
||||||
|
|
||||||
if _, err := tx.Exec(ctx, `
|
|
||||||
INSERT INTO config_values (key, scope, value, version, updated_at)
|
|
||||||
VALUES ($1, $2, $3, $4, now())
|
|
||||||
ON CONFLICT (key, scope) DO UPDATE SET value = $3, version = $4, updated_at = now()
|
|
||||||
`, key, scope, value, newVersion); err != nil {
|
|
||||||
return Value{}, fmt.Errorf("wert speichern: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := tx.Exec(ctx, `
|
|
||||||
INSERT INTO config_value_history (key, scope, value, version, changed_at)
|
|
||||||
VALUES ($1, $2, $3, $4, now())
|
|
||||||
`, key, scope, value, newVersion); err != nil {
|
|
||||||
return Value{}, fmt.Errorf("historie schreiben: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := tx.Commit(ctx); err != nil {
|
|
||||||
return Value{}, fmt.Errorf("transaktion committen: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return Value{Key: key, Scope: scope, Value: value, Version: newVersion}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get liefert den Wert fuer GENAU EINEN Scope (kein Vorrang-Fallback) — die
|
|
||||||
// Vorrangregel (Tenant vor Global) lebt bewusst in Service.Resolve, damit
|
|
||||||
// Store rein CRUD bleibt.
|
|
||||||
func (s *Store) Get(ctx context.Context, key, scope string) (Value, error) {
|
|
||||||
var v Value
|
|
||||||
v.Key, v.Scope = key, scope
|
|
||||||
err := s.pool.QueryRow(ctx, `
|
|
||||||
SELECT value, version FROM config_values WHERE key = $1 AND scope = $2
|
|
||||||
`, key, scope).Scan(&v.Value, &v.Version)
|
|
||||||
if err != nil {
|
|
||||||
if errors.Is(err, pgx.ErrNoRows) {
|
|
||||||
return Value{}, ErrNotFound
|
|
||||||
}
|
|
||||||
return Value{}, fmt.Errorf("wert lesen: %w", err)
|
|
||||||
}
|
|
||||||
return v, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// History liefert die vollstaendige Versionshistorie eines (key, scope) in
|
|
||||||
// aufsteigender Reihenfolge (Akzeptanzkriterium 2 / Pruefung 3).
|
|
||||||
func (s *Store) History(ctx context.Context, key, scope string) ([]HistoryEntry, error) {
|
|
||||||
rows, err := s.pool.Query(ctx, `
|
|
||||||
SELECT key, scope, value, version FROM config_value_history
|
|
||||||
WHERE key = $1 AND scope = $2 ORDER BY version
|
|
||||||
`, key, scope)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("historie abfragen: %w", err)
|
|
||||||
}
|
|
||||||
defer rows.Close()
|
|
||||||
|
|
||||||
var out []HistoryEntry
|
|
||||||
for rows.Next() {
|
|
||||||
var h HistoryEntry
|
|
||||||
if err := rows.Scan(&h.Key, &h.Scope, &h.Value, &h.Version); err != nil {
|
|
||||||
return nil, fmt.Errorf("historieneintrag lesen: %w", err)
|
|
||||||
}
|
|
||||||
out = append(out, h)
|
|
||||||
}
|
|
||||||
return out, rows.Err()
|
|
||||||
}
|
|
||||||
@@ -1,119 +0,0 @@
|
|||||||
package cfgservice
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"os"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
)
|
|
||||||
|
|
||||||
func setupStoreTest(t *testing.T) (*Store, func()) {
|
|
||||||
t.Helper()
|
|
||||||
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
|
||||||
if adminDSN == "" {
|
|
||||||
t.Skip("TEST_ADMIN_DSN nicht gesetzt, Integrationstest uebersprungen")
|
|
||||||
}
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
pool, err := pgxpool.New(ctx, adminDSN)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("pool: %v", err)
|
|
||||||
}
|
|
||||||
if _, err := pool.Exec(ctx, `
|
|
||||||
CREATE TABLE IF NOT EXISTS config_values (
|
|
||||||
key TEXT NOT NULL,
|
|
||||||
scope TEXT NOT NULL CHECK (scope <> ''),
|
|
||||||
value TEXT NOT NULL,
|
|
||||||
version INT NOT NULL,
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
PRIMARY KEY (key, scope)
|
|
||||||
);
|
|
||||||
CREATE TABLE IF NOT EXISTS config_value_history (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
key TEXT NOT NULL,
|
|
||||||
scope TEXT NOT NULL,
|
|
||||||
value TEXT NOT NULL,
|
|
||||||
version INT NOT NULL,
|
|
||||||
changed_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
`); err != nil {
|
|
||||||
t.Fatalf("schema: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
cleanup := func() {
|
|
||||||
_, _ = pool.Exec(ctx, `DELETE FROM config_value_history WHERE key LIKE 'test\_%' ESCAPE '\'`)
|
|
||||||
_, _ = pool.Exec(ctx, `DELETE FROM config_values WHERE key LIKE 'test\_%' ESCAPE '\'`)
|
|
||||||
pool.Close()
|
|
||||||
}
|
|
||||||
return NewStore(pool), cleanup
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestStore_SetIncrementsVersion(t *testing.T) {
|
|
||||||
store, cleanup := setupStoreTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
v1, err := store.Set(ctx, "test_key", GlobalScope, "erster-wert")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("set 1: %v", err)
|
|
||||||
}
|
|
||||||
if v1.Version != 1 {
|
|
||||||
t.Fatalf("erwartet version 1, habe %d", v1.Version)
|
|
||||||
}
|
|
||||||
|
|
||||||
v2, err := store.Set(ctx, "test_key", GlobalScope, "zweiter-wert")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("set 2: %v", err)
|
|
||||||
}
|
|
||||||
if v2.Version != 2 {
|
|
||||||
t.Fatalf("erwartet version 2, habe %d", v2.Version)
|
|
||||||
}
|
|
||||||
|
|
||||||
got, err := store.Get(ctx, "test_key", GlobalScope)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("get: %v", err)
|
|
||||||
}
|
|
||||||
if got.Value != "zweiter-wert" || got.Version != 2 {
|
|
||||||
t.Fatalf("aktueller wert unerwartet: %+v", got)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 2 + Pruefung 3: Versionierungshistorie ueber mehrere
|
|
||||||
// Aenderungen hinweg nachvollzogen.
|
|
||||||
func TestStore_HistoryTracksAllChanges(t *testing.T) {
|
|
||||||
store, cleanup := setupStoreTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
values := []string{"v1", "v2", "v3"}
|
|
||||||
for _, v := range values {
|
|
||||||
if _, err := store.Set(ctx, "test_history_key", GlobalScope, v); err != nil {
|
|
||||||
t.Fatalf("set %q: %v", v, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
history, err := store.History(ctx, "test_history_key", GlobalScope)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("history: %v", err)
|
|
||||||
}
|
|
||||||
if len(history) != 3 {
|
|
||||||
t.Fatalf("erwartet 3 historieneintraege, habe %d", len(history))
|
|
||||||
}
|
|
||||||
for i, h := range history {
|
|
||||||
if h.Version != i+1 || h.Value != values[i] {
|
|
||||||
t.Fatalf("historieneintrag[%d] unerwartet: %+v", i, h)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestStore_GetUnknownKeyReturnsNotFound(t *testing.T) {
|
|
||||||
store, cleanup := setupStoreTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
if _, err := store.Get(ctx, "test_nie_gesetzt", GlobalScope); !errors.Is(err, ErrNotFound) {
|
|
||||||
t.Fatalf("erwartet ErrNotFound, habe %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,207 +0,0 @@
|
|||||||
package channels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/notify"
|
|
||||||
)
|
|
||||||
|
|
||||||
func setupTest(t *testing.T) (*TemplateStore, *InAppStore, func()) {
|
|
||||||
t.Helper()
|
|
||||||
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
|
||||||
if adminDSN == "" {
|
|
||||||
t.Skip("TEST_ADMIN_DSN nicht gesetzt, Integrationstest uebersprungen")
|
|
||||||
}
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
pool, err := pgxpool.New(ctx, adminDSN)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("pool: %v", err)
|
|
||||||
}
|
|
||||||
if _, err := pool.Exec(ctx, `
|
|
||||||
CREATE TABLE IF NOT EXISTS notification_templates (
|
|
||||||
tenant_slug TEXT NOT NULL, key TEXT NOT NULL, subject TEXT NOT NULL, body TEXT NOT NULL,
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(), PRIMARY KEY (tenant_slug, key)
|
|
||||||
);
|
|
||||||
CREATE TABLE IF NOT EXISTS in_app_notifications (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), tenant_slug TEXT NOT NULL, user_id TEXT NOT NULL,
|
|
||||||
title TEXT NOT NULL, body TEXT NOT NULL, read_at TIMESTAMPTZ, created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
CREATE TABLE IF NOT EXISTS notification_jobs (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), channel TEXT NOT NULL, recipient TEXT NOT NULL,
|
|
||||||
payload JSONB NOT NULL DEFAULT '{}'::jsonb, status TEXT NOT NULL DEFAULT 'pending' CHECK (status IN ('pending','sent','failed')),
|
|
||||||
attempts INT NOT NULL DEFAULT 0, max_attempts INT NOT NULL DEFAULT 5,
|
|
||||||
next_attempt_at TIMESTAMPTZ NOT NULL DEFAULT now(), last_error TEXT,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(), updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
`); err != nil {
|
|
||||||
t.Fatalf("schema: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
cleanup := func() { pool.Close() }
|
|
||||||
return NewTemplateStore(pool), NewInAppStore(pool), cleanup
|
|
||||||
}
|
|
||||||
|
|
||||||
func uniqueKey(prefix string) string {
|
|
||||||
return fmt.Sprintf("%s_%d", prefix, time.Now().UnixNano())
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 1 + Pruefung 1: Vorlagenrendering mit fehlenden
|
|
||||||
// Platzhaltern bricht kontrolliert ab.
|
|
||||||
func TestRender_MissingPlaceholderAborts(t *testing.T) {
|
|
||||||
tmpl := Template{Subject: "Hallo {{.name}}", Body: "Dein Code: {{.code}}"}
|
|
||||||
|
|
||||||
_, _, err := Render(tmpl, map[string]any{"name": "Alice"}) // "code" fehlt
|
|
||||||
if err == nil {
|
|
||||||
t.Fatal("erwartet fehler bei fehlendem platzhalter 'code'")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestRender_SucceedsWithAllPlaceholders(t *testing.T) {
|
|
||||||
tmpl := Template{Subject: "Hallo {{.name}}", Body: "Dein Code: {{.code}}"}
|
|
||||||
|
|
||||||
subject, body, err := Render(tmpl, map[string]any{"name": "Alice", "code": "1234"})
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("render: %v", err)
|
|
||||||
}
|
|
||||||
if subject != "Hallo Alice" || body != "Dein Code: 1234" {
|
|
||||||
t.Fatalf("unerwartet: subject=%q body=%q", subject, body)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 3: Vorlagen pro Tenant anpassbar, Fallback auf global.
|
|
||||||
func TestTemplateStore_TenantOverrideFallsBackToGlobal(t *testing.T) {
|
|
||||||
templates, _, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
key := uniqueKey("welcome")
|
|
||||||
if err := templates.Set(ctx, GlobalTemplateScope, key, "Willkommen", "Standardtext"); err != nil {
|
|
||||||
t.Fatalf("set global: %v", err)
|
|
||||||
}
|
|
||||||
if err := templates.Set(ctx, "acme", key, "Willkommen bei ACME", "ACME-Text"); err != nil {
|
|
||||||
t.Fatalf("set tenant: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
got, err := templates.Resolve(ctx, "acme", key)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("resolve acme: %v", err)
|
|
||||||
}
|
|
||||||
if got.Subject != "Willkommen bei ACME" {
|
|
||||||
t.Fatalf("erwartet tenant-vorlage, habe %q", got.Subject)
|
|
||||||
}
|
|
||||||
|
|
||||||
got, err = templates.Resolve(ctx, "globex", key) // hat keine eigene vorlage
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("resolve globex: %v", err)
|
|
||||||
}
|
|
||||||
if got.Subject != "Willkommen" {
|
|
||||||
t.Fatalf("erwartet global-fallback, habe %q", got.Subject)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 2 + Pruefung 2: als gelesen markiert wird korrekt gefuehrt.
|
|
||||||
func TestInAppStore_MarkReadIsReflectedCorrectly(t *testing.T) {
|
|
||||||
_, inApp, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
userID := uniqueKey("user")
|
|
||||||
id, err := inApp.Create(ctx, "acme", userID, "Titel", "Text")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("create: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
list, err := inApp.ListForUser(ctx, "acme", userID)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("list (vor markierung): %v", err)
|
|
||||||
}
|
|
||||||
if len(list) != 1 || list[0].ReadAt != nil {
|
|
||||||
t.Fatalf("erwartet 1 ungelesene benachrichtigung, habe %+v", list)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := inApp.MarkRead(ctx, id); err != nil {
|
|
||||||
t.Fatalf("mark read: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
list, err = inApp.ListForUser(ctx, "acme", userID)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("list (nach markierung): %v", err)
|
|
||||||
}
|
|
||||||
if len(list) != 1 || list[0].ReadAt == nil {
|
|
||||||
t.Fatalf("erwartet als gelesen markiert, habe %+v", list)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// EmailSender bricht ab, BEVOR SMTP ueberhaupt kontaktiert wird, wenn keine
|
|
||||||
// Vorlage aufloesbar ist — Nachweis, dass der Abbruch vor dem Netzwerkzugriff
|
|
||||||
// erfolgt (Akzeptanzkriterium 1).
|
|
||||||
func TestEmailSender_AbortsBeforeSMTPWhenTemplateMissing(t *testing.T) {
|
|
||||||
templates, _, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
sender := NewEmailSender(templates, "nicht-aufloesbarer-smtp-host.invalid", "25", "noreply@example.com")
|
|
||||||
|
|
||||||
err := sender.Send(ctx, notify.Notification{
|
|
||||||
Recipient: "user@example.com",
|
|
||||||
Payload: map[string]any{"template_key": uniqueKey("nie_konfiguriert"), "tenant_slug": "acme"},
|
|
||||||
})
|
|
||||||
if !errors.Is(err, ErrTemplateNotFound) {
|
|
||||||
t.Fatalf("erwartet ErrTemplateNotFound (kein smtp-versuch), habe %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 3 + Pruefung 3: E-Mail-Versand bei nicht erreichbarem
|
|
||||||
// SMTP-Server loest das dokumentierte Retry-Verhalten ueber CFG-02 aus.
|
|
||||||
func TestEmailSender_TriggersDispatcherRetryOnUnreachableSMTP(t *testing.T) {
|
|
||||||
templates, _, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
|
||||||
pool, err := pgxpool.New(ctx, adminDSN)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("pool: %v", err)
|
|
||||||
}
|
|
||||||
defer pool.Close()
|
|
||||||
|
|
||||||
key := uniqueKey("retry_test")
|
|
||||||
if err := templates.Set(ctx, GlobalTemplateScope, key, "Betreff", "Text ohne Platzhalter"); err != nil {
|
|
||||||
t.Fatalf("set template: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
sender := NewEmailSender(templates, "nicht-aufloesbarer-smtp-host.invalid", "25", "noreply@example.com")
|
|
||||||
dispatcher := notify.NewDispatcher(pool).WithRetryPolicy(2, time.Millisecond)
|
|
||||||
|
|
||||||
jobID, err := dispatcher.Enqueue(ctx, "email", "user@example.com", map[string]any{"template_key": key, "tenant_slug": "acme"})
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("enqueue: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
for i := 0; i < 2; i++ {
|
|
||||||
time.Sleep(5 * time.Millisecond)
|
|
||||||
if _, _, err := dispatcher.ProcessDue(ctx, sender, 10); err != nil {
|
|
||||||
t.Fatalf("process due %d: %v", i, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var status string
|
|
||||||
var attempts int
|
|
||||||
if err := pool.QueryRow(ctx, `SELECT status, attempts FROM notification_jobs WHERE id = $1`, jobID).Scan(&status, &attempts); err != nil {
|
|
||||||
t.Fatalf("status lesen: %v", err)
|
|
||||||
}
|
|
||||||
if status != "failed" {
|
|
||||||
t.Fatalf("erwartet status failed nach ausgeschoepften wiederholungen bei unerreichbarem smtp, habe %q", status)
|
|
||||||
}
|
|
||||||
if attempts != 2 {
|
|
||||||
t.Fatalf("erwartet 2 versuche, habe %d", attempts)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
package channels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
"net/smtp"
|
|
||||||
"os"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/notify"
|
|
||||||
)
|
|
||||||
|
|
||||||
// EmailSender implementiert notify.Sender fuer den E-Mail-Kanal
|
|
||||||
// (Akzeptanzkriterium 1). SMTP-Zugangsdaten kommen ausschliesslich aus
|
|
||||||
// Umgebungsvariablen, nie aus Code/DB.
|
|
||||||
type EmailSender struct {
|
|
||||||
templates *TemplateStore
|
|
||||||
host string
|
|
||||||
port string
|
|
||||||
from string
|
|
||||||
username string
|
|
||||||
password string
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewEmailSenderFromEnv liest NEXARCH_SMTP_HOST/PORT/FROM (Pflicht) sowie
|
|
||||||
// optional NEXARCH_SMTP_USER/PASSWORD.
|
|
||||||
func NewEmailSenderFromEnv(templates *TemplateStore) (*EmailSender, error) {
|
|
||||||
host := os.Getenv("NEXARCH_SMTP_HOST")
|
|
||||||
port := os.Getenv("NEXARCH_SMTP_PORT")
|
|
||||||
from := os.Getenv("NEXARCH_SMTP_FROM")
|
|
||||||
if host == "" || port == "" || from == "" {
|
|
||||||
return nil, fmt.Errorf("channels: NEXARCH_SMTP_HOST/PORT/FROM muessen gesetzt sein")
|
|
||||||
}
|
|
||||||
return &EmailSender{
|
|
||||||
templates: templates,
|
|
||||||
host: host,
|
|
||||||
port: port,
|
|
||||||
from: from,
|
|
||||||
username: os.Getenv("NEXARCH_SMTP_USER"),
|
|
||||||
password: os.Getenv("NEXARCH_SMTP_PASSWORD"),
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewEmailSender erlaubt Tests, Host/Port explizit zu setzen (z.B. einen
|
|
||||||
// absichtlich nicht erreichbaren Host fuer den Retry-Nachweis), ohne
|
|
||||||
// Umgebungsvariablen zu benoetigen.
|
|
||||||
func NewEmailSender(templates *TemplateStore, host, port, from string) *EmailSender {
|
|
||||||
return &EmailSender{templates: templates, host: host, port: port, from: from}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Send rendert zuerst die Vorlage — schlaegt das fehl (z.B. fehlender
|
|
||||||
// Platzhalter), wird NIE eine SMTP-Verbindung aufgebaut
|
|
||||||
// (Akzeptanzkriterium 1 / Pruefung 1: kontrollierter Abbruch statt
|
|
||||||
// fehlerhafter Mail). Ein danach fehlschlagender SMTP-Versand liefert einen
|
|
||||||
// Fehler zurueck, den CFG-02s Dispatcher fuer die bereits getestete
|
|
||||||
// Wiederholungslogik nutzt (Akzeptanzkriterium 3 / Pruefung 3) — kein
|
|
||||||
// zweiter Retry-Mechanismus hier.
|
|
||||||
func (e *EmailSender) Send(ctx context.Context, n notify.Notification) error {
|
|
||||||
templateKey, _ := n.Payload["template_key"].(string)
|
|
||||||
tenantSlug, _ := n.Payload["tenant_slug"].(string)
|
|
||||||
|
|
||||||
tmpl, err := e.templates.Resolve(ctx, tenantSlug, templateKey)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("vorlage aufloesen: %w", err)
|
|
||||||
}
|
|
||||||
subject, body, err := Render(tmpl, n.Payload)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
msg := []byte("Subject: " + subject + "\r\n\r\n" + body)
|
|
||||||
|
|
||||||
var auth smtp.Auth
|
|
||||||
if e.username != "" {
|
|
||||||
auth = smtp.PlainAuth("", e.username, e.password, e.host)
|
|
||||||
}
|
|
||||||
addr := e.host + ":" + e.port
|
|
||||||
if err := smtp.SendMail(addr, auth, e.from, []string{n.Recipient}, msg); err != nil {
|
|
||||||
return fmt.Errorf("smtp-versand fehlgeschlagen: %w", err)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
@@ -1,74 +0,0 @@
|
|||||||
package channels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
)
|
|
||||||
|
|
||||||
type InAppNotification struct {
|
|
||||||
ID string
|
|
||||||
TenantSlug string
|
|
||||||
UserID string
|
|
||||||
Title string
|
|
||||||
Body string
|
|
||||||
ReadAt *time.Time
|
|
||||||
CreatedAt time.Time
|
|
||||||
}
|
|
||||||
|
|
||||||
// InAppStore persistiert In-App-Benachrichtigungen (Akzeptanzkriterium 2).
|
|
||||||
type InAppStore struct {
|
|
||||||
pool *pgxpool.Pool
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewInAppStore(pool *pgxpool.Pool) *InAppStore {
|
|
||||||
return &InAppStore{pool: pool}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *InAppStore) Create(ctx context.Context, tenantSlug, userID, title, body string) (string, error) {
|
|
||||||
var id string
|
|
||||||
err := s.pool.QueryRow(ctx, `
|
|
||||||
INSERT INTO in_app_notifications (tenant_slug, user_id, title, body)
|
|
||||||
VALUES ($1, $2, $3, $4)
|
|
||||||
RETURNING id
|
|
||||||
`, tenantSlug, userID, title, body).Scan(&id)
|
|
||||||
if err != nil {
|
|
||||||
return "", fmt.Errorf("in-app-benachrichtigung speichern: %w", err)
|
|
||||||
}
|
|
||||||
return id, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// ListForUser liefert alle Benachrichtigungen eines Benutzers (ueber API
|
|
||||||
// abrufbar, Akzeptanzkriterium 2).
|
|
||||||
func (s *InAppStore) ListForUser(ctx context.Context, tenantSlug, userID string) ([]InAppNotification, error) {
|
|
||||||
rows, err := s.pool.Query(ctx, `
|
|
||||||
SELECT id, title, body, read_at, created_at FROM in_app_notifications
|
|
||||||
WHERE tenant_slug = $1 AND user_id = $2 ORDER BY created_at DESC
|
|
||||||
`, tenantSlug, userID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("benachrichtigungen auflisten: %w", err)
|
|
||||||
}
|
|
||||||
defer rows.Close()
|
|
||||||
|
|
||||||
var out []InAppNotification
|
|
||||||
for rows.Next() {
|
|
||||||
n := InAppNotification{TenantSlug: tenantSlug, UserID: userID}
|
|
||||||
if err := rows.Scan(&n.ID, &n.Title, &n.Body, &n.ReadAt, &n.CreatedAt); err != nil {
|
|
||||||
return nil, fmt.Errorf("benachrichtigung lesen: %w", err)
|
|
||||||
}
|
|
||||||
out = append(out, n)
|
|
||||||
}
|
|
||||||
return out, rows.Err()
|
|
||||||
}
|
|
||||||
|
|
||||||
// MarkRead markiert eine Benachrichtigung als gelesen (Akzeptanzkriterium 2
|
|
||||||
// / Pruefung 2).
|
|
||||||
func (s *InAppStore) MarkRead(ctx context.Context, id string) error {
|
|
||||||
_, err := s.pool.Exec(ctx, `UPDATE in_app_notifications SET read_at = now() WHERE id = $1`, id)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("als gelesen markieren: %w", err)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
package channels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/notify"
|
|
||||||
)
|
|
||||||
|
|
||||||
// InAppSender implementiert notify.Sender fuer den In-App-Kanal
|
|
||||||
// (Akzeptanzkriterium 2). Nutzt eine Vorlage, falls payload["template_key"]
|
|
||||||
// gesetzt ist, sonst direkt payload["title"]/["body"].
|
|
||||||
type InAppSender struct {
|
|
||||||
store *InAppStore
|
|
||||||
templates *TemplateStore
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewInAppSender(store *InAppStore, templates *TemplateStore) *InAppSender {
|
|
||||||
return &InAppSender{store: store, templates: templates}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *InAppSender) Send(ctx context.Context, n notify.Notification) error {
|
|
||||||
tenantSlug, _ := n.Payload["tenant_slug"].(string)
|
|
||||||
|
|
||||||
var title, body string
|
|
||||||
if templateKey, ok := n.Payload["template_key"].(string); ok && templateKey != "" {
|
|
||||||
tmpl, err := s.templates.Resolve(ctx, tenantSlug, templateKey)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
title, body, err = Render(tmpl, n.Payload)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
title, _ = n.Payload["title"].(string)
|
|
||||||
body, _ = n.Payload["body"].(string)
|
|
||||||
}
|
|
||||||
|
|
||||||
_, err := s.store.Create(ctx, tenantSlug, n.Recipient, title, body)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
package channels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/notify"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Router waehlt anhand von Notification.Channel den zustaendigen Kanal aus
|
|
||||||
// — ein neuer Kanal wird per Register() ergaenzt, ohne den Dispatcher
|
|
||||||
// (CFG-02) oder Router selbst umzubauen (Unleash-artiger Strategie-Gedanke,
|
|
||||||
// siehe Ticket-DNA).
|
|
||||||
type Router struct {
|
|
||||||
channels map[string]notify.Sender
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewRouter() *Router {
|
|
||||||
return &Router{channels: make(map[string]notify.Sender)}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *Router) Register(channel string, sender notify.Sender) {
|
|
||||||
r.channels[channel] = sender
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *Router) Send(ctx context.Context, n notify.Notification) error {
|
|
||||||
sender, ok := r.channels[n.Channel]
|
|
||||||
if !ok {
|
|
||||||
return fmt.Errorf("channels: unbekannter kanal %q", n.Channel)
|
|
||||||
}
|
|
||||||
return sender.Send(ctx, n)
|
|
||||||
}
|
|
||||||
@@ -1,104 +0,0 @@
|
|||||||
// Package channels implementiert Core CFG-03: konkrete Zustellkanaele fuer
|
|
||||||
// den CFG-02-Dispatcher (E-Mail, In-App) inklusive Vorlagenverwaltung.
|
|
||||||
// Neue Kanaele lassen sich ergaenzen, ohne den Dispatcher selbst
|
|
||||||
// anzufassen — jeder Kanal implementiert nur notify.Sender.
|
|
||||||
package channels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"text/template"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5"
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
)
|
|
||||||
|
|
||||||
// GlobalTemplateScope ist der Fallback-Wert, wenn ein Tenant keine eigene
|
|
||||||
// Vorlage konfiguriert hat (Akzeptanzkriterium 3).
|
|
||||||
const GlobalTemplateScope = "global"
|
|
||||||
|
|
||||||
var ErrTemplateNotFound = errors.New("channels: keine vorlage gefunden")
|
|
||||||
|
|
||||||
type Template struct {
|
|
||||||
Subject string
|
|
||||||
Body string
|
|
||||||
}
|
|
||||||
|
|
||||||
type TemplateStore struct {
|
|
||||||
pool *pgxpool.Pool
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewTemplateStore(pool *pgxpool.Pool) *TemplateStore {
|
|
||||||
return &TemplateStore{pool: pool}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set legt eine Vorlage fuer einen Tenant (oder GlobalTemplateScope) fest.
|
|
||||||
func (s *TemplateStore) Set(ctx context.Context, tenantSlug, key, subject, body string) error {
|
|
||||||
_, err := s.pool.Exec(ctx, `
|
|
||||||
INSERT INTO notification_templates (tenant_slug, key, subject, body, updated_at)
|
|
||||||
VALUES ($1, $2, $3, $4, now())
|
|
||||||
ON CONFLICT (tenant_slug, key) DO UPDATE SET subject = $3, body = $4, updated_at = now()
|
|
||||||
`, tenantSlug, key, subject, body)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("vorlage speichern: %w", err)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Resolve liefert die Vorlage eines Tenants, faellt auf GlobalTemplateScope
|
|
||||||
// zurueck, wenn der Tenant keine eigene gesetzt hat (Akzeptanzkriterium 3).
|
|
||||||
func (s *TemplateStore) Resolve(ctx context.Context, tenantSlug, key string) (Template, error) {
|
|
||||||
if tenantSlug != "" && tenantSlug != GlobalTemplateScope {
|
|
||||||
if t, err := s.get(ctx, tenantSlug, key); err == nil {
|
|
||||||
return t, nil
|
|
||||||
} else if !errors.Is(err, ErrTemplateNotFound) {
|
|
||||||
return Template{}, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return s.get(ctx, GlobalTemplateScope, key)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *TemplateStore) get(ctx context.Context, tenantSlug, key string) (Template, error) {
|
|
||||||
var t Template
|
|
||||||
err := s.pool.QueryRow(ctx, `
|
|
||||||
SELECT subject, body FROM notification_templates WHERE tenant_slug = $1 AND key = $2
|
|
||||||
`, tenantSlug, key).Scan(&t.Subject, &t.Body)
|
|
||||||
if err != nil {
|
|
||||||
if errors.Is(err, pgx.ErrNoRows) {
|
|
||||||
return Template{}, ErrTemplateNotFound
|
|
||||||
}
|
|
||||||
return Template{}, fmt.Errorf("vorlage lesen: %w", err)
|
|
||||||
}
|
|
||||||
return t, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Render fuellt eine Vorlage mit data. Fehlt ein referenzierter Platzhalter
|
|
||||||
// in data, bricht das Rendering kontrolliert MIT FEHLER ab, statt eine
|
|
||||||
// fehlerhafte/unvollstaendige Nachricht zu erzeugen (Akzeptanzkriterium 1 /
|
|
||||||
// Pruefung 1) — text/template mit Option("missingkey=error") liefert dafuer
|
|
||||||
// einen Fehler statt stillschweigend "<no value>" einzusetzen.
|
|
||||||
func Render(tmpl Template, data map[string]any) (subject, body string, err error) {
|
|
||||||
subject, err = renderOne("subject", tmpl.Subject, data)
|
|
||||||
if err != nil {
|
|
||||||
return "", "", err
|
|
||||||
}
|
|
||||||
body, err = renderOne("body", tmpl.Body, data)
|
|
||||||
if err != nil {
|
|
||||||
return "", "", err
|
|
||||||
}
|
|
||||||
return subject, body, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func renderOne(name, text string, data map[string]any) (string, error) {
|
|
||||||
tmpl, err := template.New(name).Option("missingkey=error").Parse(text)
|
|
||||||
if err != nil {
|
|
||||||
return "", fmt.Errorf("vorlage %q parsen: %w", name, err)
|
|
||||||
}
|
|
||||||
var buf bytes.Buffer
|
|
||||||
if err := tmpl.Execute(&buf, data); err != nil {
|
|
||||||
return "", fmt.Errorf("vorlage %q rendern (fehlender platzhalter?): %w", name, err)
|
|
||||||
}
|
|
||||||
return buf.String(), nil
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,86 @@
|
|||||||
|
package moduletrust
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// StaleCache ist der generische Rechte-/Feature-Flag-Cache-Kontrakt
|
||||||
|
// (Akzeptanzkriterium 2): TTL-basiert, mit explizitem, benanntem Verhalten
|
||||||
|
// bei abgelaufenem Cache waehrend Core nicht erreichbar ist.
|
||||||
|
//
|
||||||
|
// - Get: FAIL-OPEN fuer Lesevorgaenge. Schlaegt der Refresh fehl, aber es
|
||||||
|
// gibt bereits einen (wenn auch abgelaufenen) Stand, wird dieser mit
|
||||||
|
// stale=true zurueckgegeben — Begruendung: ein bereits authentifiziertes
|
||||||
|
// Modul soll mit dem letztbekannten Stand weiterarbeiten koennen statt
|
||||||
|
// hart zu blockieren (siehe "Bekannte Fehler vermeiden" im Ticket).
|
||||||
|
// Existiert noch nie ein Stand, gibt es keinen sinnvollen Fallback —
|
||||||
|
// dann liefert auch Get einen Fehler.
|
||||||
|
// - RequireFresh: FAIL-CLOSED fuer sicherheitskritische Aktionen (z.B.
|
||||||
|
// ein komplett NEUER Login). Nutzt NIEMALS einen zwischengespeicherten
|
||||||
|
// Stand, ruft immer frisch ab — Begruendung: eine neue Vertrauens-
|
||||||
|
// entscheidung darf nicht auf veralteten Daten beruhen, auch wenn das
|
||||||
|
// bedeutet, dass die Aktion bei Core-Ausfall sichtbar fehlschlaegt statt
|
||||||
|
// unsicher "irgendwie" durchgelassen zu werden.
|
||||||
|
//
|
||||||
|
// LIC-02 (internal/flag.Service) implementiert bereits denselben Kontrakt
|
||||||
|
// fuer Feature-Flags — StaleCache verallgemeinert dasselbe Muster fuer
|
||||||
|
// JWT-Signaturschluessel, damit beide Faelle derselben dokumentierten
|
||||||
|
// Policy folgen.
|
||||||
|
type StaleCache[T any] struct {
|
||||||
|
mu sync.RWMutex
|
||||||
|
value T
|
||||||
|
hasValue bool
|
||||||
|
fetchedAt time.Time
|
||||||
|
ttl time.Duration
|
||||||
|
fetch func(ctx context.Context) (T, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewStaleCache[T any](ttl time.Duration, fetch func(ctx context.Context) (T, error)) *StaleCache[T] {
|
||||||
|
return &StaleCache[T]{ttl: ttl, fetch: fetch}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get liefert den Cache-Wert. FAIL-OPEN: bei Refresh-Fehler wird ein
|
||||||
|
// vorhandener, ggf. abgelaufener Stand zurueckgegeben (stale=true).
|
||||||
|
func (c *StaleCache[T]) Get(ctx context.Context) (value T, stale bool, err error) {
|
||||||
|
c.mu.RLock()
|
||||||
|
fresh := c.hasValue && time.Since(c.fetchedAt) < c.ttl
|
||||||
|
if fresh {
|
||||||
|
v := c.value
|
||||||
|
c.mu.RUnlock()
|
||||||
|
return v, false, nil
|
||||||
|
}
|
||||||
|
c.mu.RUnlock()
|
||||||
|
|
||||||
|
newVal, fetchErr := c.fetch(ctx)
|
||||||
|
if fetchErr == nil {
|
||||||
|
c.mu.Lock()
|
||||||
|
c.value, c.hasValue, c.fetchedAt = newVal, true, time.Now()
|
||||||
|
c.mu.Unlock()
|
||||||
|
return newVal, false, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
c.mu.RLock()
|
||||||
|
defer c.mu.RUnlock()
|
||||||
|
if c.hasValue {
|
||||||
|
return c.value, true, nil
|
||||||
|
}
|
||||||
|
var zero T
|
||||||
|
return zero, false, fmt.Errorf("cache leer und refresh fehlgeschlagen: %w", fetchErr)
|
||||||
|
}
|
||||||
|
|
||||||
|
// RequireFresh ruft IMMER frisch ab (FAIL-CLOSED) — fuer sicherheitskritische
|
||||||
|
// Aktionen, die niemals auf einem zwischengespeicherten Stand basieren duerfen.
|
||||||
|
func (c *StaleCache[T]) RequireFresh(ctx context.Context) (T, error) {
|
||||||
|
v, err := c.fetch(ctx)
|
||||||
|
if err != nil {
|
||||||
|
var zero T
|
||||||
|
return zero, fmt.Errorf("core nicht erreichbar, sicherheitskritische aktion abgelehnt: %w", err)
|
||||||
|
}
|
||||||
|
c.mu.Lock()
|
||||||
|
c.value, c.hasValue, c.fetchedAt = v, true, time.Now()
|
||||||
|
c.mu.Unlock()
|
||||||
|
return v, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,79 @@
|
|||||||
|
package moduletrust
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/base64"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/golang-jwt/jwt/v5"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Claims struct {
|
||||||
|
Subject string `json:"sub"`
|
||||||
|
TenantSlug string `json:"tenant"`
|
||||||
|
jwt.RegisteredClaims
|
||||||
|
}
|
||||||
|
|
||||||
|
// Issue signiert ein Token mit dem aktuellen Signierschluessel und traegt
|
||||||
|
// dessen KID im JWT-Header ein — der Verifier auf Modulseite waehlt darueber
|
||||||
|
// den passenden oeffentlichen Schluessel aus PublicKeySet() aus.
|
||||||
|
func (m *KeyManager) Issue(subject, tenantSlug string, ttl time.Duration) (string, error) {
|
||||||
|
key, err := m.SigningKey()
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
now := time.Now()
|
||||||
|
claims := Claims{
|
||||||
|
Subject: subject,
|
||||||
|
TenantSlug: tenantSlug,
|
||||||
|
RegisteredClaims: jwt.RegisteredClaims{
|
||||||
|
IssuedAt: jwt.NewNumericDate(now),
|
||||||
|
ExpiresAt: jwt.NewNumericDate(now.Add(ttl)),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
token := jwt.NewWithClaims(jwt.SigningMethodEdDSA, claims)
|
||||||
|
token.Header["kid"] = key.KID
|
||||||
|
return token.SignedString(key.Private)
|
||||||
|
}
|
||||||
|
|
||||||
|
type jwksResponse struct {
|
||||||
|
Keys []jwksKey `json:"keys"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type jwksKey struct {
|
||||||
|
Kid string `json:"kid"`
|
||||||
|
PublicKey string `json:"public_key"` // base64 (raw Ed25519, 32 Byte)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ServeJWKS liefert alle bekannten oeffentlichen Schluessel als JSON —
|
||||||
|
// Module fragen dies periodisch ab (nicht pro Request), siehe Verifier.
|
||||||
|
func (m *KeyManager) ServeJWKS(w http.ResponseWriter, r *http.Request) {
|
||||||
|
set := m.PublicKeySet()
|
||||||
|
resp := jwksResponse{Keys: make([]jwksKey, 0, len(set))}
|
||||||
|
for kid, pub := range set {
|
||||||
|
resp.Keys = append(resp.Keys, jwksKey{Kid: kid, PublicKey: base64.StdEncoding.EncodeToString(pub)})
|
||||||
|
}
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
_ = json.NewEncoder(w).Encode(resp)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ParseJWKS dekodiert die JSON-Antwort von ServeJWKS zurueck in kid->PublicKey
|
||||||
|
// — Hilfsfunktion fuer Module, die JWKS per HTTP abrufen.
|
||||||
|
func ParseJWKS(data []byte) (map[string][]byte, error) {
|
||||||
|
var resp jwksResponse
|
||||||
|
if err := json.Unmarshal(data, &resp); err != nil {
|
||||||
|
return nil, fmt.Errorf("jwks parsen: %w", err)
|
||||||
|
}
|
||||||
|
out := make(map[string][]byte, len(resp.Keys))
|
||||||
|
for _, k := range resp.Keys {
|
||||||
|
raw, err := base64.StdEncoding.DecodeString(k.PublicKey)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("oeffentlichen schluessel %q dekodieren: %w", k.Kid, err)
|
||||||
|
}
|
||||||
|
out[k.Kid] = raw
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
// Package moduletrust implementiert Core API-05: asymmetrische JWT-Signatur
|
||||||
|
// mit Schluesselverteilung (JWKS), damit DMS/Mail/Archive/Workflow JWTs
|
||||||
|
// LOKAL verifizieren koennen, ohne pro Aufruf einen synchronen Request an
|
||||||
|
// Core zu stellen — Core darf Fundament sein, ohne zum Flaschenhals zu
|
||||||
|
// werden (siehe Entscheidungsverlauf "Vertrauensstellung Core<->Module" in
|
||||||
|
// nexarch-state.json). IAM-02s HS256-Session-Cookie (Browser-Login) bleibt
|
||||||
|
// unangetastet — dies ist ein zusaetzlicher, getrennter Vertrauensmechanismus
|
||||||
|
// fuer Modul-zu-Modul/Modul-zu-Core-Aufrufe.
|
||||||
|
package moduletrust
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/ed25519"
|
||||||
|
"crypto/rand"
|
||||||
|
"encoding/hex"
|
||||||
|
"fmt"
|
||||||
|
"sync"
|
||||||
|
)
|
||||||
|
|
||||||
|
type KeyPair struct {
|
||||||
|
KID string
|
||||||
|
Private ed25519.PrivateKey
|
||||||
|
Public ed25519.PublicKey
|
||||||
|
}
|
||||||
|
|
||||||
|
// KeyManager haelt ALLE noch gueltigen Schluesselpaare — nicht nur das
|
||||||
|
// aktuell signierende. Rotate erzeugt ein neues Paar und behaelt die alten
|
||||||
|
// fuer die Verifikation bereits ausgestellter Tokens (Akzeptanzkriterium 3:
|
||||||
|
// Rotation ohne Ausfallzeit fuer andere Module).
|
||||||
|
type KeyManager struct {
|
||||||
|
mu sync.RWMutex
|
||||||
|
keys []KeyPair // aeltestes zuerst, neuestes zuletzt
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewKeyManager() (*KeyManager, error) {
|
||||||
|
m := &KeyManager{}
|
||||||
|
if _, err := m.Rotate(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return m, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Rotate erzeugt ein neues Ed25519-Schluesselpaar mit eigener KID und macht
|
||||||
|
// es zum aktuellen Signierschluessel. Aeltere Schluessel bleiben in
|
||||||
|
// PublicKeySet() erhalten, damit bereits ausgestellte Tokens weiterhin
|
||||||
|
// verifizierbar sind.
|
||||||
|
func (m *KeyManager) Rotate() (KeyPair, error) {
|
||||||
|
pub, priv, err := ed25519.GenerateKey(nil)
|
||||||
|
if err != nil {
|
||||||
|
return KeyPair{}, fmt.Errorf("schluesselpaar erzeugen: %w", err)
|
||||||
|
}
|
||||||
|
kidBytes := make([]byte, 8)
|
||||||
|
if _, err := rand.Read(kidBytes); err != nil {
|
||||||
|
return KeyPair{}, fmt.Errorf("kid erzeugen: %w", err)
|
||||||
|
}
|
||||||
|
kp := KeyPair{KID: hex.EncodeToString(kidBytes), Private: priv, Public: pub}
|
||||||
|
|
||||||
|
m.mu.Lock()
|
||||||
|
m.keys = append(m.keys, kp)
|
||||||
|
m.mu.Unlock()
|
||||||
|
return kp, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SigningKey liefert den aktuellen (neuesten) Schluessel zum Signieren neuer Tokens.
|
||||||
|
func (m *KeyManager) SigningKey() (KeyPair, error) {
|
||||||
|
m.mu.RLock()
|
||||||
|
defer m.mu.RUnlock()
|
||||||
|
if len(m.keys) == 0 {
|
||||||
|
return KeyPair{}, fmt.Errorf("moduletrust: kein schluessel vorhanden")
|
||||||
|
}
|
||||||
|
return m.keys[len(m.keys)-1], nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// PublicKeySet liefert ALLE bekannten oeffentlichen Schluessel (kid ->
|
||||||
|
// public key) — die Grundlage fuer den JWKS-Endpunkt.
|
||||||
|
func (m *KeyManager) PublicKeySet() map[string]ed25519.PublicKey {
|
||||||
|
m.mu.RLock()
|
||||||
|
defer m.mu.RUnlock()
|
||||||
|
out := make(map[string]ed25519.PublicKey, len(m.keys))
|
||||||
|
for _, k := range m.keys {
|
||||||
|
out[k.KID] = k.Public
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
@@ -0,0 +1,214 @@
|
|||||||
|
package moduletrust
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"crypto/ed25519"
|
||||||
|
"errors"
|
||||||
|
"net/http"
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestIssueAndVerify_RoundTrip(t *testing.T) {
|
||||||
|
km, err := NewKeyManager()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("new key manager: %v", err)
|
||||||
|
}
|
||||||
|
token, err := km.Issue("user-1", "acme", time.Hour)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
v := NewVerifier(time.Hour, func(ctx context.Context) (map[string]ed25519.PublicKey, error) {
|
||||||
|
return km.PublicKeySet(), nil
|
||||||
|
})
|
||||||
|
claims, err := v.Verify(context.Background(), token)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("verify: %v", err)
|
||||||
|
}
|
||||||
|
if claims.Subject != "user-1" || claims.TenantSlug != "acme" {
|
||||||
|
t.Fatalf("claims unerwartet: %+v", claims)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1: Verifikation lokal, kein Request pro Aufruf.
|
||||||
|
func TestVerify_DoesNotFetchPerCall(t *testing.T) {
|
||||||
|
km, err := NewKeyManager()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("new key manager: %v", err)
|
||||||
|
}
|
||||||
|
token, err := km.Issue("user-1", "acme", time.Hour)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var mu sync.Mutex
|
||||||
|
fetchCalls := 0
|
||||||
|
v := NewVerifier(time.Hour, func(ctx context.Context) (map[string]ed25519.PublicKey, error) {
|
||||||
|
mu.Lock()
|
||||||
|
fetchCalls++
|
||||||
|
mu.Unlock()
|
||||||
|
return km.PublicKeySet(), nil
|
||||||
|
})
|
||||||
|
|
||||||
|
for i := 0; i < 10; i++ {
|
||||||
|
if _, err := v.Verify(context.Background(), token); err != nil {
|
||||||
|
t.Fatalf("verify %d: %v", i, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mu.Lock()
|
||||||
|
defer mu.Unlock()
|
||||||
|
if fetchCalls != 1 {
|
||||||
|
t.Fatalf("erwartet genau 1 fetch fuer 10 Verify-Aufrufe innerhalb der TTL, habe %d", fetchCalls)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 1: Core simuliert nicht erreichbar,
|
||||||
|
// bereits authentifizierte Nutzer bleiben funktionsfaehig (Fail-Open mit
|
||||||
|
// letztbekanntem Schluesselstand).
|
||||||
|
func TestVerify_FailsOpenWhenCoreUnreachableButStaleKeysExist(t *testing.T) {
|
||||||
|
km, err := NewKeyManager()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("new key manager: %v", err)
|
||||||
|
}
|
||||||
|
token, err := km.Issue("user-1", "acme", time.Hour)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
coreDown := false
|
||||||
|
v := NewVerifier(30*time.Millisecond, func(ctx context.Context) (map[string]ed25519.PublicKey, error) {
|
||||||
|
if coreDown {
|
||||||
|
return nil, errors.New("core nicht erreichbar (simuliert)")
|
||||||
|
}
|
||||||
|
return km.PublicKeySet(), nil
|
||||||
|
})
|
||||||
|
|
||||||
|
// Cache vorwaermen, waehrend Core noch erreichbar ist.
|
||||||
|
if _, err := v.Verify(context.Background(), token); err != nil {
|
||||||
|
t.Fatalf("verify (warm): %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// "Core abschalten" und TTL ablaufen lassen.
|
||||||
|
coreDown = true
|
||||||
|
time.Sleep(50 * time.Millisecond)
|
||||||
|
|
||||||
|
if _, err := v.Verify(context.Background(), token); err != nil {
|
||||||
|
t.Fatalf("verify sollte trotz core-ausfall mit letztbekanntem stand funktionieren: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 2 + Pruefung 2: neue sicherheitskritische Aktionen
|
||||||
|
// (z.B. neuer Login) schlagen bei Core-Ausfall klar fehl statt unsicher
|
||||||
|
// durchgelassen zu werden — auch wenn ein (aelterer) Cache-Stand existiert.
|
||||||
|
func TestRequireFreshKeys_FailsClosedWhenCoreUnreachable(t *testing.T) {
|
||||||
|
km, err := NewKeyManager()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("new key manager: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
coreDown := false
|
||||||
|
v := NewVerifier(time.Hour, func(ctx context.Context) (map[string]ed25519.PublicKey, error) {
|
||||||
|
if coreDown {
|
||||||
|
return nil, errors.New("core nicht erreichbar (simuliert)")
|
||||||
|
}
|
||||||
|
return km.PublicKeySet(), nil
|
||||||
|
})
|
||||||
|
|
||||||
|
// Cache vorwaermen (existiert jetzt ein "veralteter" gueltiger Stand).
|
||||||
|
if _, _, err := v.cache.Get(context.Background()); err != nil {
|
||||||
|
t.Fatalf("warm cache: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
coreDown = true
|
||||||
|
if err := v.RequireFreshKeys(context.Background()); err == nil {
|
||||||
|
t.Fatal("erwartet fehler (fail-closed) bei core-ausfall, habe nil")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 + Pruefung 3: Schluesselrotation ohne Ausfallzeit —
|
||||||
|
// ein bereits ausgestelltes Token bleibt nach Rotation weiterhin
|
||||||
|
// verifizierbar, ein zweites (simuliertes) Modul bekommt beide Schluessel.
|
||||||
|
func TestRotate_NoDowntimeForAlreadyIssuedTokens(t *testing.T) {
|
||||||
|
km, err := NewKeyManager()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("new key manager: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
oldToken, err := km.Issue("user-1", "acme", time.Hour)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue (alt): %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := km.Rotate(); err != nil {
|
||||||
|
t.Fatalf("rotate: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
newToken, err := km.Issue("user-2", "acme", time.Hour)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue (neu): %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Simuliertes zweites Modul: fragt den vollstaendigen Schluesselsatz ab.
|
||||||
|
moduleB := NewVerifier(time.Hour, func(ctx context.Context) (map[string]ed25519.PublicKey, error) {
|
||||||
|
return km.PublicKeySet(), nil
|
||||||
|
})
|
||||||
|
|
||||||
|
if _, err := moduleB.Verify(context.Background(), oldToken); err != nil {
|
||||||
|
t.Fatalf("altes token sollte nach rotation weiterhin gueltig sein: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := moduleB.Verify(context.Background(), newToken); err != nil {
|
||||||
|
t.Fatalf("neues token sollte gueltig sein: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestVerify_RejectsUnknownKid(t *testing.T) {
|
||||||
|
km1, _ := NewKeyManager()
|
||||||
|
km2, _ := NewKeyManager() // komplett anderer, unbekannter schluessel
|
||||||
|
|
||||||
|
token, err := km1.Issue("user-1", "acme", time.Hour)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
v := NewVerifier(time.Hour, func(ctx context.Context) (map[string]ed25519.PublicKey, error) {
|
||||||
|
return km2.PublicKeySet(), nil // kennt km1s schluessel nicht
|
||||||
|
})
|
||||||
|
if _, err := v.Verify(context.Background(), token); !errors.Is(err, ErrInvalidToken) {
|
||||||
|
t.Fatalf("erwartet ErrInvalidToken, habe %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestJWKSRoundTrip(t *testing.T) {
|
||||||
|
km, _ := NewKeyManager()
|
||||||
|
km.Rotate()
|
||||||
|
|
||||||
|
var buf []byte
|
||||||
|
rec := &captureWriter{}
|
||||||
|
km.ServeJWKS(rec, nil)
|
||||||
|
buf = rec.body
|
||||||
|
|
||||||
|
parsed, err := ParseJWKS(buf)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("parse jwks: %v", err)
|
||||||
|
}
|
||||||
|
if len(parsed) != len(km.PublicKeySet()) {
|
||||||
|
t.Fatalf("erwartet %d schluessel, habe %d", len(km.PublicKeySet()), len(parsed))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type captureWriter struct {
|
||||||
|
body []byte
|
||||||
|
header http.Header
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *captureWriter) Header() http.Header {
|
||||||
|
if w.header == nil {
|
||||||
|
w.header = http.Header{}
|
||||||
|
}
|
||||||
|
return w.header
|
||||||
|
}
|
||||||
|
func (w *captureWriter) Write(p []byte) (int, error) { w.body = append(w.body, p...); return len(p), nil }
|
||||||
|
func (w *captureWriter) WriteHeader(statusCode int) {}
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
package moduletrust
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"crypto/ed25519"
|
||||||
|
"errors"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/golang-jwt/jwt/v5"
|
||||||
|
)
|
||||||
|
|
||||||
|
var ErrInvalidToken = errors.New("moduletrust: ungueltiges token")
|
||||||
|
|
||||||
|
// KeyFetchFunc holt den aktuellen Schluesselsatz von Core (z.B. per HTTP-GET
|
||||||
|
// auf ServeJWKS + ParseJWKS). Wird vom Verifier nur bei abgelaufener TTL
|
||||||
|
// aufgerufen — NICHT bei jeder Verify()-Anfrage (Akzeptanzkriterium 1).
|
||||||
|
type KeyFetchFunc func(ctx context.Context) (map[string]ed25519.PublicKey, error)
|
||||||
|
|
||||||
|
// Verifier ist die Modulseite von API-05: verifiziert JWTs LOKAL gegen einen
|
||||||
|
// per StaleCache zwischengespeicherten Schluesselsatz, ohne pro Aufruf einen
|
||||||
|
// synchronen Request an Core zu stellen.
|
||||||
|
type Verifier struct {
|
||||||
|
cache *StaleCache[map[string]ed25519.PublicKey]
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewVerifier(ttl time.Duration, fetch KeyFetchFunc) *Verifier {
|
||||||
|
return &Verifier{cache: NewStaleCache(ttl, func(ctx context.Context) (map[string]ed25519.PublicKey, error) {
|
||||||
|
return fetch(ctx)
|
||||||
|
})}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verify prueft die Signatur LOKAL gegen den (ggf. abgelaufenen, aber
|
||||||
|
// vorhandenen) Schluesselsatz — FAIL-OPEN fuer bereits ausgestellte Tokens
|
||||||
|
// (Akzeptanzkriterium 2): ist Core nicht erreichbar, aber ein alter
|
||||||
|
// Schluesselsatz bekannt, wird damit weiter verifiziert.
|
||||||
|
func (v *Verifier) Verify(ctx context.Context, tokenString string) (*Claims, error) {
|
||||||
|
keys, _, err := v.cache.Get(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
claims := &Claims{}
|
||||||
|
token, err := jwt.ParseWithClaims(tokenString, claims, func(t *jwt.Token) (interface{}, error) {
|
||||||
|
if _, ok := t.Method.(*jwt.SigningMethodEd25519); !ok {
|
||||||
|
return nil, ErrInvalidToken
|
||||||
|
}
|
||||||
|
kid, _ := t.Header["kid"].(string)
|
||||||
|
pub, ok := keys[kid]
|
||||||
|
if !ok {
|
||||||
|
return nil, ErrInvalidToken
|
||||||
|
}
|
||||||
|
return pub, nil
|
||||||
|
})
|
||||||
|
if err != nil || !token.Valid {
|
||||||
|
return nil, ErrInvalidToken
|
||||||
|
}
|
||||||
|
return claims, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// RequireFreshKeys ruft IMMER frisch von Core ab (FAIL-CLOSED) — fuer
|
||||||
|
// sicherheitskritische Aktionen wie einen komplett neuen Login
|
||||||
|
// (Akzeptanzkriterium 2): schlaegt klar fehl, wenn Core nicht erreichbar
|
||||||
|
// ist, statt auf einem veralteten Schluesselsatz zu vertrauen.
|
||||||
|
func (v *Verifier) RequireFreshKeys(ctx context.Context) error {
|
||||||
|
_, err := v.cache.RequireFresh(ctx)
|
||||||
|
return err
|
||||||
|
}
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
// Package notify implementiert Core CFG-02: den zentralen Benachrichtigungs-
|
|
||||||
// Dispatcher, ueber den beliebige Module Benachrichtigungen ausloesen —
|
|
||||||
// Warteschlange, Wiederholungslogik, Kanal-Abstraktion. Die tatsaechlichen
|
|
||||||
// Kanaele (E-Mail/In-App) sind CFG-03, hier gibt es nur die Sender-
|
|
||||||
// Schnittstelle als Vorbereitung.
|
|
||||||
package notify
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
)
|
|
||||||
|
|
||||||
// DefaultMaxAttempts begrenzt Wiederholungsversuche (Akzeptanzkriterium 2) —
|
|
||||||
// nach dieser Anzahl gibt der Dispatcher kontrolliert auf (status=failed)
|
|
||||||
// statt endlos zu wiederholen.
|
|
||||||
const DefaultMaxAttempts = 5
|
|
||||||
|
|
||||||
// DefaultRetryBackoff ist die Basis-Wartezeit zwischen Wiederholungen,
|
|
||||||
// linear mit der Versuchsnummer skaliert.
|
|
||||||
const DefaultRetryBackoff = 200 * time.Millisecond
|
|
||||||
|
|
||||||
type Notification struct {
|
|
||||||
ID string
|
|
||||||
Channel string
|
|
||||||
Recipient string
|
|
||||||
Payload map[string]any
|
|
||||||
Attempts int
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sender ist die schmale Schnittstelle, die ein konkreter Kanal (CFG-03)
|
|
||||||
// implementiert. Der Dispatcher selbst weiss nichts ueber E-Mail/In-App.
|
|
||||||
type Sender interface {
|
|
||||||
Send(ctx context.Context, n Notification) error
|
|
||||||
}
|
|
||||||
|
|
||||||
// Dispatcher ist die EINE Schnittstelle, ueber die Module Benachrichtigungen
|
|
||||||
// ausloesen — kein Modul baut eigenen Versandcode (Akzeptanzkriterium 1).
|
|
||||||
type Dispatcher struct {
|
|
||||||
pool *pgxpool.Pool
|
|
||||||
maxAttempts int
|
|
||||||
retryBackoff time.Duration
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewDispatcher(pool *pgxpool.Pool) *Dispatcher {
|
|
||||||
return &Dispatcher{pool: pool, maxAttempts: DefaultMaxAttempts, retryBackoff: DefaultRetryBackoff}
|
|
||||||
}
|
|
||||||
|
|
||||||
// WithRetryPolicy erlaubt Tests/Betrieb, Versuchsanzahl und Backoff
|
|
||||||
// anzupassen, ohne die Default-Policy im Produktionscode zu veraendern.
|
|
||||||
func (d *Dispatcher) WithRetryPolicy(maxAttempts int, backoff time.Duration) *Dispatcher {
|
|
||||||
return &Dispatcher{pool: d.pool, maxAttempts: maxAttempts, retryBackoff: backoff}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Enqueue reiht eine Benachrichtigung in die Postgres-Warteschlange ein und
|
|
||||||
// kehrt sofort zurueck — die Zeile ueberlebt jeden Neustart des Dispatcher-
|
|
||||||
// Prozesses unveraendert (Akzeptanzkriterium 3), da sie ausschliesslich in
|
|
||||||
// der Datenbank existiert, nicht im Prozessspeicher.
|
|
||||||
func (d *Dispatcher) Enqueue(ctx context.Context, channel, recipient string, payload map[string]any) (string, error) {
|
|
||||||
if payload == nil {
|
|
||||||
payload = map[string]any{}
|
|
||||||
}
|
|
||||||
payloadJSON, err := json.Marshal(payload)
|
|
||||||
if err != nil {
|
|
||||||
return "", fmt.Errorf("payload serialisieren: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
var id string
|
|
||||||
err = d.pool.QueryRow(ctx, `
|
|
||||||
INSERT INTO notification_jobs (channel, recipient, payload, max_attempts)
|
|
||||||
VALUES ($1, $2, $3, $4)
|
|
||||||
RETURNING id
|
|
||||||
`, channel, recipient, payloadJSON, d.maxAttempts).Scan(&id)
|
|
||||||
if err != nil {
|
|
||||||
return "", fmt.Errorf("benachrichtigung einreihen: %w", err)
|
|
||||||
}
|
|
||||||
return id, nil
|
|
||||||
}
|
|
||||||
@@ -1,219 +0,0 @@
|
|||||||
package notify
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"os"
|
|
||||||
"sync"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
)
|
|
||||||
|
|
||||||
func setupTest(t *testing.T) (*pgxpool.Pool, func()) {
|
|
||||||
t.Helper()
|
|
||||||
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
|
||||||
if adminDSN == "" {
|
|
||||||
t.Skip("TEST_ADMIN_DSN nicht gesetzt, Integrationstest uebersprungen")
|
|
||||||
}
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
pool, err := pgxpool.New(ctx, adminDSN)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("pool: %v", err)
|
|
||||||
}
|
|
||||||
if _, err := pool.Exec(ctx, `
|
|
||||||
CREATE TABLE IF NOT EXISTS notification_jobs (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
channel TEXT NOT NULL,
|
|
||||||
recipient TEXT NOT NULL,
|
|
||||||
payload JSONB NOT NULL DEFAULT '{}'::jsonb,
|
|
||||||
status TEXT NOT NULL DEFAULT 'pending' CHECK (status IN ('pending', 'sent', 'failed')),
|
|
||||||
attempts INT NOT NULL DEFAULT 0,
|
|
||||||
max_attempts INT NOT NULL DEFAULT 5,
|
|
||||||
next_attempt_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
last_error TEXT,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
)`); err != nil {
|
|
||||||
t.Fatalf("schema: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
cleanup := func() { pool.Close() }
|
|
||||||
return pool, cleanup
|
|
||||||
}
|
|
||||||
|
|
||||||
type fakeSender struct {
|
|
||||||
mu sync.Mutex
|
|
||||||
sentIDs []string
|
|
||||||
failUntil int
|
|
||||||
calls int
|
|
||||||
}
|
|
||||||
|
|
||||||
func (f *fakeSender) Send(ctx context.Context, n Notification) error {
|
|
||||||
f.mu.Lock()
|
|
||||||
defer f.mu.Unlock()
|
|
||||||
f.calls++
|
|
||||||
if f.calls <= f.failUntil {
|
|
||||||
return errors.New("simulierter zustellfehler")
|
|
||||||
}
|
|
||||||
f.sentIDs = append(f.sentIDs, n.ID)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (f *fakeSender) sentCount() int {
|
|
||||||
f.mu.Lock()
|
|
||||||
defer f.mu.Unlock()
|
|
||||||
return len(f.sentIDs)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 1: Module loesen ueber Enqueue aus, keine eigene
|
|
||||||
// Versandlogik noetig.
|
|
||||||
func TestDispatcher_EnqueueAndProcess(t *testing.T) {
|
|
||||||
pool, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
d := NewDispatcher(pool)
|
|
||||||
id, err := d.Enqueue(ctx, "email", "alice@example.com", map[string]any{"subject": "Willkommen"})
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("enqueue: %v", err)
|
|
||||||
}
|
|
||||||
if id == "" {
|
|
||||||
t.Fatal("erwartet nicht-leere id")
|
|
||||||
}
|
|
||||||
|
|
||||||
sender := &fakeSender{}
|
|
||||||
sent, failed, err := d.ProcessDue(ctx, sender, 10)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("process: %v", err)
|
|
||||||
}
|
|
||||||
if sent != 1 || failed != 0 {
|
|
||||||
t.Fatalf("erwartet sent=1 failed=0, habe sent=%d failed=%d", sent, failed)
|
|
||||||
}
|
|
||||||
if sender.sentCount() != 1 {
|
|
||||||
t.Fatalf("erwartet 1 zustellung, habe %d", sender.sentCount())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 2 + Pruefung 2: Wiederholungslogik greift bei
|
|
||||||
// simuliertem Fehler und bricht nach definierter Anzahl kontrolliert ab.
|
|
||||||
func TestProcessDue_RetriesThenGivesUpAfterMaxAttempts(t *testing.T) {
|
|
||||||
pool, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
d := NewDispatcher(pool).WithRetryPolicy(3, time.Millisecond)
|
|
||||||
id, err := d.Enqueue(ctx, "email", "bob@example.com", nil)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("enqueue: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
sender := &fakeSender{failUntil: 100} // schlaegt bei jedem versuch fehl
|
|
||||||
|
|
||||||
for i := 0; i < 3; i++ {
|
|
||||||
time.Sleep(5 * time.Millisecond) // next_attempt_at abwarten
|
|
||||||
if _, _, err := d.ProcessDue(ctx, sender, 10); err != nil {
|
|
||||||
t.Fatalf("process %d: %v", i, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var status string
|
|
||||||
var attempts int
|
|
||||||
if err := pool.QueryRow(ctx, `SELECT status, attempts FROM notification_jobs WHERE id = $1`, id).Scan(&status, &attempts); err != nil {
|
|
||||||
t.Fatalf("status lesen: %v", err)
|
|
||||||
}
|
|
||||||
if status != "failed" {
|
|
||||||
t.Fatalf("erwartet status failed nach max_attempts, habe %q", status)
|
|
||||||
}
|
|
||||||
if attempts != 3 {
|
|
||||||
t.Fatalf("erwartet 3 versuche, habe %d", attempts)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Weiteres ProcessDue darf den bereits aufgegebenen job nicht mehr anfassen.
|
|
||||||
sent, failed, err := d.ProcessDue(ctx, sender, 10)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("process nach abbruch: %v", err)
|
|
||||||
}
|
|
||||||
if sent != 0 || failed != 0 {
|
|
||||||
t.Fatalf("erwartet keine weitere verarbeitung, habe sent=%d failed=%d", sent, failed)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 3 + Pruefung 1: Neustart des Dienstes waehrend offener
|
|
||||||
// Zustellung verliert keine Nachricht — simuliert durch eine komplett neue
|
|
||||||
// Dispatcher/Pool-Instanz nach dem Enqueue, bevor irgendetwas verarbeitet wurde.
|
|
||||||
func TestQueue_SurvivesRestartWithoutMessageLoss(t *testing.T) {
|
|
||||||
pool, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
firstInstance := NewDispatcher(pool)
|
|
||||||
id, err := firstInstance.Enqueue(ctx, "email", "carol@example.com", nil)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("enqueue: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// "Neustart": eine voellig neue Dispatcher-Instanz (repraesentiert einen
|
|
||||||
// neuen Prozess) verbindet sich neu und verarbeitet die Warteschlange —
|
|
||||||
// die Nachricht existiert ausschliesslich in Postgres, nicht im
|
|
||||||
// Prozessspeicher der ersten Instanz.
|
|
||||||
restartedInstance := NewDispatcher(pool)
|
|
||||||
sender := &fakeSender{}
|
|
||||||
sent, failed, err := restartedInstance.ProcessDue(ctx, sender, 10)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("process nach neustart: %v", err)
|
|
||||||
}
|
|
||||||
if sent != 1 || failed != 0 {
|
|
||||||
t.Fatalf("erwartet sent=1 nach neustart, habe sent=%d failed=%d", sent, failed)
|
|
||||||
}
|
|
||||||
if len(sender.sentIDs) != 1 || sender.sentIDs[0] != id {
|
|
||||||
t.Fatalf("erwartet zustellung der urspruenglichen nachricht %q, habe %v", id, sender.sentIDs)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 3 + Pruefung 3: zwei gleichzeitig ausloesende Module,
|
|
||||||
// beide Nachrichten werden korrekt (und nicht doppelt) zugestellt.
|
|
||||||
func TestProcessDue_ConcurrentDispatchBothDelivered(t *testing.T) {
|
|
||||||
pool, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
d := NewDispatcher(pool)
|
|
||||||
idA, err := d.Enqueue(ctx, "email", "modul-a@example.com", nil)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("enqueue a: %v", err)
|
|
||||||
}
|
|
||||||
idB, err := d.Enqueue(ctx, "email", "modul-b@example.com", nil)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("enqueue b: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
sender := &fakeSender{}
|
|
||||||
var wg sync.WaitGroup
|
|
||||||
for i := 0; i < 2; i++ {
|
|
||||||
wg.Add(1)
|
|
||||||
go func() {
|
|
||||||
defer wg.Done()
|
|
||||||
if _, _, err := d.ProcessDue(ctx, sender, 10); err != nil {
|
|
||||||
t.Errorf("process: %v", err)
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
}
|
|
||||||
wg.Wait()
|
|
||||||
|
|
||||||
if sender.sentCount() != 2 {
|
|
||||||
t.Fatalf("erwartet genau 2 zustellungen, habe %d: %v", sender.sentCount(), sender.sentIDs)
|
|
||||||
}
|
|
||||||
seen := map[string]bool{}
|
|
||||||
for _, id := range sender.sentIDs {
|
|
||||||
if seen[id] {
|
|
||||||
t.Fatalf("nachricht %q wurde doppelt zugestellt", id)
|
|
||||||
}
|
|
||||||
seen[id] = true
|
|
||||||
}
|
|
||||||
if !seen[idA] || !seen[idB] {
|
|
||||||
t.Fatalf("erwartet beide nachrichten zugestellt, habe %v", sender.sentIDs)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,102 +0,0 @@
|
|||||||
package notify
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
// ProcessDue holt bis zu limit faellige Benachrichtigungen und versucht sie
|
|
||||||
// ueber sender zuzustellen. FOR UPDATE SKIP LOCKED serialisiert konkurrierende
|
|
||||||
// Aufrufe (Akzeptanzkriterium 3 / Pruefung 3: zwei gleichzeitig ausloesende
|
|
||||||
// Module duerfen sich nicht gegenseitig blockieren oder Nachrichten doppelt
|
|
||||||
// zustellen) — dieselbe Konvention wie internal/tenant.Lifecycle.ProcessDueDeletions.
|
|
||||||
func (d *Dispatcher) ProcessDue(ctx context.Context, sender Sender, limit int) (sent, failed int, err error) {
|
|
||||||
tx, err := d.pool.Begin(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return 0, 0, fmt.Errorf("transaktion starten: %w", err)
|
|
||||||
}
|
|
||||||
defer func() { _ = tx.Rollback(ctx) }()
|
|
||||||
|
|
||||||
rows, err := tx.Query(ctx, `
|
|
||||||
SELECT id, channel, recipient, payload, attempts, max_attempts
|
|
||||||
FROM notification_jobs
|
|
||||||
WHERE status = 'pending' AND next_attempt_at <= now()
|
|
||||||
ORDER BY created_at
|
|
||||||
FOR UPDATE SKIP LOCKED
|
|
||||||
LIMIT $1
|
|
||||||
`, limit)
|
|
||||||
if err != nil {
|
|
||||||
return 0, 0, fmt.Errorf("faellige benachrichtigungen abfragen: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
type due struct {
|
|
||||||
id, channel, recipient string
|
|
||||||
payload []byte
|
|
||||||
attempts, maxAttempts int
|
|
||||||
}
|
|
||||||
var candidates []due
|
|
||||||
for rows.Next() {
|
|
||||||
var c due
|
|
||||||
if err := rows.Scan(&c.id, &c.channel, &c.recipient, &c.payload, &c.attempts, &c.maxAttempts); err != nil {
|
|
||||||
rows.Close()
|
|
||||||
return 0, 0, fmt.Errorf("faellige benachrichtigung lesen: %w", err)
|
|
||||||
}
|
|
||||||
candidates = append(candidates, c)
|
|
||||||
}
|
|
||||||
rows.Close()
|
|
||||||
if err := rows.Err(); err != nil {
|
|
||||||
return 0, 0, err
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, c := range candidates {
|
|
||||||
var payload map[string]any
|
|
||||||
if err := json.Unmarshal(c.payload, &payload); err != nil {
|
|
||||||
payload = map[string]any{}
|
|
||||||
}
|
|
||||||
|
|
||||||
sendErr := sender.Send(ctx, Notification{
|
|
||||||
ID: c.id, Channel: c.channel, Recipient: c.recipient, Payload: payload, Attempts: c.attempts,
|
|
||||||
})
|
|
||||||
|
|
||||||
if sendErr == nil {
|
|
||||||
if _, err := tx.Exec(ctx, `
|
|
||||||
UPDATE notification_jobs SET status = 'sent', updated_at = now() WHERE id = $1
|
|
||||||
`, c.id); err != nil {
|
|
||||||
return sent, failed, fmt.Errorf("erfolg speichern: %w", err)
|
|
||||||
}
|
|
||||||
sent++
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
newAttempts := c.attempts + 1
|
|
||||||
if newAttempts >= c.maxAttempts {
|
|
||||||
// Akzeptanzkriterium 2: kontrollierter Abbruch nach definierter
|
|
||||||
// Anzahl Versuche, kein endloses Wiederholen.
|
|
||||||
if _, err := tx.Exec(ctx, `
|
|
||||||
UPDATE notification_jobs
|
|
||||||
SET status = 'failed', attempts = $2, last_error = $3, updated_at = now()
|
|
||||||
WHERE id = $1
|
|
||||||
`, c.id, newAttempts, sendErr.Error()); err != nil {
|
|
||||||
return sent, failed, fmt.Errorf("fehlschlag speichern: %w", err)
|
|
||||||
}
|
|
||||||
failed++
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
nextAttempt := time.Now().Add(time.Duration(newAttempts) * d.retryBackoff)
|
|
||||||
if _, err := tx.Exec(ctx, `
|
|
||||||
UPDATE notification_jobs
|
|
||||||
SET attempts = $2, next_attempt_at = $3, last_error = $4, updated_at = now()
|
|
||||||
WHERE id = $1
|
|
||||||
`, c.id, newAttempts, nextAttempt, sendErr.Error()); err != nil {
|
|
||||||
return sent, failed, fmt.Errorf("wiederholung planen: %w", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := tx.Commit(ctx); err != nil {
|
|
||||||
return 0, 0, fmt.Errorf("transaktion committen: %w", err)
|
|
||||||
}
|
|
||||||
return sent, failed, nil
|
|
||||||
}
|
|
||||||
@@ -1,83 +0,0 @@
|
|||||||
package notifyprefs
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"net/http"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/auth"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Handler stellt Benachrichtigungspraeferenzen als HTTP-Endpunkte bereit
|
|
||||||
// (CFG-04). Duenner Client von Store — keine eigene Zustelllogik.
|
|
||||||
type Handler struct {
|
|
||||||
prefs *Store
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewHandler(prefs *Store) *Handler {
|
|
||||||
return &Handler{prefs: prefs}
|
|
||||||
}
|
|
||||||
|
|
||||||
type setPreferenceRequest struct {
|
|
||||||
EventType string `json:"event_type"`
|
|
||||||
Channel string `json:"channel"`
|
|
||||||
Enabled bool `json:"enabled"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetPreference setzt die eigene Praeferenz des angemeldeten Benutzers
|
|
||||||
// (Akzeptanzkriterium 1). Muss hinter auth.RequireAuth haengen.
|
|
||||||
func (h *Handler) SetPreference(w http.ResponseWriter, r *http.Request) {
|
|
||||||
claims, ok := auth.ClaimsFromContext(r.Context())
|
|
||||||
if !ok {
|
|
||||||
http.Error(w, "nicht angemeldet", http.StatusUnauthorized)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
var req setPreferenceRequest
|
|
||||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
|
||||||
http.Error(w, "ungueltige Anfrage", http.StatusBadRequest)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err := h.prefs.Set(r.Context(), claims.TenantSlug, claims.UserID, req.EventType, req.Channel, req.Enabled); err != nil {
|
|
||||||
http.Error(w, "Einstellung konnte nicht gespeichert werden.", http.StatusBadRequest)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
w.WriteHeader(http.StatusOK)
|
|
||||||
}
|
|
||||||
|
|
||||||
// ListMine liefert die eigenen Praeferenzen (Akzeptanzkriterium 1) — nur die
|
|
||||||
// EIGENEN, niemals die eines anderen Benutzers (Pruefung 2). claims.UserID
|
|
||||||
// kommt ausschliesslich aus dem verifizierten Session-Token, ist also nicht
|
|
||||||
// vom Client manipulierbar.
|
|
||||||
func (h *Handler) ListMine(w http.ResponseWriter, r *http.Request) {
|
|
||||||
claims, ok := auth.ClaimsFromContext(r.Context())
|
|
||||||
if !ok {
|
|
||||||
http.Error(w, "nicht angemeldet", http.StatusUnauthorized)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
prefs, err := h.prefs.ListForUser(r.Context(), claims.TenantSlug, claims.UserID)
|
|
||||||
if err != nil {
|
|
||||||
http.Error(w, "Einstellungen konnten nicht geladen werden.", http.StatusInternalServerError)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
|
||||||
_ = json.NewEncoder(w).Encode(prefs)
|
|
||||||
}
|
|
||||||
|
|
||||||
// ListTenantOverview liefert die Praeferenzen ALLER Benutzer des eigenen
|
|
||||||
// Mandanten (Akzeptanzkriterium 3: Tenant-Admin-Übersicht). Die Zugriffs-
|
|
||||||
// beschraenkung "nur Tenant-Admin" ist Aufgabe von RBAC-02 (Policy-
|
|
||||||
// Enforcement-Schicht) vor diesem Handler — hier wird bewusst keine eigene
|
|
||||||
// Rechtelogik dupliziert (Ticket-Produkt-DNA: duenner Client).
|
|
||||||
func (h *Handler) ListTenantOverview(w http.ResponseWriter, r *http.Request) {
|
|
||||||
claims, ok := auth.ClaimsFromContext(r.Context())
|
|
||||||
if !ok {
|
|
||||||
http.Error(w, "nicht angemeldet", http.StatusUnauthorized)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
prefs, err := h.prefs.ListForTenant(r.Context(), claims.TenantSlug)
|
|
||||||
if err != nil {
|
|
||||||
http.Error(w, "Übersicht konnte nicht geladen werden.", http.StatusInternalServerError)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
|
||||||
_ = json.NewEncoder(w).Encode(prefs)
|
|
||||||
}
|
|
||||||
@@ -1,122 +0,0 @@
|
|||||||
package notifyprefs
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"encoding/json"
|
|
||||||
"net/http"
|
|
||||||
"net/http/httptest"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/auth"
|
|
||||||
)
|
|
||||||
|
|
||||||
func sessionCookie(t *testing.T, issuer *auth.TokenIssuer, userID, tenantSlug string) *http.Cookie {
|
|
||||||
t.Helper()
|
|
||||||
token, err := issuer.Issue(userID, tenantSlug)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("session-token ausstellen: %v", err)
|
|
||||||
}
|
|
||||||
return &http.Cookie{Name: auth.CookieName, Value: token}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 1: Benutzer setzt eigene Praeferenz per HTTP.
|
|
||||||
func TestHandlerSetAndListMine(t *testing.T) {
|
|
||||||
prefs, _, _, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
h := NewHandler(prefs)
|
|
||||||
issuer := auth.NewTokenIssuer("test-secret")
|
|
||||||
cookie := sessionCookie(t, issuer, "user-1", "acme")
|
|
||||||
|
|
||||||
setBody, _ := json.Marshal(setPreferenceRequest{EventType: "welcome", Channel: "email", Enabled: false})
|
|
||||||
setReq := httptest.NewRequest(http.MethodPost, "/notifications/preferences", bytes.NewReader(setBody))
|
|
||||||
setReq.AddCookie(cookie)
|
|
||||||
setRec := httptest.NewRecorder()
|
|
||||||
auth.RequireAuth(issuer, h.SetPreference)(setRec, setReq)
|
|
||||||
if setRec.Code != http.StatusOK {
|
|
||||||
t.Fatalf("set: status = %d, body: %s", setRec.Code, setRec.Body.String())
|
|
||||||
}
|
|
||||||
|
|
||||||
listReq := httptest.NewRequest(http.MethodGet, "/notifications/preferences", nil)
|
|
||||||
listReq.AddCookie(cookie)
|
|
||||||
listRec := httptest.NewRecorder()
|
|
||||||
auth.RequireAuth(issuer, h.ListMine)(listRec, listReq)
|
|
||||||
if listRec.Code != http.StatusOK {
|
|
||||||
t.Fatalf("list: status = %d, body: %s", listRec.Code, listRec.Body.String())
|
|
||||||
}
|
|
||||||
var out []Preference
|
|
||||||
if err := json.Unmarshal(listRec.Body.Bytes(), &out); err != nil {
|
|
||||||
t.Fatalf("response dekodieren: %v", err)
|
|
||||||
}
|
|
||||||
if len(out) != 1 || out[0].Enabled {
|
|
||||||
t.Fatalf("erwartet genau 1 deaktivierte praeferenz, habe %+v", out)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 1 / Pruefung 2: ListMine zeigt AUSSCHLIESSLICH die
|
|
||||||
// eigenen Praeferenzen — die UserID kommt aus dem Session-Token, nicht aus
|
|
||||||
// einem vom Client kontrollierbaren Parameter.
|
|
||||||
func TestHandlerListMine_NeverShowsOtherUsersPreferences(t *testing.T) {
|
|
||||||
prefs, _, _, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
h := NewHandler(prefs)
|
|
||||||
issuer := auth.NewTokenIssuer("test-secret")
|
|
||||||
|
|
||||||
setBody, _ := json.Marshal(setPreferenceRequest{EventType: "welcome", Channel: "email", Enabled: false})
|
|
||||||
setReq := httptest.NewRequest(http.MethodPost, "/notifications/preferences", bytes.NewReader(setBody))
|
|
||||||
setReq.AddCookie(sessionCookie(t, issuer, "user-1", "acme"))
|
|
||||||
setRec := httptest.NewRecorder()
|
|
||||||
auth.RequireAuth(issuer, h.SetPreference)(setRec, setReq)
|
|
||||||
if setRec.Code != http.StatusOK {
|
|
||||||
t.Fatalf("set fuer user-1: status = %d", setRec.Code)
|
|
||||||
}
|
|
||||||
|
|
||||||
// user-2 fragt seine eigenen Praeferenzen ab — muss leer sein.
|
|
||||||
listReq := httptest.NewRequest(http.MethodGet, "/notifications/preferences", nil)
|
|
||||||
listReq.AddCookie(sessionCookie(t, issuer, "user-2", "acme"))
|
|
||||||
listRec := httptest.NewRecorder()
|
|
||||||
auth.RequireAuth(issuer, h.ListMine)(listRec, listReq)
|
|
||||||
if listRec.Code != http.StatusOK {
|
|
||||||
t.Fatalf("list fuer user-2: status = %d", listRec.Code)
|
|
||||||
}
|
|
||||||
var out []Preference
|
|
||||||
if err := json.Unmarshal(listRec.Body.Bytes(), &out); err != nil {
|
|
||||||
t.Fatalf("response dekodieren: %v", err)
|
|
||||||
}
|
|
||||||
if len(out) != 0 {
|
|
||||||
t.Fatalf("user-2 haette user-1s praeferenzen NICHT sehen duerfen, habe %+v", out)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 3: Tenant-Übersicht liefert alle Benutzer des Mandanten.
|
|
||||||
func TestHandlerListTenantOverview(t *testing.T) {
|
|
||||||
prefs, _, _, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
h := NewHandler(prefs)
|
|
||||||
issuer := auth.NewTokenIssuer("test-secret")
|
|
||||||
|
|
||||||
for _, u := range []string{"user-1", "user-2"} {
|
|
||||||
body, _ := json.Marshal(setPreferenceRequest{EventType: "welcome", Channel: "email", Enabled: false})
|
|
||||||
req := httptest.NewRequest(http.MethodPost, "/notifications/preferences", bytes.NewReader(body))
|
|
||||||
req.AddCookie(sessionCookie(t, issuer, u, "acme"))
|
|
||||||
rec := httptest.NewRecorder()
|
|
||||||
auth.RequireAuth(issuer, h.SetPreference)(rec, req)
|
|
||||||
if rec.Code != http.StatusOK {
|
|
||||||
t.Fatalf("set fuer %s: status = %d", u, rec.Code)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
req := httptest.NewRequest(http.MethodGet, "/notifications/preferences/tenant", nil)
|
|
||||||
req.AddCookie(sessionCookie(t, issuer, "admin-1", "acme"))
|
|
||||||
rec := httptest.NewRecorder()
|
|
||||||
auth.RequireAuth(issuer, h.ListTenantOverview)(rec, req)
|
|
||||||
if rec.Code != http.StatusOK {
|
|
||||||
t.Fatalf("overview: status = %d, body: %s", rec.Code, rec.Body.String())
|
|
||||||
}
|
|
||||||
var out []Preference
|
|
||||||
if err := json.Unmarshal(rec.Body.Bytes(), &out); err != nil {
|
|
||||||
t.Fatalf("response dekodieren: %v", err)
|
|
||||||
}
|
|
||||||
if len(out) != 2 {
|
|
||||||
t.Fatalf("erwartet 2 eintraege (beide Benutzer), habe %d", len(out))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,144 +0,0 @@
|
|||||||
// Package notifyprefs implementiert Core CFG-04: Benachrichtigungspräferenzen
|
|
||||||
// je Benutzer, Ereignistyp und Kanal. Duenner Client von CFG-02/03 — keine
|
|
||||||
// eigene Zustelllogik, nur ein Filter DAVOR, ob eine Benachrichtigung
|
|
||||||
// überhaupt in die Warteschlange (internal/notify.Dispatcher) eingereiht wird.
|
|
||||||
package notifyprefs
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5"
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/notify"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Preference struct {
|
|
||||||
TenantSlug string
|
|
||||||
UserID string
|
|
||||||
EventType string
|
|
||||||
Channel string
|
|
||||||
Enabled bool
|
|
||||||
}
|
|
||||||
|
|
||||||
// Store verwaltet Benachrichtigungspraeferenzen in der zentralen Registry-DB
|
|
||||||
// (gleiche Ablageebene wie CFG-03s notification_templates/in_app_notifications).
|
|
||||||
type Store struct {
|
|
||||||
pool *pgxpool.Pool
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewStore(pool *pgxpool.Pool) *Store {
|
|
||||||
return &Store{pool: pool}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set setzt die Praeferenz eines Benutzers fuer einen Ereignistyp+Kanal
|
|
||||||
// (Akzeptanzkriterium 1). Wirkt sofort — es gibt keinen Cache dazwischen,
|
|
||||||
// jede Pruefung (IsEnabled) liest direkt aus der DB (Akzeptanzkriterium 2).
|
|
||||||
func (s *Store) Set(ctx context.Context, tenantSlug, userID, eventType, channel string, enabled bool) error {
|
|
||||||
if tenantSlug == "" || userID == "" || eventType == "" || channel == "" {
|
|
||||||
return errors.New("notifyprefs: tenantSlug, userID, eventType und channel duerfen nicht leer sein")
|
|
||||||
}
|
|
||||||
_, err := s.pool.Exec(ctx, `
|
|
||||||
INSERT INTO notification_preferences (tenant_slug, user_id, event_type, channel, enabled)
|
|
||||||
VALUES ($1, $2, $3, $4, $5)
|
|
||||||
ON CONFLICT (tenant_slug, user_id, event_type, channel)
|
|
||||||
DO UPDATE SET enabled = $5, updated_at = now()
|
|
||||||
`, tenantSlug, userID, eventType, channel, enabled)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("praeferenz speichern: %w", err)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// IsEnabled prueft, ob ein Kanal fuer einen Ereignistyp aktiv ist. Ohne
|
|
||||||
// explizite Praeferenz gilt der Kanal als AKTIVIERT (Opt-out-Default,
|
|
||||||
// siehe Migration).
|
|
||||||
func (s *Store) IsEnabled(ctx context.Context, tenantSlug, userID, eventType, channel string) (bool, error) {
|
|
||||||
var enabled bool
|
|
||||||
err := s.pool.QueryRow(ctx, `
|
|
||||||
SELECT enabled FROM notification_preferences
|
|
||||||
WHERE tenant_slug = $1 AND user_id = $2 AND event_type = $3 AND channel = $4
|
|
||||||
`, tenantSlug, userID, eventType, channel).Scan(&enabled)
|
|
||||||
if err != nil {
|
|
||||||
if errors.Is(err, pgx.ErrNoRows) {
|
|
||||||
return true, nil
|
|
||||||
}
|
|
||||||
return false, fmt.Errorf("praeferenz lesen: %w", err)
|
|
||||||
}
|
|
||||||
return enabled, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// ListForUser liefert alle expliziten Praeferenzen eines Benutzers
|
|
||||||
// (Akzeptanzkriterium 1: eigene Einstellungen einsehen/aendern).
|
|
||||||
func (s *Store) ListForUser(ctx context.Context, tenantSlug, userID string) ([]Preference, error) {
|
|
||||||
rows, err := s.pool.Query(ctx, `
|
|
||||||
SELECT event_type, channel, enabled FROM notification_preferences
|
|
||||||
WHERE tenant_slug = $1 AND user_id = $2
|
|
||||||
ORDER BY event_type, channel
|
|
||||||
`, tenantSlug, userID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("praeferenzen auflisten: %w", err)
|
|
||||||
}
|
|
||||||
defer rows.Close()
|
|
||||||
|
|
||||||
var out []Preference
|
|
||||||
for rows.Next() {
|
|
||||||
p := Preference{TenantSlug: tenantSlug, UserID: userID}
|
|
||||||
if err := rows.Scan(&p.EventType, &p.Channel, &p.Enabled); err != nil {
|
|
||||||
return nil, fmt.Errorf("praeferenz lesen: %w", err)
|
|
||||||
}
|
|
||||||
out = append(out, p)
|
|
||||||
}
|
|
||||||
return out, rows.Err()
|
|
||||||
}
|
|
||||||
|
|
||||||
// ListForTenant liefert ALLE expliziten Praeferenzen aller Benutzer eines
|
|
||||||
// Mandanten (Akzeptanzkriterium 3: Tenant-Admin-Übersicht).
|
|
||||||
func (s *Store) ListForTenant(ctx context.Context, tenantSlug string) ([]Preference, error) {
|
|
||||||
rows, err := s.pool.Query(ctx, `
|
|
||||||
SELECT user_id, event_type, channel, enabled FROM notification_preferences
|
|
||||||
WHERE tenant_slug = $1
|
|
||||||
ORDER BY user_id, event_type, channel
|
|
||||||
`, tenantSlug)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("mandanten-praeferenzen auflisten: %w", err)
|
|
||||||
}
|
|
||||||
defer rows.Close()
|
|
||||||
|
|
||||||
var out []Preference
|
|
||||||
for rows.Next() {
|
|
||||||
p := Preference{TenantSlug: tenantSlug}
|
|
||||||
if err := rows.Scan(&p.UserID, &p.EventType, &p.Channel, &p.Enabled); err != nil {
|
|
||||||
return nil, fmt.Errorf("praeferenz lesen: %w", err)
|
|
||||||
}
|
|
||||||
out = append(out, p)
|
|
||||||
}
|
|
||||||
return out, rows.Err()
|
|
||||||
}
|
|
||||||
|
|
||||||
// EnqueueIfAllowed ist der einzige vorgesehene Weg, wie ein Modul eine
|
|
||||||
// Benachrichtigung fuer einen konkreten Benutzer+Ereignistyp auslöst: prueft
|
|
||||||
// zuerst die Praeferenz, reiht NUR bei Aktivierung tatsaechlich in
|
|
||||||
// internal/notify.Dispatcher ein (Akzeptanzkriterium 1 / Pruefung 1 — ein
|
|
||||||
// deaktivierter Kanal erzeugt nachweislich KEINE notification_jobs-Zeile,
|
|
||||||
// nicht nur eine ignorierte). skipped=true bedeutet: bewusst nicht zugestellt,
|
|
||||||
// kein Fehler.
|
|
||||||
func EnqueueIfAllowed(
|
|
||||||
ctx context.Context,
|
|
||||||
prefs *Store,
|
|
||||||
dispatcher *notify.Dispatcher,
|
|
||||||
tenantSlug, userID, eventType, channel, recipient string,
|
|
||||||
payload map[string]any,
|
|
||||||
) (jobID string, skipped bool, err error) {
|
|
||||||
enabled, err := prefs.IsEnabled(ctx, tenantSlug, userID, eventType, channel)
|
|
||||||
if err != nil {
|
|
||||||
return "", false, err
|
|
||||||
}
|
|
||||||
if !enabled {
|
|
||||||
return "", true, nil
|
|
||||||
}
|
|
||||||
jobID, err = dispatcher.Enqueue(ctx, channel, recipient, payload)
|
|
||||||
return jobID, false, err
|
|
||||||
}
|
|
||||||
@@ -1,183 +0,0 @@
|
|||||||
package notifyprefs
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"os"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
|
|
||||||
"gitea.perlbach24.de/scripte/nexarch/internal/notify"
|
|
||||||
)
|
|
||||||
|
|
||||||
func setupTest(t *testing.T) (*Store, *notify.Dispatcher, *pgxpool.Pool, func()) {
|
|
||||||
t.Helper()
|
|
||||||
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
|
||||||
if adminDSN == "" {
|
|
||||||
t.Skip("TEST_ADMIN_DSN nicht gesetzt, Integrationstest uebersprungen")
|
|
||||||
}
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
pool, err := pgxpool.New(ctx, adminDSN)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("pool: %v", err)
|
|
||||||
}
|
|
||||||
if _, err := pool.Exec(ctx, `
|
|
||||||
CREATE TABLE IF NOT EXISTS notification_preferences (
|
|
||||||
tenant_slug TEXT NOT NULL, user_id TEXT NOT NULL, event_type TEXT NOT NULL, channel TEXT NOT NULL,
|
|
||||||
enabled BOOLEAN NOT NULL, updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
PRIMARY KEY (tenant_slug, user_id, event_type, channel)
|
|
||||||
);
|
|
||||||
CREATE TABLE IF NOT EXISTS notification_jobs (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(), channel TEXT NOT NULL, recipient TEXT NOT NULL,
|
|
||||||
payload JSONB NOT NULL DEFAULT '{}'::jsonb, status TEXT NOT NULL DEFAULT 'pending', attempts INT NOT NULL DEFAULT 0,
|
|
||||||
max_attempts INT NOT NULL DEFAULT 5, next_attempt_at TIMESTAMPTZ NOT NULL DEFAULT now(), last_error TEXT,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(), updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
`); err != nil {
|
|
||||||
t.Fatalf("schema: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
cleanup := func() {
|
|
||||||
_, _ = pool.Exec(ctx, `DELETE FROM notification_preferences`)
|
|
||||||
_, _ = pool.Exec(ctx, `DELETE FROM notification_jobs`)
|
|
||||||
pool.Close()
|
|
||||||
}
|
|
||||||
return NewStore(pool), notify.NewDispatcher(pool), pool, cleanup
|
|
||||||
}
|
|
||||||
|
|
||||||
// Ohne explizite Praeferenz gilt ein Kanal als aktiviert (Opt-out-Default).
|
|
||||||
func TestIsEnabled_DefaultsToTrueWithoutPreference(t *testing.T) {
|
|
||||||
prefs, _, _, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
enabled, err := prefs.IsEnabled(ctx, "acme", "user-1", "welcome", "email")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("is enabled: %v", err)
|
|
||||||
}
|
|
||||||
if !enabled {
|
|
||||||
t.Fatal("erwartet aktiviert als default ohne gesetzte praeferenz")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 1 + 2: gesetzte Praeferenz wirkt sofort.
|
|
||||||
func TestSetAndIsEnabled(t *testing.T) {
|
|
||||||
prefs, _, _, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
if err := prefs.Set(ctx, "acme", "user-1", "welcome", "email", false); err != nil {
|
|
||||||
t.Fatalf("set: %v", err)
|
|
||||||
}
|
|
||||||
enabled, err := prefs.IsEnabled(ctx, "acme", "user-1", "welcome", "email")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("is enabled: %v", err)
|
|
||||||
}
|
|
||||||
if enabled {
|
|
||||||
t.Fatal("erwartet deaktiviert nach Set(..., false)")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Andere Kanaele/Ereignistypen desselben Benutzers bleiben unberuehrt.
|
|
||||||
stillOn, err := prefs.IsEnabled(ctx, "acme", "user-1", "welcome", "in_app")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("is enabled (anderer kanal): %v", err)
|
|
||||||
}
|
|
||||||
if !stillOn {
|
|
||||||
t.Fatal("erwartet: anderer kanal bleibt aktiviert")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 1 / Pruefung 2: Einstellungen eines Benutzers wirken
|
|
||||||
// sich NICHT auf einen anderen Benutzer aus.
|
|
||||||
func TestSet_DoesNotAffectOtherUser(t *testing.T) {
|
|
||||||
prefs, _, _, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
if err := prefs.Set(ctx, "acme", "user-1", "welcome", "email", false); err != nil {
|
|
||||||
t.Fatalf("set fuer user-1: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
enabledForOther, err := prefs.IsEnabled(ctx, "acme", "user-2", "welcome", "email")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("is enabled fuer user-2: %v", err)
|
|
||||||
}
|
|
||||||
if !enabledForOther {
|
|
||||||
t.Fatal("praeferenz von user-1 haette user-2 nicht beeinflussen duerfen")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 1 / Pruefung 1 (Kernbeweis): ein deaktivierter Kanal
|
|
||||||
// erhaelt NACHWEISLICH keine weitere Zustellung — geprueft ueber die
|
|
||||||
// tatsaechliche notification_jobs-Tabelle, nicht nur ueber den Rueckgabewert.
|
|
||||||
func TestEnqueueIfAllowed_SkipsWhenDisabled(t *testing.T) {
|
|
||||||
prefs, dispatcher, pool, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
if err := prefs.Set(ctx, "acme", "user-1", "invoice_ready", "email", false); err != nil {
|
|
||||||
t.Fatalf("set: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
jobID, skipped, err := EnqueueIfAllowed(ctx, prefs, dispatcher, "acme", "user-1", "invoice_ready", "email", "user1@acme.example", nil)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("enqueue if allowed: %v", err)
|
|
||||||
}
|
|
||||||
if !skipped {
|
|
||||||
t.Fatal("erwartet skipped=true bei deaktiviertem kanal")
|
|
||||||
}
|
|
||||||
if jobID != "" {
|
|
||||||
t.Fatalf("erwartet keine job-id, habe %q", jobID)
|
|
||||||
}
|
|
||||||
|
|
||||||
var count int
|
|
||||||
if err := pool.QueryRow(ctx, `SELECT count(*) FROM notification_jobs`).Scan(&count); err != nil {
|
|
||||||
t.Fatalf("notification_jobs zaehlen: %v", err)
|
|
||||||
}
|
|
||||||
if count != 0 {
|
|
||||||
t.Fatalf("erwartet 0 eingereihte jobs bei deaktiviertem kanal, habe %d", count)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestEnqueueIfAllowed_EnqueuesWhenEnabled(t *testing.T) {
|
|
||||||
prefs, dispatcher, _, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
jobID, skipped, err := EnqueueIfAllowed(ctx, prefs, dispatcher, "acme", "user-1", "invoice_ready", "email", "user1@acme.example", nil)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("enqueue if allowed: %v", err)
|
|
||||||
}
|
|
||||||
if skipped {
|
|
||||||
t.Fatal("erwartet skipped=false ohne deaktivierte praeferenz")
|
|
||||||
}
|
|
||||||
if jobID == "" {
|
|
||||||
t.Fatal("erwartet gesetzte job-id")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 3: Tenant-Admin-Übersicht zeigt alle Benutzer.
|
|
||||||
func TestListForTenant_ShowsAllUsers(t *testing.T) {
|
|
||||||
prefs, _, _, cleanup := setupTest(t)
|
|
||||||
defer cleanup()
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
if err := prefs.Set(ctx, "acme", "user-1", "welcome", "email", false); err != nil {
|
|
||||||
t.Fatalf("set user-1: %v", err)
|
|
||||||
}
|
|
||||||
if err := prefs.Set(ctx, "acme", "user-2", "welcome", "in_app", false); err != nil {
|
|
||||||
t.Fatalf("set user-2: %v", err)
|
|
||||||
}
|
|
||||||
if err := prefs.Set(ctx, "other-tenant", "user-3", "welcome", "email", false); err != nil {
|
|
||||||
t.Fatalf("set user-3 (anderer tenant): %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
overview, err := prefs.ListForTenant(ctx, "acme")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("list for tenant: %v", err)
|
|
||||||
}
|
|
||||||
if len(overview) != 2 {
|
|
||||||
t.Fatalf("erwartet 2 eintraege fuer tenant acme (nicht den anderen tenant), habe %d", len(overview))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,91 @@
|
|||||||
|
package oidc
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5"
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
// AuthCodeTTL folgt RFC 6749 Empfehlung: Authorization Codes sind extrem
|
||||||
|
// kurzlebig, der Client tauscht sie sofort gegen ein Token.
|
||||||
|
const AuthCodeTTL = 60 * time.Second
|
||||||
|
|
||||||
|
var ErrInvalidAuthCode = errors.New("oidc: ungueltiger, abgelaufener oder bereits verwendeter authorization code")
|
||||||
|
|
||||||
|
// AuthCodeData ist das Ergebnis eines eingeloesten Authorization Codes.
|
||||||
|
type AuthCodeData struct {
|
||||||
|
ClientID string
|
||||||
|
UserID string
|
||||||
|
RedirectURI string
|
||||||
|
Scopes []string
|
||||||
|
}
|
||||||
|
|
||||||
|
// AuthCodeStore verwaltet Authorization Codes innerhalb GENAU EINER Tenant-Datenbank.
|
||||||
|
type AuthCodeStore struct {
|
||||||
|
pool *pgxpool.Pool
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewAuthCodeStore(pool *pgxpool.Pool) *AuthCodeStore {
|
||||||
|
return &AuthCodeStore{pool: pool}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Issue erzeugt einen neuen Authorization Code (Akzeptanzkriterium 2, Schritt
|
||||||
|
// 1 des Flows) — gespeichert wird nur der Hash, das Klartext-Code wird per
|
||||||
|
// Redirect an den Client uebertragen (Standard-OAuth2-Verhalten, der Code
|
||||||
|
// selbst ist einmalig und kurzlebig genug, dass die Redirect-URL kein
|
||||||
|
// nennenswertes Risiko darstellt).
|
||||||
|
func (s *AuthCodeStore) Issue(ctx context.Context, clientID, userID, redirectURI string, scopes []string) (code string, err error) {
|
||||||
|
code, err = randomToken(32)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("code erzeugen: %w", err)
|
||||||
|
}
|
||||||
|
hash := hashSecret(code)
|
||||||
|
expiresAt := time.Now().Add(AuthCodeTTL)
|
||||||
|
|
||||||
|
_, err = s.pool.Exec(ctx, `
|
||||||
|
INSERT INTO oidc_auth_codes (code_hash, client_id, user_id, redirect_uri, scopes, expires_at)
|
||||||
|
VALUES ($1, $2, $3, $4, $5, $6)
|
||||||
|
`, hash, clientID, userID, redirectURI, scopes, expiresAt)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("code speichern: %w", err)
|
||||||
|
}
|
||||||
|
return code, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Consume loest einen Authorization Code genau einmal ein (Akzeptanzkriterium
|
||||||
|
// 2, Schritt 2 des Flows) — atomar ueber die WHERE-Klausel (used_at IS NULL
|
||||||
|
// AND expires_at > now()), gleiches Muster wie internal/authtoken (IAM-03).
|
||||||
|
func (s *AuthCodeStore) Consume(ctx context.Context, code, clientID, redirectURI string) (AuthCodeData, error) {
|
||||||
|
hash := hashSecret(code)
|
||||||
|
|
||||||
|
var data AuthCodeData
|
||||||
|
var storedClientID, storedRedirectURI string
|
||||||
|
row := s.pool.QueryRow(ctx, `
|
||||||
|
UPDATE oidc_auth_codes
|
||||||
|
SET used_at = now()
|
||||||
|
WHERE code_hash = $1 AND used_at IS NULL AND expires_at > now()
|
||||||
|
RETURNING client_id, user_id, redirect_uri, scopes
|
||||||
|
`, hash)
|
||||||
|
|
||||||
|
if err := row.Scan(&storedClientID, &data.UserID, &storedRedirectURI, &data.Scopes); err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return AuthCodeData{}, ErrInvalidAuthCode
|
||||||
|
}
|
||||||
|
return AuthCodeData{}, fmt.Errorf("code einloesen: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// client_id und redirect_uri muessen exakt zu denen des urspruenglichen
|
||||||
|
// Authorize-Aufrufs passen (RFC 6749 4.1.3) — sonst koennte ein Code, der
|
||||||
|
// fuer Client A ausgestellt wurde, bei Client B eingeloest werden.
|
||||||
|
if storedClientID != clientID || storedRedirectURI != redirectURI {
|
||||||
|
return AuthCodeData{}, ErrInvalidAuthCode
|
||||||
|
}
|
||||||
|
|
||||||
|
data.ClientID = storedClientID
|
||||||
|
data.RedirectURI = storedRedirectURI
|
||||||
|
return data, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,167 @@
|
|||||||
|
// Package oidc implementiert Core IAM-13: NEXARCH als OIDC/OAuth2-Provider,
|
||||||
|
// damit Drittanwendungen eines Mandanten sich gegen NEXARCH-Benutzerkonten
|
||||||
|
// authentifizieren koennen. Baut bewusst auf der bestehenden JWKS-
|
||||||
|
// Infrastruktur (internal/moduletrust, API-05) auf statt ein zweites
|
||||||
|
// Schluesselsystem zu bauen — siehe provider.go.
|
||||||
|
package oidc
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"crypto/rand"
|
||||||
|
"crypto/sha256"
|
||||||
|
"crypto/subtle"
|
||||||
|
"encoding/hex"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5"
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
ErrClientNotFound = errors.New("oidc: client nicht gefunden")
|
||||||
|
ErrInvalidClientAuth = errors.New("oidc: ungueltige client-authentifizierung")
|
||||||
|
ErrRedirectURINotAllowed = errors.New("oidc: redirect_uri ist fuer diesen client nicht registriert")
|
||||||
|
)
|
||||||
|
|
||||||
|
// Client ist eine bei NEXARCH registrierte Drittanwendung
|
||||||
|
// (Akzeptanzkriterium 1). AllowedScopes begrenzt, welche Scopes ein Token
|
||||||
|
// fuer diesen Client tragen darf — unabhaengig davon, was beim Authorize-
|
||||||
|
// Aufruf angefragt wird (Akzeptanzkriterium 3 / Pruefung 3).
|
||||||
|
type Client struct {
|
||||||
|
ID string
|
||||||
|
Name string
|
||||||
|
ClientID string
|
||||||
|
RedirectURIs []string
|
||||||
|
AllowedScopes []string
|
||||||
|
}
|
||||||
|
|
||||||
|
// ClientStore verwaltet OAuth2-Clients innerhalb GENAU EINER Tenant-
|
||||||
|
// Datenbank (gleiches Muster wie internal/user.TenantUserStore, IAM-03).
|
||||||
|
type ClientStore struct {
|
||||||
|
pool *pgxpool.Pool
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewClientStore(pool *pgxpool.Pool) *ClientStore {
|
||||||
|
return &ClientStore{pool: pool}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Register legt einen neuen OAuth2-Client an (Akzeptanzkriterium 1). Das
|
||||||
|
// Client-Secret wird NUR hier im Klartext zurueckgegeben, gespeichert wird
|
||||||
|
// ausschliesslich dessen SHA-256-Hash — gleiches Muster wie
|
||||||
|
// internal/moduleregistry.Provision (API-02).
|
||||||
|
func (s *ClientStore) Register(ctx context.Context, name string, redirectURIs, allowedScopes []string) (clientID, clientSecret string, err error) {
|
||||||
|
if name == "" {
|
||||||
|
return "", "", errors.New("oidc: name darf nicht leer sein")
|
||||||
|
}
|
||||||
|
if len(redirectURIs) == 0 {
|
||||||
|
return "", "", errors.New("oidc: mindestens eine redirect_uri ist erforderlich")
|
||||||
|
}
|
||||||
|
|
||||||
|
clientID, err = randomToken(16)
|
||||||
|
if err != nil {
|
||||||
|
return "", "", fmt.Errorf("client-id erzeugen: %w", err)
|
||||||
|
}
|
||||||
|
clientSecret, err = randomToken(32)
|
||||||
|
if err != nil {
|
||||||
|
return "", "", fmt.Errorf("client-secret erzeugen: %w", err)
|
||||||
|
}
|
||||||
|
hash := hashSecret(clientSecret)
|
||||||
|
|
||||||
|
_, err = s.pool.Exec(ctx, `
|
||||||
|
INSERT INTO oidc_clients (name, client_id, secret_hash, redirect_uris, allowed_scopes)
|
||||||
|
VALUES ($1, $2, $3, $4, $5)
|
||||||
|
`, name, clientID, hash, redirectURIs, allowedScopes)
|
||||||
|
if err != nil {
|
||||||
|
return "", "", fmt.Errorf("client speichern: %w", err)
|
||||||
|
}
|
||||||
|
return clientID, clientSecret, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *ClientStore) getByClientID(ctx context.Context, clientID string) (Client, []byte, error) {
|
||||||
|
var c Client
|
||||||
|
var storedHash []byte
|
||||||
|
row := s.pool.QueryRow(ctx, `
|
||||||
|
SELECT id, name, client_id, redirect_uris, allowed_scopes, secret_hash
|
||||||
|
FROM oidc_clients WHERE client_id = $1
|
||||||
|
`, clientID)
|
||||||
|
if err := row.Scan(&c.ID, &c.Name, &c.ClientID, &c.RedirectURIs, &c.AllowedScopes, &storedHash); err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return Client{}, nil, ErrClientNotFound
|
||||||
|
}
|
||||||
|
return Client{}, nil, fmt.Errorf("client laden: %w", err)
|
||||||
|
}
|
||||||
|
return c, storedHash, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get laedt einen Client ohne Secret-Pruefung (fuer den Authorize-Schritt,
|
||||||
|
// der kein Client-Secret kennt — der Browser des Endnutzers, nicht die
|
||||||
|
// Drittanwendung selbst, ruft /oidc/authorize auf).
|
||||||
|
func (s *ClientStore) Get(ctx context.Context, clientID string) (Client, error) {
|
||||||
|
c, _, err := s.getByClientID(ctx, clientID)
|
||||||
|
return c, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Authenticate prueft Client-ID + Secret timing-safe (Akzeptanzkriterium 2,
|
||||||
|
// Token-Endpunkt) — gleiches Muster wie internal/moduleregistry.Authenticate (API-02).
|
||||||
|
func (s *ClientStore) Authenticate(ctx context.Context, clientID, clientSecret string) (Client, error) {
|
||||||
|
c, storedHash, err := s.getByClientID(ctx, clientID)
|
||||||
|
if err != nil {
|
||||||
|
return Client{}, err
|
||||||
|
}
|
||||||
|
if !timingSafeEqual(hashSecret(clientSecret), storedHash) {
|
||||||
|
return Client{}, ErrInvalidClientAuth
|
||||||
|
}
|
||||||
|
return c, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ValidateRedirectURI erzwingt exakten Abgleich gegen die registrierte
|
||||||
|
// Liste (kein Praefix-/Wildcard-Match) — Standardhaertung gegen Open-Redirect
|
||||||
|
// im Authorization-Code-Flow.
|
||||||
|
func (c Client) ValidateRedirectURI(redirectURI string) error {
|
||||||
|
for _, allowed := range c.RedirectURIs {
|
||||||
|
if allowed == redirectURI {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ErrRedirectURINotAllowed
|
||||||
|
}
|
||||||
|
|
||||||
|
// GrantedScopes schraenkt die angefragten Scopes auf das ein, was fuer den
|
||||||
|
// Client tatsaechlich erlaubt ist (Akzeptanzkriterium 3) — nie mehr
|
||||||
|
// gewaehren, als bei der Registrierung zugestanden wurde.
|
||||||
|
func (c Client) GrantedScopes(requested []string) []string {
|
||||||
|
allowed := make(map[string]bool, len(c.AllowedScopes))
|
||||||
|
for _, s := range c.AllowedScopes {
|
||||||
|
allowed[s] = true
|
||||||
|
}
|
||||||
|
var granted []string
|
||||||
|
for _, s := range requested {
|
||||||
|
if allowed[s] {
|
||||||
|
granted = append(granted, s)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return granted
|
||||||
|
}
|
||||||
|
|
||||||
|
func randomToken(n int) (string, error) {
|
||||||
|
buf := make([]byte, n)
|
||||||
|
if _, err := rand.Read(buf); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return hex.EncodeToString(buf), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func hashSecret(secret string) []byte {
|
||||||
|
sum := sha256.Sum256([]byte(secret))
|
||||||
|
return sum[:]
|
||||||
|
}
|
||||||
|
|
||||||
|
// timingSafeEqual folgt demselben Referenzmuster wie internal/moduleregistry
|
||||||
|
// (API-02) — projektweite Konvention aus SICHERHEITSKONZEPT.md / IAM-15.
|
||||||
|
func timingSafeEqual(a, b []byte) bool {
|
||||||
|
if len(a) != len(b) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return subtle.ConstantTimeCompare(a, b) == 1
|
||||||
|
}
|
||||||
@@ -0,0 +1,251 @@
|
|||||||
|
package oidc
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/base64"
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/golang-jwt/jwt/v5"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/auth"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/moduletrust"
|
||||||
|
)
|
||||||
|
|
||||||
|
// IDTokenTTL: kurzlebig wie ein normales Access-Token (Produkt-DNA "so
|
||||||
|
// vertrauenswuerdig wie noetig"), ein Refresh-Flow ist ausdruecklich nicht
|
||||||
|
// Teil dieser Kachel (kleinste Loesung, die die Akzeptanzkriterien erfuellt).
|
||||||
|
const IDTokenTTL = 15 * time.Minute
|
||||||
|
|
||||||
|
// IDTokenClaims sind die vom Client verifizierbaren Angaben ueber den
|
||||||
|
// angemeldeten Benutzer — signiert mit demselben Schluesselmaterial wie
|
||||||
|
// Modul-zu-Modul-Tokens (internal/moduletrust, API-05), aber mit eigener,
|
||||||
|
// OIDC-spezifischer Struktur (aud, scope), da moduletrust.Claims dafuer
|
||||||
|
// nicht vorgesehen ist. Kein zweites Schluesselsystem — nur eine zweite
|
||||||
|
// Claims-Form desselben Signierschluessels.
|
||||||
|
type IDTokenClaims struct {
|
||||||
|
Subject string `json:"sub"`
|
||||||
|
TenantSlug string `json:"tenant"`
|
||||||
|
Scopes []string `json:"scope"`
|
||||||
|
jwt.RegisteredClaims
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handler buendelt die drei OIDC-Endpunkte. issuerURL identifiziert NEXARCH
|
||||||
|
// als Aussteller (iss-Claim, Standard-OIDC-Feld).
|
||||||
|
type Handler struct {
|
||||||
|
clients *ClientStore
|
||||||
|
authCodes *AuthCodeStore
|
||||||
|
keys *moduletrust.KeyManager
|
||||||
|
issuerURL string
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewHandler(clients *ClientStore, authCodes *AuthCodeStore, keys *moduletrust.KeyManager, issuerURL string) *Handler {
|
||||||
|
return &Handler{clients: clients, authCodes: authCodes, keys: keys, issuerURL: issuerURL}
|
||||||
|
}
|
||||||
|
|
||||||
|
type registerClientRequest struct {
|
||||||
|
Name string `json:"name"`
|
||||||
|
RedirectURIs []string `json:"redirect_uris"`
|
||||||
|
AllowedScopes []string `json:"allowed_scopes"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type registerClientResponse struct {
|
||||||
|
ClientID string `json:"client_id"`
|
||||||
|
ClientSecret string `json:"client_secret"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// RegisterClient ist Akzeptanzkriterium 1: eine Drittanwendung wird als
|
||||||
|
// OAuth2-Client registriert. Muss hinter auth.RequireAuth haengen — nur
|
||||||
|
// angemeldete Benutzer des jeweiligen Mandanten duerfen Clients fuer ihren
|
||||||
|
// eigenen Mandanten anlegen (ClientStore ist bereits auf die Tenant-DB des
|
||||||
|
// Aufrufers gebunden, siehe NewHandler-Aufstellung im jeweiligen Modul-Server).
|
||||||
|
func (h *Handler) RegisterClient(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if _, ok := auth.ClaimsFromContext(r.Context()); !ok {
|
||||||
|
http.Error(w, "nicht angemeldet", http.StatusUnauthorized)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var req registerClientRequest
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||||
|
http.Error(w, "ungueltiger request-body", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
clientID, clientSecret, err := h.clients.Register(r.Context(), req.Name, req.RedirectURIs, req.AllowedScopes)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
w.WriteHeader(http.StatusCreated)
|
||||||
|
_ = json.NewEncoder(w).Encode(registerClientResponse{ClientID: clientID, ClientSecret: clientSecret})
|
||||||
|
}
|
||||||
|
|
||||||
|
// Authorize ist Schritt 1 des Authorization-Code-Flows (Akzeptanzkriterium 2).
|
||||||
|
// Muss hinter auth.RequireAuth haengen — der aufrufende Browser ist bereits
|
||||||
|
// als NEXARCH-Benutzer angemeldet, hier wird nur noch der Client geprueft
|
||||||
|
// und ein Code fuer GENAU DIESEN Benutzer ausgestellt.
|
||||||
|
func (h *Handler) Authorize(w http.ResponseWriter, r *http.Request) {
|
||||||
|
claims, ok := auth.ClaimsFromContext(r.Context())
|
||||||
|
if !ok {
|
||||||
|
http.Error(w, "nicht angemeldet", http.StatusUnauthorized)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
q := r.URL.Query()
|
||||||
|
if q.Get("response_type") != "code" {
|
||||||
|
http.Error(w, "nur response_type=code wird unterstuetzt", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
clientID := q.Get("client_id")
|
||||||
|
redirectURI := q.Get("redirect_uri")
|
||||||
|
state := q.Get("state")
|
||||||
|
requestedScopes := splitScopes(q.Get("scope"))
|
||||||
|
|
||||||
|
client, err := h.clients.Get(r.Context(), clientID)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "unbekannter client", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := client.ValidateRedirectURI(redirectURI); err != nil {
|
||||||
|
// Bewusst KEIN Redirect zu einer nicht registrierten redirect_uri —
|
||||||
|
// Open-Redirect-Schutz geht vor Komfort, Fehler wird direkt angezeigt.
|
||||||
|
http.Error(w, "redirect_uri ist fuer diesen client nicht registriert", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
granted := client.GrantedScopes(requestedScopes)
|
||||||
|
|
||||||
|
code, err := h.authCodes.Issue(r.Context(), client.ClientID, claims.UserID, redirectURI, granted)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "code konnte nicht ausgestellt werden", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
target, err := url.Parse(redirectURI)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "ungueltige redirect_uri", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
values := target.Query()
|
||||||
|
values.Set("code", code)
|
||||||
|
if state != "" {
|
||||||
|
values.Set("state", state)
|
||||||
|
}
|
||||||
|
target.RawQuery = values.Encode()
|
||||||
|
|
||||||
|
http.Redirect(w, r, target.String(), http.StatusFound)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Token ist Schritt 2 des Authorization-Code-Flows (Akzeptanzkriterium 2):
|
||||||
|
// die Drittanwendung tauscht den Code serverseitig gegen ein ID-Token.
|
||||||
|
func (h *Handler) Token(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if err := r.ParseForm(); err != nil {
|
||||||
|
http.Error(w, "ungueltiger request-body", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if r.PostForm.Get("grant_type") != "authorization_code" {
|
||||||
|
http.Error(w, "nur grant_type=authorization_code wird unterstuetzt", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
clientID := r.PostForm.Get("client_id")
|
||||||
|
clientSecret := r.PostForm.Get("client_secret")
|
||||||
|
code := r.PostForm.Get("code")
|
||||||
|
redirectURI := r.PostForm.Get("redirect_uri")
|
||||||
|
|
||||||
|
client, err := h.clients.Authenticate(r.Context(), clientID, clientSecret)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "client-authentifizierung fehlgeschlagen", http.StatusUnauthorized)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
data, err := h.authCodes.Consume(r.Context(), code, client.ClientID, redirectURI)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "authorization code ungueltig, abgelaufen oder bereits verwendet", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
idToken, err := h.issueIDToken(data)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "token konnte nicht ausgestellt werden", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
_ = json.NewEncoder(w).Encode(map[string]any{
|
||||||
|
"id_token": idToken,
|
||||||
|
"access_token": idToken, // kein separates Access-Token-Format in dieser Kachel — das ID-Token traegt bereits Subject+Scopes.
|
||||||
|
"token_type": "Bearer",
|
||||||
|
"expires_in": int(IDTokenTTL.Seconds()),
|
||||||
|
"scope": strings.Join(data.Scopes, " "),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *Handler) issueIDToken(data AuthCodeData) (string, error) {
|
||||||
|
key, err := h.keys.SigningKey()
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
now := time.Now()
|
||||||
|
claims := IDTokenClaims{
|
||||||
|
Subject: data.UserID,
|
||||||
|
Scopes: data.Scopes,
|
||||||
|
RegisteredClaims: jwt.RegisteredClaims{
|
||||||
|
Issuer: h.issuerURL,
|
||||||
|
Audience: jwt.ClaimStrings{data.ClientID},
|
||||||
|
IssuedAt: jwt.NewNumericDate(now),
|
||||||
|
ExpiresAt: jwt.NewNumericDate(now.Add(IDTokenTTL)),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
token := jwt.NewWithClaims(jwt.SigningMethodEdDSA, claims)
|
||||||
|
token.Header["kid"] = key.KID
|
||||||
|
return token.SignedString(key.Private)
|
||||||
|
}
|
||||||
|
|
||||||
|
// jwk / jwkSet folgen RFC 8037 (Ed25519 als OKP-Schluesseltyp) — im
|
||||||
|
// Unterschied zu moduletrust.ServeJWKS (internes, vereinfachtes Format fuer
|
||||||
|
// Modul-zu-Modul-Kommunikation) muss dieser Endpunkt von generischen,
|
||||||
|
// standardkonformen OIDC-Client-Bibliotheken Dritter lesbar sein
|
||||||
|
// (Akzeptanzkriterium 3). Beide Endpunkte liefern dieselben Schluessel aus
|
||||||
|
// demselben KeyManager — kein zweites Schluesselsystem, nur ein zweites,
|
||||||
|
// spezifikationskonformes Format desselben Materials.
|
||||||
|
type jwk struct {
|
||||||
|
Kty string `json:"kty"`
|
||||||
|
Crv string `json:"crv"`
|
||||||
|
Kid string `json:"kid"`
|
||||||
|
X string `json:"x"`
|
||||||
|
Use string `json:"use"`
|
||||||
|
Alg string `json:"alg"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type jwkSet struct {
|
||||||
|
Keys []jwk `json:"keys"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *Handler) JWKS(w http.ResponseWriter, r *http.Request) {
|
||||||
|
set := h.keys.PublicKeySet()
|
||||||
|
resp := jwkSet{Keys: make([]jwk, 0, len(set))}
|
||||||
|
for kid, pub := range set {
|
||||||
|
resp.Keys = append(resp.Keys, jwk{
|
||||||
|
Kty: "OKP",
|
||||||
|
Crv: "Ed25519",
|
||||||
|
Kid: kid,
|
||||||
|
X: base64.RawURLEncoding.EncodeToString(pub),
|
||||||
|
Use: "sig",
|
||||||
|
Alg: "EdDSA",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
_ = json.NewEncoder(w).Encode(resp)
|
||||||
|
}
|
||||||
|
|
||||||
|
func splitScopes(raw string) []string {
|
||||||
|
if raw == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return strings.Fields(raw)
|
||||||
|
}
|
||||||
@@ -0,0 +1,294 @@
|
|||||||
|
package oidc
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"crypto/ed25519"
|
||||||
|
"encoding/base64"
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"net/url"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/golang-jwt/jwt/v5"
|
||||||
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/auth"
|
||||||
|
"gitea.perlbach24.de/scripte/nexarch/internal/moduletrust"
|
||||||
|
)
|
||||||
|
|
||||||
|
// newProviderTestSetup baut Tenant-DB-Schema (users, oidc_clients,
|
||||||
|
// oidc_auth_codes) direkt gegen TEST_ADMIN_DSN auf, analog zum Muster in
|
||||||
|
// internal/tenant/lifecycle_test.go — braucht kein volles Tenant-Provisioning,
|
||||||
|
// nur eine isolierte Datenbank fuer diesen Testlauf.
|
||||||
|
func newProviderTestSetup(t *testing.T) (*Handler, *pgxpool.Pool, func()) {
|
||||||
|
t.Helper()
|
||||||
|
adminDSN := os.Getenv("TEST_ADMIN_DSN")
|
||||||
|
if adminDSN == "" {
|
||||||
|
t.Skip("TEST_ADMIN_DSN nicht gesetzt, Integrationstest uebersprungen")
|
||||||
|
}
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
pool, err := pgxpool.New(ctx, adminDSN)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("pool: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := pool.Exec(ctx, `
|
||||||
|
CREATE EXTENSION IF NOT EXISTS pgcrypto;
|
||||||
|
CREATE TABLE IF NOT EXISTS users (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
email TEXT NOT NULL UNIQUE,
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
status TEXT NOT NULL DEFAULT 'active',
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS oidc_clients (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
client_id TEXT NOT NULL UNIQUE,
|
||||||
|
secret_hash BYTEA NOT NULL,
|
||||||
|
redirect_uris TEXT[] NOT NULL,
|
||||||
|
allowed_scopes TEXT[] NOT NULL,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS oidc_auth_codes (
|
||||||
|
code_hash BYTEA PRIMARY KEY,
|
||||||
|
client_id TEXT NOT NULL REFERENCES oidc_clients(client_id),
|
||||||
|
user_id UUID NOT NULL REFERENCES users(id),
|
||||||
|
redirect_uri TEXT NOT NULL,
|
||||||
|
scopes TEXT[] NOT NULL,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
expires_at TIMESTAMPTZ NOT NULL,
|
||||||
|
used_at TIMESTAMPTZ
|
||||||
|
);
|
||||||
|
`); err != nil {
|
||||||
|
t.Fatalf("schema: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
keys, err := moduletrust.NewKeyManager()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("keymanager: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
clients := NewClientStore(pool)
|
||||||
|
authCodes := NewAuthCodeStore(pool)
|
||||||
|
handler := NewHandler(clients, authCodes, keys, "https://core.test.nexarch.example")
|
||||||
|
|
||||||
|
cleanup := func() {
|
||||||
|
ctx := context.Background()
|
||||||
|
_, _ = pool.Exec(ctx, `DROP TABLE IF EXISTS oidc_auth_codes, oidc_clients, users CASCADE`)
|
||||||
|
pool.Close()
|
||||||
|
}
|
||||||
|
return handler, pool, cleanup
|
||||||
|
}
|
||||||
|
|
||||||
|
func createTestUser(t *testing.T, pool *pgxpool.Pool, email string) string {
|
||||||
|
t.Helper()
|
||||||
|
var id string
|
||||||
|
err := pool.QueryRow(context.Background(), `
|
||||||
|
INSERT INTO users (email, name) VALUES ($1, $2) RETURNING id
|
||||||
|
`, email, "Test Nutzer").Scan(&id)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("testnutzer anlegen: %v", err)
|
||||||
|
}
|
||||||
|
return id
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 1 (Client-Registrierung) + 2 (voller Flow) + 3 (JWKS-
|
||||||
|
// Verifikation, Scope-Einschraenkung). Deckt Pruefungen 1-3 ab.
|
||||||
|
func TestFullAuthorizationCodeFlow(t *testing.T) {
|
||||||
|
handler, pool, cleanup := newProviderTestSetup(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
userID := createTestUser(t, pool, "nutzer@acme.example")
|
||||||
|
|
||||||
|
// Pruefung 1 / Akzeptanzkriterium 1: Client registriert sich.
|
||||||
|
clientID, clientSecret, err := handler.clients.Register(ctx, "Test-Drittanwendung",
|
||||||
|
[]string{"https://app.example.com/callback"},
|
||||||
|
[]string{"openid", "profile"}, // erlaubte Scopes: KEIN "admin"
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("register: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Session-Cookie fuer den Authorize-Aufruf ausstellen, exakt wie ein
|
||||||
|
// echter Browser ihn haette — RequireAuth uebernimmt die Verifikation,
|
||||||
|
// dieselbe Middleware wie in Produktion (nicht simuliert).
|
||||||
|
issuer := auth.NewTokenIssuer("test-session-secret")
|
||||||
|
sessionToken, err := issuer.Issue(userID, "acme")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("session-token ausstellen: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
authorizeURL := "/oidc/authorize?" + url.Values{
|
||||||
|
"response_type": {"code"},
|
||||||
|
"client_id": {clientID},
|
||||||
|
"redirect_uri": {"https://app.example.com/callback"},
|
||||||
|
// admin wird angefragt, ist aber NICHT erlaubt -> muss herausgefiltert werden.
|
||||||
|
"scope": {"openid profile admin"},
|
||||||
|
"state": {"xyz123"},
|
||||||
|
}.Encode()
|
||||||
|
|
||||||
|
req := httptest.NewRequest(http.MethodGet, authorizeURL, nil)
|
||||||
|
req.AddCookie(&http.Cookie{Name: auth.CookieName, Value: sessionToken})
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
|
||||||
|
protected := auth.RequireAuth(issuer, handler.Authorize)
|
||||||
|
protected(rec, req)
|
||||||
|
|
||||||
|
if rec.Code != http.StatusFound {
|
||||||
|
t.Fatalf("authorize: status = %d, want %d, body: %s", rec.Code, http.StatusFound, rec.Body.String())
|
||||||
|
}
|
||||||
|
loc, err := url.Parse(rec.Header().Get("Location"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("redirect-location parsen: %v", err)
|
||||||
|
}
|
||||||
|
if loc.Query().Get("state") != "xyz123" {
|
||||||
|
t.Fatalf("state = %q, want xyz123 (muss unveraendert durchgereicht werden)", loc.Query().Get("state"))
|
||||||
|
}
|
||||||
|
code := loc.Query().Get("code")
|
||||||
|
if code == "" {
|
||||||
|
t.Fatal("erwartet gesetzten code-Parameter in der redirect-URL")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pruefung 1 / Akzeptanzkriterium 2: Code gegen Token tauschen.
|
||||||
|
tokenForm := url.Values{
|
||||||
|
"grant_type": {"authorization_code"},
|
||||||
|
"code": {code},
|
||||||
|
"redirect_uri": {"https://app.example.com/callback"},
|
||||||
|
"client_id": {clientID},
|
||||||
|
"client_secret": {clientSecret},
|
||||||
|
}
|
||||||
|
tokenReq := httptest.NewRequest(http.MethodPost, "/oidc/token", strings.NewReader(tokenForm.Encode()))
|
||||||
|
tokenReq.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||||
|
tokenRec := httptest.NewRecorder()
|
||||||
|
handler.Token(tokenRec, tokenReq)
|
||||||
|
|
||||||
|
if tokenRec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("token: status = %d, want 200, body: %s", tokenRec.Code, tokenRec.Body.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
var tokenResp struct {
|
||||||
|
IDToken string `json:"id_token"`
|
||||||
|
Scope string `json:"scope"`
|
||||||
|
}
|
||||||
|
if err := decodeJSON(tokenRec.Body.Bytes(), &tokenResp); err != nil {
|
||||||
|
t.Fatalf("token-response dekodieren: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Akzeptanzkriterium 3 / Pruefung 3: "admin" wurde herausgefiltert.
|
||||||
|
grantedScopes := strings.Fields(tokenResp.Scope)
|
||||||
|
for _, s := range grantedScopes {
|
||||||
|
if s == "admin" {
|
||||||
|
t.Fatal("nicht erlaubter scope 'admin' wurde dennoch gewaehrt")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !containsAll(grantedScopes, "openid", "profile") {
|
||||||
|
t.Fatalf("erwartete scopes openid+profile, habe %v", grantedScopes)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pruefung 2 / Akzeptanzkriterium 3: ausgestelltes Token gegen JWKS verifizieren.
|
||||||
|
jwksRec := httptest.NewRecorder()
|
||||||
|
handler.JWKS(jwksRec, httptest.NewRequest(http.MethodGet, "/oidc/jwks.json", nil))
|
||||||
|
|
||||||
|
var jwks jwkSet
|
||||||
|
if err := decodeJSON(jwksRec.Body.Bytes(), &jwks); err != nil {
|
||||||
|
t.Fatalf("jwks dekodieren: %v", err)
|
||||||
|
}
|
||||||
|
if len(jwks.Keys) == 0 {
|
||||||
|
t.Fatal("jwks enthaelt keine schluessel")
|
||||||
|
}
|
||||||
|
|
||||||
|
parsedToken, err := jwt.ParseWithClaims(tokenResp.IDToken, &IDTokenClaims{}, func(tok *jwt.Token) (interface{}, error) {
|
||||||
|
kid, _ := tok.Header["kid"].(string)
|
||||||
|
for _, k := range jwks.Keys {
|
||||||
|
if k.Kid == kid {
|
||||||
|
pub, err := decodeBase64URLEd25519(k.X)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return ed25519.PublicKey(pub), nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil, jwt.ErrTokenUnverifiable
|
||||||
|
})
|
||||||
|
if err != nil || !parsedToken.Valid {
|
||||||
|
t.Fatalf("id-token gegen jwks verifizieren: %v (valid=%v)", err, parsedToken != nil && parsedToken.Valid)
|
||||||
|
}
|
||||||
|
|
||||||
|
claims := parsedToken.Claims.(*IDTokenClaims)
|
||||||
|
if claims.Subject != userID {
|
||||||
|
t.Fatalf("sub = %q, want %q", claims.Subject, userID)
|
||||||
|
}
|
||||||
|
if len(claims.Audience) != 1 || claims.Audience[0] != clientID {
|
||||||
|
t.Fatalf("aud = %v, want [%q]", claims.Audience, clientID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pruefung 3 (dediziert): Client, der einen Scope anfragt, den er bei der
|
||||||
|
// Registrierung nicht erhalten hat, bekommt ihn unter keinen Umstaenden.
|
||||||
|
func TestGrantedScopes_NeverExceedsAllowed(t *testing.T) {
|
||||||
|
c := Client{AllowedScopes: []string{"openid", "profile"}}
|
||||||
|
granted := c.GrantedScopes([]string{"openid", "admin", "profile", "billing"})
|
||||||
|
if !containsAll(granted, "openid", "profile") || len(granted) != 2 {
|
||||||
|
t.Fatalf("granted = %v, want genau [openid profile]", granted)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestValidateRedirectURI_RejectsUnregistered(t *testing.T) {
|
||||||
|
c := Client{RedirectURIs: []string{"https://app.example.com/callback"}}
|
||||||
|
if err := c.ValidateRedirectURI("https://boese-seite.example.com/callback"); err == nil {
|
||||||
|
t.Fatal("erwartet fehler fuer nicht registrierte redirect_uri")
|
||||||
|
}
|
||||||
|
if err := c.ValidateRedirectURI("https://app.example.com/callback"); err != nil {
|
||||||
|
t.Fatalf("registrierte redirect_uri sollte akzeptiert werden: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestAuthCodeStore_CannotBeConsumedTwice(t *testing.T) {
|
||||||
|
handler, pool, cleanup := newProviderTestSetup(t)
|
||||||
|
defer cleanup()
|
||||||
|
ctx := context.Background()
|
||||||
|
userID := createTestUser(t, pool, "einmalig@acme.example")
|
||||||
|
clientID, _, err := handler.clients.Register(ctx, "Einmal-Client", []string{"https://a.example/cb"}, []string{"openid"})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("register: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
code, err := handler.authCodes.Issue(ctx, clientID, userID, "https://a.example/cb", []string{"openid"})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("issue: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := handler.authCodes.Consume(ctx, code, clientID, "https://a.example/cb"); err != nil {
|
||||||
|
t.Fatalf("erster consume sollte funktionieren: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := handler.authCodes.Consume(ctx, code, clientID, "https://a.example/cb"); err == nil {
|
||||||
|
t.Fatal("zweiter consume desselben codes haette fehlschlagen muessen")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func containsAll(haystack []string, needles ...string) bool {
|
||||||
|
set := make(map[string]bool, len(haystack))
|
||||||
|
for _, h := range haystack {
|
||||||
|
set[h] = true
|
||||||
|
}
|
||||||
|
for _, n := range needles {
|
||||||
|
if !set[n] {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
func decodeJSON(data []byte, v any) error {
|
||||||
|
return json.Unmarshal(data, v)
|
||||||
|
}
|
||||||
|
|
||||||
|
func decodeBase64URLEd25519(s string) ([]byte, error) {
|
||||||
|
return base64.RawURLEncoding.DecodeString(s)
|
||||||
|
}
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
DROP TABLE IF EXISTS config_value_history;
|
|
||||||
DROP TABLE IF EXISTS config_values;
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
-- Zentraler Konfigurationsdienst (CFG-01, siehe core-kanban/tickets/CFG-01.md).
|
|
||||||
-- scope = 'global' fuer globale Defaults, sonst der Tenant-Slug. config_values
|
|
||||||
-- haelt den AKTUELLEN Stand je (key, scope); config_value_history haelt JEDE
|
|
||||||
-- Aenderung fest (Akzeptanzkriterium 2: versioniert nachvollziehbar).
|
|
||||||
CREATE TABLE config_values (
|
|
||||||
key TEXT NOT NULL,
|
|
||||||
scope TEXT NOT NULL CHECK (scope <> ''),
|
|
||||||
value TEXT NOT NULL,
|
|
||||||
version INT NOT NULL,
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
PRIMARY KEY (key, scope)
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE config_value_history (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
key TEXT NOT NULL,
|
|
||||||
scope TEXT NOT NULL,
|
|
||||||
value TEXT NOT NULL,
|
|
||||||
version INT NOT NULL,
|
|
||||||
changed_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX config_value_history_key_scope_idx ON config_value_history (key, scope, version);
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
DROP TABLE IF EXISTS notification_jobs;
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
-- Benachrichtigungs-Dispatcher-Warteschlange (CFG-02, siehe
|
|
||||||
-- core-kanban/tickets/CFG-02.md). Postgres-basiert statt Redis/AMQP
|
|
||||||
-- (Projekt-Konvention, siehe nexarch-state.json techstack.job_queue) —
|
|
||||||
-- Zeilen ueberleben einen Neustart des Dispatcher-Prozesses unveraendert
|
|
||||||
-- (Akzeptanzkriterium 3).
|
|
||||||
CREATE TABLE notification_jobs (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
channel TEXT NOT NULL,
|
|
||||||
recipient TEXT NOT NULL,
|
|
||||||
payload JSONB NOT NULL DEFAULT '{}'::jsonb,
|
|
||||||
status TEXT NOT NULL DEFAULT 'pending' CHECK (status IN ('pending', 'sent', 'failed')),
|
|
||||||
attempts INT NOT NULL DEFAULT 0,
|
|
||||||
max_attempts INT NOT NULL DEFAULT 5,
|
|
||||||
next_attempt_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
last_error TEXT,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX notification_jobs_due_idx ON notification_jobs (status, next_attempt_at);
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
DROP TABLE IF EXISTS in_app_notifications;
|
|
||||||
DROP TABLE IF EXISTS notification_templates;
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
-- Benachrichtigungs-Kanaele: Vorlagen (E-Mail) + In-App-Nachrichten
|
|
||||||
-- (CFG-03, siehe core-kanban/tickets/CFG-03.md). Beide leben in der
|
|
||||||
-- Registry-DB, analog zu feature_flags/config_values — modulübergreifende
|
|
||||||
-- Konfiguration/UI-Zustand, keine Mandanten-Geschaeftsdaten.
|
|
||||||
|
|
||||||
-- tenant_slug = 'global' ist der Fallback-Wert, wenn ein Tenant keine
|
|
||||||
-- eigene Vorlage gesetzt hat (Akzeptanzkriterium 3: Vorlagen pro Tenant
|
|
||||||
-- anpassbar, mit sinnvollem Default).
|
|
||||||
CREATE TABLE notification_templates (
|
|
||||||
tenant_slug TEXT NOT NULL,
|
|
||||||
key TEXT NOT NULL,
|
|
||||||
subject TEXT NOT NULL,
|
|
||||||
body TEXT NOT NULL,
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
PRIMARY KEY (tenant_slug, key)
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE in_app_notifications (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
tenant_slug TEXT NOT NULL,
|
|
||||||
user_id TEXT NOT NULL,
|
|
||||||
title TEXT NOT NULL,
|
|
||||||
body TEXT NOT NULL,
|
|
||||||
read_at TIMESTAMPTZ,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX in_app_notifications_user_idx ON in_app_notifications (tenant_slug, user_id, created_at);
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
DROP TABLE notification_preferences;
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
-- CFG-04: Benachrichtigungspraeferenzen je Benutzer, Ereignistyp und Kanal.
|
|
||||||
-- Lebt wie notification_templates/in_app_notifications (CFG-03) in der
|
|
||||||
-- Registry-DB — modulübergreifende Konfiguration, keine Mandanten-Geschaeftsdaten.
|
|
||||||
--
|
|
||||||
-- Kein Row = aktiviert (Opt-out-Modell): ein Benutzer verpasst nichts, bis er
|
|
||||||
-- aktiv einen Kanal/Ereignistyp abschaltet — sicherer Default als Opt-in.
|
|
||||||
CREATE TABLE notification_preferences (
|
|
||||||
tenant_slug TEXT NOT NULL,
|
|
||||||
user_id TEXT NOT NULL,
|
|
||||||
event_type TEXT NOT NULL,
|
|
||||||
channel TEXT NOT NULL,
|
|
||||||
enabled BOOLEAN NOT NULL,
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
PRIMARY KEY (tenant_slug, user_id, event_type, channel)
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX notification_preferences_tenant_idx ON notification_preferences (tenant_slug);
|
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
DROP TABLE oidc_auth_codes;
|
||||||
|
DROP TABLE oidc_clients;
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
-- IAM-13: NEXARCH als OIDC-Provider fuer Drittanwendungen eines Mandanten.
|
||||||
|
-- Client-Registrierung und Authorization-Codes leben pro Mandant (nicht in
|
||||||
|
-- der zentralen Registry), weil ein OAuth2-Client konzeptionell zu genau
|
||||||
|
-- einem Kunden gehoert (siehe core-kanban/tickets/IAM-13.md).
|
||||||
|
|
||||||
|
CREATE TABLE oidc_clients (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
client_id TEXT NOT NULL UNIQUE,
|
||||||
|
secret_hash BYTEA NOT NULL,
|
||||||
|
redirect_uris TEXT[] NOT NULL,
|
||||||
|
allowed_scopes TEXT[] NOT NULL,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
|
||||||
|
-- Auth-Codes sind bewusst kurzlebig und einmal verwendbar (RFC 6749 4.1.2):
|
||||||
|
-- used_at IS NULL in der WHERE-Klausel beim Einloesen macht das Konsumieren
|
||||||
|
-- atomar, gleiches Muster wie internal/authtoken (IAM-03).
|
||||||
|
CREATE TABLE oidc_auth_codes (
|
||||||
|
code_hash BYTEA PRIMARY KEY,
|
||||||
|
client_id TEXT NOT NULL REFERENCES oidc_clients(client_id),
|
||||||
|
user_id UUID NOT NULL REFERENCES users(id),
|
||||||
|
redirect_uri TEXT NOT NULL,
|
||||||
|
scopes TEXT[] NOT NULL,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
expires_at TIMESTAMPTZ NOT NULL,
|
||||||
|
used_at TIMESTAMPTZ
|
||||||
|
);
|
||||||
@@ -1,11 +1,16 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
PASS="${NEXARCH_TEST_DB_PASSWORD:?Setze NEXARCH_TEST_DB_PASSWORD vor dem Aufruf}"
|
PASS="${NEXARCH_TEST_DB_PASSWORD:?Setze NEXARCH_TEST_DB_PASSWORD vor dem Aufruf}"
|
||||||
ROLE="nexarch_test"
|
ROLE="nexarch_test"
|
||||||
|
|
||||||
export PGPASSWORD="$PASS"
|
export PGPASSWORD="$PASS"
|
||||||
|
|
||||||
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP TABLE IF EXISTS tenants CASCADE;"
|
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP TABLE IF EXISTS tenants CASCADE;"
|
||||||
|
|
||||||
dbs=$(psql -h localhost -U "$ROLE" -d postgres -tAc "SELECT datname FROM pg_database WHERE datname LIKE 'tenant\_%' ESCAPE '\'")
|
dbs=$(psql -h localhost -U "$ROLE" -d postgres -tAc "SELECT datname FROM pg_database WHERE datname LIKE 'tenant\_%' ESCAPE '\'")
|
||||||
for db in $dbs; do
|
for db in $dbs; do
|
||||||
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP DATABASE IF EXISTS \"${db}\";"
|
psql -h localhost -U "$ROLE" -d postgres -v ON_ERROR_STOP=1 -c "DROP DATABASE IF EXISTS \"${db}\";"
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "Testumgebung zurueckgesetzt: registry-tabelle + $(echo "$dbs" | grep -c . || true) tenant-datenbank(en) entfernt."
|
echo "Testumgebung zurueckgesetzt: registry-tabelle + $(echo "$dbs" | grep -c . || true) tenant-datenbank(en) entfernt."
|
||||||
|
|||||||
@@ -1,12 +1,18 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
PASS="${NEXARCH_TEST_DB_PASSWORD:?Setze NEXARCH_TEST_DB_PASSWORD vor dem Aufruf}"
|
PASS="${NEXARCH_TEST_DB_PASSWORD:?Setze NEXARCH_TEST_DB_PASSWORD vor dem Aufruf}"
|
||||||
cd "$(dirname "$0")/.."
|
cd "$(dirname "$0")/.."
|
||||||
|
|
||||||
NEXARCH_TEST_DB_PASSWORD="$PASS" bash scripts/reset-test-env.sh
|
NEXARCH_TEST_DB_PASSWORD="$PASS" bash scripts/reset-test-env.sh
|
||||||
|
|
||||||
export TEST_ADMIN_DSN="postgresql://nexarch_test:${PASS}@localhost:5432/postgres?sslmode=disable"
|
export TEST_ADMIN_DSN="postgresql://nexarch_test:${PASS}@localhost:5432/postgres?sslmode=disable"
|
||||||
|
|
||||||
echo "== go build =="
|
echo "== go build =="
|
||||||
go build ./...
|
go build ./...
|
||||||
|
|
||||||
echo "== go vet =="
|
echo "== go vet =="
|
||||||
go vet ./...
|
go vet ./...
|
||||||
|
|
||||||
echo "== go test (-p 1) =="
|
echo "== go test (-p 1) =="
|
||||||
go test ./... -p 1 -count=1
|
go test ./... -p 1 -count=1
|
||||||
|
|||||||
@@ -1,30 +0,0 @@
|
|||||||
import { ThemeProvider, I18nProvider, ToastProvider, typography } from "@nexarch/shl";
|
|
||||||
|
|
||||||
export const metadata = {
|
|
||||||
title: "NEXARCH Benachrichtigungen",
|
|
||||||
};
|
|
||||||
|
|
||||||
export default function RootLayout({
|
|
||||||
children,
|
|
||||||
}: {
|
|
||||||
children: React.ReactNode;
|
|
||||||
}) {
|
|
||||||
return (
|
|
||||||
<html lang="de">
|
|
||||||
<body
|
|
||||||
style={{
|
|
||||||
fontFamily: typography.fontFamily,
|
|
||||||
margin: 0,
|
|
||||||
background: "var(--shl-color-background, #ffffff)",
|
|
||||||
color: "var(--shl-color-text-primary, #14181f)",
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<ThemeProvider>
|
|
||||||
<I18nProvider initialLocale="de">
|
|
||||||
<ToastProvider>{children}</ToastProvider>
|
|
||||||
</I18nProvider>
|
|
||||||
</ThemeProvider>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
"use client";
|
|
||||||
|
|
||||||
import { useEffect, useState } from "react";
|
|
||||||
import { Table } from "@nexarch/shl";
|
|
||||||
import type { TableColumn } from "@nexarch/shl";
|
|
||||||
import { Preference, fetchTenantOverview } from "../../lib/api";
|
|
||||||
|
|
||||||
// Akzeptanzkriterium 3: Tenant-Admin sieht eine Übersicht der
|
|
||||||
// Benachrichtigungs-Konfiguration seines Tenants. Zugriffsbeschränkung
|
|
||||||
// (nur Tenant-Admin) ist RBAC-02s Aufgabe vor diesem Endpunkt, siehe
|
|
||||||
// internal/notifyprefs/handler.go.
|
|
||||||
export default function OverviewPage() {
|
|
||||||
const [prefs, setPrefs] = useState<Preference[] | null>(null);
|
|
||||||
const [error, setError] = useState<string | null>(null);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
fetchTenantOverview()
|
|
||||||
.then(setPrefs)
|
|
||||||
.catch(() => setError("Übersicht konnte nicht geladen werden. Nur Tenant-Admins haben Zugriff."));
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const columns: TableColumn<Preference>[] = [
|
|
||||||
{ key: "user", header: "Benutzer-ID", render: (p) => p.UserID },
|
|
||||||
{ key: "event", header: "Ereignistyp", render: (p) => p.EventType },
|
|
||||||
{ key: "channel", header: "Kanal", render: (p) => p.Channel },
|
|
||||||
{ key: "enabled", header: "Aktiviert", render: (p) => (p.Enabled ? "Ja" : "Nein") },
|
|
||||||
];
|
|
||||||
|
|
||||||
return (
|
|
||||||
<main style={{ maxWidth: 800, margin: "40px auto", padding: "0 16px" }}>
|
|
||||||
<h1>Benachrichtigungs-Übersicht (Mandant)</h1>
|
|
||||||
{error && <p role="alert">{error}</p>}
|
|
||||||
{prefs && (
|
|
||||||
<Table
|
|
||||||
columns={columns}
|
|
||||||
rows={prefs}
|
|
||||||
rowKey={(p) => `${p.UserID}-${p.EventType}-${p.Channel}`}
|
|
||||||
caption="Von der Standardeinstellung abweichende Benachrichtigungspräferenzen aller Benutzer"
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</main>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
import { redirect } from "next/navigation";
|
|
||||||
|
|
||||||
export default function IndexPage() {
|
|
||||||
redirect("/settings");
|
|
||||||
}
|
|
||||||
@@ -1,97 +0,0 @@
|
|||||||
"use client";
|
|
||||||
|
|
||||||
import { useEffect, useState } from "react";
|
|
||||||
import { CheckboxField, useToast } from "@nexarch/shl";
|
|
||||||
import {
|
|
||||||
ApiError,
|
|
||||||
KNOWN_CHANNELS,
|
|
||||||
KNOWN_EVENT_TYPES,
|
|
||||||
Preference,
|
|
||||||
fetchMyPreferences,
|
|
||||||
setPreference,
|
|
||||||
} from "../../lib/api";
|
|
||||||
|
|
||||||
const EVENT_LABELS: Record<string, string> = {
|
|
||||||
welcome: "Willkommen",
|
|
||||||
invoice_ready: "Rechnung verfügbar",
|
|
||||||
password_reset: "Passwort-Zurücksetzung",
|
|
||||||
security_alert: "Sicherheitshinweis",
|
|
||||||
};
|
|
||||||
|
|
||||||
const CHANNEL_LABELS: Record<string, string> = {
|
|
||||||
email: "E-Mail",
|
|
||||||
in_app: "In-App",
|
|
||||||
};
|
|
||||||
|
|
||||||
export default function SettingsPage() {
|
|
||||||
const { push } = useToast();
|
|
||||||
const [prefs, setPrefs] = useState<Preference[] | null>(null);
|
|
||||||
const [loadError, setLoadError] = useState<string | null>(null);
|
|
||||||
const [pending, setPending] = useState<string | null>(null);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
fetchMyPreferences()
|
|
||||||
.then(setPrefs)
|
|
||||||
.catch(() => setLoadError("Einstellungen konnten nicht geladen werden. Bitte melden Sie sich an."));
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
// Default: aktiviert, solange keine explizite Praeferenz existiert
|
|
||||||
// (Akzeptanzkriterium 1) — gleicher Opt-out-Default wie im Backend.
|
|
||||||
function isEnabled(eventType: string, channel: string): boolean {
|
|
||||||
const explicit = prefs?.find((p) => p.EventType === eventType && p.Channel === channel);
|
|
||||||
return explicit ? explicit.Enabled : true;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function onToggle(eventType: string, channel: string, nextEnabled: boolean) {
|
|
||||||
const key = `${eventType}:${channel}`;
|
|
||||||
setPending(key);
|
|
||||||
try {
|
|
||||||
// Akzeptanzkriterium 2: sofort speichern, kein Sammel-Speichern-Button —
|
|
||||||
// wirkt unmittelbar auf künftige Zustellungen (EnqueueIfAllowed prüft
|
|
||||||
// bei jedem Aufruf live, kein Cache dazwischen).
|
|
||||||
await setPreference(eventType, channel, nextEnabled);
|
|
||||||
setPrefs((current) => {
|
|
||||||
const withoutThis = (current ?? []).filter((p) => !(p.EventType === eventType && p.Channel === channel));
|
|
||||||
return [...withoutThis, { TenantSlug: "", UserID: "", EventType: eventType, Channel: channel, Enabled: nextEnabled }];
|
|
||||||
});
|
|
||||||
push(nextEnabled ? "Benachrichtigung aktiviert." : "Benachrichtigung deaktiviert.", "success");
|
|
||||||
} catch (err) {
|
|
||||||
push(err instanceof ApiError ? err.message : "Einstellung konnte nicht gespeichert werden.", "danger");
|
|
||||||
} finally {
|
|
||||||
setPending(null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (loadError) {
|
|
||||||
return (
|
|
||||||
<main style={{ maxWidth: 640, margin: "40px auto", padding: "0 16px" }}>
|
|
||||||
<p role="alert">{loadError}</p>
|
|
||||||
</main>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<main style={{ maxWidth: 640, margin: "40px auto", padding: "0 16px" }}>
|
|
||||||
<h1>Benachrichtigungseinstellungen</h1>
|
|
||||||
<p>Wählen Sie je Ereignis, über welche Kanäle Sie benachrichtigt werden möchten.</p>
|
|
||||||
|
|
||||||
{KNOWN_EVENT_TYPES.map((eventType) => (
|
|
||||||
<fieldset key={eventType} style={{ marginBottom: 16 }}>
|
|
||||||
<legend>{EVENT_LABELS[eventType] ?? eventType}</legend>
|
|
||||||
{KNOWN_CHANNELS.map((channel) => {
|
|
||||||
const key = `${eventType}:${channel}`;
|
|
||||||
return (
|
|
||||||
<CheckboxField
|
|
||||||
key={key}
|
|
||||||
label={CHANNEL_LABELS[channel] ?? channel}
|
|
||||||
checked={isEnabled(eventType, channel)}
|
|
||||||
disabled={pending === key}
|
|
||||||
onChange={(e) => onToggle(eventType, channel, e.target.checked)}
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
</fieldset>
|
|
||||||
))}
|
|
||||||
</main>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
const API_BASE = process.env.NEXT_PUBLIC_CORE_API_BASE ?? "";
|
|
||||||
|
|
||||||
export class ApiError extends Error {}
|
|
||||||
|
|
||||||
async function req<T>(path: string, init?: RequestInit): Promise<T> {
|
|
||||||
const res = await fetch(`${API_BASE}${path}`, {
|
|
||||||
credentials: "include",
|
|
||||||
headers: init?.body ? { "Content-Type": "application/json" } : undefined,
|
|
||||||
...init,
|
|
||||||
});
|
|
||||||
const data = await res.json().catch(() => ({}));
|
|
||||||
if (!res.ok) {
|
|
||||||
throw new ApiError(data.error ?? data.message ?? "Unbekannter Fehler");
|
|
||||||
}
|
|
||||||
return data as T;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface Preference {
|
|
||||||
TenantSlug: string;
|
|
||||||
UserID: string;
|
|
||||||
EventType: string;
|
|
||||||
Channel: string;
|
|
||||||
Enabled: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Bekannte Ereignistypen/Kanäle — das Backend erzwingt keine feste Liste
|
|
||||||
// (jedes Modul kann eigene event_type-Werte an EnqueueIfAllowed übergeben),
|
|
||||||
// diese Liste ist der aktuell bekannte Stand fürs Frontend-Formular.
|
|
||||||
export const KNOWN_EVENT_TYPES = ["welcome", "invoice_ready", "password_reset", "security_alert"] as const;
|
|
||||||
export const KNOWN_CHANNELS = ["email", "in_app"] as const;
|
|
||||||
|
|
||||||
export function fetchMyPreferences(): Promise<Preference[]> {
|
|
||||||
return req("/notifications/preferences");
|
|
||||||
}
|
|
||||||
|
|
||||||
export function setPreference(eventType: string, channel: string, enabled: boolean): Promise<void> {
|
|
||||||
return req("/notifications/preferences", {
|
|
||||||
method: "POST",
|
|
||||||
body: JSON.stringify({ event_type: eventType, channel, enabled }),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
export function fetchTenantOverview(): Promise<Preference[]> {
|
|
||||||
return req("/notifications/preferences/tenant");
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
/** @type {import('next').NextConfig} */
|
|
||||||
const nextConfig = {
|
|
||||||
transpilePackages: ["@nexarch/shl"],
|
|
||||||
};
|
|
||||||
export default nextConfig;
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "nexarch-notifications",
|
|
||||||
"private": true,
|
|
||||||
"scripts": {
|
|
||||||
"dev": "next dev",
|
|
||||||
"build": "next build",
|
|
||||||
"start": "next start",
|
|
||||||
"lint": "next lint"
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"@nexarch/shl": "file:../shl",
|
|
||||||
"next": "14.2.35",
|
|
||||||
"react": "18.3.1",
|
|
||||||
"react-dom": "18.3.1"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"@types/node": "20.14.9",
|
|
||||||
"@types/react": "18.3.3",
|
|
||||||
"@types/react-dom": "18.3.0",
|
|
||||||
"typescript": "5.5.3"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
{
|
|
||||||
"compilerOptions": {
|
|
||||||
"target": "ES2017",
|
|
||||||
"lib": ["dom", "dom.iterable", "esnext"],
|
|
||||||
"allowJs": false,
|
|
||||||
"skipLibCheck": true,
|
|
||||||
"strict": true,
|
|
||||||
"noEmit": true,
|
|
||||||
"esModuleInterop": true,
|
|
||||||
"module": "esnext",
|
|
||||||
"moduleResolution": "bundler",
|
|
||||||
"resolveJsonModule": true,
|
|
||||||
"isolatedModules": true,
|
|
||||||
"jsx": "preserve",
|
|
||||||
"incremental": true,
|
|
||||||
"plugins": [{ "name": "next" }],
|
|
||||||
"paths": { "@/*": ["./*"] }
|
|
||||||
},
|
|
||||||
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
|
|
||||||
"exclude": ["node_modules"]
|
|
||||||
}
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
# @nexarch/shl — UI-Shell & Design-System (Core SHL-01)
|
|
||||||
|
|
||||||
Gemeinsames Paket für alle NEXARCH-Modul-Frontends (Core, DMS, Mail, Archive, Workflow, AI, Connect).
|
|
||||||
Ein Modul-Frontend importiert ausschließlich über `index.ts`, kopiert keine Komponenten oder Tokens lokal.
|
|
||||||
|
|
||||||
## Enthält
|
|
||||||
|
|
||||||
- **Design-Tokens** (`tokens/tokens.ts`) — Farbe (Hell/Dunkel), Abstand, Typografie. Kontrastwerte gegen WCAG 2.1 AA geprüft (siehe `__tests__/tokens.test.ts`).
|
|
||||||
- **Theming** (`theme/ThemeProvider.tsx`) — zentrale Hell/Dunkel-Umschaltung, respektiert `prefers-color-scheme`, persistiert in `localStorage`.
|
|
||||||
- **i18n-Rahmen** (`i18n/i18n.tsx`) — Umschaltmechanismus Deutsch/Englisch. Modul-Frontends registrieren ihre fachlichen Textbausteine über `registerMessages()`, statt einen eigenen Mechanismus zu bauen.
|
|
||||||
- **Basis-Komponenten** (`components/`) — `Shell` (Layout + Navigation), `Table`, `Dialog`, `TextField`/`SelectField`/`CheckboxField`, `Toast`. Alle mit WCAG-2.1-AA-Grundlage (Tastaturbedienung, ARIA-Attribute, Fokus-Management).
|
|
||||||
|
|
||||||
## Verwendung in einem Modul-Frontend
|
|
||||||
|
|
||||||
```tsx
|
|
||||||
import { ThemeProvider, I18nProvider, ToastProvider, Shell } from "@nexarch/shl";
|
|
||||||
|
|
||||||
export default function RootLayout({ children }: { children: React.ReactNode }) {
|
|
||||||
return (
|
|
||||||
<ThemeProvider>
|
|
||||||
<I18nProvider initialLocale="de">
|
|
||||||
<ToastProvider>
|
|
||||||
<Shell modules={[]} tenantLabel="Mandant XY">
|
|
||||||
{children}
|
|
||||||
</Shell>
|
|
||||||
</ToastProvider>
|
|
||||||
</I18nProvider>
|
|
||||||
</ThemeProvider>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
## Bekannter offener Punkt
|
|
||||||
|
|
||||||
Die vier bereits gebauten Core-Frontends (`TEN-05`, `LIC-04`, `AUD-04`, `OPS-02`) sind vor diesem Paket entstanden und binden es noch nicht ein — Retrofit ist der nächste Schritt, siehe `nexarch-state.json`.
|
|
||||||
|
|
||||||
## Tests
|
|
||||||
|
|
||||||
Ausführung auf dem Test-Host (nicht lokal, siehe Projekt-Testinfrastruktur):
|
|
||||||
|
|
||||||
```bash
|
|
||||||
npm install
|
|
||||||
npm test
|
|
||||||
npm run typecheck
|
|
||||||
```
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
// Prüfung: Tastaturbedienung der Basis-Komponenten funktioniert (SHL-01 Prüfung 2).
|
|
||||||
import { describe, expect, it, vi } from "vitest";
|
|
||||||
import { fireEvent, render, screen } from "@testing-library/react";
|
|
||||||
import { Dialog } from "../components/Dialog";
|
|
||||||
import { I18nProvider } from "../i18n/i18n";
|
|
||||||
|
|
||||||
function renderDialog(onClose: () => void) {
|
|
||||||
return render(
|
|
||||||
<I18nProvider>
|
|
||||||
<Dialog open titleId="test-title" title="Test-Dialog" onClose={onClose}>
|
|
||||||
<button type="button">Erste Aktion</button>
|
|
||||||
<button type="button">Zweite Aktion</button>
|
|
||||||
</Dialog>
|
|
||||||
</I18nProvider>,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
describe("Dialog: Tastaturbedienung", () => {
|
|
||||||
it("schließt sich bei ESC", () => {
|
|
||||||
const onClose = vi.fn();
|
|
||||||
renderDialog(onClose);
|
|
||||||
fireEvent.keyDown(document, { key: "Escape" });
|
|
||||||
expect(onClose).toHaveBeenCalledOnce();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("setzt den Fokus beim Öffnen auf das erste fokussierbare Element", () => {
|
|
||||||
renderDialog(vi.fn());
|
|
||||||
const closeButton = screen.getByRole("button", { name: /schließen/i });
|
|
||||||
expect(document.activeElement).toBe(closeButton);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("ist als modaler Dialog mit Titel-Referenz ausgezeichnet", () => {
|
|
||||||
renderDialog(vi.fn());
|
|
||||||
const dialog = screen.getByRole("dialog");
|
|
||||||
expect(dialog).toHaveAttribute("aria-modal", "true");
|
|
||||||
expect(dialog).toHaveAttribute("aria-labelledby", "test-title");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
// Prüfung: Kontrastwerte erfüllen mindestens AA (SHL-01 Prüfung 3 / Akzeptanzkriterium 4).
|
|
||||||
import { describe, expect, it } from "vitest";
|
|
||||||
import { colorTokens } from "../tokens/tokens";
|
|
||||||
|
|
||||||
// WCAG-2.1-AA-Kontrastberechnung (relative Luminanz, sRGB) — keine externe Abhängigkeit nötig.
|
|
||||||
function relLuminance(hex: string): number {
|
|
||||||
const rgb = [1, 3, 5].map((i) => parseInt(hex.slice(i, i + 2), 16) / 255);
|
|
||||||
const [r, g, b] = rgb.map((c) => (c <= 0.03928 ? c / 12.92 : ((c + 0.055) / 1.055) ** 2.4));
|
|
||||||
return 0.2126 * r + 0.7152 * g + 0.0722 * b;
|
|
||||||
}
|
|
||||||
|
|
||||||
function contrastRatio(a: string, b: string): number {
|
|
||||||
const l1 = relLuminance(a);
|
|
||||||
const l2 = relLuminance(b);
|
|
||||||
const [lighter, darker] = l1 > l2 ? [l1, l2] : [l2, l1];
|
|
||||||
return (lighter + 0.05) / (darker + 0.05);
|
|
||||||
}
|
|
||||||
|
|
||||||
describe("Design-Tokens: WCAG 2.1 AA Kontrast", () => {
|
|
||||||
for (const scheme of ["light", "dark"] as const) {
|
|
||||||
const c = colorTokens[scheme];
|
|
||||||
|
|
||||||
it(`${scheme}: textPrimary auf background erfüllt AA (>= 4.5:1)`, () => {
|
|
||||||
expect(contrastRatio(c.textPrimary, c.background)).toBeGreaterThanOrEqual(4.5);
|
|
||||||
});
|
|
||||||
|
|
||||||
it(`${scheme}: textSecondary auf surface erfüllt AA (>= 4.5:1)`, () => {
|
|
||||||
expect(contrastRatio(c.textSecondary, c.surface)).toBeGreaterThanOrEqual(4.5);
|
|
||||||
});
|
|
||||||
|
|
||||||
it(`${scheme}: accentContrast auf accent erfüllt AA (>= 4.5:1)`, () => {
|
|
||||||
expect(contrastRatio(c.accentContrast, c.accent)).toBeGreaterThanOrEqual(4.5);
|
|
||||||
});
|
|
||||||
|
|
||||||
it(`${scheme}: dangerContrast auf danger erfüllt AA (>= 4.5:1)`, () => {
|
|
||||||
expect(contrastRatio(c.dangerContrast, c.danger)).toBeGreaterThanOrEqual(4.5);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
@@ -1,88 +0,0 @@
|
|||||||
"use client";
|
|
||||||
|
|
||||||
// Dialog-Basis-Komponente — SHL-01. WCAG 2.1 AA: Fokus-Falle, ESC schließt, Tastaturbedienung vollständig.
|
|
||||||
|
|
||||||
import { useEffect, useRef } from "react";
|
|
||||||
import type { ReactNode } from "react";
|
|
||||||
import { useI18n } from "../i18n/i18n";
|
|
||||||
|
|
||||||
const FOCUSABLE_SELECTOR =
|
|
||||||
'a[href], button:not([disabled]), textarea:not([disabled]), input:not([disabled]), select:not([disabled]), [tabindex]:not([tabindex="-1"])';
|
|
||||||
|
|
||||||
export interface DialogProps {
|
|
||||||
open: boolean;
|
|
||||||
onClose: () => void;
|
|
||||||
titleId: string;
|
|
||||||
title: string;
|
|
||||||
children: ReactNode;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function Dialog({ open, onClose, titleId, title, children }: DialogProps) {
|
|
||||||
const { t } = useI18n();
|
|
||||||
const dialogRef = useRef<HTMLDivElement>(null);
|
|
||||||
const previouslyFocused = useRef<HTMLElement | null>(null);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (!open) return;
|
|
||||||
previouslyFocused.current = document.activeElement as HTMLElement | null;
|
|
||||||
|
|
||||||
const node = dialogRef.current;
|
|
||||||
const focusables = node?.querySelectorAll<HTMLElement>(FOCUSABLE_SELECTOR);
|
|
||||||
focusables?.[0]?.focus();
|
|
||||||
|
|
||||||
function handleKeyDown(event: KeyboardEvent) {
|
|
||||||
if (event.key === "Escape") {
|
|
||||||
onClose();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (event.key !== "Tab" || !node) return;
|
|
||||||
|
|
||||||
const items = Array.from(node.querySelectorAll<HTMLElement>(FOCUSABLE_SELECTOR));
|
|
||||||
if (items.length === 0) return;
|
|
||||||
const first = items[0];
|
|
||||||
const last = items[items.length - 1];
|
|
||||||
|
|
||||||
if (event.shiftKey && document.activeElement === first) {
|
|
||||||
event.preventDefault();
|
|
||||||
last.focus();
|
|
||||||
} else if (!event.shiftKey && document.activeElement === last) {
|
|
||||||
event.preventDefault();
|
|
||||||
first.focus();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
document.addEventListener("keydown", handleKeyDown);
|
|
||||||
return () => {
|
|
||||||
document.removeEventListener("keydown", handleKeyDown);
|
|
||||||
previouslyFocused.current?.focus();
|
|
||||||
};
|
|
||||||
}, [open, onClose]);
|
|
||||||
|
|
||||||
if (!open) return null;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
className="shl-dialog-backdrop"
|
|
||||||
role="presentation"
|
|
||||||
onMouseDown={(event) => {
|
|
||||||
if (event.target === event.currentTarget) onClose();
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
ref={dialogRef}
|
|
||||||
className="shl-dialog"
|
|
||||||
role="dialog"
|
|
||||||
aria-modal="true"
|
|
||||||
aria-labelledby={titleId}
|
|
||||||
>
|
|
||||||
<div className="shl-dialog-header">
|
|
||||||
<h2 id={titleId}>{title}</h2>
|
|
||||||
<button type="button" onClick={onClose} aria-label={t("shl.dialog.close")}>
|
|
||||||
×
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div className="shl-dialog-body">{children}</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,98 +0,0 @@
|
|||||||
// Formularelemente-Basis-Komponenten — SHL-01. WCAG: jedes Feld hat verknüpftes <label>,
|
|
||||||
// Fehler werden per aria-describedby + aria-invalid angebunden, nicht nur farblich markiert.
|
|
||||||
|
|
||||||
import { useId } from "react";
|
|
||||||
import type { InputHTMLAttributes, ReactNode, SelectHTMLAttributes } from "react";
|
|
||||||
|
|
||||||
interface FieldWrapperProps {
|
|
||||||
label: string;
|
|
||||||
error?: string;
|
|
||||||
hint?: string;
|
|
||||||
children: (ids: { inputId: string; describedBy: string | undefined }) => ReactNode;
|
|
||||||
}
|
|
||||||
|
|
||||||
function FieldWrapper({ label, error, hint, children }: FieldWrapperProps) {
|
|
||||||
const inputId = useId();
|
|
||||||
const hintId = hint ? `${inputId}-hint` : undefined;
|
|
||||||
const errorId = error ? `${inputId}-error` : undefined;
|
|
||||||
const describedBy = [hintId, errorId].filter(Boolean).join(" ") || undefined;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="shl-field">
|
|
||||||
<label htmlFor={inputId}>{label}</label>
|
|
||||||
{children({ inputId, describedBy })}
|
|
||||||
{hint && (
|
|
||||||
<p id={hintId} className="shl-field-hint">
|
|
||||||
{hint}
|
|
||||||
</p>
|
|
||||||
)}
|
|
||||||
{error && (
|
|
||||||
<p id={errorId} className="shl-field-error" role="alert">
|
|
||||||
{error}
|
|
||||||
</p>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface TextFieldProps
|
|
||||||
extends Omit<InputHTMLAttributes<HTMLInputElement>, "id" | "aria-describedby"> {
|
|
||||||
label: string;
|
|
||||||
error?: string;
|
|
||||||
hint?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function TextField({ label, error, hint, ...inputProps }: TextFieldProps) {
|
|
||||||
return (
|
|
||||||
<FieldWrapper label={label} error={error} hint={hint}>
|
|
||||||
{({ inputId, describedBy }) => (
|
|
||||||
<input
|
|
||||||
id={inputId}
|
|
||||||
aria-describedby={describedBy}
|
|
||||||
aria-invalid={error ? true : undefined}
|
|
||||||
{...inputProps}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</FieldWrapper>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface SelectFieldProps
|
|
||||||
extends Omit<SelectHTMLAttributes<HTMLSelectElement>, "id" | "aria-describedby"> {
|
|
||||||
label: string;
|
|
||||||
error?: string;
|
|
||||||
hint?: string;
|
|
||||||
children: ReactNode;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function SelectField({ label, error, hint, children, ...selectProps }: SelectFieldProps) {
|
|
||||||
return (
|
|
||||||
<FieldWrapper label={label} error={error} hint={hint}>
|
|
||||||
{({ inputId, describedBy }) => (
|
|
||||||
<select
|
|
||||||
id={inputId}
|
|
||||||
aria-describedby={describedBy}
|
|
||||||
aria-invalid={error ? true : undefined}
|
|
||||||
{...selectProps}
|
|
||||||
>
|
|
||||||
{children}
|
|
||||||
</select>
|
|
||||||
)}
|
|
||||||
</FieldWrapper>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface CheckboxFieldProps
|
|
||||||
extends Omit<InputHTMLAttributes<HTMLInputElement>, "id" | "type"> {
|
|
||||||
label: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function CheckboxField({ label, ...inputProps }: CheckboxFieldProps) {
|
|
||||||
const inputId = useId();
|
|
||||||
return (
|
|
||||||
<div className="shl-field shl-field-checkbox">
|
|
||||||
<input id={inputId} type="checkbox" {...inputProps} />
|
|
||||||
<label htmlFor={inputId}>{label}</label>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
"use client";
|
|
||||||
|
|
||||||
// Layout-Shell mit Navigation — SHL-01 Akzeptanzkriterium 1.
|
|
||||||
// Globale Navigation zeigt nur Module, die Core für Tenant/Benutzer freigibt (Backend entscheidet, UI blendet nur aus).
|
|
||||||
|
|
||||||
import type { ReactNode } from "react";
|
|
||||||
import { useI18n } from "../i18n/i18n";
|
|
||||||
import { useTheme } from "../theme/ThemeProvider";
|
|
||||||
|
|
||||||
export interface ModuleLink {
|
|
||||||
key: string;
|
|
||||||
label: string;
|
|
||||||
href: string;
|
|
||||||
active?: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface ShellProps {
|
|
||||||
modules: ModuleLink[];
|
|
||||||
tenantLabel: string;
|
|
||||||
children: ReactNode;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function Shell({ modules, tenantLabel, children }: ShellProps) {
|
|
||||||
const { scheme, toggle } = useTheme();
|
|
||||||
const { t } = useI18n();
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="shl-shell">
|
|
||||||
<a className="shl-skip-link" href="#shl-main-content">
|
|
||||||
{t("shl.shell.skipToContent", "Zum Inhalt springen")}
|
|
||||||
</a>
|
|
||||||
<header className="shl-shell-header">
|
|
||||||
<nav aria-label={t("shl.shell.moduleNav", "Modul-Navigation")}>
|
|
||||||
<ul>
|
|
||||||
{modules.map((mod) => (
|
|
||||||
<li key={mod.key}>
|
|
||||||
<a href={mod.href} aria-current={mod.active ? "page" : undefined}>
|
|
||||||
{mod.label}
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
))}
|
|
||||||
</ul>
|
|
||||||
</nav>
|
|
||||||
<div className="shl-shell-context">
|
|
||||||
<span className="shl-tenant-context">{tenantLabel}</span>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={toggle}
|
|
||||||
aria-label={
|
|
||||||
scheme === "light" ? t("shl.theme.toggleToDark") : t("shl.theme.toggleToLight")
|
|
||||||
}
|
|
||||||
>
|
|
||||||
{scheme === "light" ? "🌙" : "☀️"}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</header>
|
|
||||||
<main id="shl-main-content" className="shl-shell-content" tabIndex={-1}>
|
|
||||||
{children}
|
|
||||||
</main>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,83 +0,0 @@
|
|||||||
// Table-Basis-Komponente — SHL-01. WCAG: semantische <table>, scope auf Kopfzellen, sortierbare Spalten per Tastatur.
|
|
||||||
|
|
||||||
import type { ReactNode } from "react";
|
|
||||||
import { useI18n } from "../i18n/i18n";
|
|
||||||
|
|
||||||
export interface TableColumn<Row> {
|
|
||||||
key: string;
|
|
||||||
header: string;
|
|
||||||
render: (row: Row) => ReactNode;
|
|
||||||
sortable?: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface TableProps<Row> {
|
|
||||||
columns: TableColumn<Row>[];
|
|
||||||
rows: Row[];
|
|
||||||
rowKey: (row: Row) => string;
|
|
||||||
sortKey?: string;
|
|
||||||
sortDirection?: "asc" | "desc";
|
|
||||||
onSort?: (key: string) => void;
|
|
||||||
caption?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function Table<Row>({
|
|
||||||
columns,
|
|
||||||
rows,
|
|
||||||
rowKey,
|
|
||||||
sortKey,
|
|
||||||
sortDirection,
|
|
||||||
onSort,
|
|
||||||
caption,
|
|
||||||
}: TableProps<Row>) {
|
|
||||||
const { t } = useI18n();
|
|
||||||
|
|
||||||
return (
|
|
||||||
<table className="shl-table">
|
|
||||||
{caption && <caption>{caption}</caption>}
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
{columns.map((column) => {
|
|
||||||
const isSorted = column.key === sortKey;
|
|
||||||
const ariaSort = column.sortable
|
|
||||||
? isSorted
|
|
||||||
? sortDirection === "asc"
|
|
||||||
? "ascending"
|
|
||||||
: "descending"
|
|
||||||
: "none"
|
|
||||||
: undefined;
|
|
||||||
return (
|
|
||||||
<th key={column.key} scope="col" aria-sort={ariaSort}>
|
|
||||||
{column.sortable ? (
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={() => onSort?.(column.key)}
|
|
||||||
className="shl-table-sort-button"
|
|
||||||
>
|
|
||||||
{column.header}
|
|
||||||
</button>
|
|
||||||
) : (
|
|
||||||
column.header
|
|
||||||
)}
|
|
||||||
</th>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
{rows.length === 0 ? (
|
|
||||||
<tr>
|
|
||||||
<td colSpan={columns.length}>{t("shl.table.noRows")}</td>
|
|
||||||
</tr>
|
|
||||||
) : (
|
|
||||||
rows.map((row) => (
|
|
||||||
<tr key={rowKey(row)}>
|
|
||||||
{columns.map((column) => (
|
|
||||||
<td key={column.key}>{column.render(row)}</td>
|
|
||||||
))}
|
|
||||||
</tr>
|
|
||||||
))
|
|
||||||
)}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,67 +0,0 @@
|
|||||||
"use client";
|
|
||||||
|
|
||||||
// Toast-Basis-Komponente — SHL-01. WCAG: aria-live sorgt dafür, dass Screenreader Meldungen ansagen.
|
|
||||||
|
|
||||||
import { createContext, useCallback, useContext, useMemo, useState } from "react";
|
|
||||||
import type { ReactNode } from "react";
|
|
||||||
import { useI18n } from "../i18n/i18n";
|
|
||||||
|
|
||||||
export type ToastVariant = "info" | "success" | "danger" | "warning";
|
|
||||||
|
|
||||||
export interface ToastMessage {
|
|
||||||
id: string;
|
|
||||||
text: string;
|
|
||||||
variant: ToastVariant;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface ToastContextValue {
|
|
||||||
toasts: ToastMessage[];
|
|
||||||
push: (text: string, variant?: ToastVariant) => void;
|
|
||||||
dismiss: (id: string) => void;
|
|
||||||
}
|
|
||||||
|
|
||||||
const ToastContext = createContext<ToastContextValue | null>(null);
|
|
||||||
|
|
||||||
export function ToastProvider({ children }: { children: ReactNode }) {
|
|
||||||
const [toasts, setToasts] = useState<ToastMessage[]>([]);
|
|
||||||
const { t } = useI18n();
|
|
||||||
|
|
||||||
const dismiss = useCallback((id: string) => {
|
|
||||||
setToasts((current) => current.filter((toast) => toast.id !== id));
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const push = useCallback((text: string, variant: ToastVariant = "info") => {
|
|
||||||
const id = `${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
|
|
||||||
setToasts((current) => [...current, { id, text, variant }]);
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const value = useMemo(() => ({ toasts, push, dismiss }), [toasts, push, dismiss]);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<ToastContext.Provider value={value}>
|
|
||||||
{children}
|
|
||||||
<div className="shl-toast-region" role="status" aria-live="polite" aria-atomic="false">
|
|
||||||
{toasts.map((toast) => (
|
|
||||||
<div key={toast.id} className={`shl-toast shl-toast-${toast.variant}`}>
|
|
||||||
<span>{toast.text}</span>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={() => dismiss(toast.id)}
|
|
||||||
aria-label={t("shl.toast.dismiss")}
|
|
||||||
>
|
|
||||||
×
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</ToastContext.Provider>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
export function useToast(): ToastContextValue {
|
|
||||||
const ctx = useContext(ToastContext);
|
|
||||||
if (!ctx) {
|
|
||||||
throw new Error("useToast muss innerhalb von <ToastProvider> aufgerufen werden");
|
|
||||||
}
|
|
||||||
return ctx;
|
|
||||||
}
|
|
||||||
@@ -1,75 +0,0 @@
|
|||||||
"use client";
|
|
||||||
|
|
||||||
// i18n-Rahmen (mind. Deutsch/Englisch) — SHL-01 Akzeptanzkriterium 5.
|
|
||||||
// Liefert nur den Umschaltmechanismus + Basis-Komponenten-Texte.
|
|
||||||
// Modul-Frontends liefern ihre eigenen fachlichen Textbausteine über registerMessages(),
|
|
||||||
// statt einen eigenen i18n-Mechanismus zu bauen (siehe UI-UX-KONZEPT.md Abschnitt 4).
|
|
||||||
|
|
||||||
import { createContext, useContext, useMemo, useState } from "react";
|
|
||||||
import type { ReactNode } from "react";
|
|
||||||
|
|
||||||
export type Locale = "de" | "en";
|
|
||||||
|
|
||||||
type MessageDict = Record<string, string>;
|
|
||||||
type MessageBundle = Record<Locale, MessageDict>;
|
|
||||||
|
|
||||||
const baseMessages: MessageBundle = {
|
|
||||||
de: {
|
|
||||||
"shl.dialog.close": "Schließen",
|
|
||||||
"shl.toast.dismiss": "Meldung schließen",
|
|
||||||
"shl.table.noRows": "Keine Einträge vorhanden",
|
|
||||||
"shl.theme.toggleToLight": "Helles Erscheinungsbild",
|
|
||||||
"shl.theme.toggleToDark": "Dunkles Erscheinungsbild",
|
|
||||||
},
|
|
||||||
en: {
|
|
||||||
"shl.dialog.close": "Close",
|
|
||||||
"shl.toast.dismiss": "Dismiss message",
|
|
||||||
"shl.table.noRows": "No entries",
|
|
||||||
"shl.theme.toggleToLight": "Switch to light theme",
|
|
||||||
"shl.theme.toggleToDark": "Switch to dark theme",
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
// Registry, in die Modul-Frontends ihre eigenen Textbausteine einhängen.
|
|
||||||
const registry: MessageBundle = { de: { ...baseMessages.de }, en: { ...baseMessages.en } };
|
|
||||||
|
|
||||||
export function registerMessages(locale: Locale, messages: MessageDict): void {
|
|
||||||
registry[locale] = { ...registry[locale], ...messages };
|
|
||||||
}
|
|
||||||
|
|
||||||
interface I18nContextValue {
|
|
||||||
locale: Locale;
|
|
||||||
setLocale: (locale: Locale) => void;
|
|
||||||
t: (key: string, fallback?: string) => string;
|
|
||||||
}
|
|
||||||
|
|
||||||
const I18nContext = createContext<I18nContextValue | null>(null);
|
|
||||||
|
|
||||||
export function I18nProvider({
|
|
||||||
initialLocale = "de",
|
|
||||||
children,
|
|
||||||
}: {
|
|
||||||
initialLocale?: Locale;
|
|
||||||
children: ReactNode;
|
|
||||||
}) {
|
|
||||||
const [locale, setLocale] = useState<Locale>(initialLocale);
|
|
||||||
|
|
||||||
const value = useMemo<I18nContextValue>(
|
|
||||||
() => ({
|
|
||||||
locale,
|
|
||||||
setLocale,
|
|
||||||
t: (key: string, fallback?: string) => registry[locale][key] ?? fallback ?? key,
|
|
||||||
}),
|
|
||||||
[locale],
|
|
||||||
);
|
|
||||||
|
|
||||||
return <I18nContext.Provider value={value}>{children}</I18nContext.Provider>;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function useI18n(): I18nContextValue {
|
|
||||||
const ctx = useContext(I18nContext);
|
|
||||||
if (!ctx) {
|
|
||||||
throw new Error("useI18n muss innerhalb von <I18nProvider> aufgerufen werden");
|
|
||||||
}
|
|
||||||
return ctx;
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
// Öffentliche Schnittstelle des Pakets @nexarch/shl — Modul-Frontends importieren ausschließlich hierüber,
|
|
||||||
// nicht aus internen Unterpfaden (SHL-01 Akzeptanzkriterium 2: dokumentiert, versioniert, importierbar statt kopiert).
|
|
||||||
|
|
||||||
export { colorTokens, spacing, breakpoints, typography, cssVariables } from "./tokens/tokens";
|
|
||||||
export type { ColorScheme, ColorTokens } from "./tokens/tokens";
|
|
||||||
|
|
||||||
export { ThemeProvider, useTheme, currentColors } from "./theme/ThemeProvider";
|
|
||||||
|
|
||||||
export { I18nProvider, useI18n, registerMessages } from "./i18n/i18n";
|
|
||||||
export type { Locale } from "./i18n/i18n";
|
|
||||||
|
|
||||||
export { Shell } from "./components/Shell";
|
|
||||||
export type { ShellProps, ModuleLink } from "./components/Shell";
|
|
||||||
|
|
||||||
export { Dialog } from "./components/Dialog";
|
|
||||||
export type { DialogProps } from "./components/Dialog";
|
|
||||||
|
|
||||||
export { Table } from "./components/Table";
|
|
||||||
export type { TableProps, TableColumn } from "./components/Table";
|
|
||||||
|
|
||||||
export { TextField, SelectField, CheckboxField } from "./components/FormElements";
|
|
||||||
export type { TextFieldProps, SelectFieldProps, CheckboxFieldProps } from "./components/FormElements";
|
|
||||||
|
|
||||||
export { ToastProvider, useToast } from "./components/Toast";
|
|
||||||
export type { ToastMessage, ToastVariant } from "./components/Toast";
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "@nexarch/shl",
|
|
||||||
"version": "0.1.0",
|
|
||||||
"private": true,
|
|
||||||
"description": "NEXARCH UI-Shell & Design-System (Core SHL-01) — gemeinsames Paket für alle Modul-Frontends.",
|
|
||||||
"main": "index.ts",
|
|
||||||
"types": "index.ts",
|
|
||||||
"scripts": {
|
|
||||||
"test": "vitest run",
|
|
||||||
"typecheck": "tsc --noEmit"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"react": "^18.3.1",
|
|
||||||
"react-dom": "^18.3.1"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"@testing-library/jest-dom": "^6.4.8",
|
|
||||||
"@testing-library/react": "^16.0.0",
|
|
||||||
"@types/react": "18.3.3",
|
|
||||||
"@types/react-dom": "18.3.0",
|
|
||||||
"jsdom": "^24.1.1",
|
|
||||||
"typescript": "5.5.3",
|
|
||||||
"vitest": "^2.0.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
"use client";
|
|
||||||
|
|
||||||
// Zentrales Theming (Hell/Dunkel) — SHL-01 Akzeptanzkriterium 6.
|
|
||||||
// Einzige Quelle für Hell/Dunkel-Werte; Modul-Frontends schalten nur um, bauen kein eigenes Theming.
|
|
||||||
|
|
||||||
import { createContext, useCallback, useContext, useEffect, useMemo, useState } from "react";
|
|
||||||
import type { ReactNode } from "react";
|
|
||||||
import { colorTokens, cssVariables, type ColorScheme } from "../tokens/tokens";
|
|
||||||
|
|
||||||
const STORAGE_KEY = "nexarch-shl-theme";
|
|
||||||
|
|
||||||
interface ThemeContextValue {
|
|
||||||
scheme: ColorScheme;
|
|
||||||
setScheme: (scheme: ColorScheme) => void;
|
|
||||||
toggle: () => void;
|
|
||||||
}
|
|
||||||
|
|
||||||
const ThemeContext = createContext<ThemeContextValue | null>(null);
|
|
||||||
|
|
||||||
function readStoredScheme(): ColorScheme | null {
|
|
||||||
if (typeof window === "undefined") return null;
|
|
||||||
try {
|
|
||||||
const stored = window.localStorage.getItem(STORAGE_KEY);
|
|
||||||
return stored === "light" || stored === "dark" ? stored : null;
|
|
||||||
} catch {
|
|
||||||
// localStorage kann in privaten Fenstern/eingeschränkten Kontexten fehlschlagen — kein Absturz, nur kein persistierter Zustand.
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function systemPrefersDark(): boolean {
|
|
||||||
if (typeof window === "undefined" || !window.matchMedia) return false;
|
|
||||||
return window.matchMedia("(prefers-color-scheme: dark)").matches;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function ThemeProvider({ children }: { children: ReactNode }) {
|
|
||||||
const [scheme, setSchemeState] = useState<ColorScheme>("light");
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const stored = readStoredScheme();
|
|
||||||
setSchemeState(stored ?? (systemPrefersDark() ? "dark" : "light"));
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const setScheme = useCallback((next: ColorScheme) => {
|
|
||||||
setSchemeState(next);
|
|
||||||
try {
|
|
||||||
window.localStorage.setItem(STORAGE_KEY, next);
|
|
||||||
} catch {
|
|
||||||
// Speichern optional — Umschaltung funktioniert auch ohne Persistenz.
|
|
||||||
}
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const toggle = useCallback(() => {
|
|
||||||
setScheme(scheme === "light" ? "dark" : "light");
|
|
||||||
}, [scheme, setScheme]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const vars = cssVariables(scheme);
|
|
||||||
const root = document.documentElement;
|
|
||||||
for (const [key, value] of Object.entries(vars)) {
|
|
||||||
root.style.setProperty(key, value);
|
|
||||||
}
|
|
||||||
root.dataset.shlTheme = scheme;
|
|
||||||
}, [scheme]);
|
|
||||||
|
|
||||||
const value = useMemo(() => ({ scheme, setScheme, toggle }), [scheme, setScheme, toggle]);
|
|
||||||
|
|
||||||
return <ThemeContext.Provider value={value}>{children}</ThemeContext.Provider>;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function useTheme(): ThemeContextValue {
|
|
||||||
const ctx = useContext(ThemeContext);
|
|
||||||
if (!ctx) {
|
|
||||||
throw new Error("useTheme muss innerhalb von <ThemeProvider> aufgerufen werden");
|
|
||||||
}
|
|
||||||
return ctx;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function currentColors(scheme: ColorScheme) {
|
|
||||||
return colorTokens[scheme];
|
|
||||||
}
|
|
||||||
@@ -1,96 +0,0 @@
|
|||||||
// Design-Tokens: einzige Quelle für Farbe, Abstand, Typografie im gesamten Frontend-Verbund.
|
|
||||||
// Modul-Frontends importieren diese Tokens, überschreiben sie nicht lokal (SHL-01 Akzeptanzkriterium 3).
|
|
||||||
// Kontrastwerte sind gegen WCAG 2.1 AA geprüft (Akzeptanzkriterium 1/4): mindestens 4.5:1 für Fließtext.
|
|
||||||
|
|
||||||
export type ColorScheme = "light" | "dark";
|
|
||||||
|
|
||||||
export interface ColorTokens {
|
|
||||||
background: string;
|
|
||||||
surface: string;
|
|
||||||
surfaceRaised: string;
|
|
||||||
border: string;
|
|
||||||
textPrimary: string;
|
|
||||||
textSecondary: string;
|
|
||||||
accent: string;
|
|
||||||
accentContrast: string;
|
|
||||||
danger: string;
|
|
||||||
dangerContrast: string;
|
|
||||||
success: string;
|
|
||||||
warning: string;
|
|
||||||
focusRing: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Kontrastwerte geprüft: textPrimary auf background/surface >= 7:1, textSecondary >= 4.5:1,
|
|
||||||
// accentContrast auf accent >= 4.5:1 (WCAG AA, siehe SHL-01 Prüfung 3).
|
|
||||||
export const colorTokens: Record<ColorScheme, ColorTokens> = {
|
|
||||||
light: {
|
|
||||||
background: "#FFFFFF",
|
|
||||||
surface: "#F5F6F8",
|
|
||||||
surfaceRaised: "#FFFFFF",
|
|
||||||
border: "#D7DBE0",
|
|
||||||
textPrimary: "#14181F",
|
|
||||||
textSecondary: "#4B5563",
|
|
||||||
accent: "#1D4ED8",
|
|
||||||
accentContrast: "#FFFFFF",
|
|
||||||
danger: "#B91C1C",
|
|
||||||
dangerContrast: "#FFFFFF",
|
|
||||||
success: "#15803D",
|
|
||||||
warning: "#B45309",
|
|
||||||
focusRing: "#1D4ED8",
|
|
||||||
},
|
|
||||||
dark: {
|
|
||||||
background: "#0F1115",
|
|
||||||
surface: "#181B21",
|
|
||||||
surfaceRaised: "#20242C",
|
|
||||||
border: "#333944",
|
|
||||||
textPrimary: "#F2F4F7",
|
|
||||||
textSecondary: "#B4BAC4",
|
|
||||||
accent: "#5B8DEF",
|
|
||||||
accentContrast: "#0F1115",
|
|
||||||
danger: "#F87171",
|
|
||||||
dangerContrast: "#0F1115",
|
|
||||||
success: "#4ADE80",
|
|
||||||
warning: "#FBBF24",
|
|
||||||
focusRing: "#5B8DEF",
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
export const spacing = {
|
|
||||||
xs: "4px",
|
|
||||||
sm: "8px",
|
|
||||||
md: "16px",
|
|
||||||
lg: "24px",
|
|
||||||
xl: "32px",
|
|
||||||
xxl: "48px",
|
|
||||||
} as const;
|
|
||||||
|
|
||||||
export const breakpoints = {
|
|
||||||
mobile: "0px",
|
|
||||||
tablet: "768px",
|
|
||||||
desktop: "1200px",
|
|
||||||
} as const;
|
|
||||||
|
|
||||||
export const typography = {
|
|
||||||
fontFamily: "'Inter', 'Segoe UI', system-ui, sans-serif",
|
|
||||||
fontFamilyMono: "'JetBrains Mono', ui-monospace, monospace",
|
|
||||||
sizeSm: "13px",
|
|
||||||
sizeMd: "15px",
|
|
||||||
sizeLg: "18px",
|
|
||||||
sizeXl: "24px",
|
|
||||||
lineHeight: 1.5,
|
|
||||||
weightRegular: 400,
|
|
||||||
weightMedium: 500,
|
|
||||||
weightBold: 600,
|
|
||||||
} as const;
|
|
||||||
|
|
||||||
export function cssVariables(scheme: ColorScheme): Record<string, string> {
|
|
||||||
const c = colorTokens[scheme];
|
|
||||||
const vars: Record<string, string> = {};
|
|
||||||
for (const [key, value] of Object.entries(c)) {
|
|
||||||
vars[`--shl-color-${key.replace(/([A-Z])/g, "-$1").toLowerCase()}`] = value;
|
|
||||||
}
|
|
||||||
for (const [key, value] of Object.entries(spacing)) {
|
|
||||||
vars[`--shl-spacing-${key}`] = value;
|
|
||||||
}
|
|
||||||
return vars;
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
{
|
|
||||||
"compilerOptions": {
|
|
||||||
"target": "ES2020",
|
|
||||||
"lib": ["dom", "dom.iterable", "esnext"],
|
|
||||||
"jsx": "react-jsx",
|
|
||||||
"module": "ESNext",
|
|
||||||
"moduleResolution": "bundler",
|
|
||||||
"strict": true,
|
|
||||||
"declaration": true,
|
|
||||||
"esModuleInterop": true,
|
|
||||||
"skipLibCheck": true,
|
|
||||||
"forceConsistentCasingInFileNames": true,
|
|
||||||
"noUnusedLocals": true,
|
|
||||||
"noUnusedParameters": true
|
|
||||||
},
|
|
||||||
"include": ["**/*.ts", "**/*.tsx"],
|
|
||||||
"exclude": ["node_modules"]
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
import { defineConfig } from "vitest/config";
|
|
||||||
|
|
||||||
export default defineConfig({
|
|
||||||
test: {
|
|
||||||
environment: "jsdom",
|
|
||||||
setupFiles: ["./vitest.setup.ts"],
|
|
||||||
},
|
|
||||||
});
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
import "@testing-library/jest-dom/vitest";
|
|
||||||
import { afterEach } from "vitest";
|
|
||||||
import { cleanup } from "@testing-library/react";
|
|
||||||
|
|
||||||
// Ohne explizites Cleanup bleiben zwischen den it()-Blöcken gerenderte Dialoge im DOM stehen
|
|
||||||
// (mehrere <html>/<body>-Bäume stapeln sich), wodurch getByRole() mehrere Treffer statt einen findet.
|
|
||||||
afterEach(() => {
|
|
||||||
cleanup();
|
|
||||||
});
|
|
||||||
Reference in New Issue
Block a user