diff --git a/.gitignore b/.gitignore index 0a3fe88..d331e65 100644 --- a/.gitignore +++ b/.gitignore @@ -49,10 +49,6 @@ Icon /site/config/.license -# Env -# --------------- -/site/config/env.php - # Content # --------------- diff --git a/composer.lock b/composer.lock index b6c20fd..a7c7598 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "fc199b109fe001629f126b05b4839dc6", + "content-hash": "22c9955fcf5f9ecd2075714cadc06760", "packages": [ { "name": "christian-riesen/base32", @@ -272,16 +272,16 @@ }, { "name": "getkirby/cms", - "version": "4.6.1", + "version": "4.6.0", "source": { "type": "git", "url": "https://github.com/getkirby/kirby.git", - "reference": "e29f216630ee1c2ab7e3f8f1bb3d335541121587" + "reference": "994556ca78eab3c11415702870b6388e8472addc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getkirby/kirby/zipball/e29f216630ee1c2ab7e3f8f1bb3d335541121587", - "reference": "e29f216630ee1c2ab7e3f8f1bb3d335541121587", + "url": "https://api.github.com/repos/getkirby/kirby/zipball/994556ca78eab3c11415702870b6388e8472addc", + "reference": "994556ca78eab3c11415702870b6388e8472addc", "shasum": "" }, "require": { @@ -371,7 +371,7 @@ "type": "custom" } ], - "time": "2025-02-06T15:39:59+00:00" + "time": "2025-01-30T11:02:53+00:00" }, { "name": "getkirby/composer-installer", @@ -1328,7 +1328,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "platform-dev": {}, "plugin-api-version": "2.6.0" diff --git a/site/blueprints/pages/scribble.yml b/site/blueprints/pages/scribble.yml index 7384409..843a405 100644 --- a/site/blueprints/pages/scribble.yml +++ b/site/blueprints/pages/scribble.yml @@ -1,6 +1,6 @@ title: Scribble -num: '{{ page.date.toDate("YmdHi") }}' +num: '{{ page.date.toDate("YmdHis") }}' create: title: "{{ page.date.toDate('Y-m-d H:i') }}" @@ -17,9 +17,7 @@ sections: label: Date required: true time: - step: - unit: second - size: 1 + step: 1 default: now text: type: textarea diff --git a/site/plugins/kirby-helpers/index.php b/site/plugins/kirby-helpers/index.php index a82813b..e1615e8 100644 --- a/site/plugins/kirby-helpers/index.php +++ b/site/plugins/kirby-helpers/index.php @@ -1,20 +1,7 @@ 'src/RssFeed.php', - 'Mmk2410\\KirbyHelpers\\Middleware\\ApiAuthentication' => 'src/Middleware/ApiAuthentication.php', - 'Mmk2410\\KirbyHelpers\\Controller\\ScribbleController' => 'src/Controller/ScribbleController.php', + 'Mmk2410\\KirbyHelpers\\RssFeed' => 'src/RssFeed.php' ], __DIR__); - -Kirby::plugin('mmk2410/kirby-helpers', [ - 'routes' => [ - [ - 'pattern' => 'my/api/v1/scribble', - 'action' => fn () => (new Mmk2410\KirbyHelpers\Controller\ScribbleController())->addScribble(), - 'method' => 'POST' - ], - ] -]); diff --git a/site/plugins/kirby-helpers/src/Controller/ScribbleController.php b/site/plugins/kirby-helpers/src/Controller/ScribbleController.php deleted file mode 100644 index 08e4782..0000000 --- a/site/plugins/kirby-helpers/src/Controller/ScribbleController.php +++ /dev/null @@ -1,57 +0,0 @@ -auth(); - - $text = kirby()->request()->body()->get('text'); - - if ($text === null) { - throw new BadMethodCallException('Invalid request'); - } - - $date = new DateTimeImmutable(); - $num = (int) $date->format(self::NUM_DATE_FORMAT); - - kirby()->impersonate('kirby'); - $page = Page::create([ - 'parent' => page(self::SCRIBBLES_PAGE), - 'slug' => $date->format(self::SLUG_DATE_FORMAT), - 'draft' => false, - 'template' => self::SCRIBBLE_TEMPLATE, - 'content' => [ - 'title' => $date->format(self::TITLE_DATE_FORMAT), - 'text' => $text, - 'date' => $date->format(self::CONTENT_DATE_FORMAT), - ], - ]); - $page->changeStatus(self::STATUS_LISTED, $num); - kirby()->impersonate('nobody'); - - return new Response(code: 200); - } -} diff --git a/site/plugins/kirby-helpers/src/Middleware/ApiAuthentication.php b/site/plugins/kirby-helpers/src/Middleware/ApiAuthentication.php deleted file mode 100644 index 381d6c0..0000000 --- a/site/plugins/kirby-helpers/src/Middleware/ApiAuthentication.php +++ /dev/null @@ -1,36 +0,0 @@ -request(); - $apiKeyHeader = $request->header('Api-Key'); - - if ($apiKeyHeader === null) { - throw new PermissionException(); - } - - $apiKey = $this->getApiKey(); - - if ($apiKey !== $apiKeyHeader) { - throw new PermissionException(); - } - } - - private function getApiKey(): string - { - $apiKey = kirby()->option('mmk2410.kirby-helpers.api-key'); - - if ($apiKey === null) { - throw new Exception('No API key set!'); - } - - return $apiKey; - } -}