Merge pull request #473 from jonnybarnes/develop

MTM Fix IndieAuth sign in
This commit is contained in:
Jonny Barnes 2022-10-15 16:24:35 +01:00 committed by GitHub
commit d52b8a3e83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 455 additions and 443 deletions

View file

@ -10,6 +10,7 @@ use GuzzleHttp\Exception\BadResponseException;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use IndieAuth\Client;
use JsonException;
class TokenEndpointController extends Controller
{
@ -68,13 +69,13 @@ class TokenEndpointController extends Controller
$scope = $auth['scope'] ?? '';
$tokenData = [
'me' => $request->input('me'),
'me' => config('app.url'),
'client_id' => $request->input('client_id'),
'scope' => $scope,
];
$token = $this->tokenService->getNewToken($tokenData);
$content = [
'me' => $request->input('me'),
'me' => config('app.url'),
'scope' => $scope,
'access_token' => $token,
];
@ -106,7 +107,7 @@ class TokenEndpointController extends Controller
try {
$authData = json_decode((string) $response->getBody(), true, 512, JSON_THROW_ON_ERROR);
} catch (\JsonException) {
} catch (JsonException) {
return null;
}

304
composer.lock generated
View file

@ -58,16 +58,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.235.10",
"version": "3.238.4",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "943f96f50d19244584675c34fb3e4c8aa3eaddce"
"reference": "3b87356aea911fa7a5596802a27baefe59062ee6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/943f96f50d19244584675c34fb3e4c8aa3eaddce",
"reference": "943f96f50d19244584675c34fb3e4c8aa3eaddce",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3b87356aea911fa7a5596802a27baefe59062ee6",
"reference": "3b87356aea911fa7a5596802a27baefe59062ee6",
"shasum": ""
},
"require": {
@ -146,9 +146,9 @@
"support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues",
"source": "https://github.com/aws/aws-sdk-php/tree/3.235.10"
"source": "https://github.com/aws/aws-sdk-php/tree/3.238.4"
},
"time": "2022-09-16T18:18:42+00:00"
"time": "2022-10-13T18:18:23+00:00"
},
{
"name": "brick/math",
@ -1741,37 +1741,37 @@
},
{
"name": "laravel/framework",
"version": "v9.31.0",
"version": "v9.35.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "75013d4fffe3b24748d313fbbea53206351214f7"
"reference": "79aed20f54b6ab75f926bf7d0dd7a5043ceb774a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/75013d4fffe3b24748d313fbbea53206351214f7",
"reference": "75013d4fffe3b24748d313fbbea53206351214f7",
"url": "https://api.github.com/repos/laravel/framework/zipball/79aed20f54b6ab75f926bf7d0dd7a5043ceb774a",
"reference": "79aed20f54b6ab75f926bf7d0dd7a5043ceb774a",
"shasum": ""
},
"require": {
"doctrine/inflector": "^2.0",
"dragonmantank/cron-expression": "^3.1",
"egulias/email-validator": "^3.1",
"dragonmantank/cron-expression": "^3.3.2",
"egulias/email-validator": "^3.2.1",
"ext-mbstring": "*",
"ext-openssl": "*",
"fruitcake/php-cors": "^1.2",
"laravel/serializable-closure": "^1.0",
"laravel/serializable-closure": "^1.2.2",
"league/commonmark": "^2.2",
"league/flysystem": "^3.0.16",
"monolog/monolog": "^2.0",
"nesbot/carbon": "^2.53.1",
"nesbot/carbon": "^2.62.1",
"nunomaduro/termwind": "^1.13",
"php": "^8.0.2",
"psr/container": "^1.1.1|^2.0.1",
"psr/log": "^1.0|^2.0|^3.0",
"psr/simple-cache": "^1.0|^2.0|^3.0",
"ramsey/uuid": "^4.2.2",
"symfony/console": "^6.0.3",
"symfony/console": "^6.0.9",
"symfony/error-handler": "^6.0",
"symfony/finder": "^6.0",
"symfony/http-foundation": "^6.0",
@ -1782,7 +1782,7 @@
"symfony/routing": "^6.0",
"symfony/uid": "^6.0",
"symfony/var-dumper": "^6.0",
"tijsverkoyen/css-to-inline-styles": "^2.2.2",
"tijsverkoyen/css-to-inline-styles": "^2.2.5",
"vlucas/phpdotenv": "^5.4.1",
"voku/portable-ascii": "^2.0"
},
@ -1829,26 +1829,26 @@
},
"require-dev": {
"ably/ably-php": "^1.0",
"aws/aws-sdk-php": "^3.198.1",
"aws/aws-sdk-php": "^3.235.5",
"doctrine/dbal": "^2.13.3|^3.1.4",
"fakerphp/faker": "^1.9.2",
"guzzlehttp/guzzle": "^7.2",
"guzzlehttp/guzzle": "^7.5",
"league/flysystem-aws-s3-v3": "^3.0",
"league/flysystem-ftp": "^3.0",
"league/flysystem-path-prefixing": "^3.3",
"league/flysystem-read-only": "^3.3",
"league/flysystem-sftp-v3": "^3.0",
"mockery/mockery": "^1.4.4",
"orchestra/testbench-core": "^7.1",
"mockery/mockery": "^1.5.1",
"orchestra/testbench-core": "^7.8",
"pda/pheanstalk": "^4.0",
"phpstan/phpstan": "^1.4.7",
"phpunit/phpunit": "^9.5.8",
"predis/predis": "^1.1.9|^2.0",
"predis/predis": "^1.1.9|^2.0.2",
"symfony/cache": "^6.0"
},
"suggest": {
"ably/ably-php": "Required to use the Ably broadcast driver (^1.0).",
"aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.198.1).",
"aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.235.5).",
"brianium/paratest": "Required to run tests in parallel (^6.0).",
"doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.13.3|^3.1.4).",
"ext-bcmath": "Required to use the multiple_of validation rule.",
@ -1860,18 +1860,18 @@
"ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).",
"fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
"filp/whoops": "Required for friendly error pages in development (^2.14.3).",
"guzzlehttp/guzzle": "Required to use the HTTP Client and the ping methods on schedules (^7.2).",
"guzzlehttp/guzzle": "Required to use the HTTP Client and the ping methods on schedules (^7.5).",
"laravel/tinker": "Required to use the tinker console command (^2.0).",
"league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.0).",
"league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.0).",
"league/flysystem-path-prefixing": "Required to use the scoped driver (^3.3).",
"league/flysystem-read-only": "Required to use read-only disks (^3.3)",
"league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.0).",
"mockery/mockery": "Required to use mocking (^1.4.4).",
"mockery/mockery": "Required to use mocking (^1.5.1).",
"nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).",
"pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
"phpunit/phpunit": "Required to use assertions and run tests (^9.5.8).",
"predis/predis": "Required to use the predis connector (^1.1.9|^2.0).",
"predis/predis": "Required to use the predis connector (^1.1.9|^2.0.2).",
"psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
"pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).",
"symfony/cache": "Required to PSR-6 cache bridge (^6.0).",
@ -1923,20 +1923,20 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2022-09-20T13:32:50+00:00"
"time": "2022-10-11T17:30:47+00:00"
},
{
"name": "laravel/horizon",
"version": "v5.10.1",
"version": "v5.10.2",
"source": {
"type": "git",
"url": "https://github.com/laravel/horizon.git",
"reference": "1570c8a4612484a37392eca986f06d01b771cb96"
"reference": "de84bf86ffee940fa92e29c54d41618048ec9b6f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/horizon/zipball/1570c8a4612484a37392eca986f06d01b771cb96",
"reference": "1570c8a4612484a37392eca986f06d01b771cb96",
"url": "https://api.github.com/repos/laravel/horizon/zipball/de84bf86ffee940fa92e29c54d41618048ec9b6f",
"reference": "de84bf86ffee940fa92e29c54d41618048ec9b6f",
"shasum": ""
},
"require": {
@ -1998,9 +1998,9 @@
],
"support": {
"issues": "https://github.com/laravel/horizon/issues",
"source": "https://github.com/laravel/horizon/tree/v5.10.1"
"source": "https://github.com/laravel/horizon/tree/v5.10.2"
},
"time": "2022-09-05T16:33:43+00:00"
"time": "2022-09-26T13:45:51+00:00"
},
{
"name": "laravel/serializable-closure",
@ -2455,16 +2455,16 @@
},
{
"name": "league/flysystem",
"version": "3.5.1",
"version": "3.6.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
"reference": "f14993c6e394450ac4649da35264df0544d0234e"
"reference": "8eded334b9894dc90ebdcb7be81e3a1c9413f709"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/f14993c6e394450ac4649da35264df0544d0234e",
"reference": "f14993c6e394450ac4649da35264df0544d0234e",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/8eded334b9894dc90ebdcb7be81e3a1c9413f709",
"reference": "8eded334b9894dc90ebdcb7be81e3a1c9413f709",
"shasum": ""
},
"require": {
@ -2526,7 +2526,7 @@
],
"support": {
"issues": "https://github.com/thephpleague/flysystem/issues",
"source": "https://github.com/thephpleague/flysystem/tree/3.5.1"
"source": "https://github.com/thephpleague/flysystem/tree/3.6.0"
},
"funding": [
{
@ -2542,25 +2542,25 @@
"type": "tidelift"
}
],
"time": "2022-09-18T18:23:19+00:00"
"time": "2022-10-13T20:05:14+00:00"
},
{
"name": "league/flysystem-aws-s3-v3",
"version": "3.5.0",
"version": "3.6.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
"reference": "adb6633f325c934c15a099c363dc5362bdcb07a2"
"reference": "5518ab783314c91bfd781b81fea912f553afb323"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/adb6633f325c934c15a099c363dc5362bdcb07a2",
"reference": "adb6633f325c934c15a099c363dc5362bdcb07a2",
"url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/5518ab783314c91bfd781b81fea912f553afb323",
"reference": "5518ab783314c91bfd781b81fea912f553afb323",
"shasum": ""
},
"require": {
"aws/aws-sdk-php": "^3.132.4",
"league/flysystem": "^3.0.0",
"league/flysystem": "^3.6.0",
"league/mime-type-detection": "^1.0.0",
"php": "^8.0.2"
},
@ -2596,7 +2596,7 @@
],
"support": {
"issues": "https://github.com/thephpleague/flysystem-aws-s3-v3/issues",
"source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.5.0"
"source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.6.0"
},
"funding": [
{
@ -2612,7 +2612,7 @@
"type": "tidelift"
}
],
"time": "2022-09-17T21:00:35+00:00"
"time": "2022-10-13T19:38:48+00:00"
},
{
"name": "league/glide",
@ -4789,16 +4789,16 @@
},
{
"name": "symfony/console",
"version": "v6.1.4",
"version": "v6.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "7fccea8728aa2d431a6725b02b3ce759049fc84d"
"reference": "7fa3b9cf17363468795e539231a5c91b02b608fc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/7fccea8728aa2d431a6725b02b3ce759049fc84d",
"reference": "7fccea8728aa2d431a6725b02b3ce759049fc84d",
"url": "https://api.github.com/repos/symfony/console/zipball/7fa3b9cf17363468795e539231a5c91b02b608fc",
"reference": "7fa3b9cf17363468795e539231a5c91b02b608fc",
"shasum": ""
},
"require": {
@ -4865,7 +4865,7 @@
"terminal"
],
"support": {
"source": "https://github.com/symfony/console/tree/v6.1.4"
"source": "https://github.com/symfony/console/tree/v6.1.6"
},
"funding": [
{
@ -4881,7 +4881,7 @@
"type": "tidelift"
}
],
"time": "2022-08-26T10:32:31+00:00"
"time": "2022-10-07T08:04:03+00:00"
},
{
"name": "symfony/css-selector",
@ -5017,16 +5017,16 @@
},
{
"name": "symfony/error-handler",
"version": "v6.1.3",
"version": "v6.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/error-handler.git",
"reference": "736e42db3fd586d91820355988698e434e1d8419"
"reference": "49f718e41f1b6f0fd5730895ca5b1c37defd828d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/736e42db3fd586d91820355988698e434e1d8419",
"reference": "736e42db3fd586d91820355988698e434e1d8419",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/49f718e41f1b6f0fd5730895ca5b1c37defd828d",
"reference": "49f718e41f1b6f0fd5730895ca5b1c37defd828d",
"shasum": ""
},
"require": {
@ -5068,7 +5068,7 @@
"description": "Provides tools to manage errors and ease debugging PHP code",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/error-handler/tree/v6.1.3"
"source": "https://github.com/symfony/error-handler/tree/v6.1.6"
},
"funding": [
{
@ -5084,7 +5084,7 @@
"type": "tidelift"
}
],
"time": "2022-07-29T07:42:06+00:00"
"time": "2022-10-07T08:04:03+00:00"
},
{
"name": "symfony/event-dispatcher",
@ -5383,16 +5383,16 @@
},
{
"name": "symfony/http-foundation",
"version": "v6.1.4",
"version": "v6.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "18e0f106a32887bcebef757e5b39c88e39a08f20"
"reference": "3ae8e9c57155fc48930493a629da293b32efbde0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/18e0f106a32887bcebef757e5b39c88e39a08f20",
"reference": "18e0f106a32887bcebef757e5b39c88e39a08f20",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/3ae8e9c57155fc48930493a629da293b32efbde0",
"reference": "3ae8e9c57155fc48930493a629da293b32efbde0",
"shasum": ""
},
"require": {
@ -5438,7 +5438,7 @@
"description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/http-foundation/tree/v6.1.4"
"source": "https://github.com/symfony/http-foundation/tree/v6.1.6"
},
"funding": [
{
@ -5454,20 +5454,20 @@
"type": "tidelift"
}
],
"time": "2022-08-19T14:27:04+00:00"
"time": "2022-10-02T08:30:52+00:00"
},
{
"name": "symfony/http-kernel",
"version": "v6.1.4",
"version": "v6.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "2144c53a278254af57fa1e6f71427be656fab6f4"
"reference": "102f99bf81799e93f61b9a73b2f38b309c587a94"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/2144c53a278254af57fa1e6f71427be656fab6f4",
"reference": "2144c53a278254af57fa1e6f71427be656fab6f4",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/102f99bf81799e93f61b9a73b2f38b309c587a94",
"reference": "102f99bf81799e93f61b9a73b2f38b309c587a94",
"shasum": ""
},
"require": {
@ -5548,7 +5548,7 @@
"description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/http-kernel/tree/v6.1.4"
"source": "https://github.com/symfony/http-kernel/tree/v6.1.6"
},
"funding": [
{
@ -5564,20 +5564,20 @@
"type": "tidelift"
}
],
"time": "2022-08-26T14:50:30+00:00"
"time": "2022-10-12T07:48:47+00:00"
},
{
"name": "symfony/mailer",
"version": "v6.1.4",
"version": "v6.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/mailer.git",
"reference": "55a7cb8f8518d35e2a039daaec6e1ee20509510e"
"reference": "e1b32deb9efc48def0c76b876860ad36f2123e89"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/mailer/zipball/55a7cb8f8518d35e2a039daaec6e1ee20509510e",
"reference": "55a7cb8f8518d35e2a039daaec6e1ee20509510e",
"url": "https://api.github.com/repos/symfony/mailer/zipball/e1b32deb9efc48def0c76b876860ad36f2123e89",
"reference": "e1b32deb9efc48def0c76b876860ad36f2123e89",
"shasum": ""
},
"require": {
@ -5622,7 +5622,7 @@
"description": "Helps sending emails",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/mailer/tree/v6.1.4"
"source": "https://github.com/symfony/mailer/tree/v6.1.5"
},
"funding": [
{
@ -5638,20 +5638,20 @@
"type": "tidelift"
}
],
"time": "2022-08-03T05:16:05+00:00"
"time": "2022-08-29T06:58:39+00:00"
},
{
"name": "symfony/mime",
"version": "v6.1.4",
"version": "v6.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
"reference": "5d1de2d3c52f8ca469c488f4b9e007e9e9cee0b3"
"reference": "5ae192b9a39730435cfec025a499f79d05ac68a3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/5d1de2d3c52f8ca469c488f4b9e007e9e9cee0b3",
"reference": "5d1de2d3c52f8ca469c488f4b9e007e9e9cee0b3",
"url": "https://api.github.com/repos/symfony/mime/zipball/5ae192b9a39730435cfec025a499f79d05ac68a3",
"reference": "5ae192b9a39730435cfec025a499f79d05ac68a3",
"shasum": ""
},
"require": {
@ -5663,7 +5663,8 @@
"egulias/email-validator": "~3.0.0",
"phpdocumentor/reflection-docblock": "<3.2.2",
"phpdocumentor/type-resolver": "<1.4.0",
"symfony/mailer": "<5.4"
"symfony/mailer": "<5.4",
"symfony/serializer": "<5.4.14|>=6.0,<6.0.14|>=6.1,<6.1.6"
},
"require-dev": {
"egulias/email-validator": "^2.1.10|^3.1",
@ -5671,7 +5672,7 @@
"symfony/dependency-injection": "^5.4|^6.0",
"symfony/property-access": "^5.4|^6.0",
"symfony/property-info": "^5.4|^6.0",
"symfony/serializer": "^5.4|^6.0"
"symfony/serializer": "^5.4.14|~6.0.14|^6.1.6"
},
"type": "library",
"autoload": {
@ -5703,7 +5704,7 @@
"mime-type"
],
"support": {
"source": "https://github.com/symfony/mime/tree/v6.1.4"
"source": "https://github.com/symfony/mime/tree/v6.1.6"
},
"funding": [
{
@ -5719,7 +5720,7 @@
"type": "tidelift"
}
],
"time": "2022-08-19T14:27:04+00:00"
"time": "2022-10-07T08:04:03+00:00"
},
{
"name": "symfony/polyfill-ctype",
@ -6521,16 +6522,16 @@
},
{
"name": "symfony/routing",
"version": "v6.1.3",
"version": "v6.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
"reference": "ef9108b3a88045b7546e808fb404ddb073dd35ea"
"reference": "f8c1ebb43d0f39e5ecd12a732ba1952a3dd8455c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/ef9108b3a88045b7546e808fb404ddb073dd35ea",
"reference": "ef9108b3a88045b7546e808fb404ddb073dd35ea",
"url": "https://api.github.com/repos/symfony/routing/zipball/f8c1ebb43d0f39e5ecd12a732ba1952a3dd8455c",
"reference": "f8c1ebb43d0f39e5ecd12a732ba1952a3dd8455c",
"shasum": ""
},
"require": {
@ -6589,7 +6590,7 @@
"url"
],
"support": {
"source": "https://github.com/symfony/routing/tree/v6.1.3"
"source": "https://github.com/symfony/routing/tree/v6.1.5"
},
"funding": [
{
@ -6605,7 +6606,7 @@
"type": "tidelift"
}
],
"time": "2022-07-20T15:00:40+00:00"
"time": "2022-09-09T09:26:14+00:00"
},
{
"name": "symfony/service-contracts",
@ -6694,16 +6695,16 @@
},
{
"name": "symfony/string",
"version": "v6.1.4",
"version": "v6.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
"reference": "290972cad7b364e3befaa74ba0ec729800fb161c"
"reference": "7e7e0ff180d4c5a6636eaad57b65092014b61864"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/290972cad7b364e3befaa74ba0ec729800fb161c",
"reference": "290972cad7b364e3befaa74ba0ec729800fb161c",
"url": "https://api.github.com/repos/symfony/string/zipball/7e7e0ff180d4c5a6636eaad57b65092014b61864",
"reference": "7e7e0ff180d4c5a6636eaad57b65092014b61864",
"shasum": ""
},
"require": {
@ -6759,7 +6760,7 @@
"utf8"
],
"support": {
"source": "https://github.com/symfony/string/tree/v6.1.4"
"source": "https://github.com/symfony/string/tree/v6.1.6"
},
"funding": [
{
@ -6775,20 +6776,20 @@
"type": "tidelift"
}
],
"time": "2022-08-12T18:05:43+00:00"
"time": "2022-10-10T09:34:31+00:00"
},
{
"name": "symfony/translation",
"version": "v6.1.4",
"version": "v6.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "45d0f5bb8df7255651ca91c122fab604e776af03"
"reference": "e6cd330e5a072518f88d65148f3f165541807494"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/45d0f5bb8df7255651ca91c122fab604e776af03",
"reference": "45d0f5bb8df7255651ca91c122fab604e776af03",
"url": "https://api.github.com/repos/symfony/translation/zipball/e6cd330e5a072518f88d65148f3f165541807494",
"reference": "e6cd330e5a072518f88d65148f3f165541807494",
"shasum": ""
},
"require": {
@ -6855,7 +6856,7 @@
"description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/translation/tree/v6.1.4"
"source": "https://github.com/symfony/translation/tree/v6.1.6"
},
"funding": [
{
@ -6871,7 +6872,7 @@
"type": "tidelift"
}
],
"time": "2022-08-02T16:17:38+00:00"
"time": "2022-10-07T08:04:03+00:00"
},
{
"name": "symfony/translation-contracts",
@ -6956,16 +6957,16 @@
},
{
"name": "symfony/uid",
"version": "v6.1.3",
"version": "v6.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/uid.git",
"reference": "ea2ccf0fdb88c83e626105b68e5bab5c132d812b"
"reference": "e03519f7b1ce1d3c0b74f751892bb41d549a2d98"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/uid/zipball/ea2ccf0fdb88c83e626105b68e5bab5c132d812b",
"reference": "ea2ccf0fdb88c83e626105b68e5bab5c132d812b",
"url": "https://api.github.com/repos/symfony/uid/zipball/e03519f7b1ce1d3c0b74f751892bb41d549a2d98",
"reference": "e03519f7b1ce1d3c0b74f751892bb41d549a2d98",
"shasum": ""
},
"require": {
@ -7010,7 +7011,7 @@
"uuid"
],
"support": {
"source": "https://github.com/symfony/uid/tree/v6.1.3"
"source": "https://github.com/symfony/uid/tree/v6.1.5"
},
"funding": [
{
@ -7026,20 +7027,20 @@
"type": "tidelift"
}
],
"time": "2022-07-20T13:46:29+00:00"
"time": "2022-09-09T09:34:27+00:00"
},
{
"name": "symfony/var-dumper",
"version": "v6.1.3",
"version": "v6.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "d5a5e44a2260c5eb5e746bf4f1fbd12ee6ceb427"
"reference": "0f0adde127f24548e23cbde83bcaeadc491c551f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/d5a5e44a2260c5eb5e746bf4f1fbd12ee6ceb427",
"reference": "d5a5e44a2260c5eb5e746bf4f1fbd12ee6ceb427",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/0f0adde127f24548e23cbde83bcaeadc491c551f",
"reference": "0f0adde127f24548e23cbde83bcaeadc491c551f",
"shasum": ""
},
"require": {
@ -7098,7 +7099,7 @@
"dump"
],
"support": {
"source": "https://github.com/symfony/var-dumper/tree/v6.1.3"
"source": "https://github.com/symfony/var-dumper/tree/v6.1.6"
},
"funding": [
{
@ -7114,7 +7115,7 @@
"type": "tidelift"
}
],
"time": "2022-07-20T13:46:29+00:00"
"time": "2022-10-07T08:04:03+00:00"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
@ -8875,16 +8876,16 @@
},
{
"name": "laravel/dusk",
"version": "v7.0.2",
"version": "v7.1.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/dusk.git",
"reference": "0fa48e86ad6234bd12ef92a12055e1236cec87dd"
"reference": "c7aacfabdf0883ba9a76c23a0d08b63dea2d0de8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/dusk/zipball/0fa48e86ad6234bd12ef92a12055e1236cec87dd",
"reference": "0fa48e86ad6234bd12ef92a12055e1236cec87dd",
"url": "https://api.github.com/repos/laravel/dusk/zipball/c7aacfabdf0883ba9a76c23a0d08b63dea2d0de8",
"reference": "c7aacfabdf0883ba9a76c23a0d08b63dea2d0de8",
"shasum": ""
},
"require": {
@ -8942,9 +8943,9 @@
],
"support": {
"issues": "https://github.com/laravel/dusk/issues",
"source": "https://github.com/laravel/dusk/tree/v7.0.2"
"source": "https://github.com/laravel/dusk/tree/v7.1.1"
},
"time": "2022-09-15T13:17:41+00:00"
"time": "2022-09-29T09:38:10+00:00"
},
{
"name": "laravel/pint",
@ -9014,16 +9015,16 @@
},
{
"name": "laravel/sail",
"version": "v1.16.0",
"version": "v1.16.2",
"source": {
"type": "git",
"url": "https://github.com/laravel/sail.git",
"reference": "73030c18b769f27e6f6aacf7848d024fa9a55560"
"reference": "7d1ed5f856ec8b9708712e3fc0708fcabe114659"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/sail/zipball/73030c18b769f27e6f6aacf7848d024fa9a55560",
"reference": "73030c18b769f27e6f6aacf7848d024fa9a55560",
"url": "https://api.github.com/repos/laravel/sail/zipball/7d1ed5f856ec8b9708712e3fc0708fcabe114659",
"reference": "7d1ed5f856ec8b9708712e3fc0708fcabe114659",
"shasum": ""
},
"require": {
@ -9070,7 +9071,7 @@
"issues": "https://github.com/laravel/sail/issues",
"source": "https://github.com/laravel/sail"
},
"time": "2022-08-31T16:38:14+00:00"
"time": "2022-09-28T13:13:22+00:00"
},
{
"name": "maximebf/debugbar",
@ -9322,16 +9323,16 @@
},
{
"name": "nunomaduro/collision",
"version": "v6.3.0",
"version": "v6.3.1",
"source": {
"type": "git",
"url": "https://github.com/nunomaduro/collision.git",
"reference": "17f600e2e8872856ff2846243efb74ad4b6da531"
"reference": "0f6349c3ed5dd28467087b08fb59384bb458a22b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nunomaduro/collision/zipball/17f600e2e8872856ff2846243efb74ad4b6da531",
"reference": "17f600e2e8872856ff2846243efb74ad4b6da531",
"url": "https://api.github.com/repos/nunomaduro/collision/zipball/0f6349c3ed5dd28467087b08fb59384bb458a22b",
"reference": "0f6349c3ed5dd28467087b08fb59384bb458a22b",
"shasum": ""
},
"require": {
@ -9406,7 +9407,7 @@
"type": "patreon"
}
],
"time": "2022-08-29T09:11:20+00:00"
"time": "2022-09-29T12:29:49+00:00"
},
{
"name": "openlss/lib-array2xml",
@ -10117,16 +10118,16 @@
},
{
"name": "phpunit/phpunit",
"version": "9.5.24",
"version": "9.5.25",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5"
"reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d0aa6097bef9fd42458a9b3c49da32c6ce6129c5",
"reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d",
"reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d",
"shasum": ""
},
"require": {
@ -10148,14 +10149,14 @@
"phpunit/php-timer": "^5.0.2",
"sebastian/cli-parser": "^1.0.1",
"sebastian/code-unit": "^1.0.6",
"sebastian/comparator": "^4.0.5",
"sebastian/comparator": "^4.0.8",
"sebastian/diff": "^4.0.3",
"sebastian/environment": "^5.1.3",
"sebastian/exporter": "^4.0.3",
"sebastian/exporter": "^4.0.5",
"sebastian/global-state": "^5.0.1",
"sebastian/object-enumerator": "^4.0.3",
"sebastian/resource-operations": "^3.0.3",
"sebastian/type": "^3.1",
"sebastian/type": "^3.2",
"sebastian/version": "^3.0.2"
},
"suggest": {
@ -10199,7 +10200,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.24"
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.25"
},
"funding": [
{
@ -10209,9 +10210,13 @@
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
"type": "tidelift"
}
],
"time": "2022-08-30T07:42:16+00:00"
"time": "2022-09-25T03:44:45+00:00"
},
{
"name": "pimple/pimple",
@ -11487,16 +11492,16 @@
},
{
"name": "spatie/laravel-ignition",
"version": "1.5.0",
"version": "1.5.1",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-ignition.git",
"reference": "192962f4d84526f6868c512530c00633e3165749"
"reference": "75d465ec577abb432af1ca9b33683d5a6e921eb9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/192962f4d84526f6868c512530c00633e3165749",
"reference": "192962f4d84526f6868c512530c00633e3165749",
"url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/75d465ec577abb432af1ca9b33683d5a6e921eb9",
"reference": "75d465ec577abb432af1ca9b33683d5a6e921eb9",
"shasum": ""
},
"require": {
@ -11573,7 +11578,7 @@
"type": "github"
}
],
"time": "2022-09-16T13:45:54+00:00"
"time": "2022-10-04T10:14:31+00:00"
},
{
"name": "spatie/laravel-ray",
@ -11981,16 +11986,16 @@
},
{
"name": "vimeo/psalm",
"version": "4.27.0",
"version": "4.29.0",
"source": {
"type": "git",
"url": "https://github.com/vimeo/psalm.git",
"reference": "faf106e717c37b8c81721845dba9de3d8deed8ff"
"reference": "7ec5ffbd5f68ae03782d7fd33fff0c45a69f95b3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/vimeo/psalm/zipball/faf106e717c37b8c81721845dba9de3d8deed8ff",
"reference": "faf106e717c37b8c81721845dba9de3d8deed8ff",
"url": "https://api.github.com/repos/vimeo/psalm/zipball/7ec5ffbd5f68ae03782d7fd33fff0c45a69f95b3",
"reference": "7ec5ffbd5f68ae03782d7fd33fff0c45a69f95b3",
"shasum": ""
},
"require": {
@ -12029,6 +12034,7 @@
"phpdocumentor/reflection-docblock": "^5",
"phpmyadmin/sql-parser": "5.1.0||dev-master",
"phpspec/prophecy": ">=1.9.0",
"phpstan/phpdoc-parser": "1.2.* || 1.6.4",
"phpunit/phpunit": "^9.0",
"psalm/plugin-phpunit": "^0.16",
"slevomat/coding-standard": "^7.0",
@ -12082,9 +12088,9 @@
],
"support": {
"issues": "https://github.com/vimeo/psalm/issues",
"source": "https://github.com/vimeo/psalm/tree/4.27.0"
"source": "https://github.com/vimeo/psalm/tree/4.29.0"
},
"time": "2022-08-31T13:47:09+00:00"
"time": "2022-10-11T17:09:17+00:00"
},
{
"name": "webmozart/path-util",

558
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -6,26 +6,26 @@
"license": "CC0-1.0",
"dependencies": {
"normalize.css": "^8.0.1",
"puppeteer": "^18.0.5"
"puppeteer": "^18.2.1"
},
"devDependencies": {
"@babel/core": "^7.19.1",
"@babel/preset-env": "^7.19.1",
"@babel/core": "^7.19.3",
"@babel/preset-env": "^7.19.4",
"autoprefixer": "^10.4.12",
"babel-loader": "^8.2.1",
"browserlist": "^1.0.1",
"compression-webpack-plugin": "^10.0.0",
"css-loader": "^6.2.0",
"cssnano": "^5.1.13",
"eslint": "^8.23.1",
"eslint": "^8.25.0",
"eslint-webpack-plugin": "^3.2.0",
"mini-css-extract-plugin": "^2.6.1",
"postcss": "^8.4.16",
"postcss": "^8.4.18",
"postcss-combine-duplicated-selectors": "^10.0.2",
"postcss-combine-media-query": "^1.0.1",
"postcss-import": "^15.0.0",
"postcss-loader": "^7.0.1",
"stylelint": "^14.12.1",
"stylelint": "^14.13.0",
"stylelint-config-standard": "^28.0.0",
"stylelint-webpack-plugin": "^3.1.1",
"webpack": "^5.74.0",

View file

@ -31,16 +31,15 @@ class TokenEndpointTest extends TestCase
$mockGuzzleClient = new Client(['handler' => $handlerStack]);
$this->app->instance(Client::class, $mockGuzzleClient);
$response = $this->post('/api/token', [
'me' => config('app.url'),
'code' => 'abc123',
'redirect_uri' => config('app.url') . '/indieauth-callback',
'client_id' => config('app.url') . '/micropub-client',
'state' => random_int(1000, 10000),
]);
$response->assertJson([
'me' => config('app.url'),
'scope' => 'create update',
'grant_type' => 'authorization_code',
'code' => '1234567890',
'redirect_uri' => 'https://example.com/auth/callback',
'client_id' => 'https://example.com',
'code_verifier' => '1234567890',
]);
$this->assertSame(config('app.url'), $response->json('me'));
$this->assertNotEmpty($response->json('access_token'));
}
/**