diff --git a/composer.json b/composer.json
index 68252f287340437854f0dcc2404eab300bd73390..6ab22d89742cad2b6a11abceed4508eba8979622 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,6 @@
],
"require": {
"php": ">=8.2",
- "ext-igbinary": "*",
"distantmagic/graphql-swoole-promise-adapter": "^0.1.1",
"distantmagic/swoole-futures": "^0.1.1",
"doctrine/dbal": "^3.7",
@@ -40,7 +39,12 @@
"symfony/yaml": "^6.3",
"twig/cache-extra": "^3.7",
"twig/twig": "^3.7",
- "webonyx/graphql-php": "^15.6"
+ "webonyx/graphql-php": "^15.6",
+ "league/oauth2-server": "^8.5",
+ "psr/http-message": "^2.0",
+ "defuse/php-encryption": "^2.4",
+ "nyholm/psr7": "^1.8",
+ "nyholm/psr7-server": "^1.1"
},
"require-dev": {
"mockery/mockery": "^1.6",
@@ -50,6 +54,8 @@
"suggest": {
"ext-ds": "For better memory management",
"ext-intl": "Date formatting",
+ "ext-igbinary": "For better object serialization",
+ "ext-openssl": "To generate application keys",
"ext-readline": "Unlocks some console features",
"ext-redis": "HTTP Sessions driver",
"ext-uuid": "Faster UUID generation"
diff --git a/composer.lock b/composer.lock
index ef3d0a347295a5dfae963b935d0e59c86e530c99..2ad151de7c23006b8aacef610254a4e6ecbbfaf0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,75 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "aca438d15949e9d6254c43fef973339b",
+ "content-hash": "2e7670bbc9c5b3df37e08f1f454c276d",
"packages": [
+ {
+ "name": "defuse/php-encryption",
+ "version": "v2.4.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/defuse/php-encryption.git",
+ "reference": "f53396c2d34225064647a05ca76c1da9d99e5828"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/defuse/php-encryption/zipball/f53396c2d34225064647a05ca76c1da9d99e5828",
+ "reference": "f53396c2d34225064647a05ca76c1da9d99e5828",
+ "shasum": ""
+ },
+ "require": {
+ "ext-openssl": "*",
+ "paragonie/random_compat": ">= 2",
+ "php": ">=5.6.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^5|^6|^7|^8|^9|^10",
+ "yoast/phpunit-polyfills": "^2.0.0"
+ },
+ "bin": [
+ "bin/generate-defuse-key"
+ ],
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Defuse\\Crypto\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Taylor Hornby",
+ "email": "taylor@defuse.ca",
+ "homepage": "https://defuse.ca/"
+ },
+ {
+ "name": "Scott Arciszewski",
+ "email": "info@paragonie.com",
+ "homepage": "https://paragonie.com"
+ }
+ ],
+ "description": "Secure PHP Encryption Library",
+ "keywords": [
+ "aes",
+ "authenticated encryption",
+ "cipher",
+ "crypto",
+ "cryptography",
+ "encrypt",
+ "encryption",
+ "openssl",
+ "security",
+ "symmetric key cryptography"
+ ],
+ "support": {
+ "issues": "https://github.com/defuse/php-encryption/issues",
+ "source": "https://github.com/defuse/php-encryption/tree/v2.4.0"
+ },
+ "time": "2023-06-19T06:10:36+00:00"
+ },
{
"name": "dflydev/dot-access-data",
"version": "v3.0.2",
@@ -915,47 +982,47 @@
},
{
"name": "doctrine/migrations",
- "version": "3.6.0",
+ "version": "3.7.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/migrations.git",
- "reference": "e542ad8bcd606d7a18d0875babb8a6d963c9c059"
+ "reference": "282661f27129232e94e5e4dd5cb89a95c796bec2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/migrations/zipball/e542ad8bcd606d7a18d0875babb8a6d963c9c059",
- "reference": "e542ad8bcd606d7a18d0875babb8a6d963c9c059",
+ "url": "https://api.github.com/repos/doctrine/migrations/zipball/282661f27129232e94e5e4dd5cb89a95c796bec2",
+ "reference": "282661f27129232e94e5e4dd5cb89a95c796bec2",
"shasum": ""
},
"require": {
"composer-runtime-api": "^2",
- "doctrine/dbal": "^3.5.1",
+ "doctrine/dbal": "^3.5.1 || ^4",
"doctrine/deprecations": "^0.5.3 || ^1",
"doctrine/event-manager": "^1.2 || ^2.0",
"php": "^8.1",
"psr/log": "^1.1.3 || ^2 || ^3",
- "symfony/console": "^4.4.16 || ^5.4 || ^6.0",
- "symfony/stopwatch": "^4.4 || ^5.4 || ^6.0",
- "symfony/var-exporter": "^6.2"
+ "symfony/console": "^5.4 || ^6.0 || ^7.0",
+ "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0",
+ "symfony/var-exporter": "^6.2 || ^7.0"
},
"conflict": {
- "doctrine/orm": "<2.12"
+ "doctrine/orm": "<2.12 || >=4"
},
"require-dev": {
- "doctrine/coding-standard": "^9",
- "doctrine/orm": "^2.13",
+ "doctrine/coding-standard": "^12",
+ "doctrine/orm": "^2.13 || ^3",
"doctrine/persistence": "^2 || ^3",
"doctrine/sql-formatter": "^1.0",
"ext-pdo_sqlite": "*",
- "phpstan/phpstan": "^1.5",
- "phpstan/phpstan-deprecation-rules": "^1",
- "phpstan/phpstan-phpunit": "^1.1",
- "phpstan/phpstan-strict-rules": "^1.1",
- "phpstan/phpstan-symfony": "^1.1",
- "phpunit/phpunit": "^9.5.24",
- "symfony/cache": "^4.4 || ^5.4 || ^6.0",
- "symfony/process": "^4.4 || ^5.4 || ^6.0",
- "symfony/yaml": "^4.4 || ^5.4 || ^6.0"
+ "phpstan/phpstan": "^1.10",
+ "phpstan/phpstan-deprecation-rules": "^1.1",
+ "phpstan/phpstan-phpunit": "^1.3",
+ "phpstan/phpstan-strict-rules": "^1.4",
+ "phpstan/phpstan-symfony": "^1.3",
+ "phpunit/phpunit": "^10.3",
+ "symfony/cache": "^5.4 || ^6.0 || ^7.0",
+ "symfony/process": "^5.4 || ^6.0 || ^7.0",
+ "symfony/yaml": "^5.4 || ^6.0 || ^7.0"
},
"suggest": {
"doctrine/sql-formatter": "Allows to generate formatted SQL with the diff command.",
@@ -997,7 +1064,7 @@
],
"support": {
"issues": "https://github.com/doctrine/migrations/issues",
- "source": "https://github.com/doctrine/migrations/tree/3.6.0"
+ "source": "https://github.com/doctrine/migrations/tree/3.7.0"
},
"funding": [
{
@@ -1013,7 +1080,7 @@
"type": "tidelift"
}
],
- "time": "2023-02-15T18:49:46+00:00"
+ "time": "2023-11-13T12:31:07+00:00"
},
{
"name": "doctrine/orm",
@@ -1327,6 +1394,145 @@
},
"time": "2022-09-18T07:06:19+00:00"
},
+ {
+ "name": "lcobucci/clock",
+ "version": "3.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/lcobucci/clock.git",
+ "reference": "30a854ceb22bd87d83a7a4563b3f6312453945fc"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/lcobucci/clock/zipball/30a854ceb22bd87d83a7a4563b3f6312453945fc",
+ "reference": "30a854ceb22bd87d83a7a4563b3f6312453945fc",
+ "shasum": ""
+ },
+ "require": {
+ "php": "~8.2.0",
+ "psr/clock": "^1.0"
+ },
+ "provide": {
+ "psr/clock-implementation": "1.0"
+ },
+ "require-dev": {
+ "infection/infection": "^0.26",
+ "lcobucci/coding-standard": "^10.0.0",
+ "phpstan/extension-installer": "^1.2",
+ "phpstan/phpstan": "^1.10.7",
+ "phpstan/phpstan-deprecation-rules": "^1.1.3",
+ "phpstan/phpstan-phpunit": "^1.3.10",
+ "phpstan/phpstan-strict-rules": "^1.5.0",
+ "phpunit/phpunit": "^10.0.17"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Lcobucci\\Clock\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "LuÃs Cobucci",
+ "email": "lcobucci@gmail.com"
+ }
+ ],
+ "description": "Yet another clock abstraction",
+ "support": {
+ "issues": "https://github.com/lcobucci/clock/issues",
+ "source": "https://github.com/lcobucci/clock/tree/3.1.0"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/lcobucci",
+ "type": "github"
+ },
+ {
+ "url": "https://www.patreon.com/lcobucci",
+ "type": "patreon"
+ }
+ ],
+ "time": "2023-03-20T19:12:25+00:00"
+ },
+ {
+ "name": "lcobucci/jwt",
+ "version": "5.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/lcobucci/jwt.git",
+ "reference": "f0031c07b96db6a0ca649206e7eacddb7e9d5908"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/lcobucci/jwt/zipball/f0031c07b96db6a0ca649206e7eacddb7e9d5908",
+ "reference": "f0031c07b96db6a0ca649206e7eacddb7e9d5908",
+ "shasum": ""
+ },
+ "require": {
+ "ext-hash": "*",
+ "ext-json": "*",
+ "ext-openssl": "*",
+ "ext-sodium": "*",
+ "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+ "psr/clock": "^1.0"
+ },
+ "require-dev": {
+ "infection/infection": "^0.27.0",
+ "lcobucci/clock": "^3.0",
+ "lcobucci/coding-standard": "^11.0",
+ "phpbench/phpbench": "^1.2.9",
+ "phpstan/extension-installer": "^1.2",
+ "phpstan/phpstan": "^1.10.7",
+ "phpstan/phpstan-deprecation-rules": "^1.1.3",
+ "phpstan/phpstan-phpunit": "^1.3.10",
+ "phpstan/phpstan-strict-rules": "^1.5.0",
+ "phpunit/phpunit": "^10.2.6"
+ },
+ "suggest": {
+ "lcobucci/clock": ">= 3.0"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Lcobucci\\JWT\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "LuÃs Cobucci",
+ "email": "lcobucci@gmail.com",
+ "role": "Developer"
+ }
+ ],
+ "description": "A simple library to work with JSON Web Token and JSON Web Signature",
+ "keywords": [
+ "JWS",
+ "jwt"
+ ],
+ "support": {
+ "issues": "https://github.com/lcobucci/jwt/issues",
+ "source": "https://github.com/lcobucci/jwt/tree/5.1.0"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/lcobucci",
+ "type": "github"
+ },
+ {
+ "url": "https://www.patreon.com/lcobucci",
+ "type": "patreon"
+ }
+ ],
+ "time": "2023-10-31T06:41:47+00:00"
+ },
{
"name": "league/commonmark",
"version": "2.4.1",
@@ -1515,6 +1721,322 @@
],
"time": "2022-12-11T20:36:23+00:00"
},
+ {
+ "name": "league/event",
+ "version": "2.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/thephpleague/event.git",
+ "reference": "d2cc124cf9a3fab2bb4ff963307f60361ce4d119"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/thephpleague/event/zipball/d2cc124cf9a3fab2bb4ff963307f60361ce4d119",
+ "reference": "d2cc124cf9a3fab2bb4ff963307f60361ce4d119",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.4.0"
+ },
+ "require-dev": {
+ "henrikbjorn/phpspec-code-coverage": "~1.0.1",
+ "phpspec/phpspec": "^2.2"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.2-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "League\\Event\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Frank de Jonge",
+ "email": "info@frenky.net"
+ }
+ ],
+ "description": "Event package",
+ "keywords": [
+ "emitter",
+ "event",
+ "listener"
+ ],
+ "support": {
+ "issues": "https://github.com/thephpleague/event/issues",
+ "source": "https://github.com/thephpleague/event/tree/master"
+ },
+ "time": "2018-11-26T11:52:41+00:00"
+ },
+ {
+ "name": "league/oauth2-server",
+ "version": "8.5.4",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/thephpleague/oauth2-server.git",
+ "reference": "ab7714d073844497fd222d5d0a217629089936bc"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/ab7714d073844497fd222d5d0a217629089936bc",
+ "reference": "ab7714d073844497fd222d5d0a217629089936bc",
+ "shasum": ""
+ },
+ "require": {
+ "defuse/php-encryption": "^2.3",
+ "ext-openssl": "*",
+ "lcobucci/clock": "^2.2 || ^3.0",
+ "lcobucci/jwt": "^4.3 || ^5.0",
+ "league/event": "^2.2",
+ "league/uri": "^6.7 || ^7.0",
+ "php": "^8.0",
+ "psr/http-message": "^1.0.1 || ^2.0"
+ },
+ "replace": {
+ "league/oauth2server": "*",
+ "lncd/oauth2": "*"
+ },
+ "require-dev": {
+ "laminas/laminas-diactoros": "^3.0.0",
+ "phpstan/phpstan": "^0.12.57",
+ "phpstan/phpstan-phpunit": "^0.12.16",
+ "phpunit/phpunit": "^9.6.6",
+ "roave/security-advisories": "dev-master"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "League\\OAuth2\\Server\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Alex Bilbie",
+ "email": "hello@alexbilbie.com",
+ "homepage": "http://www.alexbilbie.com",
+ "role": "Developer"
+ },
+ {
+ "name": "Andy Millington",
+ "email": "andrew@noexceptions.io",
+ "homepage": "https://www.noexceptions.io",
+ "role": "Developer"
+ }
+ ],
+ "description": "A lightweight and powerful OAuth 2.0 authorization and resource server library with support for all the core specification grants. This library will allow you to secure your API with OAuth and allow your applications users to approve apps that want to access their data from your API.",
+ "homepage": "https://oauth2.thephpleague.com/",
+ "keywords": [
+ "Authentication",
+ "api",
+ "auth",
+ "authorisation",
+ "authorization",
+ "oauth",
+ "oauth 2",
+ "oauth 2.0",
+ "oauth2",
+ "protect",
+ "resource",
+ "secure",
+ "server"
+ ],
+ "support": {
+ "issues": "https://github.com/thephpleague/oauth2-server/issues",
+ "source": "https://github.com/thephpleague/oauth2-server/tree/8.5.4"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/sephster",
+ "type": "github"
+ }
+ ],
+ "time": "2023-08-25T22:35:12+00:00"
+ },
+ {
+ "name": "league/uri",
+ "version": "7.3.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/thephpleague/uri.git",
+ "reference": "36743c3961bb82bf93da91917b6bced0358a8d45"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/thephpleague/uri/zipball/36743c3961bb82bf93da91917b6bced0358a8d45",
+ "reference": "36743c3961bb82bf93da91917b6bced0358a8d45",
+ "shasum": ""
+ },
+ "require": {
+ "league/uri-interfaces": "^7.3",
+ "php": "^8.1"
+ },
+ "conflict": {
+ "league/uri-schemes": "^1.0"
+ },
+ "suggest": {
+ "ext-bcmath": "to improve IPV4 host parsing",
+ "ext-fileinfo": "to create Data URI from file contennts",
+ "ext-gmp": "to improve IPV4 host parsing",
+ "ext-intl": "to handle IDN host with the best performance",
+ "jeremykendall/php-domain-parser": "to resolve Public Suffix and Top Level Domain",
+ "league/uri-components": "Needed to easily manipulate URI objects components",
+ "php-64bit": "to improve IPV4 host parsing",
+ "symfony/polyfill-intl-idn": "to handle IDN host via the Symfony polyfill if ext-intl is not present"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "7.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "League\\Uri\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Ignace Nyamagana Butera",
+ "email": "nyamsprod@gmail.com",
+ "homepage": "https://nyamsprod.com"
+ }
+ ],
+ "description": "URI manipulation library",
+ "homepage": "https://uri.thephpleague.com",
+ "keywords": [
+ "data-uri",
+ "file-uri",
+ "ftp",
+ "hostname",
+ "http",
+ "https",
+ "middleware",
+ "parse_str",
+ "parse_url",
+ "psr-7",
+ "query-string",
+ "querystring",
+ "rfc3986",
+ "rfc3987",
+ "rfc6570",
+ "uri",
+ "uri-template",
+ "url",
+ "ws"
+ ],
+ "support": {
+ "docs": "https://uri.thephpleague.com",
+ "forum": "https://thephpleague.slack.com",
+ "issues": "https://github.com/thephpleague/uri-src/issues",
+ "source": "https://github.com/thephpleague/uri/tree/7.3.0"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/sponsors/nyamsprod",
+ "type": "github"
+ }
+ ],
+ "time": "2023-09-09T17:21:43+00:00"
+ },
+ {
+ "name": "league/uri-interfaces",
+ "version": "7.3.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/thephpleague/uri-interfaces.git",
+ "reference": "c409b60ed2245ff94c965a8c798a60166db53361"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/c409b60ed2245ff94c965a8c798a60166db53361",
+ "reference": "c409b60ed2245ff94c965a8c798a60166db53361",
+ "shasum": ""
+ },
+ "require": {
+ "ext-filter": "*",
+ "php": "^8.1",
+ "psr/http-factory": "^1",
+ "psr/http-message": "^1.1 || ^2.0"
+ },
+ "suggest": {
+ "ext-bcmath": "to improve IPV4 host parsing",
+ "ext-gmp": "to improve IPV4 host parsing",
+ "ext-intl": "to handle IDN host with the best performance",
+ "php-64bit": "to improve IPV4 host parsing",
+ "symfony/polyfill-intl-idn": "to handle IDN host via the Symfony polyfill if ext-intl is not present"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "7.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "League\\Uri\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Ignace Nyamagana Butera",
+ "email": "nyamsprod@gmail.com",
+ "homepage": "https://nyamsprod.com"
+ }
+ ],
+ "description": "Common interfaces and classes for URI representation and interaction",
+ "homepage": "https://uri.thephpleague.com",
+ "keywords": [
+ "data-uri",
+ "file-uri",
+ "ftp",
+ "hostname",
+ "http",
+ "https",
+ "parse_str",
+ "parse_url",
+ "psr-7",
+ "query-string",
+ "querystring",
+ "rfc3986",
+ "rfc3987",
+ "rfc6570",
+ "uri",
+ "url",
+ "ws"
+ ],
+ "support": {
+ "docs": "https://uri.thephpleague.com",
+ "forum": "https://thephpleague.slack.com",
+ "issues": "https://github.com/thephpleague/uri-src/issues",
+ "source": "https://github.com/thephpleague/uri-interfaces/tree/7.3.0"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/sponsors/nyamsprod",
+ "type": "github"
+ }
+ ],
+ "time": "2023-09-09T17:21:43+00:00"
+ },
{
"name": "nette/php-generator",
"version": "v4.1.2",
@@ -1786,6 +2308,200 @@
},
"time": "2023-06-18T12:36:55+00:00"
},
+ {
+ "name": "nyholm/psr7",
+ "version": "1.8.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Nyholm/psr7.git",
+ "reference": "aa5fc277a4f5508013d571341ade0c3886d4d00e"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/Nyholm/psr7/zipball/aa5fc277a4f5508013d571341ade0c3886d4d00e",
+ "reference": "aa5fc277a4f5508013d571341ade0c3886d4d00e",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.2",
+ "psr/http-factory": "^1.0",
+ "psr/http-message": "^1.1 || ^2.0"
+ },
+ "provide": {
+ "php-http/message-factory-implementation": "1.0",
+ "psr/http-factory-implementation": "1.0",
+ "psr/http-message-implementation": "1.0"
+ },
+ "require-dev": {
+ "http-interop/http-factory-tests": "^0.9",
+ "php-http/message-factory": "^1.0",
+ "php-http/psr7-integration-tests": "^1.0",
+ "phpunit/phpunit": "^7.5 || ^8.5 || ^9.4",
+ "symfony/error-handler": "^4.4"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.8-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Nyholm\\Psr7\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Tobias Nyholm",
+ "email": "tobias.nyholm@gmail.com"
+ },
+ {
+ "name": "Martijn van der Ven",
+ "email": "martijn@vanderven.se"
+ }
+ ],
+ "description": "A fast PHP7 implementation of PSR-7",
+ "homepage": "https://tnyholm.se",
+ "keywords": [
+ "psr-17",
+ "psr-7"
+ ],
+ "support": {
+ "issues": "https://github.com/Nyholm/psr7/issues",
+ "source": "https://github.com/Nyholm/psr7/tree/1.8.1"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/Zegnat",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/nyholm",
+ "type": "github"
+ }
+ ],
+ "time": "2023-11-13T09:31:12+00:00"
+ },
+ {
+ "name": "nyholm/psr7-server",
+ "version": "1.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Nyholm/psr7-server.git",
+ "reference": "4335801d851f554ca43fa6e7d2602141538854dc"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/Nyholm/psr7-server/zipball/4335801d851f554ca43fa6e7d2602141538854dc",
+ "reference": "4335801d851f554ca43fa6e7d2602141538854dc",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.1 || ^8.0",
+ "psr/http-factory": "^1.0",
+ "psr/http-message": "^1.0 || ^2.0"
+ },
+ "require-dev": {
+ "nyholm/nsa": "^1.1",
+ "nyholm/psr7": "^1.3",
+ "phpunit/phpunit": "^7.0 || ^8.5 || ^9.3"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Nyholm\\Psr7Server\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Tobias Nyholm",
+ "email": "tobias.nyholm@gmail.com"
+ },
+ {
+ "name": "Martijn van der Ven",
+ "email": "martijn@vanderven.se"
+ }
+ ],
+ "description": "Helper classes to handle PSR-7 server requests",
+ "homepage": "http://tnyholm.se",
+ "keywords": [
+ "psr-17",
+ "psr-7"
+ ],
+ "support": {
+ "issues": "https://github.com/Nyholm/psr7-server/issues",
+ "source": "https://github.com/Nyholm/psr7-server/tree/1.1.0"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/Zegnat",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/nyholm",
+ "type": "github"
+ }
+ ],
+ "time": "2023-11-08T09:30:43+00:00"
+ },
+ {
+ "name": "paragonie/random_compat",
+ "version": "v9.99.100",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/paragonie/random_compat.git",
+ "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a",
+ "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">= 7"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "4.*|5.*",
+ "vimeo/psalm": "^1"
+ },
+ "suggest": {
+ "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+ },
+ "type": "library",
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Paragon Initiative Enterprises",
+ "email": "security@paragonie.com",
+ "homepage": "https://paragonie.com"
+ }
+ ],
+ "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+ "keywords": [
+ "csprng",
+ "polyfill",
+ "pseudorandom",
+ "random"
+ ],
+ "support": {
+ "email": "info@paragonie.com",
+ "issues": "https://github.com/paragonie/random_compat/issues",
+ "source": "https://github.com/paragonie/random_compat"
+ },
+ "time": "2020-10-15T08:29:30+00:00"
+ },
{
"name": "psr/cache",
"version": "3.0.0",
@@ -1835,6 +2551,54 @@
},
"time": "2021-02-03T23:26:27+00:00"
},
+ {
+ "name": "psr/clock",
+ "version": "1.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/clock.git",
+ "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/clock/zipball/e41a24703d4560fd0acb709162f73b8adfc3aa0d",
+ "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.0 || ^8.0"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Psr\\Clock\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "https://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interface for reading the clock.",
+ "homepage": "https://github.com/php-fig/clock",
+ "keywords": [
+ "clock",
+ "now",
+ "psr",
+ "psr-20",
+ "time"
+ ],
+ "support": {
+ "issues": "https://github.com/php-fig/clock/issues",
+ "source": "https://github.com/php-fig/clock/tree/1.0.0"
+ },
+ "time": "2022-11-25T14:36:26+00:00"
+ },
{
"name": "psr/container",
"version": "2.0.2",
@@ -1938,6 +2702,114 @@
},
"time": "2019-01-08T18:20:26+00:00"
},
+ {
+ "name": "psr/http-factory",
+ "version": "1.0.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-factory.git",
+ "reference": "e616d01114759c4c489f93b099585439f795fe35"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
+ "reference": "e616d01114759c4c489f93b099585439f795fe35",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.0.0",
+ "psr/http-message": "^1.0 || ^2.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Message\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "https://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interfaces for PSR-7 HTTP message factories",
+ "keywords": [
+ "factory",
+ "http",
+ "message",
+ "psr",
+ "psr-17",
+ "psr-7",
+ "request",
+ "response"
+ ],
+ "support": {
+ "source": "https://github.com/php-fig/http-factory/tree/1.0.2"
+ },
+ "time": "2023-04-10T20:10:41+00:00"
+ },
+ {
+ "name": "psr/http-message",
+ "version": "2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-message.git",
+ "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+ "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.2 || ^8.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Message\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "https://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interface for HTTP messages",
+ "homepage": "https://github.com/php-fig/http-message",
+ "keywords": [
+ "http",
+ "http-message",
+ "psr",
+ "psr-7",
+ "request",
+ "response"
+ ],
+ "support": {
+ "source": "https://github.com/php-fig/http-message/tree/2.0"
+ },
+ "time": "2023-04-04T09:54:51+00:00"
+ },
{
"name": "psr/link",
"version": "2.0.1",
@@ -2046,16 +2918,16 @@
},
{
"name": "symfony/cache",
- "version": "v6.3.6",
+ "version": "v6.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/cache.git",
- "reference": "84aff8d948d6292d2b5a01ac622760be44dddc72"
+ "reference": "ba33517043c22c94c7ab04b056476f6f86816cf8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/cache/zipball/84aff8d948d6292d2b5a01ac622760be44dddc72",
- "reference": "84aff8d948d6292d2b5a01ac622760be44dddc72",
+ "url": "https://api.github.com/repos/symfony/cache/zipball/ba33517043c22c94c7ab04b056476f6f86816cf8",
+ "reference": "ba33517043c22c94c7ab04b056476f6f86816cf8",
"shasum": ""
},
"require": {
@@ -2122,7 +2994,7 @@
"psr6"
],
"support": {
- "source": "https://github.com/symfony/cache/tree/v6.3.6"
+ "source": "https://github.com/symfony/cache/tree/v6.3.8"
},
"funding": [
{
@@ -2138,7 +3010,7 @@
"type": "tidelift"
}
],
- "time": "2023-10-17T14:44:58+00:00"
+ "time": "2023-11-07T10:17:15+00:00"
},
{
"name": "symfony/cache-contracts",
@@ -2218,16 +3090,16 @@
},
{
"name": "symfony/console",
- "version": "v6.3.4",
+ "version": "v6.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6"
+ "reference": "0d14a9f6d04d4ac38a8cea1171f4554e325dae92"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/eca495f2ee845130855ddf1cf18460c38966c8b6",
- "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6",
+ "url": "https://api.github.com/repos/symfony/console/zipball/0d14a9f6d04d4ac38a8cea1171f4554e325dae92",
+ "reference": "0d14a9f6d04d4ac38a8cea1171f4554e325dae92",
"shasum": ""
},
"require": {
@@ -2288,7 +3160,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v6.3.4"
+ "source": "https://github.com/symfony/console/tree/v6.3.8"
},
"funding": [
{
@@ -2304,7 +3176,7 @@
"type": "tidelift"
}
],
- "time": "2023-08-16T10:10:12+00:00"
+ "time": "2023-10-31T08:09:35+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -3374,16 +4246,16 @@
},
{
"name": "symfony/string",
- "version": "v6.3.5",
+ "version": "v6.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339"
+ "reference": "13880a87790c76ef994c91e87efb96134522577a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339",
- "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339",
+ "url": "https://api.github.com/repos/symfony/string/zipball/13880a87790c76ef994c91e87efb96134522577a",
+ "reference": "13880a87790c76ef994c91e87efb96134522577a",
"shasum": ""
},
"require": {
@@ -3440,7 +4312,7 @@
"utf8"
],
"support": {
- "source": "https://github.com/symfony/string/tree/v6.3.5"
+ "source": "https://github.com/symfony/string/tree/v6.3.8"
},
"funding": [
{
@@ -3456,7 +4328,7 @@
"type": "tidelift"
}
],
- "time": "2023-09-18T10:38:32+00:00"
+ "time": "2023-11-09T08:28:21+00:00"
},
{
"name": "symfony/var-exporter",
@@ -3534,16 +4406,16 @@
},
{
"name": "symfony/yaml",
- "version": "v6.3.7",
+ "version": "v6.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "9758b6c69d179936435d0ffb577c3708d57e38a8"
+ "reference": "3493af8a8dad7fa91c77fa473ba23ecd95334a92"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/9758b6c69d179936435d0ffb577c3708d57e38a8",
- "reference": "9758b6c69d179936435d0ffb577c3708d57e38a8",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/3493af8a8dad7fa91c77fa473ba23ecd95334a92",
+ "reference": "3493af8a8dad7fa91c77fa473ba23ecd95334a92",
"shasum": ""
},
"require": {
@@ -3586,7 +4458,7 @@
"description": "Loads and dumps YAML files",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/yaml/tree/v6.3.7"
+ "source": "https://github.com/symfony/yaml/tree/v6.3.8"
},
"funding": [
{
@@ -3602,7 +4474,7 @@
"type": "tidelift"
}
],
- "time": "2023-10-28T23:31:00+00:00"
+ "time": "2023-11-06T10:58:05+00:00"
},
{
"name": "twig/cache-extra",
@@ -5604,8 +6476,7 @@
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
- "php": ">=8.2",
- "ext-igbinary": "*"
+ "php": ">=8.2"
},
"platform-dev": [],
"plugin-api-version": "2.3.0"
diff --git a/config.ini.example b/config.ini.example
index 63e07177f3196141232d2bb09b6e4c4923801a6b..27877231e6f6ed26a90df25da5f9925ab6461478 100644
--- a/config.ini.example
+++ b/config.ini.example
@@ -1,6 +1,7 @@
[app]
env = development
esbuild_metafile = esbuild-meta-app.json
+scheme = https
[database]
default[driver] = mysql
diff --git a/docs/pages/changelog/index.md b/docs/pages/changelog/index.md
deleted file mode 100644
index 760a8e2a0021ff923bfa95565dd9e181bc676b77..0000000000000000000000000000000000000000
--- a/docs/pages/changelog/index.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-collections:
- - primary_navigation
-description: Changelog
-draft: true
-layout: dm:page
-title: Changelog
----
-
-# Changelog
diff --git a/docs/pages/docs/changelog/index.md b/docs/pages/docs/changelog/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..f6d0fccf5fa30ea8d1ca1fb8382a0c9b8285d060
--- /dev/null
+++ b/docs/pages/docs/changelog/index.md
@@ -0,0 +1,16 @@
+---
+collections:
+ - name: documents
+ next: docs/features/index
+description: Changelog
+layout: dm:document
+parent: docs/index
+title: Changelog
+---
+
+# Changelog
+
+## v0.10.0
+
+- Added {{docs/features/security/oauth2/index}} support.
+- Added {{docs/features/http/psr-http-messages}} wrapper.
diff --git a/docs/pages/docs/extras/index.md b/docs/pages/docs/extras/index.md
index 2c8e5e9f0a177ab927e3131f37ffa193592d704d..5a025a733aed068f5ac41e9d4ba633466943169a 100644
--- a/docs/pages/docs/extras/index.md
+++ b/docs/pages/docs/extras/index.md
@@ -1,7 +1,6 @@
---
collections:
- - name: documents
- next: docs/features/index
+ - documents
layout: dm:document
parent: docs/index
title: Extras
diff --git a/docs/pages/docs/features/configuration/index.md b/docs/pages/docs/features/configuration/index.md
index 889545f987ea8a0d2bab6f4dc59b003f9ca1b26a..2acaaa0f663e13c61d6a53c32f52f3084125e6b6 100644
--- a/docs/pages/docs/features/configuration/index.md
+++ b/docs/pages/docs/features/configuration/index.md
@@ -71,6 +71,8 @@ This is the default configuration file:
```ini file:config.ini
[app]
env = development
+esbuild_metafile = esbuild-meta-app.json
+scheme = https
[database]
default[driver] = mysql
diff --git a/docs/pages/docs/features/database/doctrine/entities.md b/docs/pages/docs/features/database/doctrine/entities.md
index 7153219d5421c7eee1e00b04ae8bf9f13fe72d1a..0b23ce6661e14c8c73b20f8188d73213642ed424 100644
--- a/docs/pages/docs/features/database/doctrine/entities.md
+++ b/docs/pages/docs/features/database/doctrine/entities.md
@@ -79,5 +79,5 @@ final readonly class BlogPostShow extends HttpController
```
If you use an entity in a controller parameters, you might also need to add
-{{docs/features/security/authorization}} gate to determine who can use that
-entity.
+{{docs/features/security/authorization/index}} gate to determine who can use
+that entity.
diff --git a/docs/pages/docs/features/graphql/developing-schema.md b/docs/pages/docs/features/graphql/developing-schema.md
index df9fbeeefe8e1081950648d40929a8c39f948552..72c7faf8c23226643dae447a0554414e128e8f33 100644
--- a/docs/pages/docs/features/graphql/developing-schema.md
+++ b/docs/pages/docs/features/graphql/developing-schema.md
@@ -57,7 +57,7 @@ final readonly class GraphQL extends HttpResponder
## Authorization
-You need to provide the {{docs/features/security/authorization}} gate for
+You need to provide the {{docs/features/security/authorization/index}} gate for
`SiteAction::UseGraphQL`:
```php
diff --git a/docs/pages/docs/features/http/controllers.md b/docs/pages/docs/features/http/controllers.md
index a255965e420fa9c97f2e1660a3bcc4cd39afdd01..fbb9a13da6c36bc01fafc3d66ca751d9cc275e1a 100644
--- a/docs/pages/docs/features/http/controllers.md
+++ b/docs/pages/docs/features/http/controllers.md
@@ -51,7 +51,7 @@ resource.
:::note
Using the `RouteParameter` might require to create a Crud Gate. See more at
-the {{docs/features/security/authorization}} page.
+the {{docs/features/security/authorization/index}} page.
:::
Remember that the framework resolves parameters assigned to the `handle` method
@@ -63,7 +63,7 @@ resolves during the application bootstrap phase thanks to the
:::note
You can learn more about CRUD actions on the
-{{docs/features/security/authorization}} page.
+{{docs/features/security/authorization/index}} page.
:::
```php
diff --git a/docs/pages/docs/features/http/middleware.md b/docs/pages/docs/features/http/middleware.md
index 1e36f55cb611f08ba983a9dbef36713905dd7e3a..e4106346defaaa984357b86e1c423362018bf1a8 100644
--- a/docs/pages/docs/features/http/middleware.md
+++ b/docs/pages/docs/features/http/middleware.md
@@ -70,9 +70,9 @@ Resonance comes with several middleware handlers:
attribute | description
-|-
-`Can` | Uses {{docs/features/security/authorization}} to check if user can perform a given Site Action before accesing the responder.
-`ContentSecurityPolicy` | Sends selected {{docs/features/security/content-security-policy}} headers with the response.
-`ValidatesCSRFToken` | Uses the {{docs/features/security/csrf-protection}} mechanisms to validate CSRF token.
+`Can` | Uses {{docs/features/security/authorization/index}} to check if user can perform a given Site Action before accesing the responder.
+`ContentSecurityPolicy` | Sends selected {{docs/features/security/content-security-policy/index}} headers with the response.
+`ValidatesCSRFToken` | Uses the {{docs/features/security/csrf-protection/index}} mechanisms to validate CSRF token.
You can add them to any HTTP Responder. For example:
diff --git a/docs/pages/docs/features/http/psr-http-messages.md b/docs/pages/docs/features/http/psr-http-messages.md
new file mode 100644
index 0000000000000000000000000000000000000000..ed4d9f79b6c45ceb54eb95bc7ef03fee6543aee0
--- /dev/null
+++ b/docs/pages/docs/features/http/psr-http-messages.md
@@ -0,0 +1,62 @@
+---
+collections:
+ - documents
+layout: dm:document
+parent: docs/features/http/index
+title: PSR HTTP Messages
+description: >
+ Learn how to convert Swoole server requests to PSR server requests.
+---
+
+# PSR HTTP Messages
+
+If you need to convert Swoole's HTTP Request object to it's
+[PSR counterpart](https://www.php-fig.org/psr/psr-7/) you can use the
+converters.
+
+# Usage
+
+## Swoole Request -> PSR Server Request
+
+You should only convert requests if you need to use some third-party library
+that relies on them. Primarily because PSR requests do not provide any
+additional features, it's just for standardization. Conversion between request
+formats hinders the performance.
+
+`PsrServerRequestConverter` can/should also be used as a singleton.
+
+```php
+/**
+ * @var Distantmagic\Resonance\PsrServerRequestConverter $psrServerRequestRepository
+ * @var Swoole\Http\Request $request
+ * @var Psr\Http\Message\ServerRequestInterface $psrRequest
+ */
+$psrRequest = $psrServerRequestRepository->convertToServerRequest($request);
+```
+
+## PSR Response -> Swoole Response
+
+If you want to respond with PSR response, you need to wrap it in
+`PsrResponder`:
+
+```php
+use Distantmagic\Resonance\HttpResponder;
+use Distantmagic\Resonance\HttpResponderInterface;
+use Distantmagic\Resonance\HttpResponder\PsrResponder;
+use Psr\Http\Message\ResponseInterface;
+use Swoole\Http\Request;
+use Swoole\Http\Response;
+
+readonly class MyResponder extends HttpResponder
+{
+ public function respond(Request $request, Response $response): HttpResponderInterface
+ {
+ // (...) obtain psr response somehow
+
+ /**
+ * @var ResponseInterface $psrResponse
+ */
+ return new PsrResponder($psrResponse);
+ }
+}
+```
diff --git a/docs/pages/docs/features/http/sessions.md b/docs/pages/docs/features/http/sessions.md
index 7c42d17ffd523d806b891c28a98ce6c2f5b28742..e6032b362c11bfc66e94594935c8813778c9d5f4 100644
--- a/docs/pages/docs/features/http/sessions.md
+++ b/docs/pages/docs/features/http/sessions.md
@@ -1,7 +1,9 @@
---
collections:
- - documents
+ - name: documents
+ next: docs/features/http/index
layout: dm:document
+next: docs/features/http/psr-http-messages
parent: docs/features/http/index
title: Sessions
description: >
diff --git a/docs/pages/docs/features/index.md b/docs/pages/docs/features/index.md
index 7c4d9e42636295126beaab452b1c123635b2ef78..205f1ea1e1332c2f8d9f2218c8584d9885cec18a 100644
--- a/docs/pages/docs/features/index.md
+++ b/docs/pages/docs/features/index.md
@@ -1,6 +1,7 @@
---
collections:
- - documents
+ - name: documents
+ next: docs/extras/index
layout: dm:document
parent: docs/index
title: Features
diff --git a/docs/pages/docs/features/security/authentication.md b/docs/pages/docs/features/security/authentication/index.md
similarity index 98%
rename from docs/pages/docs/features/security/authentication.md
rename to docs/pages/docs/features/security/authentication/index.md
index d8a6160a3092328052eba0762047a1c4b6ac434e..6eae21d3dcdd42616ef75d99643874c0a8f59eac 100644
--- a/docs/pages/docs/features/security/authentication.md
+++ b/docs/pages/docs/features/security/authentication/index.md
@@ -2,7 +2,7 @@
collections:
- documents
layout: dm:document
-next: docs/features/security/authorization
+next: docs/features/security/authorization/index
parent: docs/features/security/index
title: Authentication
description: >
diff --git a/docs/pages/docs/features/security/authorization.md b/docs/pages/docs/features/security/authorization/index.md
similarity index 99%
rename from docs/pages/docs/features/security/authorization.md
rename to docs/pages/docs/features/security/authorization/index.md
index 09f647407d1cb4e06611ae45c2282e64ffda4dd1..38ee0fbc0b076560e10bdea55aa6a304471e553e 100644
--- a/docs/pages/docs/features/security/authorization.md
+++ b/docs/pages/docs/features/security/authorization/index.md
@@ -2,7 +2,7 @@
collections:
- documents
layout: dm:document
-next: docs/features/security/csrf-protection
+next: docs/features/security/csrf-protection/index
parent: docs/features/security/index
title: Authorization
description: >
diff --git a/docs/pages/docs/features/security/content-security-policy.md b/docs/pages/docs/features/security/content-security-policy/index.md
similarity index 96%
rename from docs/pages/docs/features/security/content-security-policy.md
rename to docs/pages/docs/features/security/content-security-policy/index.md
index f3de801641112f5053b5689ccff2097994e44ea1..a9729dbfeac0a08b01aa79b537577f289757ff49 100644
--- a/docs/pages/docs/features/security/content-security-policy.md
+++ b/docs/pages/docs/features/security/content-security-policy/index.md
@@ -22,7 +22,7 @@ Modern browsers implement CSP, but it needs to be activated by sending them a
series of specific headers.
`Distantmagic\Resonance\SecurityPolicyHeaders` provides not only
-{{docs/features/security/content-security-policy}} headers but also some
+{{docs/features/security/content-security-policy/index}} headers but also some
additional headers recommended by
[OWASP's Secure Headers Project](https://owasp.org/www-project-secure-headers/).
diff --git a/docs/pages/docs/features/security/csrf-protection.md b/docs/pages/docs/features/security/csrf-protection/index.md
similarity index 96%
rename from docs/pages/docs/features/security/csrf-protection.md
rename to docs/pages/docs/features/security/csrf-protection/index.md
index 48f674a23aaa5fd3d6ea0b4f8ba125648b73d432..393de1773ea0d7c0243d32dab66fc311ac453dec 100644
--- a/docs/pages/docs/features/security/csrf-protection.md
+++ b/docs/pages/docs/features/security/csrf-protection/index.md
@@ -2,7 +2,7 @@
collections:
- documents
layout: dm:document
-next: docs/features/security/content-security-policy
+next: docs/features/security/content-security-policy/index
parent: docs/features/security/index
title: CSRF Protection
description: >
@@ -23,7 +23,7 @@ use those first.
:::tip
**Besides** the CSRF protection, it's a good idea to protect your site by
setting
-{{docs/features/security/content-security-policy}} wherever they may be
+{{docs/features/security/content-security-policy/index}} wherever they may be
applied.
:::
diff --git a/docs/pages/docs/features/security/index.md b/docs/pages/docs/features/security/index.md
index 3ee4c3311ce02400dc3a8efe143a392989f9b45f..980272ff57094ea80c88cd3edc82e989deb5f9cd 100644
--- a/docs/pages/docs/features/security/index.md
+++ b/docs/pages/docs/features/security/index.md
@@ -30,4 +30,4 @@ That means sometimes you must provide an authorization gate (and possibly an
authentication mechanism - unless you want to *explicitly* enable guest access
to all resources).
-{{docs/features/security/*!docs/features/security/index}}
+{{docs/features/security/*/index}}
diff --git a/docs/pages/docs/features/security/oauth2/configuration.md b/docs/pages/docs/features/security/oauth2/configuration.md
new file mode 100644
index 0000000000000000000000000000000000000000..df33f70b24815bb9463ffd0f7f6206b043ffa81c
--- /dev/null
+++ b/docs/pages/docs/features/security/oauth2/configuration.md
@@ -0,0 +1,65 @@
+---
+collections:
+ - name: documents
+ next: docs/features/security/oauth2/enabling-grants
+layout: dm:document
+next: docs/features/security/oauth2/enabling-grants
+parent: docs/features/security/oauth2/index
+title: Configuration
+description: >
+ Learn how to configure OAuth 2.0 server.
+---
+
+# Configuration
+
+## Encryption Keys Paths
+
+You can configure the paths by adding this section to the configuration file:
+
+```ini
+[oauth2]
+encryption_key = oauth2/defuse.key
+jwt_signing_key_passphrase =
+jwt_signing_key_private = oauth2/private.key
+jwt_signing_key_public = oauth2/public.key
+```
+
+## HTTP Authorization Server Endpoint
+
+You need to add an endpoint to your application that exposes OAuth2 server.
+
+The simplest one can forward every request to the OAuth2 authorization
+server, the framework takes care of the rest:
+
+```php file:app/HttpResponder/OAuth2AuthorizationServer.php
+<?php
+
+namespace App\HttpResponder;
+
+use App\HttpRouteSymbol;
+use Distantmagic\Resonance\Attribute\RespondsToHttp;
+use Distantmagic\Resonance\Attribute\Singleton;
+use Distantmagic\Resonance\HttpResponder;
+use Distantmagic\Resonance\HttpResponder\OAuth2\AuthorizationServer;
+use Distantmagic\Resonance\HttpResponderInterface;
+use Distantmagic\Resonance\RequestMethod;
+use Distantmagic\Resonance\SingletonCollection;
+use Swoole\Http\Request;
+use Swoole\Http\Response;
+
+#[RespondsToHttp(
+ method: RequestMethod::POST,
+ pattern: '/oauth2',
+ routeSymbol: HttpRouteSymbol::OAuth2AuthorizationServer,
+)]
+#[Singleton(collection: SingletonCollection::HttpResponder)]
+final readonly class OAuth2AuthorizationServer extends HttpResponder
+{
+ public function __construct(private AuthorizationServer $authorizationServer) {}
+
+ public function respond(Request $request, Response $response): HttpResponderInterface
+ {
+ return $this->authorizationServer;
+ }
+}
+```
diff --git a/docs/pages/docs/features/security/oauth2/enabling-grants.md b/docs/pages/docs/features/security/oauth2/enabling-grants.md
new file mode 100644
index 0000000000000000000000000000000000000000..4db801978e76885d281305434a1f7adb003adfb3
--- /dev/null
+++ b/docs/pages/docs/features/security/oauth2/enabling-grants.md
@@ -0,0 +1,161 @@
+---
+collections:
+ - documents
+layout: dm:document
+parent: docs/features/security/oauth2/index
+title: Enabling Grants
+description: >
+ Learn how to add methods of acquiring access tokens.
+---
+
+# Enabling Grants
+
+Grant represents a method of obtaining an access token.
+
+By default, the OAuth2 server has no grants enabled, so you have to add at
+least one if you want to use it.
+
+# Usage
+
+You can follow
+[thephpleague/oauth2-server](https://oauth2.thephpleague.com/authorization-server/which-grant/)
+recommendations to decide which grants you want to enable. You can either use
+League's built-in grants or provide your own.
+
+## Providing Grant Types
+
+Then for each one you have to add a grant provider. For example, if you want to
+enable client credentials grant:
+
+```php file:app/OAuth2GrantProvider/ClientCredentialsGrantProvider.php
+<?php
+
+namespace App\OAuth2GrantProvider;
+
+use Distantmagic\Resonance\Attribute\ProvidesOAuth2Grant;
+use Distantmagic\Resonance\Attribute\Singleton;
+use Distantmagic\Resonance\OAuth2GrantProvider;
+use Distantmagic\Resonance\SingletonCollection;
+use League\OAuth2\Server\Grant\ClientCredentialsGrant;
+use League\OAuth2\Server\Grant\GrantTypeInterface;
+
+#[ProvidesOAuth2Grant]
+#[Singleton(collection: SingletonCollection::OAuth2Grant)]
+readonly class ClientCredentialsGrantProvider extends OAuth2GrantProvider
+{
+ public function getGrant(): GrantTypeInterface
+ {
+ return new ClientCredentialsGrant();
+ }
+}
+```
+
+## Persistent Data Repositories
+
+### Access Token Repository
+
+All grant types require this repository.
+
+See more at
+[thephpleague/oauth2-server](https://oauth2.thephpleague.com/access-token-repository-interface/)
+documentation.
+
+```php file:app/OAuth2AccessTokenRepository.php
+<?php
+
+namespace App;
+
+use Distantmagic\Resonance\Attribute\Singleton;
+use League\OAuth2\Server\Entities\AccessTokenEntityInterface;
+use League\OAuth2\Server\Entities\ClientEntityInterface;
+use League\OAuth2\Server\Entities\ScopeEntityInterface;
+use League\OAuth2\Server\Exception\UniqueTokenIdentifierConstraintViolationException;
+use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface;
+use ReturnTypeWillChange;
+
+#[Singleton(provides: AccessTokenRepositoryInterface::class)]
+readonly class OAuth2AccessTokenRepository implements AccessTokenRepositoryInterface
+{
+ // (...)
+}
+```
+
+### Auth Code Repository
+
+You have to implement this repository if you want to use the Authorization Code
+Grant. Otherwise it's optional.
+
+See more at
+[thephpleague/oauth2-server](https://oauth2.thephpleague.com/auth-code-repository-interface/)
+documentation.
+
+```php file:app/OAuth2AuthCodeRepository.php
+<?php
+
+namespace App;
+
+use Distantmagic\Resonance\Attribute\Singleton;
+use League\OAuth2\Server\Entities\ClientEntityInterface;
+use League\OAuth2\Server\Entities\ScopeEntityInterface;
+use League\OAuth2\Server\Repositories\AuthCodeRepositoryInterface;
+
+#[Singleton(provides: AuthCodeRepositoryInterface::class)]
+readonly class OAuth2AuthCodeRepository implements AuthCodeRepositoryInterface
+{
+ // (...)
+}
+```
+
+### Client Repository
+
+All grant types require this repository.
+
+It provides and validates clients that can connect to the OAuth 2.0 server.
+
+See more at
+[thephpleague/oauth2-server](https://oauth2.thephpleague.com/client-repository-interface/)
+documentation.
+
+```php file:app/OAuth2ClientRepository.php
+<?php
+
+namespace App;
+
+use Distantmagic\Resonance\Attribute\Singleton;
+use League\OAuth2\Server\Entities\ClientEntityInterface;
+use League\OAuth2\Server\Repositories\ClientRepositoryInterface;
+
+#[Singleton(provides: ClientRepositoryInterface::class)]
+readonly class OAuth2ClientRepository implements ClientRepositoryInterface
+{
+ // (...)
+}
+```
+
+### Scope Repository
+
+All grant types require this repository.
+
+It provides and validates scopes that the client requested while
+authenticating.
+
+See more at
+[thephpleague/oauth2-server](https://oauth2.thephpleague.com/scope-repository-interface/)
+documentation.
+
+```php file:app/OAuth2ScopeRepository.php
+<?php
+
+namespace App;
+
+use Distantmagic\Resonance\Attribute\Singleton;
+use League\OAuth2\Server\Entities\ClientEntityInterface;
+use League\OAuth2\Server\Entities\ScopeEntityInterface;
+use League\OAuth2\Server\Repositories\ScopeRepositoryInterface;
+
+#[Singleton(provides: ScopeRepositoryInterface::class)]
+readonly class OAuth2ScopeRepository implements ScopeRepositoryInterface
+{
+ // (...)
+}
+```
diff --git a/docs/pages/docs/features/security/oauth2/index.md b/docs/pages/docs/features/security/oauth2/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..7d18f8089003f0224fb3c50ddee684d6b761365a
--- /dev/null
+++ b/docs/pages/docs/features/security/oauth2/index.md
@@ -0,0 +1,22 @@
+---
+collections:
+ - documents
+layout: dm:document
+parent: docs/features/security/index
+title: OAuth 2.0
+description: >
+ OAuth 2.0 is a security protocol that incorporates some authentication and
+ authorization features. Learn how to use it with Resonance.
+---
+
+# OAuth 2.0
+
+Resonance provides built-in support for OAuth 2.0 by integrating the
+[thephpleague/oauth2-server](https://github.com/thephpleague/oauth2-server)
+library.
+
+Resonance provides a way to set up all aspects of OAuth 2.0 integrations
+through PHP attributes and comes in with sensible configuration defaults. It
+also integrates with other framework's features.
+
+{{docs/features/security/oauth2/*!docs/features/security/oauth2/index}}
diff --git a/docs/pages/docs/features/security/oauth2/installation.md b/docs/pages/docs/features/security/oauth2/installation.md
new file mode 100644
index 0000000000000000000000000000000000000000..570d40d3d8ddf20d203ed4b529c81f1fdd7e8bf2
--- /dev/null
+++ b/docs/pages/docs/features/security/oauth2/installation.md
@@ -0,0 +1,105 @@
+---
+collections:
+ - name: documents
+ next: docs/features/security/oauth2/configuration
+layout: dm:document
+next: docs/features/security/oauth2/configuration
+parent: docs/features/security/oauth2/index
+title: Installation
+description: >
+ Learn how to setup the application environment to use OAuth 2.0.
+---
+
+# Installation
+
+Although Resonance has built-in OAuth 2.0 support (based on
+[thephpleague/oauth2-server](https://github.com/thephpleague/oauth2-server)),
+you must take extra steps to enable the OAuth 2.0 features.
+
+Primarily you need to generate encryption keys. To store them, create an
+`oauth2` directory in your project first.
+
+## TL;DR
+
+Generate public/private keypair for JWT encryption and an encryption key for
+authorization and refresh codes.
+
+## Generate Encryption Keys
+
+### About Encryption Keys
+
+To secure your auth data and make sure it cannot be forged, you need to
+generate a public/private key pairs (or, to be truthful, no matter the
+implementation, it can be forged, but usually the cost of forging it
+vastly outweighs whatever is to be gained by doing so - that is what in
+actuality protects our systems).
+
+In generating the key, you have to weigh in a few factors:
+- The longer the key, the more secure it is, but the more computational power is
+ required to validate data against it.
+- You have to use the modern encryption algorithm.
+
+Since 2016,
+[NIST recommends](https://cryptome.org/2016/01/CNSA-Suite-and-Quantum-Computing-FAQ.pdf)
+RSA keys of at least 3072 bit length, so we can settle for that. On the
+other hand, it might be a good idea to use keys of 4096 bit length since almost a
+decade passed since that recommendation, but it's up to you.
+
+### JWT Encryption Keys
+
+OAuth2 uses [JWT (JSON Web Tokens)](https://datatracker.ietf.org/doc/html/rfc7519)
+as a transmission medium for the auth data like scopes, subjects, statuses, and
+such. This data is generated through the other parts of OAuth 2.0 protocol.
+
+To encrypt it, we will need public/private key pair. You can skip `-passout`
+and `-passin` arguments if you don't want to use a passphrase with your keys.
+
+Private key:
+
+```shell
+$ openssl genrsa -aes128 -passout pass:yourpassphrase -out oauth2/private.key 3072
+```
+
+Public key from the private key:
+
+```shell
+$ openssl rsa -in oauth2/private.key -passin pass:yourpassphrase -pubout -out oauth2/public.key
+```
+
+Then, change the CHMOD permissions for those keys to `0600`.
+
+We will use those keys later. You should not commit them to your repo, they
+must be stored in some accessible place, but they must be accessible to the
+application in some way.
+
+The application will sign JWT tokens with a private key and expose the public
+key so the clients will be able to verify that tokens are indeed coming from
+your server (and not from some unwanted man-in-the-middle).
+
+### Messaging Encryption Keys
+
+Besides encrypting the JWT tokens themselves, different kind of key is
+necessary to encode refresh tokens, authorization codes and such that are not
+sent as a party of JWT itself.
+
+They use the cryptography model provided by
+[defuse/php-encryption](https://github.com/defuse/php-encryption/blob/master/docs/CryptoDetails.md).
+
+Although it is technically possible to use
+
+To generate the key you have essentially two options:
+1. You can provide a string pasword from which the key is slowly derived on
+ runtime (and may be vulnerable to the
+ ["long password DOS"](https://github.com/defuse/php-encryption/issues/230)),
+ so you really shouldn't use this method - but it's there.
+2. You can provide an already prehashed key, which is much faster.
+
+Since I don't know why anyone would choose the option 1, I left just the option
+2 in the framework. If you need the option 1 please start an issue on GitHub.
+To generate the prehashed key, use the command:
+
+```shell
+$ php ./bin/resonance.php generate:defuse-key > oauth2/defuse.key
+```
+
+Then, change the CHMOD permissions for that key to `0600`.
diff --git a/docs/pages/docs/features/templating/twig/rendering-templates.md b/docs/pages/docs/features/templating/twig/rendering-templates.md
index 09f95d6b0f949b1e96303886905655708407e648..f00642b830a9aec25f40998c576cab78cb349d19 100644
--- a/docs/pages/docs/features/templating/twig/rendering-templates.md
+++ b/docs/pages/docs/features/templating/twig/rendering-templates.md
@@ -69,7 +69,7 @@ It needs the request object to determine the currently used language.
### `can`
Determines if the current user can perform the given site action. Learn more
-about site actions at the {{docs/features/security/authorization}} page.
+about site actions at the {{docs/features/security/authorization/index}} page.
```twig
{% if can(request, constant('App\\SiteAction::CreateBlogPost')) %}
@@ -80,7 +80,7 @@ about site actions at the {{docs/features/security/authorization}} page.
### `can_crud`
Determines if the current user can perform the given CRUD action. Learn more
-about CRUD actions at the {{docs/features/security/authorization}} page.
+about CRUD actions at the {{docs/features/security/authorization/index}} page.
```twig
{% if can_crud(request, blog_post, constant('Resonance\\CrudAction::Delete')) %}
diff --git a/docs/pages/docs/getting-started/index.md b/docs/pages/docs/getting-started/index.md
index ff740434df5c97be7896d7887dace46d17d7cb2f..dd9505cd51a939e2e0681f22853afcb127755a52 100644
--- a/docs/pages/docs/getting-started/index.md
+++ b/docs/pages/docs/getting-started/index.md
@@ -1,7 +1,7 @@
---
collections:
- name: documents
- next: docs/extras/index
+ next: docs/changelog/index
layout: dm:document
parent: docs/index
title: Getting Started
diff --git a/docs/pages/docs/getting-started/installation-and-requirements.md b/docs/pages/docs/getting-started/installation-and-requirements.md
index 900c98f1607ca945eac8c2fb8331f92d0167788a..670f2de5bed552e1b938d588be4e531e16b788ad 100644
--- a/docs/pages/docs/getting-started/installation-and-requirements.md
+++ b/docs/pages/docs/getting-started/installation-and-requirements.md
@@ -33,6 +33,7 @@ extension | symbol | why?
-|-|-
[Igbinary](https://www.php.net/manual/en/book.igbinary.php) | `ext-igbinary` | It's used to serialize and unserialize {{docs/features/http/sessions}}. It has a better memory footprint than a basic PHP `serialize` and allows to use `ext-ds` to store the session data.
[Intl](https://www.php.net/manual/en/book.intl.php) | `ext-intl` | Handles date formatting, helps with translations etc.
+[OpenSSL](https://datatracker.ietf.org/doc/html/rfc7519) | `ext-openssl` | Handles security keys, especially useful for {{docs/features/security/oauth2/index}}.
[Readline](https://www.php.net/manual/en/book.readline.php) | `ext-readline` | Unlocks {{docs/features/console/index}} features, formatting, piping etc.
[Redis](https://github.com/phpredis/phpredis) | `ext-redis` | Redis to handle {{docs/features/http/sessions}}
[uuid](https://pecl.php.net/package/uuid) | `ext-uuid` | Faster UUID generation for session ids and such.
diff --git a/docs/pages/tutorials/session-based-authentication/index.md b/docs/pages/tutorials/session-based-authentication/index.md
index 9d38ca34cb36040553a17a19abc4a8ad82e064f6..5b6aa033e457880aa0de10818777753308f693c8 100644
--- a/docs/pages/tutorials/session-based-authentication/index.md
+++ b/docs/pages/tutorials/session-based-authentication/index.md
@@ -293,8 +293,9 @@ final readonly class LoginForm extends HttpResponder
Notice that we used the `csrf_token` function. It's a part of
{{docs/features/templating/twig/index}} extension bundled with Resonance.
-`csrf_token` stores a {{docs/features/security/csrf-protection}} token in the
-session. Resonance will validate that token after the user submits the form.
+`csrf_token` stores a {{docs/features/security/csrf-protection/index}} token in
+the session. Resonance will validate that token after the user submits the
+form.
We do not return the `errors` variable yet, but we will reuse the same view
in the Login Validation responder later, so we might as well put those there
diff --git a/resources/css/docs-hljs.css b/resources/css/docs-hljs.css
index 3c84c72593b4ebfe94168356baee0b51dd401eee..254b2a32048c534f242b3552bf4941927167f8c8 100644
--- a/resources/css/docs-hljs.css
+++ b/resources/css/docs-hljs.css
@@ -70,20 +70,20 @@ code[class] {
}
.fenced-code {
+ border-radius: 4px;
+
@media screen and (min-width: 1024px) {
position: relative;
}
- border-radius: 4px;
-
code {
transition: opacity 0.3s ease;
@media screen and (max-width: 1023px) {
- padding: 10px;
+ padding: 10px 10ch 10px 10px;
}
@media screen and (min-width: 1024px) {
- padding: 20px;
+ padding: 20px 10ch 20px 20px;
}
}
@@ -117,6 +117,7 @@ code[class] {
padding: 6px 10px;
pointer-events: none;
user-select: none;
+ z-index: 1;
@media screen and (min-width: 1024px) {
border-top-right-radius: 4px;
diff --git a/src/ApplicationConfiguration.php b/src/ApplicationConfiguration.php
index efecd05f0c3d0d6ea5e2cd04e57c78c625a7010c..4aeef3e9270404de6c47c8a9f023f83539eca1f1 100644
--- a/src/ApplicationConfiguration.php
+++ b/src/ApplicationConfiguration.php
@@ -9,5 +9,6 @@ readonly class ApplicationConfiguration
public function __construct(
public Environment $environment,
public string $esbuildMetafile,
+ public string $scheme,
) {}
}
diff --git a/src/Attribute/ProvidesOAuth2Grant.php b/src/Attribute/ProvidesOAuth2Grant.php
new file mode 100644
index 0000000000000000000000000000000000000000..dfd39310f32634dae01c926a45f70b623d2453e5
--- /dev/null
+++ b/src/Attribute/ProvidesOAuth2Grant.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Distantmagic\Resonance\Attribute;
+
+use Attribute;
+use Distantmagic\Resonance\Attribute as BaseAttribute;
+
+#[Attribute(Attribute::TARGET_CLASS)]
+final readonly class ProvidesOAuth2Grant extends BaseAttribute {}
diff --git a/src/Command/GenerateDefuseKey.php b/src/Command/GenerateDefuseKey.php
new file mode 100644
index 0000000000000000000000000000000000000000..103332569ef554680a6e91987a0b86752668aa4a
--- /dev/null
+++ b/src/Command/GenerateDefuseKey.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Distantmagic\Resonance\Command;
+
+use Defuse\Crypto\Key;
+use Distantmagic\Resonance\Attribute\ConsoleCommand;
+use Distantmagic\Resonance\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+#[ConsoleCommand(
+ name: 'generate:defuse-key',
+ description: 'Generate Defuse Key for OAuth2'
+)]
+final class GenerateDefuseKey extends Command
+{
+ protected function execute(InputInterface $input, OutputInterface $output): int
+ {
+ $key = Key::createNewRandomKey();
+
+ $output->writeln($key->saveToAsciiSafeString());
+
+ return Command::SUCCESS;
+ }
+}
diff --git a/src/HttpResponder/OAuth2.php b/src/HttpResponder/OAuth2.php
new file mode 100644
index 0000000000000000000000000000000000000000..c12f06de09fdca657ed095e2ca8cdb4fdad5e322
--- /dev/null
+++ b/src/HttpResponder/OAuth2.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Distantmagic\Resonance\HttpResponder;
+
+use Distantmagic\Resonance\HttpResponder;
+
+abstract readonly class OAuth2 extends HttpResponder {}
diff --git a/src/HttpResponder/OAuth2/AuthorizationServer.php b/src/HttpResponder/OAuth2/AuthorizationServer.php
new file mode 100644
index 0000000000000000000000000000000000000000..bc0a317707e016cc9b0c8b8cd636997088e94c40
--- /dev/null
+++ b/src/HttpResponder/OAuth2/AuthorizationServer.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Distantmagic\Resonance\HttpResponder\OAuth2;
+
+use Distantmagic\Resonance\Attribute\Singleton;
+use Distantmagic\Resonance\HttpResponder\OAuth2;
+use Distantmagic\Resonance\HttpResponder\PsrResponder;
+use Distantmagic\Resonance\HttpResponderInterface;
+use Distantmagic\Resonance\PsrServerRequestConverter;
+use League\OAuth2\Server\AuthorizationServer as LeagueAuthorizationServer;
+use Nyholm\Psr7\Factory\Psr17Factory;
+use Swoole\Http\Request;
+use Swoole\Http\Response;
+
+#[Singleton]
+readonly class AuthorizationServer extends OAuth2
+{
+ public function __construct(
+ private LeagueAuthorizationServer $leagueAuthorizationServer,
+ private PsrServerRequestConverter $psrServerRequestConverter,
+ private Psr17Factory $psr17Factory,
+ ) {}
+
+ public function respond(Request $request, Response $response): HttpResponderInterface
+ {
+ $serverRequest = $this->psrServerRequestConverter->convertToServerRequest($request);
+ $psrResponse = $this->leagueAuthorizationServer->respondToAccessTokenRequest(
+ $serverRequest,
+ $this->psr17Factory->createResponse(),
+ );
+
+ return new PsrResponder($psrResponse);
+ }
+}
diff --git a/src/HttpResponder/PsrResponder.php b/src/HttpResponder/PsrResponder.php
new file mode 100644
index 0000000000000000000000000000000000000000..2cd967ce0c55bf53729625975e75e076dc228c37
--- /dev/null
+++ b/src/HttpResponder/PsrResponder.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Distantmagic\Resonance\HttpResponder;
+
+use Distantmagic\Resonance\HttpResponder;
+use Psr\Http\Message\ResponseInterface;
+use Swoole\Http\Request;
+use Swoole\Http\Response;
+
+readonly class PsrResponder extends HttpResponder
+{
+ public function __construct(private ResponseInterface $psrResponse) {}
+
+ public function respond(Request $request, Response $response): null
+ {
+ $response->status(
+ $this->psrResponse->getStatusCode(),
+ $this->psrResponse->getReasonPhrase(),
+ );
+
+ foreach ($this->psrResponse->getHeaders() as $name => $values) {
+ $response->header((string) $name, $values);
+ }
+
+ $response->end($this->psrResponse->getBody()->getContents());
+
+ return null;
+ }
+}
diff --git a/src/HttpResponderAggregate.php b/src/HttpResponderAggregate.php
index 954f3cbf84916d970c36a131cfee70f376a60e2b..9435869a36313c01484d222c14c2d2188abb2380 100644
--- a/src/HttpResponderAggregate.php
+++ b/src/HttpResponderAggregate.php
@@ -25,6 +25,7 @@ use Throwable;
readonly class HttpResponderAggregate
{
public function __construct(
+ private ApplicationConfiguration $applicationConfiguration,
private EventDispatcherInterface $eventDispatcher,
private HttpRecursiveResponder $recursiveResponder,
private HttpResponderCollection $httpResponderCollection,
@@ -87,7 +88,7 @@ readonly class HttpResponderAggregate
->setPathInfo((string) $request->server['path_info'])
->setHost((string) $request->server['remote_addr'])
->setHttpsPort((int) $request->server['server_port'])
- ->setScheme('https')
+ ->setScheme($this->applicationConfiguration->scheme)
;
try {
diff --git a/src/OAuth2Configuration.php b/src/OAuth2Configuration.php
new file mode 100644
index 0000000000000000000000000000000000000000..87f42ce4d7504f9534e4a739bff5638ce3336a5d
--- /dev/null
+++ b/src/OAuth2Configuration.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Distantmagic\Resonance;
+
+use Defuse\Crypto\Key;
+use League\OAuth2\Server\CryptKey;
+
+readonly class OAuth2Configuration
+{
+ public function __construct(
+ public Key $encryptionKey,
+ public CryptKey $jwtSigningKeyPrivate,
+ public CryptKey $jwtSigningKeyPublic,
+ ) {}
+}
diff --git a/src/OAuth2GrantProvider.php b/src/OAuth2GrantProvider.php
new file mode 100644
index 0000000000000000000000000000000000000000..c9fe850fddcf491e8f3f068d916a691990657727
--- /dev/null
+++ b/src/OAuth2GrantProvider.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Distantmagic\Resonance;
+
+use DateInterval;
+
+abstract readonly class OAuth2GrantProvider implements OAuth2GrantProviderInterface
+{
+ public function getAccessTokenTTL(): DateInterval
+ {
+ return new DateInterval('PT1H');
+ }
+}
diff --git a/src/OAuth2GrantProviderInterface.php b/src/OAuth2GrantProviderInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..33b8f90ca860312c0dac98d7ed32619d57b8c542
--- /dev/null
+++ b/src/OAuth2GrantProviderInterface.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Distantmagic\Resonance;
+
+use DateInterval;
+use League\OAuth2\Server\Grant\GrantTypeInterface;
+
+interface OAuth2GrantProviderInterface
+{
+ public function getAccessTokenTTL(): DateInterval;
+
+ public function getGrant(): GrantTypeInterface;
+}
diff --git a/src/PsrServerRequestConverter.php b/src/PsrServerRequestConverter.php
new file mode 100644
index 0000000000000000000000000000000000000000..9eae14fb7d97c7fb23948ef786623d2236446ea8
--- /dev/null
+++ b/src/PsrServerRequestConverter.php
@@ -0,0 +1,54 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Distantmagic\Resonance;
+
+use Distantmagic\Resonance\Attribute\Singleton;
+use Nyholm\Psr7\Factory\Psr17Factory;
+use Nyholm\Psr7Server\ServerRequestCreator;
+use Psr\Http\Message\ServerRequestInterface;
+use RuntimeException;
+use Swoole\Http\Request;
+
+#[Singleton]
+readonly class PsrServerRequestConverter
+{
+ private ServerRequestCreator $serverRequestCreator;
+
+ public function __construct(Psr17Factory $psr17Factory)
+ {
+ $this->serverRequestCreator = new ServerRequestCreator(
+ $psr17Factory,
+ $psr17Factory,
+ $psr17Factory,
+ $psr17Factory,
+ );
+ }
+
+ public function convertToServerRequest(Request $request): ServerRequestInterface
+ {
+ if (!is_array($request->server)) {
+ throw new RuntimeException('Server variables are not set.');
+ }
+
+ $serverUppercase = [];
+
+ /**
+ * @var string $value
+ */
+ foreach ($request->server as $key => $value) {
+ $serverUppercase[mb_strtoupper((string) $key)] = $value;
+ }
+
+ return $this->serverRequestCreator->fromArrays(
+ $serverUppercase,
+ is_array($request->header) ? $request->header : [],
+ is_array($request->cookie) ? $request->cookie : [],
+ is_array($request->get) ? $request->get : [],
+ is_array($request->post) ? $request->post : [],
+ is_array($request->files) ? $request->files : [],
+ $request->getContent() ?: null,
+ );
+ }
+}
diff --git a/src/SessionAuthentication.php b/src/SessionAuthentication.php
index 43a58e7ecddaab3b4e93e78bc9e8a67eb15cab25..48110bfd7238691e9b7de2b172a36cfd23756f51 100644
--- a/src/SessionAuthentication.php
+++ b/src/SessionAuthentication.php
@@ -54,7 +54,7 @@ final readonly class SessionAuthentication
public function setAuthenticatedUser(Request $request, Response $response, UserInterface $user): void
{
$session = $this->sessionManager->start($request, $response);
- $session->data->put('authenticated_user_id', $user->getId());
+ $session->data->put('authenticated_user_id', $user->getIdentifier());
$this->authenticatedUsers->offsetSet($request, $user);
}
diff --git a/src/SingletonCollection.php b/src/SingletonCollection.php
index 4fe0fa5df6c520f662b159dfba49474a24fcd5cb..60f4923d31c277a5ab3c77722cfcb9099f1cb9d7 100644
--- a/src/SingletonCollection.php
+++ b/src/SingletonCollection.php
@@ -15,6 +15,7 @@ enum SingletonCollection implements SingletonCollectionInterface
case HttpParameterBinder;
case HttpResponder;
case InputValidator;
+ case OAuth2Grant;
case SiteActionGate;
case StaticPageLayout;
case TwigExtension;
diff --git a/src/SingletonProvider/ConfigurationProvider/ApplicationConfigurationProvider.php b/src/SingletonProvider/ConfigurationProvider/ApplicationConfigurationProvider.php
index ee06d57d5ee0f9cca1d11cd70128df718558f6b9..4212e012bc9e68c721038137b83e792bf8e68489 100644
--- a/src/SingletonProvider/ConfigurationProvider/ApplicationConfigurationProvider.php
+++ b/src/SingletonProvider/ConfigurationProvider/ApplicationConfigurationProvider.php
@@ -15,6 +15,7 @@ use Nette\Schema\Schema;
* @template-extends ConfigurationProvider<ApplicationConfiguration, object{
* env: string,
* esbuild_metafile: string,
+ * scheme: string,
* }>
*/
#[Singleton(provides: ApplicationConfiguration::class)]
@@ -30,6 +31,7 @@ final readonly class ApplicationConfigurationProvider extends ConfigurationProvi
return Expect::structure([
'env' => Expect::anyOf(...Environment::values())->required(),
'esbuild_metafile' => Expect::string()->min(1)->default('esbuild-meta.json'),
+ 'scheme' => Expect::anyOf('http', 'https')->default('https'),
]);
}
@@ -38,6 +40,7 @@ final readonly class ApplicationConfigurationProvider extends ConfigurationProvi
return new ApplicationConfiguration(
environment: Environment::from($validatedData->env),
esbuildMetafile: DM_ROOT.'/'.$validatedData->esbuild_metafile,
+ scheme: $validatedData->scheme,
);
}
}
diff --git a/src/SingletonProvider/ConfigurationProvider/OAuth2ConfigurationProvider.php b/src/SingletonProvider/ConfigurationProvider/OAuth2ConfigurationProvider.php
new file mode 100644
index 0000000000000000000000000000000000000000..958d1efec829528bff55f2953946779ba5ad2935
--- /dev/null
+++ b/src/SingletonProvider/ConfigurationProvider/OAuth2ConfigurationProvider.php
@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Distantmagic\Resonance\SingletonProvider\ConfigurationProvider;
+
+use Defuse\Crypto\Key;
+use Distantmagic\Resonance\Attribute\Singleton;
+use Distantmagic\Resonance\OAuth2Configuration;
+use Distantmagic\Resonance\SingletonProvider\ConfigurationProvider;
+use League\OAuth2\Server\CryptKey;
+use Nette\Schema\Expect;
+use Nette\Schema\Schema;
+
+/**
+ * @template-extends ConfigurationProvider<OAuth2Configuration, object{
+ * encryption_key: string,
+ * jwt_signing_key_passphrase: null|string,
+ * jwt_signing_key_private: string,
+ * jwt_signing_key_public: string,
+ * }>
+ */
+#[Singleton(provides: OAuth2Configuration::class)]
+final readonly class OAuth2ConfigurationProvider extends ConfigurationProvider
+{
+ protected function getConfigurationKey(): string
+ {
+ return 'oauth2';
+ }
+
+ protected function getSchema(): Schema
+ {
+ return Expect::structure([
+ 'encryption_key' => Expect::string()->min(1)->required(),
+ 'jwt_signing_key_passphrase' => Expect::string()->min(1)->default(null),
+ 'jwt_signing_key_private' => Expect::string()->min(1)->required(),
+ 'jwt_signing_key_public' => Expect::string()->min(1)->required(),
+ ]);
+ }
+
+ protected function provideConfiguration($validatedData): OAuth2Configuration
+ {
+ return new OAuth2Configuration(
+ encryptionKey: Key::loadFromAsciiSafeString(file_get_contents($validatedData->encryption_key)),
+ jwtSigningKeyPrivate: new CryptKey(
+ DM_ROOT.'/'.$validatedData->jwt_signing_key_private,
+ $validatedData->jwt_signing_key_passphrase,
+ ),
+ jwtSigningKeyPublic: new CryptKey(
+ DM_ROOT.'/'.$validatedData->jwt_signing_key_public,
+ $validatedData->jwt_signing_key_passphrase,
+ ),
+ );
+ }
+}
diff --git a/src/SingletonProvider/NyholmPsr17FactoryProvider.php b/src/SingletonProvider/NyholmPsr17FactoryProvider.php
new file mode 100644
index 0000000000000000000000000000000000000000..5bd1b58297f12401c661e7c98accd9bd8eba059e
--- /dev/null
+++ b/src/SingletonProvider/NyholmPsr17FactoryProvider.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Distantmagic\Resonance\SingletonProvider;
+
+use Distantmagic\Resonance\Attribute\Singleton;
+use Distantmagic\Resonance\PHPProjectFiles;
+use Distantmagic\Resonance\SingletonContainer;
+use Distantmagic\Resonance\SingletonProvider;
+use Nyholm\Psr7\Factory\Psr17Factory;
+
+/**
+ * @template-extends SingletonProvider<Psr17Factory>
+ */
+#[Singleton(provides: Psr17Factory::class)]
+final readonly class NyholmPsr17FactoryProvider extends SingletonProvider
+{
+ public function provide(SingletonContainer $singletons, PHPProjectFiles $phpProjectFiles): Psr17Factory
+ {
+ return new Psr17Factory();
+ }
+}
diff --git a/src/SingletonProvider/OAuth2AuthorizationServerProvider.php b/src/SingletonProvider/OAuth2AuthorizationServerProvider.php
new file mode 100644
index 0000000000000000000000000000000000000000..b7c2395283f6501c08fbab8495d104b9dbbcac24
--- /dev/null
+++ b/src/SingletonProvider/OAuth2AuthorizationServerProvider.php
@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Distantmagic\Resonance\SingletonProvider;
+
+use Distantmagic\Resonance\Attribute\ProvidesOAuth2Grant;
+use Distantmagic\Resonance\Attribute\RequiresSingletonCollection;
+use Distantmagic\Resonance\Attribute\Singleton;
+use Distantmagic\Resonance\OAuth2Configuration;
+use Distantmagic\Resonance\OAuth2GrantProviderInterface;
+use Distantmagic\Resonance\PHPProjectFiles;
+use Distantmagic\Resonance\SingletonAttribute;
+use Distantmagic\Resonance\SingletonCollection;
+use Distantmagic\Resonance\SingletonContainer;
+use Distantmagic\Resonance\SingletonProvider;
+use League\OAuth2\Server\AuthorizationServer;
+use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface;
+use League\OAuth2\Server\Repositories\ClientRepositoryInterface;
+use League\OAuth2\Server\Repositories\ScopeRepositoryInterface;
+
+/**
+ * @template-extends SingletonProvider<AuthorizationServer>
+ */
+#[RequiresSingletonCollection(SingletonCollection::OAuth2Grant)]
+#[Singleton(provides: AuthorizationServer::class)]
+final readonly class OAuth2AuthorizationServerProvider extends SingletonProvider
+{
+ public function __construct(
+ private AccessTokenRepositoryInterface $accessTokenRepository,
+ private ClientRepositoryInterface $clientRepository,
+ private OAuth2Configuration $oAuth2Configuration,
+ private ScopeRepositoryInterface $scopeRepository,
+ ) {}
+
+ public function provide(SingletonContainer $singletons, PHPProjectFiles $phpProjectFiles): AuthorizationServer
+ {
+ $authorizationServer = new AuthorizationServer(
+ $this->clientRepository,
+ $this->accessTokenRepository,
+ $this->scopeRepository,
+ $this->oAuth2Configuration->jwtSigningKeyPrivate,
+ $this->oAuth2Configuration->encryptionKey,
+ );
+
+ foreach ($this->collectGrants($singletons) as $grantAttribute) {
+ $authorizationServer->enableGrantType(
+ $grantAttribute->singleton->getGrant(),
+ $grantAttribute->singleton->getAccessTokenTTL(),
+ );
+ }
+
+ return $authorizationServer;
+ }
+
+ /**
+ * @return iterable<SingletonAttribute<OAuth2GrantProviderInterface,ProvidesOAuth2Grant>>
+ */
+ private function collectGrants(SingletonContainer $singletons): iterable
+ {
+ return $this->collectAttributes(
+ $singletons,
+ OAuth2GrantProviderInterface::class,
+ ProvidesOAuth2Grant::class,
+ );
+ }
+}
diff --git a/src/TestsGraphQLQueriesTrait.php b/src/TestsGraphQLQueriesTrait.php
index 2001479515f0e6ef0e3906bac38fb0e4e048ad8e..79ae0a28eb70660a0e90b56131878492c65a1ea5 100644
--- a/src/TestsGraphQLQueriesTrait.php
+++ b/src/TestsGraphQLQueriesTrait.php
@@ -18,16 +18,7 @@ trait TestsGraphQLQueriesTrait
$result = self::$container->call(static function (
CrudActionGateAggregate $crudActionGateAggregate,
GraphQLAdapter $graphQLAdapter,
- SiteActionGateAggregate $siteActionGateAggregate,
) use ($query) {
- $graphQLDatabaseQueryAdapter = new GraphQLDatabaseQueryAdapter(
- new GatekeeperUserContext(
- $crudActionGateAggregate,
- $siteActionGateAggregate,
- null,
- ),
- );
-
$swoolePromiseAdapter = new SwoolePromiseAdapter();
return $graphQLAdapter
diff --git a/src/UserInterface.php b/src/UserInterface.php
index 489ec639f25a24bcff11b6e55e36fcb48fa75c00..8a94d0367dcef79d901eb6d39dfdfdecd6ad9fd0 100644
--- a/src/UserInterface.php
+++ b/src/UserInterface.php
@@ -4,9 +4,11 @@ declare(strict_types=1);
namespace Distantmagic\Resonance;
-interface UserInterface
+use League\OAuth2\Server\Entities\UserEntityInterface;
+
+interface UserInterface extends UserEntityInterface
{
- public function getId(): int|string;
+ public function getIdentifier(): int|string;
public function getRole(): UserRoleInterface;
}