* Add push notifications support * fix(notifications): address push notification review findings - Gate the capability endpoint's apple_push availability on the admin delivery toggle, matching web push: Available now means setup will actually deliver. - Reject direct admin writes to push_relay_deployment_id/api_key; the relay issues them as a pair during registration and a lone write desyncs them (and poisons the next rotation request). - Purge a device's registrations under other profiles when it re-registers, so a profile switch on a shared device stops the old profile's pushes (attempts cascade); adds a DB-backed test. - Extract the shared channelDispatcher core + retry sweep and rebuild the webhook/web push/Apple push dispatchers on it instead of keeping three copies of the worker-pool/retry loop. - Deduplicate relay URL validation (admin setting + register flow) and the push outbox attempt-building loops behind shared helpers. - Cap free-text decline reasons in notification display bodies. - Fix TestHandleApplePushDisplayDB expectations to match the shared display copy (test previously failed under SILO_TEST_DATABASE_URL). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(notifications): route push relay URL writes through registration only Direct writes to notifications.push_relay_url via the admin settings endpoint bypassed the relay registration flow, letting the stored URL drift out of sync with the deployment id / API key pair the relay minted for it. Reject the URL alongside the deployment id and API key in the settings handler; POST /admin/notifications/push/relay/register remains the only path that persists all three together. The admin UI's Relay URL field now edits local draft state and is applied by the Register/Rotate action instead of the settings save. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
158 lines
5.2 KiB
Go
158 lines
5.2 KiB
Go
package notifications
|
|
|
|
import (
|
|
"context"
|
|
"io"
|
|
"log/slog"
|
|
"os"
|
|
"testing"
|
|
|
|
"github.com/jackc/pgx/v5/pgxpool"
|
|
)
|
|
|
|
func TestDispatchOperationalEnqueuesApplePushAttempts(t *testing.T) {
|
|
dsn := os.Getenv("SILO_TEST_DATABASE_URL")
|
|
if dsn == "" {
|
|
t.Skip("set SILO_TEST_DATABASE_URL to run DB-backed operational push dispatch test")
|
|
}
|
|
|
|
ctx := context.Background()
|
|
config, err := pgxpool.ParseConfig(dsn)
|
|
if err != nil {
|
|
t.Fatalf("parse db config: %v", err)
|
|
}
|
|
config.MaxConns = 1
|
|
pool, err := pgxpool.NewWithConfig(ctx, config)
|
|
if err != nil {
|
|
t.Fatalf("connect db: %v", err)
|
|
}
|
|
t.Cleanup(pool.Close)
|
|
|
|
if _, err := pool.Exec(ctx, `
|
|
CREATE TEMP TABLE notification_deliveries (
|
|
id text PRIMARY KEY,
|
|
release_event_id text,
|
|
user_id integer NOT NULL,
|
|
profile_id text NOT NULL,
|
|
library_id integer,
|
|
series_id text,
|
|
episode_id text,
|
|
type text NOT NULL,
|
|
reason_flags jsonb NOT NULL DEFAULT '{}'::jsonb,
|
|
status text NOT NULL DEFAULT 'delivered',
|
|
read_at timestamptz,
|
|
delivered_at timestamptz,
|
|
created_at timestamptz NOT NULL DEFAULT now()
|
|
) ON COMMIT PRESERVE ROWS;
|
|
|
|
CREATE TEMP TABLE push_devices (
|
|
id text PRIMARY KEY,
|
|
user_id integer NOT NULL,
|
|
profile_id text NOT NULL,
|
|
device_id varchar(128) NOT NULL,
|
|
platform text NOT NULL,
|
|
provider text NOT NULL,
|
|
apns_environment text,
|
|
apns_topic text,
|
|
apns_token_ciphertext text,
|
|
apns_token_hash text,
|
|
server_device_id text NOT NULL,
|
|
push_mode text NOT NULL DEFAULT 'private_push',
|
|
enabled boolean NOT NULL DEFAULT true,
|
|
last_seen_at timestamptz,
|
|
last_success_at timestamptz,
|
|
last_failure_at timestamptz,
|
|
last_failure_code text,
|
|
created_at timestamptz NOT NULL DEFAULT now(),
|
|
updated_at timestamptz NOT NULL DEFAULT now()
|
|
) ON COMMIT PRESERVE ROWS;
|
|
|
|
CREATE TEMP TABLE push_delivery_attempts (
|
|
id text PRIMARY KEY,
|
|
notification_delivery_id text,
|
|
push_device_id text NOT NULL,
|
|
trigger_type text NOT NULL,
|
|
provider text NOT NULL,
|
|
platform text NOT NULL,
|
|
attempt_number integer NOT NULL DEFAULT 0,
|
|
attempted_at timestamptz,
|
|
next_retry_at timestamptz,
|
|
outcome text NOT NULL DEFAULT 'pending',
|
|
relay_request_id text,
|
|
upstream_status integer,
|
|
upstream_reason text,
|
|
failure_message text,
|
|
created_at timestamptz NOT NULL DEFAULT now(),
|
|
updated_at timestamptz NOT NULL DEFAULT now(),
|
|
UNIQUE (notification_delivery_id, push_device_id, trigger_type)
|
|
) ON COMMIT PRESERVE ROWS;
|
|
`); err != nil {
|
|
t.Fatalf("create temp notification push tables: %v", err)
|
|
}
|
|
|
|
if _, err := pool.Exec(ctx, `
|
|
INSERT INTO push_devices
|
|
(id, user_id, profile_id, device_id, platform, provider, apns_environment, apns_topic,
|
|
apns_token_ciphertext, apns_token_hash, server_device_id, push_mode, enabled)
|
|
VALUES
|
|
('device-private', 42, 'profile-1', 'local-private', 'apple', 'silo_relay', 'sandbox',
|
|
'org.siloserver.silo', 'ciphertext', 'hash-1', 'server-private', 'private_push', true),
|
|
('device-in-app', 42, 'profile-1', 'local-in-app', 'apple', 'silo_relay', 'sandbox',
|
|
'org.siloserver.silo', 'ciphertext', 'hash-2', 'server-in-app', 'in_app_only', true),
|
|
('device-disabled', 42, 'profile-1', 'local-disabled', 'apple', 'silo_relay', 'sandbox',
|
|
'org.siloserver.silo', 'ciphertext', 'hash-3', 'server-disabled', 'private_push', false),
|
|
('device-other-profile', 42, 'profile-2', 'local-other', 'apple', 'silo_relay', 'sandbox',
|
|
'org.siloserver.silo', 'ciphertext', 'hash-4', 'server-other', 'private_push', true)
|
|
`); err != nil {
|
|
t.Fatalf("seed push devices: %v", err)
|
|
}
|
|
|
|
system := &System{
|
|
pool: pool,
|
|
Settings: NewSettings(mapSettingReader{SettingApplePushDeliveryEnabled: "true"}),
|
|
Deliveries: NewDeliveryRepository(pool),
|
|
pushDeviceRepo: NewPushDeviceRepository(pool),
|
|
dispatcher: NewMultiDispatcher(),
|
|
logger: slog.New(slog.NewTextHandler(io.Discard, nil)),
|
|
}
|
|
|
|
inserted, err := system.DispatchOperational(ctx, Delivery{
|
|
ID: "delivery-request-1",
|
|
UserID: 42,
|
|
ProfileID: "profile-1",
|
|
Type: DeliveryTypeRequestFulfilled,
|
|
ReasonFlags: []byte(`{}`),
|
|
}, OperationalDispatch{})
|
|
if err != nil {
|
|
t.Fatalf("dispatch operational: %v", err)
|
|
}
|
|
if inserted == nil || inserted.ID != "delivery-request-1" {
|
|
t.Fatalf("inserted = %+v", inserted)
|
|
}
|
|
|
|
var deliveryID, pushDeviceID, triggerType, provider, platform, outcome string
|
|
if err := pool.QueryRow(ctx, `
|
|
SELECT notification_delivery_id, push_device_id, trigger_type, provider, platform, outcome
|
|
FROM push_delivery_attempts
|
|
`).Scan(&deliveryID, &pushDeviceID, &triggerType, &provider, &platform, &outcome); err != nil {
|
|
t.Fatalf("query push attempt: %v", err)
|
|
}
|
|
if deliveryID != inserted.ID ||
|
|
pushDeviceID != "device-private" ||
|
|
triggerType != PushTriggerDelivery ||
|
|
provider != PushProviderSiloRelay ||
|
|
platform != PushPlatformApple ||
|
|
outcome != PushOutcomePending {
|
|
t.Fatalf("unexpected push attempt: delivery=%q device=%q trigger=%q provider=%q platform=%q outcome=%q",
|
|
deliveryID, pushDeviceID, triggerType, provider, platform, outcome)
|
|
}
|
|
|
|
var count int
|
|
if err := pool.QueryRow(ctx, `SELECT count(*) FROM push_delivery_attempts`).Scan(&count); err != nil {
|
|
t.Fatalf("count push attempts: %v", err)
|
|
}
|
|
if count != 1 {
|
|
t.Fatalf("push attempt count = %d, want 1", count)
|
|
}
|
|
}
|