Dev lb/gdpr columns stuff

app/Console/Kernel.php

@@ -12,6 +12,7 @@
 use App\Console\Commands\WikidataFetcher;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+use Spatie\PersonalDataExport\Commands\CleanOldPersonalDataExportsCommand;
 
 class Kernel extends ConsoleKernel
 {
@@ -44,6 +45,7 @@ protected function schedule(Schedule $schedule): void {
         //daily tasks
         $schedule->command(DatabaseCleaner::class)->daily();
         $schedule->command(CleanUpProfilePictures::class)->daily();
+        $schedule->command(CleanOldPersonalDataExportsCommand::class)->daily();
 
         //weekly tasks
         $schedule->command(MastodonServers::class)->weekly();

app/Http/Controllers/API/v1/ExportController.php

@@ -5,6 +5,7 @@
 use App\Enum\ExportableColumn;
 use App\Exceptions\DataOverflowException;
 use App\Http\Controllers\Backend\Export\ExportController as ExportBackend;
+use App\Jobs\MonitoredPersonalDataExportJob;
 use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
@@ -15,18 +16,37 @@
 
 class ExportController extends Controller
 {
+    public function requestGdprExport(Request $request): JsonResponse|Response|RedirectResponse {
+        $validated = $request->validate([
+                                            'frontend' => ['nullable', 'boolean'],
+                                        ]);
+
+        $user = $request->user();
+
+        if ($user->recent_gdpr_export && $user->recent_gdpr_export->diffInDays(now()) < 30) {
+            return $this->frontendOrJson($validated, ['error' => __('export.error.gdpr-time', ['date' => userTime($user->recent_gdpr_export)])]);
+        }
+
+        $user->update(['recent_gdpr_export' => now()]);
+
+        dispatch(new MonitoredPersonalDataExportJob($user));
+
+        return $this->frontendOrJson($validated, ['message' => __('export.requested')], 200);
+    }
+
     public function generateStatusExport(Request $request): JsonResponse|StreamedResponse|Response|RedirectResponse {
         $validated = $request->validate([
                                             'from'      => ['required', 'date', 'before_or_equal:until'],
                                             'until'     => ['required', 'date', 'after_or_equal:from'],
                                             'columns.*' => ['required', Rule::enum(ExportableColumn::class)],
                                             'filetype'  => ['required', Rule::in(['pdf', 'csv_human', 'csv_machine', 'json'])],
+                                            'frontend'  => ['nullable', 'boolean'],
                                         ]);
 
         $from  = Carbon::parse($validated['from']);
         $until = Carbon::parse($validated['until']);
         if ($from->diffInDays($until) > 365) {
-            return back()->with('error', __('export.error.time'));
+            return $this->frontendOrJson($validated, ['error' => __('export.error.time')]);
         }
 
         if ($validated['filetype'] === 'json') {
@@ -49,7 +69,19 @@ public function generateStatusExport(Request $request): JsonResponse|StreamedRes
                 filetype: $validated['filetype']
             );
         } catch (DataOverflowException) {
-            return back()->with('error', __('export.error.amount'));
+            return $this->frontendOrJson($validated, ['error' => __('export.error.amount')], 406);
+        }
+    }
+
+    private function frontendOrJson(array $validated, array $data, int $status = 400): RedirectResponse|JsonResponse {
+        if (empty($validated['frontend'])) {
+            return response()->json($data, $status);
+        }
+
+        if (array_key_exists('error', $data)) {
+            return redirect('export')->with($data);
         }
+
+        return redirect('export')->with('success', $data['message']);
     }
 }

app/Jobs/MonitoredPersonalDataExportJob.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Jobs;
+
+use romanzipp\QueueMonitor\Traits\IsMonitored;
+use Spatie\PersonalDataExport\ExportsPersonalData;
+use Spatie\PersonalDataExport\Jobs\CreatePersonalDataExportJob;
+
+class MonitoredPersonalDataExportJob extends CreatePersonalDataExportJob
+{
+
+    use IsMonitored;
+
+    public $timeout = 30 * 60;
+
+
+    protected function ensureValidUser(ExportsPersonalData $user) {
+        // Do nothing since we are not enforcing the user to have an email property
+    }
+}

app/Models/MastodonServer.php

@@ -11,6 +11,7 @@ class MastodonServer extends Model
     protected $casts    = [
         'id' => 'integer',
     ];
+    protected $hidden   = ['client_id', 'client_secret'];
 
     public function socialProfiles(): HasMany {
         return $this->hasMany(SocialLoginProfile::class, 'mastodon_server', 'id');

app/Models/OAuthClient.php

@@ -29,6 +29,10 @@ class OAuthClient extends PassportClient {
         'revoked' => 'bool',
     ];
 
+    protected $hidden = [
+        'secret',
+    ];
+
     public static function newFactory() {
         return parent::newFactory();
     }

app/Models/Status.php

@@ -96,6 +96,9 @@ public function getFavoritedAttribute(): ?bool {
     }
 
     public function getDescriptionAttribute(): string {
+        if ($this->checkin === null) {
+            return $this->body ?? '';
+        }
         return __('description.status', [
             'username'    => $this->user->name,
             'origin'      => $this->checkin->originStopover->station->name .

app/Models/User.php

@@ -8,6 +8,7 @@
 use App\Exceptions\RateLimitExceededException;
 use App\Http\Controllers\Backend\Social\MastodonProfileDetails;
 use App\Jobs\SendVerificationEmail;
+use App\Services\PersonalDataSelection\UserGdprDataService;
 use Carbon\Carbon;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Database\Eloquent\Builder;
@@ -25,6 +26,8 @@
 use Laravel\Passport\HasApiTokens;
 use Mastodon;
 use Spatie\Permission\Traits\HasRoles;
+use Spatie\PersonalDataExport\ExportsPersonalData;
+use Spatie\PersonalDataExport\PersonalDataSelection;
 
 /**
  * // properties
@@ -58,6 +61,9 @@
  * @property boolean              muted
  * @property boolean              isAuthUserBlocked
  * @property boolean              isBlockedByAuthUser
+ * @property ?Carbon              recent_gdpr_export
+ * @property Carbon               created_at
+ * @property Carbon               updated_at
  *
  * // relationships
  * @property Collection           trainCheckins
@@ -84,15 +90,15 @@
  * @todo rename mapprovider to map_provider
  * @mixin Builder
  */
-class User extends Authenticatable implements MustVerifyEmail
+class User extends Authenticatable implements MustVerifyEmail, ExportsPersonalData
 {
 
     use Notifiable, HasApiTokens, HasFactory, HasRoles;
 
     protected $fillable = [
         'username', 'name', 'avatar', 'email', 'email_verified_at', 'password', 'home_id', 'privacy_ack_at',
         'default_status_visibility', 'likes_enabled', 'points_enabled', 'private_profile', 'prevent_index',
-        'privacy_hide_days', 'language', 'last_login', 'mapprovider', 'timezone', 'friend_checkin',
+        'privacy_hide_days', 'language', 'last_login', 'mapprovider', 'timezone', 'friend_checkin', 'recent_gdpr_export',
     ];
     protected $hidden   = [
         'password', 'remember_token', 'email', 'email_verified_at', 'privacy_ack_at',
@@ -117,6 +123,7 @@ class User extends Authenticatable implements MustVerifyEmail
         'mapprovider'               => MapProvider::class,
         'timezone'                  => 'string',
         'friend_checkin'            => FriendCheckinSetting::class,
+        'recent_gdpr_export'        => 'datetime',
     ];
 
     public function getTrainDistanceAttribute(): float {
@@ -333,4 +340,16 @@ public function preferredLocale(): string {
     protected function getDefaultGuardName(): string {
         return 'web';
     }
+
+    public function oAuthClients(): HasMany {
+        return $this->hasMany(OAuthClient::class, 'user_id', 'id');
+    }
+
+    public function selectPersonalData(PersonalDataSelection $personalDataSelection): void {
+        (new UserGdprDataService())($personalDataSelection, $this);
+    }
+
+    public function personalDataExportName(): string {
+        return $this->username;
+    }
 }

app/Models/WebhookCreationRequest.php

@@ -14,6 +14,7 @@
 class WebhookCreationRequest extends Model {
     public $timestamps = false;
     protected $fillable = ['id', 'user_id', 'oauth_client_id', 'revoked', 'expires_at', 'events', 'url'];
+    protected $hidden = ['url'];
     protected $casts = [
         'id' => 'string',
         'user_id' => 'integer',

app/Notifications/BaseNotification.php

@@ -13,4 +13,6 @@ public static function getNotice(array $data): ?string;
      * @return string|null optionally link to which the user should be redirected if clicked on the notification
      */
     public static function getLink(array $data): ?string;
+
+    public function toArray(): array;
 }

app/Notifications/PersonalDataExportedNotification.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Notifications;
+
+use Carbon\Carbon;
+use Spatie\PersonalDataExport\Notifications\PersonalDataExportedNotification as MainPersonalDataExportedNotification;
+
+class PersonalDataExportedNotification extends MainPersonalDataExportedNotification implements BaseNotification
+{
+
+    public function via($notifiable): array {
+        return ['mail', 'database'];
+    }
+
+    public static function getLead(array $data): string {
+        return __('notifications.personalDataExported.lead');
+    }
+
+    public static function getNotice(array $data): ?string {
+        $date = Carbon::parse($data['deletionDatetime']);
+        return __('notifications.personalDataExported.notice', [
+            'date' => userTime($date, __('datetime-format')),
+        ]);
+    }
+
+    public static function getLink(array $data): ?string {
+        return route('personal-data-exports', $data['zipFilename']);
+    }
+
+    public function toArray(): array
+    {
+        return [
+            'zipFilename' => $this->zipFilename,
+            'deletionDatetime' => $this->deletionDatetime,
+        ];
+    }
+}

app/Services/PersonalDataSelection/Exporters/ActivityLogExporter.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Services\PersonalDataSelection\Exporters;
+
+use App\Services\PersonalDataSelection\Exporters\Base\AbstractExporter;
+use App\Services\PersonalDataSelection\Exporters\Base\DatabaseExportable;
+
+class ActivityLogExporter extends AbstractExporter
+{
+    use DatabaseExportable;
+
+    protected string $fileName        = 'activity_log.json';
+    protected string $tableName       = 'activity_log';
+    protected array  $columns         = [
+        'id', 'log_name', 'description', 'subject_type', 'event', 'subject_id',
+        'causer_type', 'causer_id', 'properties', 'created_at', 'updated_at'
+    ];
+    protected string $whereColumn     = 'causer_id';
+    protected array  $whereConditions = ['causer_type' => 'App\Models\User'];
+}

app/Services/PersonalDataSelection/Exporters/AppsExporter.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Services\PersonalDataSelection\Exporters;
+
+use App\Services\PersonalDataSelection\Exporters\Base\AbstractExporter;
+use App\Services\PersonalDataSelection\Exporters\Base\RelationExportable;
+
+class AppsExporter extends AbstractExporter
+{
+    use RelationExportable;
+
+    protected string $fileName = 'apps.json';
+    protected string $relation = 'oAuthClients';
+    // todo: columns
+}

app/Services/PersonalDataSelection/Exporters/Base/AbstractExporter.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Services\PersonalDataSelection\Exporters\Base;
+
+use App\Models\User;
+use InvalidArgumentException;
+
+abstract class AbstractExporter
+{
+    protected User   $user;
+    protected string $fileName;
+
+    public function __construct(User $user) {
+        $this->user = $user;
+
+        if (!isset($this->fileName)) {
+            throw new InvalidArgumentException('Property $fileName must be set in ' . static::class);
+        }
+    }
+
+    public function getFileName(): string {
+        return $this->fileName;
+    }
+
+    public function getData(): array|string {
+        if (!$this->onExportValidation()) {
+            throw new InvalidArgumentException('Export validation failed in ' . static::class);
+        }
+
+        if (empty($this->fileName)) {
+            throw new InvalidArgumentException('Property $fileName must be set in ' . static::class);
+        }
+
+        return $this->exportData();
+    }
+
+    abstract protected function exportData(): array|string;
+
+    abstract protected function onExportValidation(): bool;
+}

app/Services/PersonalDataSelection/Exporters/Base/DatabaseExportable.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Services\PersonalDataSelection\Exporters\Base;
+
+use Illuminate\Support\Facades\DB;
+
+trait DatabaseExportable
+{
+    protected function exportData(): array {
+
+        $condition = $this->whereCondition ?? 'id';
+
+        $db = DB::table($this->tableName)
+                ->select($this->columns)
+                ->where($this->whereColumn, $this->user->{$condition});
+
+        if (!empty($this->whereConditions)) {
+            $db->where($this->whereConditions);
+        }
+
+        return $db->get()->toArray();
+    }
+
+    protected function onExportValidation(): bool {
+        return !empty($this->columns) && !empty($this->tableName) && !empty($this->whereColumn);
+    }
+}