Statamic 6 compatibility for private API addon

composer.json

@@ -12,15 +12,14 @@
     },
     "require": {
         "php": "^8.2",
-        "statamic/cms": "^4.0 || ^5.0"
+        "statamic/cms": "^6.0"
     },
     "require-dev": {
         "nunomaduro/collision": "^8.1",
-        "orchestra/testbench": "^9.0",
-        "pestphp/pest": "^2.4",
-        "pestphp/pest-plugin-watch": "^2.0",
+        "orchestra/testbench": "^10.0",
+        "pestphp/pest": "^3.0",
         "laravel/pint": "^1.13",
-        "larastan/larastan": "^2.9"
+        "larastan/larastan": "^3.0"
     },
     "extra": {
         "statamic": {

src/Http/Controllers/ApiController.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Tv2regionerne\StatamicPrivateApi\Http\Controllers;
+
+class ApiController extends \Statamic\Http\Controllers\API\ApiController
+{
+    protected function filterSortAndPaginate($query)
+    {
+        if (method_exists(parent::class, 'filterSortAndPaginate')) {
+            return parent::filterSortAndPaginate($query);
+        }
+
+        return parent::updateAndPaginate($query);
+    }
+}

src/Http/Controllers/AssetContainersController.php

@@ -5,7 +5,6 @@
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Statamic\Facades;
-use Statamic\Http\Controllers\API\ApiController;
 use Statamic\Http\Controllers\CP\Assets\AssetContainersController as CpController;
 use Statamic\Query\ItemQueryBuilder;
 use Tv2regionerne\StatamicPrivateApi\Http\Resources\AssetContainerResource;

src/Http/Controllers/AssetsController.php

@@ -12,7 +12,6 @@
 use Statamic\Facades;
 use Statamic\Facades\Asset;
 use Statamic\Facades\Blink;
-use Statamic\Http\Controllers\API\ApiController;
 use Statamic\Http\Controllers\CP\Assets\AssetsController as CpController;
 use Symfony\Component\Mime\MimeTypes;
 use Tv2regionerne\StatamicPrivateApi\Http\Resources\AssetResource;
@@ -82,7 +81,7 @@ public function store(Request $request, $container)
 
             // Check mimetype of the file and detect extension for the file
             $mimetype = mime_content_type($tmpPath);
-            $mimetypes = new MimeTypes();
+            $mimetypes = new MimeTypes;
             $extension = collect($mimetypes->getExtensions($mimetypes->guessMimeType($tmpPath)))->first();
 
             // Create filename if not set through request

src/Http/Controllers/CollectionEntriesController.php

@@ -3,11 +3,11 @@
 namespace Tv2regionerne\StatamicPrivateApi\Http\Controllers;
 
 use Facades\Statamic\API\FilterAuthorizer;
+use Illuminate\Support\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
 use Illuminate\Validation\ValidationException;
 use Statamic\Facades;
-use Statamic\Http\Controllers\API\ApiController;
 use Statamic\Http\Controllers\CP\Collections\EntriesController as CpController;
 use Statamic\Http\Resources\API\EntryResource;
 use Tv2regionerne\StatamicPrivateApi\Traits\VerifiesPrivateAPI;
@@ -48,6 +48,11 @@ public function store(Request $request, $collection)
     {
         $collection = $this->collectionFromHandle($collection);
 
+        $request->replace($this->normalizeDateFieldtypeValuesByHandles(
+            $this->dateFieldHandlesForCollection($collection),
+            $request->all()
+        ));
+
         try {
             $response = (new CpController($request))->store($request, $collection, Facades\Site::current());
         } catch (ValidationException $e) {
@@ -75,7 +80,7 @@ public function update(Request $request, $collection, $entry)
         $originalData = collect((new CpController($request))->edit($request, $collection, $entry)->get('values'))->filter();
         $originalData = $originalData->merge($request->all());
 
-        $request->merge($originalData->all());
+        $request->replace($this->normalizeDateFieldtypeValues($entry, $originalData->all()));
 
         try {
             $response = (new CpController($request))->update($request, $collection, $entry);
@@ -137,6 +142,76 @@ private function entryFromId($entry)
         return $entry;
     }
 
+    private function normalizeDateFieldtypeValues($entry, array $payload): array
+    {
+        $dateFieldHandles = $entry->blueprint()->fields()->all()
+            ->filter(fn ($field) => $field->type() === 'date')
+            ->keys();
+
+        return $this->normalizeDateFieldtypeValuesByHandles($dateFieldHandles, $payload);
+    }
+
+    private function dateFieldHandlesForCollection($collection)
+    {
+        return $collection->entryBlueprints()
+            ->flatMap(fn ($blueprint) => $blueprint->fields()->all())
+            ->filter(fn ($field) => $field->type() === 'date')
+            ->keys()
+            ->unique()
+            ->values();
+    }
+
+    private function normalizeDateFieldtypeValuesByHandles($dateFieldHandles, array $payload): array
+    {
+        foreach ($dateFieldHandles as $handle) {
+            if (! Arr::has($payload, $handle)) {
+                continue;
+            }
+
+            Arr::set($payload, $handle, $this->normalizeDateValue(Arr::get($payload, $handle)));
+        }
+
+        return $payload;
+    }
+
+    private function normalizeDateValue($value)
+    {
+        if (! is_array($value)) {
+            return $value;
+        }
+
+        if (Arr::has($value, 'start') || Arr::has($value, 'end')) {
+            return [
+                'start' => $this->normalizeDateValue(Arr::get($value, 'start')),
+                'end' => $this->normalizeDateValue(Arr::get($value, 'end')),
+            ];
+        }
+
+        if (! Arr::has($value, 'date') && ! Arr::has($value, 'time')) {
+            return $value;
+        }
+
+        $date = Arr::get($value, 'date');
+
+        if (! $date) {
+            return null;
+        }
+
+        $time = Arr::get($value, 'time') ?: '00:00:00';
+
+        if (preg_match('/^\d{2}:\d{2}$/', $time)) {
+            $time .= ':00';
+        }
+
+        try {
+            return Carbon::parse($date.' '.$time)
+                ->utc()
+                ->format('Y-m-d\\TH:i:s.v\\Z');
+        } catch (\Throwable $e) {
+            return (string) $date;
+        }
+    }
+
     protected function allowedFilters()
     {
         return FilterAuthorizer::allowedForSubResources('api', 'collections', $this->collectionHandle);

src/Http/Controllers/CollectionTreesController.php

@@ -5,7 +5,6 @@
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Statamic\Facades;
-use Statamic\Http\Controllers\API\ApiController;
 use Statamic\Http\Controllers\CP\Collections\CollectionTreeController as CpController;
 use Tv2regionerne\StatamicPrivateApi\Traits\VerifiesPrivateAPI;
 

src/Http/Controllers/CollectionsController.php

@@ -5,7 +5,6 @@
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Statamic\Facades;
-use Statamic\Http\Controllers\API\ApiController;
 use Statamic\Http\Controllers\CP\Collections\CollectionsController as CpController;
 use Statamic\Query\ItemQueryBuilder;
 use Tv2regionerne\StatamicPrivateApi\Http\Resources\CollectionResource;

src/Http/Controllers/FormSubmissionsController.php

@@ -4,7 +4,6 @@
 
 use Illuminate\Http\Request;
 use Statamic\Facades;
-use Statamic\Http\Controllers\API\ApiController;
 use Statamic\Http\Controllers\CP\Forms\FormSubmissionsController as CpController;
 use Statamic\Query\ItemQueryBuilder;
 use Tv2regionerne\StatamicPrivateApi\Http\Resources\FormSubmissionResource;

src/Http/Controllers/FormsController.php

@@ -5,7 +5,6 @@
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Statamic\Facades;
-use Statamic\Http\Controllers\API\ApiController;
 use Statamic\Http\Controllers\CP\Forms\FormsController as CpController;
 use Statamic\Http\Resources\API\FormResource;
 use Statamic\Query\ItemQueryBuilder;

src/Http/Controllers/GlobalVariablesController.php

@@ -5,7 +5,6 @@
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Statamic\Facades;
-use Statamic\Http\Controllers\API\ApiController;
 use Tv2regionerne\StatamicPrivateApi\Http\Resources\GlobalVariablesResource;
 use Tv2regionerne\StatamicPrivateApi\Traits\VerifiesPrivateAPI;
 
@@ -45,8 +44,7 @@ public function update(Request $request, $handle, ?string $site = null)
             }
 
             $set->data($values);
-
-            $set->globalSet()->addLocalization($set)->save();
+            $set->save();
 
             $global = $this->globalFromHandle($handle);
 

src/Http/Controllers/GlobalsController.php

@@ -5,7 +5,6 @@
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Statamic\Facades;
-use Statamic\Http\Controllers\API\ApiController;
 use Statamic\Http\Controllers\CP\Globals\GlobalsController as CpController;
 use Statamic\Query\ItemQueryBuilder;
 use Tv2regionerne\StatamicPrivateApi\Http\Resources\GlobalResource;

src/Http/Controllers/NavTreesController.php

@@ -4,7 +4,6 @@
 
 use Illuminate\Http\Request;
 use Statamic\Facades;
-use Statamic\Http\Controllers\API\ApiController;
 use Statamic\Http\Controllers\CP\Navigation\NavigationTreeController as CpController;
 use Tv2regionerne\StatamicPrivateApi\Traits\VerifiesPrivateAPI;
 

src/Http/Controllers/NavsController.php

@@ -5,7 +5,6 @@
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Statamic\Facades;
-use Statamic\Http\Controllers\API\ApiController;
 use Statamic\Http\Controllers\CP\Navigation\NavigationController as CpController;
 use Statamic\Query\ItemQueryBuilder;
 use Tv2regionerne\StatamicPrivateApi\Http\Resources\NavResource;
@@ -73,7 +72,11 @@ public function destroy(Request $request, $nav)
     {
         $nav = $this->navFromHandle($nav);
 
-        return (new CpController($request))->destroy($nav->handle());
+        $this->authorize('delete', $nav);
+
+        $nav->delete();
+
+        return response()->json();
     }
 
     private function navFromHandle($nav)

src/Http/Controllers/TaxonomiesController.php

@@ -5,7 +5,6 @@
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Statamic\Facades;
-use Statamic\Http\Controllers\API\ApiController;
 use Statamic\Http\Controllers\CP\Taxonomies\TaxonomiesController as CpController;
 use Statamic\Query\ItemQueryBuilder;
 use Tv2regionerne\StatamicPrivateApi\Http\Resources\TaxonomyResource;

src/Http/Controllers/TaxonomyTermsController.php

@@ -5,7 +5,6 @@
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Statamic\Facades;
-use Statamic\Http\Controllers\API\ApiController;
 use Statamic\Http\Controllers\CP\Taxonomies\TermsController as CpController;
 use Statamic\Http\Resources\API\TermResource;
 use Tv2regionerne\StatamicPrivateApi\Traits\VerifiesPrivateAPI;

src/Http/Controllers/UsersController.php

@@ -3,12 +3,12 @@
 namespace Tv2regionerne\StatamicPrivateApi\Http\Controllers;
 
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\ValidationException;
 use Statamic\Contracts\Auth\User;
 use Statamic\Facades;
-use Statamic\Http\Controllers\API\ApiController;
-use Statamic\Http\Controllers\CP\Users\UsersController as CpController;
 use Statamic\Http\Resources\API\UserResource;
+use Statamic\Rules\UniqueUserValue;
 use Tv2regionerne\StatamicPrivateApi\Traits\VerifiesPrivateAPI;
 
 class UsersController extends ApiController
@@ -41,14 +41,35 @@ public function show($id)
 
     public function store(Request $request)
     {
+        abort_if(! $this->resourcesAllowed('users', ''), 404);
+
+        $this->authorize('create', [User::class]);
+
         try {
-            if (! $request->input('invitation')) {
-                $request = $request->merge(['invitation' => ['send' => false]]);
+            $validator = Validator::make($request->all(), [
+                'email' => ['required', 'email', new UniqueUserValue],
+            ]);
+
+            $validator->setAttributeNames([
+                'email' => 'Email Address',
+            ]);
+
+            $validator->validate();
+
+            $user = Facades\User::make()
+                ->email($request->string('email')->toString());
+
+            foreach ($request->except(['email', 'super', 'groups', 'roles', 'invitation']) as $key => $value) {
+                $user->set($key, $value);
+            }
+
+            if ($request->boolean('super') && Facades\User::current()?->isSuper()) {
+                $user->makeSuper();
             }
 
-            (new CpController($request))->store($request);
+            $user->save();
 
-            $user = Facades\User::findByEmail($request->input('email'));
+            $user = Facades\User::findByEmail($request->string('email')->toString());
 
             return app(UserResource::class)::make($user);
         } catch (ValidationException $e) {
@@ -64,14 +85,34 @@ public function update(Request $request, $id)
             abort(404);
         }
 
+        $this->authorize('edit', $user);
+
         try {
-            $data = $this->show($id)->toArray($request);
+            $payload = array_merge($request->all(), [
+                'email' => $request->input('email', $user->email()),
+            ]);
+
+            $validator = Validator::make($payload, [
+                'email' => ['required', 'email', new UniqueUserValue(except: $user->id())],
+            ]);
+
+            $validator->setAttributeNames([
+                'email' => 'Email Address',
+            ]);
 
-            $mergedData = collect($data)->merge($request->all());
+            $validator->validate();
 
-            $request->merge($mergedData->all());
+            foreach ($request->except(['email', 'super', 'groups', 'roles', 'invitation']) as $key => $value) {
+                $user->set($key, $value);
+            }
+
+            $user->email($payload['email']);
+
+            if ($request->has('super') && Facades\User::current()?->isSuper() && Facades\User::current()?->id() !== $user->id()) {
+                $user->super = $request->boolean('super');
+            }
 
-            (new CpController($request))->update($request, $id);
+            $user->save();
 
             return app(UserResource::class)::make($user);
         } catch (ValidationException $e) {