diff --git a/CHANGELOG.md b/CHANGELOG.md index eb4b5407..f8967ce0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ Neueste Version oben. Jeder Abschnitt beginnt mit `## MAJOR.MINOR.PATCH` und enthält kurze Stichpunkte für Anwenderinnen und Anwender – keine Commit-Texte. Der Self-Updater zeigt diese Abschnitte bei neuen Versionen an. +## 0.30.0 + +- Neuigkeiten: Beiträgen lässt sich ein Herz geben – mit Anzahl am Beitrag und in der Übersicht. Die Redaktion sieht, wer ein Herz gegeben hat +- Neuigkeiten: Reichweite für die Redaktion – wie viele Personen einen Beitrag gelesen haben, der Anteil an der Belegschaft und der Verlauf der ersten zwei Wochen; auch in „Redaktion → Neuigkeiten“. Gezählt wird anonym: jede Person einmal, ohne festzuhalten, wer was gelesen hat +- Vorbereitung für die Inhaus-App (iPhone und Android): Anmeldung über den Browser (auch mit Microsoft & Co.), Push-Benachrichtigungen auf dem Handy, Erscheinungsbild des Portals in der App + ## 0.29.0 – Sicherheitsupdate Ergebnis eines umfassenden Sicherheitsaudits. Bitte zeitnah einspielen. diff --git a/app/Http/Controllers/Api/AppController.php b/app/Http/Controllers/Api/AppController.php new file mode 100644 index 00000000..77c02bd8 --- /dev/null +++ b/app/Http/Controllers/Api/AppController.php @@ -0,0 +1,85 @@ +get('icons') ?? []); + + return response()->json([ + 'name' => $branding->portalName(), + 'primary_color' => $branding->primaryColor(), + 'logo_url' => $branding->logoUrl(), + 'logo_dark_url' => $branding->logoDarkUrl(), + 'icon_url' => $branding->url($icons[512] ?? $icons['512'] ?? $icons[192] ?? $icons['192'] ?? null) ?? $branding->faviconUrl(), + 'login' => [ + 'password' => true, + 'browser' => true, + 'providers' => IdentityProvider::forLogin()->map->toLoginButton()->pluck('label')->filter()->values(), + ], + 'connect_url' => route('app.connect'), + 'api_version' => 1, + ]); + } + + public function exchange(Request $request): JsonResponse + { + $data = $request->validate([ + 'code' => ['required', 'string', 'max:100'], + 'code_verifier' => ['required', 'string', 'min:43', 'max:128'], + 'device_name' => ['nullable', 'string', 'max:100'], + ]); + + $entry = AppConnect::redeem($data['code'], $data['code_verifier']); + $user = $entry ? User::query()->find($entry['user']) : null; + + if (! $user || ! $user->is_active) { + throw ValidationException::withMessages(['code' => 'Die Anmeldung ist abgelaufen oder ungültig. Bitte erneut verbinden.']); + } + + return AuthController::issue($user, $entry['device']); + } + + public function registerDevice(Request $request): JsonResponse + { + $data = $request->validate([ + 'token' => ['required', 'string', 'max:255', 'regex:/^(ExponentPushToken|ExpoPushToken)\[[A-Za-z0-9_-]+\]$/'], + 'platform' => ['nullable', 'in:ios,android'], + 'name' => ['nullable', 'string', 'max:100'], + ]); + + // Ein Gerät gehört immer der Person, die zuletzt damit angemeldet war + AppDevice::query()->updateOrCreate(['push_token' => $data['token']], [ + 'user_id' => $request->user()->id, + 'token_id' => $request->user()->currentAccessToken()?->getKey(), + 'platform' => $data['platform'] ?? null, + 'name' => $data['name'] ?? $request->user()->currentAccessToken()?->name, + ]); + + return response()->json(['registered' => true], 201); + } + + public function removeDevice(Request $request): JsonResponse + { + $data = $request->validate(['token' => ['required', 'string', 'max:255']]); + AppDevice::query()->where('user_id', $request->user()->id)->where('push_token', $data['token'])->delete(); + + return response()->json(['removed' => true]); + } +} diff --git a/app/Http/Controllers/Api/AuthController.php b/app/Http/Controllers/Api/AuthController.php index a9e703a2..45cfd97f 100644 --- a/app/Http/Controllers/Api/AuthController.php +++ b/app/Http/Controllers/Api/AuthController.php @@ -45,15 +45,22 @@ class AuthController extends Controller RateLimiter::clear($key); - // Höchstens 20 Zugänge je Person – der älteste fällt weg + return self::issue($user, $data['device_name']); + } + + /** + * Neuer App-Zugang. Höchstens 20 je Person – der älteste fällt weg. + */ + public static function issue(User $user, string $deviceName): JsonResponse + { $excess = $user->tokens()->count() - 19; if ($excess > 0) { $user->tokens()->oldest()->limit($excess)->get()->each->delete(); } - $token = $user->createToken(trim($data['device_name'])); - Audit::log('api.token_created', ['user' => $user->id, 'device' => $data['device_name']]); + $token = $user->createToken(trim($deviceName)); + Audit::log('api.token_created', ['user' => $user->id, 'device' => $deviceName]); return response()->json(['token' => $token->plainTextToken, 'user' => self::profile($user)], 201); } diff --git a/app/Http/Controllers/AppConnectController.php b/app/Http/Controllers/AppConnectController.php new file mode 100644 index 00000000..51051e24 --- /dev/null +++ b/app/Http/Controllers/AppConnectController.php @@ -0,0 +1,60 @@ +validated($request); + + return Inertia::render('AppConnect', [ + 'deviceName' => $data['device_name'], + 'query' => $data, + ]); + } + + public function confirm(Request $request): HttpResponse + { + $data = $this->validated($request); + $code = AppConnect::issueCode($request->user()->id, $data['code_challenge'], $data['device_name']); + Audit::log('api.app_connect', ['user' => $request->user()->id, 'device' => $data['device_name']]); + + $separator = str_contains($data['redirect_uri'], '?') ? '&' : '?'; + + return Inertia::location($data['redirect_uri'].$separator.http_build_query(['code' => $code, 'state' => $data['state']])); + } + + /** + * @return array{redirect_uri: string, device_name: string, code_challenge: string, state: string} + */ + private function validated(Request $request): array + { + $data = $request->validate([ + 'redirect_uri' => ['required', 'string', 'max:500'], + 'device_name' => ['nullable', 'string', 'max:100'], + 'code_challenge' => ['required', 'string'], + 'state' => ['required', 'string', 'max:200'], + ]); + + abort_unless(AppConnect::allowedRedirect($data['redirect_uri']) && AppConnect::validChallenge($data['code_challenge']), 400, 'Ungültige Anfrage der App.'); + + return [ + 'redirect_uri' => $data['redirect_uri'], + 'device_name' => trim($data['device_name'] ?? '') ?: 'Inhaus-App', + 'code_challenge' => $data['code_challenge'], + 'state' => $data['state'], + ]; + } +} diff --git a/app/Models/User.php b/app/Models/User.php index e49af23a..cd2cfaaf 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -2,6 +2,7 @@ namespace App\Models; +use App\Push\AppDevice; use App\Push\PushSubscription; use App\Support\Abilities; use App\Support\Audit; @@ -257,6 +258,7 @@ class User extends Authenticatable implements FilamentUser, HasAvatar $this->forceFill(['remember_token' => Str::random(60)])->saveQuietly(); $this->tokens()->delete(); PushSubscription::query()->where('user_id', $this->id)->delete(); + AppDevice::query()->where('user_id', $this->id)->delete(); if (Schema::hasTable(config('session.table', 'sessions'))) { DB::table(config('session.table', 'sessions'))->where('user_id', $this->id) diff --git a/app/Notifications/PortalNotification.php b/app/Notifications/PortalNotification.php index 8764758c..ac98e49c 100644 --- a/app/Notifications/PortalNotification.php +++ b/app/Notifications/PortalNotification.php @@ -3,6 +3,7 @@ namespace App\Notifications; use App\Models\User; +use App\Push\AppDevice; use App\Push\PushSubscription; use App\Push\WebPushChannel; use Illuminate\Bus\Queueable; @@ -31,7 +32,8 @@ class PortalNotification extends Notification public function via(object $notifiable): array { // Zusätzlich als Push auf Geräte, die das eingeschaltet haben - $push = $notifiable instanceof User && PushSubscription::query()->where('user_id', $notifiable->id)->exists(); + $push = $notifiable instanceof User && (PushSubscription::query()->where('user_id', $notifiable->id)->exists() + || AppDevice::query()->where('user_id', $notifiable->id)->exists()); return $push ? ['database', WebPushChannel::class] : ['database']; } diff --git a/app/Push/AppDevice.php b/app/Push/AppDevice.php new file mode 100644 index 00000000..0c609d29 --- /dev/null +++ b/app/Push/AppDevice.php @@ -0,0 +1,25 @@ + 'datetime']; + } + + /** + * @return BelongsTo + */ + public function user(): BelongsTo + { + return $this->belongsTo(User::class); + } +} diff --git a/app/Push/ExpoPush.php b/app/Push/ExpoPush.php new file mode 100644 index 00000000..5746e956 --- /dev/null +++ b/app/Push/ExpoPush.php @@ -0,0 +1,52 @@ + $devices + * @param array $payload + */ + public function send(Collection $devices, array $payload): void + { + foreach ($devices->chunk(100) as $chunk) { + $chunk = $chunk->values(); + $response = Http::timeout(15)->acceptJson()->post(self::ENDPOINT, $chunk->map(fn (AppDevice $device) => [ + 'to' => $device->push_token, + 'title' => $payload['title'] ?? '', + 'body' => $payload['body'] ?? '', + 'data' => ['url' => $payload['url'] ?? '/'], + 'sound' => 'default', + ])->all()); + + if (! $response->successful()) { + continue; + } + + // Antwort in derselben Reihenfolge: abgemeldete Geräte entfernen + foreach ((array) $response->json('data') as $i => $ticket) { + $device = $chunk[$i] ?? null; + + if (! $device) { + continue; + } + + if (($ticket['status'] ?? null) === 'error' && ($ticket['details']['error'] ?? null) === 'DeviceNotRegistered') { + $device->delete(); + } elseif (($ticket['status'] ?? null) === 'ok') { + $device->forceFill(['last_used_at' => now()])->save(); + } + } + } + } +} diff --git a/app/Push/SendWebPush.php b/app/Push/SendWebPush.php index 4495d928..a40e0b51 100644 --- a/app/Push/SendWebPush.php +++ b/app/Push/SendWebPush.php @@ -9,7 +9,7 @@ use Illuminate\Queue\InteractsWithQueue; use Throwable; /** - * Push-Nachricht an alle Geräte einer Person – im Hintergrund, damit + * Push-Nachricht an alle Geräte einer Person (Browser und App) – im Hintergrund, damit * langsame Push-Dienste keine Seite aufhalten. */ class SendWebPush implements ShouldQueue @@ -23,8 +23,18 @@ class SendWebPush implements ShouldQueue */ public function __construct(public readonly int $userId, public readonly array $payload) {} - public function handle(WebPush $push): void + public function handle(WebPush $push, ExpoPush $expo): void { + $devices = AppDevice::query()->where('user_id', $this->userId)->get(); + + if ($devices->isNotEmpty()) { + try { + $expo->send($devices, $this->payload); + } catch (Throwable $e) { + report($e); + } + } + foreach (PushSubscription::query()->where('user_id', $this->userId)->get() as $subscription) { try { $push->send($subscription, $this->payload) diff --git a/app/Support/AppConnect.php b/app/Support/AppConnect.php new file mode 100644 index 00000000..b97674e5 --- /dev/null +++ b/app/Support/AppConnect.php @@ -0,0 +1,59 @@ +"]/', $uri); + } + + public static function validChallenge(string $challenge): bool + { + return (bool) preg_match('/^[A-Za-z0-9_-]{43}$/', $challenge); + } + + public static function issueCode(int $userId, string $challenge, string $deviceName): string + { + $code = Str::random(48); + Cache::put(self::key($code), ['user' => $userId, 'challenge' => $challenge, 'device' => $deviceName], self::TTL); + + return $code; + } + + /** + * @return array{user: int, device: string}|null nur einmal einlösbar + */ + public static function redeem(string $code, string $verifier): ?array + { + $entry = Cache::pull(self::key($code)); + + if (! is_array($entry)) { + return null; + } + + $expected = rtrim(strtr(base64_encode(hash('sha256', $verifier, true)), '+/', '-_'), '='); + + return hash_equals($entry['challenge'], $expected) ? ['user' => $entry['user'], 'device' => $entry['device']] : null; + } + + private static function key(string $code): string + { + return 'app-connect:'.hash('sha256', $code); + } +} diff --git a/app/Version.php b/app/Version.php index 86158e67..68dd0e06 100644 --- a/app/Version.php +++ b/app/Version.php @@ -9,5 +9,5 @@ namespace App; */ final class Version { - public const VERSION = '0.29.0'; + public const VERSION = '0.30.0'; } diff --git a/config/inhaus.php b/config/inhaus.php index 2660c051..b0808e6e 100644 --- a/config/inhaus.php +++ b/config/inhaus.php @@ -10,4 +10,8 @@ return [ // Plugins über den Admin-Bereich (z. B. bei strengen IT-Richtlinien). 'disallow_file_mods' => env('INHAUS_DISALLOW_FILE_MODS', false), + // Adress-Schemata, an die die Anmeldung der App zurückleitet. Für die Entwicklung mit + // Expo Go zusätzlich „exp“ eintragen: INHAUS_APP_SCHEMES=inhaus,exp + 'app_schemes' => array_filter(array_map('trim', explode(',', (string) env('INHAUS_APP_SCHEMES', 'inhaus')))), + ]; diff --git a/database/migrations/2026_10_15_000002_create_app_devices_table.php b/database/migrations/2026_10_15_000002_create_app_devices_table.php new file mode 100644 index 00000000..349230c7 --- /dev/null +++ b/database/migrations/2026_10_15_000002_create_app_devices_table.php @@ -0,0 +1,31 @@ +id(); + $table->foreignId('user_id')->constrained()->cascadeOnDelete(); + $table->foreignId('token_id')->nullable()->constrained('personal_access_tokens')->cascadeOnDelete(); + $table->string('push_token', 255)->unique(); + $table->string('platform', 20)->nullable(); + $table->string('name', 100)->nullable(); + $table->timestamp('last_used_at')->nullable(); + $table->timestamps(); + }); + } + + public function down(): void + { + Schema::dropIfExists('app_devices'); + } +}; diff --git a/docs/API.md b/docs/API.md index 341b1206..a9af54a3 100644 --- a/docs/API.md +++ b/docs/API.md @@ -20,7 +20,17 @@ Ein Token bekommt man auf zwei Wegen: { "email": "ada@example.org", "password": "…", "device_name": "iPhone von Ada" } ``` Antwort `201`: `{ "token": "1|…", "user": { … } }`. Höchstens 10 Versuche je Minute. -2. **Im Portal** unter *Profil bearbeiten → Benachrichtigungen & Apps → Zugang*. Der Weg für +2. **Über den Browser** (Inhaus-App, klappt mit jedem Anmeldedienst) – Ablauf wie OAuth mit PKCE: + 1. Die App erzeugt einen geheimen `code_verifier` (43–128 Zeichen) und daraus + `code_challenge = base64url(sha256(code_verifier))` ohne `=`, dazu einen zufälligen `state`. + 2. Sie öffnet `https:///app/verbinden?redirect_uri=inhaus://verbunden&device_name=…&code_challenge=…&state=…` + im Browser. Die Person meldet sich an und bestätigt. + 3. Das Portal leitet zurück an `inhaus://verbunden?code=…&state=…`. Der Code gilt 5 Minuten und nur einmal. + 4. `POST /token/exchange` mit `{ "code": "…", "code_verifier": "…" }` → `201` wie bei `POST /token`. + + Erlaubt sind nur Rücksprung-Adressen mit dem Schema `inhaus://`. Für die Entwicklung mit Expo Go + zusätzlich `INHAUS_APP_SCHEMES=inhaus,exp` in der `.env` setzen. +3. **Im Portal** unter *Profil bearbeiten → Benachrichtigungen & Apps → Zugang*. Der Weg für alle, die sich über Microsoft, LDAP oder SAML anmelden (sie haben kein Portal-Passwort). Der Schlüssel wird nur einmal angezeigt. @@ -31,6 +41,7 @@ Tokens deaktivierter Konten gelten sofort nicht mehr. | Methode | Pfad | Inhalt | |---|---|---| +| GET | `/config` | ohne Anmeldung: Name, Hausfarbe, Logo, Symbol, Anmeldewege, `connect_url` | | GET | `/me` | eigenes Profil, Anzahl ungelesener Benachrichtigungen | | GET | `/notifications` | Benachrichtigungen (30 je Seite, `?page=`), `meta.unread` | | POST | `/notifications/{id}/read` | eine als gelesen markieren | @@ -39,7 +50,10 @@ Tokens deaktivierter Konten gelten sofort nicht mehr. | GET | `/people/{id}` | Kontaktdaten und freigegebene Profilfelder | | GET | `/search?q=` | globale Suche (wie die Suche oben im Portal) | | GET | `/news?category=` | Neuigkeiten (20 je Seite) | -| GET | `/news/{slug}` | Beitrag mit Inhalt als Blöcke (`blocks`) und reinem Text (`text`) | +| GET | `/news/{slug}` | Beitrag mit Inhalt als Blöcke (`blocks`) und reinem Text (`text`); `likes`, `liked` | +| POST/DELETE | `/news/{slug}/like` | Herz geben bzw. zurücknehmen → `{ data: { liked, likes } }` | +| POST | `/push/devices` | App-Gerät für Push anmelden: `{ "token": "ExponentPushToken[…]", "platform": "ios", "name": "…" }` | +| DELETE | `/push/devices` | App-Gerät abmelden: `{ "token": "…" }` | | GET | `/events` | anstehende Termine | | GET | `/events/{id}` | Termin mit Beschreibung (HTML) und Kalenderdatei (`ics_url`) | @@ -69,5 +83,7 @@ wenn das Portal zum Home-Bildschirm hinzugefügt ist) schaltet jede Person Push Technisch: Web-Push mit VAPID (RFC 8291/8292), Schlüssel entstehen automatisch, der Versand läuft über die Warteschlange (Cron nötig). Voraussetzung ist HTTPS. -Native Apps (App Store, Google Play) können die API nutzen; Push für native Apps -(Apple/Google-Dienste) ist noch nicht angebunden. +Die Inhaus-App (App Store, Google Play) meldet ihr Gerät mit `POST /push/devices` an. Der Versand +läuft über den Push-Dienst von Expo, der an Apple und Google weiterleitet; übertragen werden Titel, +Kurztext und Link (`data.url`, ein Pfad im Portal). Abgemeldete Geräte entfernt das Portal selbst. +Wird ein App-Zugang entzogen, fällt auch das Gerät weg. diff --git a/docs/SECURITY.md b/docs/SECURITY.md index ac15077d..3ad64403 100644 --- a/docs/SECURITY.md +++ b/docs/SECURITY.md @@ -34,6 +34,10 @@ beim Betrieb auf dem Server zu beachten ist. Plugin-Updates erreichen keine internen Adressen, auch nicht über Weiterleitungen. - **Gespeicherte Zugangsdaten** (SMTP, LDAP, OIDC, OpenNIT) gehen nur an das Ziel, für das sie eingetragen wurden. Ändert sich Server oder Adresse, müssen sie neu eingegeben werden. +- **Reichweite von Beiträgen** wird anonym gezählt: je Person und Beitrag nur ein nicht umkehrbarer + Schlüssel. Wer ein Herz gegeben hat, sieht nur die Redaktion der Kategorie. +- **App-Anmeldung über den Browser** gibt nur einen Einmal-Code zurück, der ohne den geheimen + Prüfwert der App wertlos ist (PKCE), und leitet nur an `inhaus://` zurück. - **HTTP-Header:** `X-Frame-Options`, `X-Content-Type-Options`, `Referrer-Policy`, `Permissions-Policy`, eine Basis-CSP und HSTS bei HTTPS. Das Sitzungs-Cookie ist bei HTTPS automatisch `Secure`. diff --git a/plugins-core/news/database/migrations/2026_10_15_000001_create_news_likes_and_reads.php b/plugins-core/news/database/migrations/2026_10_15_000001_create_news_likes_and_reads.php new file mode 100644 index 00000000..71583752 --- /dev/null +++ b/plugins-core/news/database/migrations/2026_10_15_000001_create_news_likes_and_reads.php @@ -0,0 +1,36 @@ +foreignId('post_id')->constrained('news_posts')->cascadeOnDelete(); + $table->foreignId('user_id')->constrained()->cascadeOnDelete(); + $table->timestamp('created_at')->nullable(); + + $table->primary(['post_id', 'user_id']); + }); + + // Reichweite: anonym – nur ein nicht umkehrbarer Schlüssel je Person und Beitrag + Schema::create('news_reads', function (Blueprint $table) { + $table->foreignId('post_id')->constrained('news_posts')->cascadeOnDelete(); + $table->char('reader', 64); + $table->date('read_on'); + + $table->primary(['post_id', 'reader']); + $table->index(['post_id', 'read_on']); + }); + } + + public function down(): void + { + Schema::dropIfExists('news_reads'); + Schema::dropIfExists('news_likes'); + } +}; diff --git a/plugins-core/news/resources/js/components/NewsCard.vue b/plugins-core/news/resources/js/components/NewsCard.vue index 04f6ad7d..5df875b8 100644 --- a/plugins-core/news/resources/js/components/NewsCard.vue +++ b/plugins-core/news/resources/js/components/NewsCard.vue @@ -1,5 +1,6 @@ + + diff --git a/routes/api.php b/routes/api.php index 680313ac..a69b95d9 100644 --- a/routes/api.php +++ b/routes/api.php @@ -1,5 +1,6 @@ group(function () { Route::post('/token', [AuthController::class, 'token'])->middleware('throttle:10,1'); + Route::post('/token/exchange', [AppController::class, 'exchange'])->middleware('throttle:10,1'); + Route::get('/config', [AppController::class, 'config'])->middleware('throttle:60,1'); Route::middleware('auth:sanctum')->group(function () { Route::get('/me', [AuthController::class, 'me']); @@ -26,5 +29,8 @@ Route::prefix('v1')->group(function () { Route::get('/people/{user}', [PeopleController::class, 'show'])->whereNumber('user'); Route::get('/search', SearchController::class); + + Route::post('/push/devices', [AppController::class, 'registerDevice'])->middleware('throttle:30,1'); + Route::delete('/push/devices', [AppController::class, 'removeDevice']); }); }); diff --git a/routes/web.php b/routes/web.php index 654a7cab..c050c850 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,6 +1,7 @@ group(function () { Route::get('/', DashboardController::class)->name('dashboard'); + // Inhaus-App über den Browser verbinden (docs/API.md) + Route::get('/app/verbinden', [AppConnectController::class, 'show'])->name('app.connect'); + Route::post('/app/verbinden', [AppConnectController::class, 'confirm'])->middleware('throttle:20,1')->name('app.connect.confirm'); + Route::get('/redaktion', EditorialController::class)->name('editorial'); // Mediathek und Bildauswahl der Editoren diff --git a/tests/Feature/Mobile/AppConnectTest.php b/tests/Feature/Mobile/AppConnectTest.php new file mode 100644 index 00000000..42b50f4e --- /dev/null +++ b/tests/Feature/Mobile/AppConnectTest.php @@ -0,0 +1,104 @@ +getJson('/api/v1/config')->assertOk() + ->assertJsonStructure(['name', 'primary_color', 'logo_url', 'icon_url', 'login' => ['password', 'browser', 'providers'], 'connect_url']); + } + + public function test_browser_connect_hands_out_a_one_time_code_for_the_app(): void + { + $user = User::factory()->create(); + [$verifier, $challenge] = $this->pkce(); + $query = ['redirect_uri' => 'inhaus://verbunden', 'device_name' => 'Pixel 9', 'code_challenge' => $challenge, 'state' => 'xyz']; + + $this->get('/app/verbinden?'.http_build_query($query))->assertRedirect('/login'); + $this->actingAs($user)->get('/app/verbinden?'.http_build_query($query))->assertOk(); + + $location = $this->actingAs($user)->post('/app/verbinden', $query, ['X-Inertia' => 'true']) + ->assertStatus(409)->headers->get('X-Inertia-Location'); + $this->assertStringStartsWith('inhaus://verbunden?code=', $location); + $this->assertStringContainsString('state=xyz', $location); + $this->assertStringNotContainsString('|', $location); + parse_str((string) parse_url($location, PHP_URL_QUERY), $params); + + // Falscher Prüfwert: nichts – und der Code ist danach verbraucht + $this->postJson('/api/v1/token/exchange', ['code' => $params['code'], 'code_verifier' => str_repeat('x', 48)])->assertUnprocessable(); + $this->postJson('/api/v1/token/exchange', ['code' => $params['code'], 'code_verifier' => $verifier])->assertUnprocessable(); + + $location = $this->actingAs($user)->post('/app/verbinden', $query, ['X-Inertia' => 'true'])->headers->get('X-Inertia-Location'); + parse_str((string) parse_url($location, PHP_URL_QUERY), $params); + $this->postJson('/api/v1/token/exchange', ['code' => $params['code'], 'code_verifier' => $verifier]) + ->assertCreated()->assertJsonPath('user.id', $user->id)->assertJsonStructure(['token']); + $this->assertSame('Pixel 9', $user->tokens()->first()->name); + } + + public function test_only_app_schemes_are_accepted_as_redirect(): void + { + $user = User::factory()->create(); + [, $challenge] = $this->pkce(); + + foreach (['https://evil.example/cb', 'javascript:alert(1)', 'exp://192.168.0.2:8081'] as $uri) { + $this->actingAs($user)->get('/app/verbinden?'.http_build_query(['redirect_uri' => $uri, 'code_challenge' => $challenge, 'state' => 's']))->assertStatus(400); + } + + config(['inhaus.app_schemes' => ['inhaus', 'exp']]); + $this->actingAs($user)->get('/app/verbinden?'.http_build_query(['redirect_uri' => 'exp://192.168.0.2:8081/--/verbunden', 'code_challenge' => $challenge, 'state' => 's']))->assertOk(); + } + + public function test_push_devices_receive_notifications_via_expo(): void + { + $user = User::factory()->create(); + $headers = ['Authorization' => 'Bearer '.$user->createToken('App')->plainTextToken]; + + $this->postJson('/api/v1/push/devices', ['token' => 'kein-token'], $headers)->assertUnprocessable(); + $this->postJson('/api/v1/push/devices', ['token' => 'ExponentPushToken[abc123]', 'platform' => 'android'], $headers)->assertCreated(); + $this->postJson('/api/v1/push/devices', ['token' => 'ExponentPushToken[weg]', 'platform' => 'ios'], $headers)->assertCreated(); + + Http::fake([ExpoPush::ENDPOINT => Http::response(['data' => [ + ['status' => 'ok', 'id' => '1'], + ['status' => 'error', 'details' => ['error' => 'DeviceNotRegistered']], + ]])]); + + $user->notify(new PortalNotification('Neue Stelle', 'Pflegefachkraft', '/stellen/1')); + + Http::assertSent(fn ($request) => $request->url() === ExpoPush::ENDPOINT + && $request[0]['to'] === 'ExponentPushToken[abc123]' && $request[0]['data']['url'] === '/stellen/1'); + $this->assertSame(['ExponentPushToken[abc123]'], AppDevice::query()->pluck('push_token')->all()); + + $this->deleteJson('/api/v1/push/devices', ['token' => 'ExponentPushToken[abc123]'], $headers)->assertOk(); + $this->assertSame(0, AppDevice::query()->count()); + } + + public function test_revoking_access_removes_app_devices(): void + { + $user = User::factory()->create(); + $token = $user->createToken('App'); + AppDevice::query()->create(['user_id' => $user->id, 'token_id' => $token->accessToken->id, 'push_token' => 'ExponentPushToken[x]']); + + $token->accessToken->delete(); + + $this->assertSame(0, AppDevice::query()->count()); + } +} diff --git a/tests/Feature/Mobile/WebPushTest.php b/tests/Feature/Mobile/WebPushTest.php index 39a9dcc3..e5796a81 100644 --- a/tests/Feature/Mobile/WebPushTest.php +++ b/tests/Feature/Mobile/WebPushTest.php @@ -4,6 +4,7 @@ namespace Tests\Feature\Mobile; use App\Models\User; use App\Notifications\PortalNotification; +use App\Push\ExpoPush; use App\Push\PushSubscription; use App\Push\SendWebPush; use App\Push\WebPush; @@ -115,7 +116,7 @@ class WebPushTest extends TestCase PushSubscription::query()->create(['user_id' => $user->id, 'endpoint' => 'https://push.example.org/weg', 'endpoint_hash' => hash('sha256', 'weg'), 'public_key' => $uaPublic, 'auth_token' => $auth]); Http::fake(['*' => Http::response('', 410)]); - (new SendWebPush($user->id, ['title' => 'x']))->handle(app(WebPush::class)); + (new SendWebPush($user->id, ['title' => 'x']))->handle(app(WebPush::class), app(ExpoPush::class)); $this->assertSame(0, PushSubscription::query()->count()); } diff --git a/tests/Feature/News/LikesAndReachTest.php b/tests/Feature/News/LikesAndReachTest.php new file mode 100644 index 00000000..cfa3ee56 --- /dev/null +++ b/tests/Feature/News/LikesAndReachTest.php @@ -0,0 +1,75 @@ +create(); + $post = NewsPost::factory()->create(['published_at' => now()->subHour()]); + + $this->actingAs($user)->post("/neuigkeiten/{$post->slug}/herz")->assertRedirect(); + $this->actingAs($user)->post("/neuigkeiten/{$post->slug}/herz")->assertRedirect(); + $this->assertSame(1, DB::table('news_likes')->where('post_id', $post->id)->count()); + + $this->actingAs($user)->get("/neuigkeiten/{$post->slug}")->assertInertia(fn (Assert $page) => $page + ->where('post.likes', 1)->where('post.liked', true)->where('reach', null)); + + $this->actingAs($user)->delete("/neuigkeiten/{$post->slug}/herz")->assertRedirect(); + $this->assertSame(0, DB::table('news_likes')->count()); + } + + public function test_hidden_or_unpublished_posts_cannot_get_hearts(): void + { + $user = User::factory()->create(); + $draft = NewsPost::factory()->create(['status' => NewsPost::DRAFT, 'published_at' => null]); + + $this->actingAs($user)->post("/neuigkeiten/{$draft->slug}/herz")->assertNotFound(); + } + + public function test_reach_is_anonymous_and_only_for_editors(): void + { + $admin = User::factory()->admin()->create(); + $readers = User::factory()->count(3)->create(); + $post = NewsPost::factory()->create(['published_at' => now()->subHour()]); + + foreach ($readers as $reader) { + $this->actingAs($reader)->get("/neuigkeiten/{$post->slug}")->assertOk(); + $this->actingAs($reader)->get("/neuigkeiten/{$post->slug}")->assertOk(); + } + + $this->actingAs($readers[0])->post("/neuigkeiten/{$post->slug}/herz"); + + // Gespeichert wird kein Personenbezug + $this->assertSame(3, DB::table('news_reads')->where('post_id', $post->id)->count()); + $this->assertFalse(DB::table('news_reads')->whereIn('reader', $readers->pluck('id')->map(fn ($id) => (string) $id))->exists()); + + $this->actingAs($admin)->get("/neuigkeiten/{$post->slug}")->assertInertia(fn (Assert $page) => $page + ->where('reach.readers', 4) + ->where('reach.likes', 1) + ->where('reach.likers', [$readers[0]->name]) + ->where('reach.share', 100)); + } + + public function test_hearts_via_the_api(): void + { + $user = User::factory()->create(); + $post = NewsPost::factory()->create(['published_at' => now()->subHour()]); + $headers = ['Authorization' => 'Bearer '.$user->createToken('App')->plainTextToken]; + + $this->postJson("/api/v1/news/{$post->slug}/like", [], $headers)->assertOk()->assertJsonPath('data.likes', 1)->assertJsonPath('data.liked', true); + $this->getJson('/api/v1/news', $headers)->assertJsonPath('data.0.likes', 1)->assertJsonPath('data.0.liked', true); + $this->getJson("/api/v1/news/{$post->slug}", $headers)->assertJsonPath('data.liked', true); + $this->deleteJson("/api/v1/news/{$post->slug}/like", [], $headers)->assertOk()->assertJsonPath('data.likes', 0); + } +} diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index cae3c722..16e72e0b 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -68,10 +68,12 @@ return array( 'App\\Filament\\Resources\\Users\\Tables\\UsersTable' => $baseDir . '/app/Filament/Resources/Users/Tables/UsersTable.php', 'App\\Filament\\Resources\\Users\\UserResource' => $baseDir . '/app/Filament/Resources/Users/UserResource.php', 'App\\Http\\Controllers\\Admin\\UpdateController' => $baseDir . '/app/Http/Controllers/Admin/UpdateController.php', + 'App\\Http\\Controllers\\Api\\AppController' => $baseDir . '/app/Http/Controllers/Api/AppController.php', 'App\\Http\\Controllers\\Api\\AuthController' => $baseDir . '/app/Http/Controllers/Api/AuthController.php', 'App\\Http\\Controllers\\Api\\NotificationController' => $baseDir . '/app/Http/Controllers/Api/NotificationController.php', 'App\\Http\\Controllers\\Api\\PeopleController' => $baseDir . '/app/Http/Controllers/Api/PeopleController.php', 'App\\Http\\Controllers\\Api\\SearchController' => $baseDir . '/app/Http/Controllers/Api/SearchController.php', + 'App\\Http\\Controllers\\AppConnectController' => $baseDir . '/app/Http/Controllers/AppConnectController.php', 'App\\Http\\Controllers\\AppearanceController' => $baseDir . '/app/Http/Controllers/AppearanceController.php', 'App\\Http\\Controllers\\Auth\\IdentityLoginController' => $baseDir . '/app/Http/Controllers/Auth/IdentityLoginController.php', 'App\\Http\\Controllers\\Controller' => $baseDir . '/app/Http/Controllers/Controller.php', @@ -160,12 +162,15 @@ return array( 'App\\Providers\\Filament\\AdminPanelProvider' => $baseDir . '/app/Providers/Filament/AdminPanelProvider.php', 'App\\Providers\\FortifyServiceProvider' => $baseDir . '/app/Providers/FortifyServiceProvider.php', 'App\\Providers\\PluginServiceProvider' => $baseDir . '/app/Providers/PluginServiceProvider.php', + 'App\\Push\\AppDevice' => $baseDir . '/app/Push/AppDevice.php', + 'App\\Push\\ExpoPush' => $baseDir . '/app/Push/ExpoPush.php', 'App\\Push\\PushSubscription' => $baseDir . '/app/Push/PushSubscription.php', 'App\\Push\\SendWebPush' => $baseDir . '/app/Push/SendWebPush.php', 'App\\Push\\WebPush' => $baseDir . '/app/Push/WebPush.php', 'App\\Push\\WebPushChannel' => $baseDir . '/app/Push/WebPushChannel.php', 'App\\Search\\GlobalSearch' => $baseDir . '/app/Search/GlobalSearch.php', 'App\\Support\\Abilities' => $baseDir . '/app/Support/Abilities.php', + 'App\\Support\\AppConnect' => $baseDir . '/app/Support/AppConnect.php', 'App\\Support\\Audit' => $baseDir . '/app/Support/Audit.php', 'App\\Support\\Avatars' => $baseDir . '/app/Support/Avatars.php', 'App\\Support\\BackgroundTasks' => $baseDir . '/app/Support/BackgroundTasks.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 74914d94..9cdd3d23 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -870,10 +870,12 @@ class ComposerStaticInit7be5f0fc2523def46ad071c4f7cbcb0e 'App\\Filament\\Resources\\Users\\Tables\\UsersTable' => __DIR__ . '/../..' . '/app/Filament/Resources/Users/Tables/UsersTable.php', 'App\\Filament\\Resources\\Users\\UserResource' => __DIR__ . '/../..' . '/app/Filament/Resources/Users/UserResource.php', 'App\\Http\\Controllers\\Admin\\UpdateController' => __DIR__ . '/../..' . '/app/Http/Controllers/Admin/UpdateController.php', + 'App\\Http\\Controllers\\Api\\AppController' => __DIR__ . '/../..' . '/app/Http/Controllers/Api/AppController.php', 'App\\Http\\Controllers\\Api\\AuthController' => __DIR__ . '/../..' . '/app/Http/Controllers/Api/AuthController.php', 'App\\Http\\Controllers\\Api\\NotificationController' => __DIR__ . '/../..' . '/app/Http/Controllers/Api/NotificationController.php', 'App\\Http\\Controllers\\Api\\PeopleController' => __DIR__ . '/../..' . '/app/Http/Controllers/Api/PeopleController.php', 'App\\Http\\Controllers\\Api\\SearchController' => __DIR__ . '/../..' . '/app/Http/Controllers/Api/SearchController.php', + 'App\\Http\\Controllers\\AppConnectController' => __DIR__ . '/../..' . '/app/Http/Controllers/AppConnectController.php', 'App\\Http\\Controllers\\AppearanceController' => __DIR__ . '/../..' . '/app/Http/Controllers/AppearanceController.php', 'App\\Http\\Controllers\\Auth\\IdentityLoginController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/IdentityLoginController.php', 'App\\Http\\Controllers\\Controller' => __DIR__ . '/../..' . '/app/Http/Controllers/Controller.php', @@ -962,12 +964,15 @@ class ComposerStaticInit7be5f0fc2523def46ad071c4f7cbcb0e 'App\\Providers\\Filament\\AdminPanelProvider' => __DIR__ . '/../..' . '/app/Providers/Filament/AdminPanelProvider.php', 'App\\Providers\\FortifyServiceProvider' => __DIR__ . '/../..' . '/app/Providers/FortifyServiceProvider.php', 'App\\Providers\\PluginServiceProvider' => __DIR__ . '/../..' . '/app/Providers/PluginServiceProvider.php', + 'App\\Push\\AppDevice' => __DIR__ . '/../..' . '/app/Push/AppDevice.php', + 'App\\Push\\ExpoPush' => __DIR__ . '/../..' . '/app/Push/ExpoPush.php', 'App\\Push\\PushSubscription' => __DIR__ . '/../..' . '/app/Push/PushSubscription.php', 'App\\Push\\SendWebPush' => __DIR__ . '/../..' . '/app/Push/SendWebPush.php', 'App\\Push\\WebPush' => __DIR__ . '/../..' . '/app/Push/WebPush.php', 'App\\Push\\WebPushChannel' => __DIR__ . '/../..' . '/app/Push/WebPushChannel.php', 'App\\Search\\GlobalSearch' => __DIR__ . '/../..' . '/app/Search/GlobalSearch.php', 'App\\Support\\Abilities' => __DIR__ . '/../..' . '/app/Support/Abilities.php', + 'App\\Support\\AppConnect' => __DIR__ . '/../..' . '/app/Support/AppConnect.php', 'App\\Support\\Audit' => __DIR__ . '/../..' . '/app/Support/Audit.php', 'App\\Support\\Avatars' => __DIR__ . '/../..' . '/app/Support/Avatars.php', 'App\\Support\\BackgroundTasks' => __DIR__ . '/../..' . '/app/Support/BackgroundTasks.php', diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 1f198c42..44623336 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => 'inhaus/inhaus', 'pretty_version' => 'dev-main', 'version' => 'dev-main', - 'reference' => 'a37895a16a5260ed45b18edeeb4b87a5bd3d1cfd', + 'reference' => 'd9fcc7a9b46c7fb8ad14735d587d33ba794a5432', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -550,7 +550,7 @@ 'inhaus/inhaus' => array( 'pretty_version' => 'dev-main', 'version' => 'dev-main', - 'reference' => 'a37895a16a5260ed45b18edeeb4b87a5bd3d1cfd', + 'reference' => 'd9fcc7a9b46c7fb8ad14735d587d33ba794a5432', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(),