diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index 3d2e052fb42..2eb7809d1b4 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -49,12 +49,12 @@ jobs: egress-policy: audit - name: Setup PHP Action - uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # 2.30.0 + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # 2.31.1 with: php-version: 8.2 - name: Checkout code - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Install dependencies uses: ramsey/composer-install@57532f8be5bda426838819c5ee9afb8af389d51a # 3.0.0 @@ -74,12 +74,12 @@ jobs: egress-policy: audit - name: Set up PHP - uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # 2.30.0 + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # 2.31.1 with: php-version: 8.2 - name: Checkout code - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Install dependencies uses: ramsey/composer-install@57532f8be5bda426838819c5ee9afb8af389d51a # 3.0.0 @@ -105,10 +105,10 @@ jobs: egress-policy: audit - name: Checkout code - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Setup PHP - uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # 2.30.0 + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # 2.31.1 with: php-version: 8.2 coverage: none @@ -169,10 +169,10 @@ jobs: egress-policy: audit - name: Checkout code - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Setup PHP - uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # 2.30.0 + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # 2.31.1 with: php-version: 8.2 extensions: ${{ env.extensions }} @@ -184,7 +184,7 @@ jobs: composer-options: --no-dev - name: Use Node.js 20 - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 + uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 with: node-version: 20 @@ -199,7 +199,7 @@ jobs: make clean dist - name: Upload a Build Artifact - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 with: name: Lychee-Dist.zip path: Lychee.zip diff --git a/.github/workflows/CICD_no_legacy.yml b/.github/workflows/CICD_no_legacy.yml index beafdb9bd71..57c8df3fa2b 100644 --- a/.github/workflows/CICD_no_legacy.yml +++ b/.github/workflows/CICD_no_legacy.yml @@ -49,12 +49,12 @@ jobs: egress-policy: audit - name: Setup PHP Action - uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # 2.30.0 + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # 2.31.1 with: php-version: 8.2 - name: Checkout code - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Removing legacy files run: | @@ -78,12 +78,12 @@ jobs: egress-policy: audit - name: Set up PHP - uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # 2.30.0 + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # 2.31.1 with: php-version: 8.2 - name: Checkout code - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Removing legacy files run: | @@ -113,14 +113,14 @@ jobs: egress-policy: audit - name: Checkout code - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Removing legacy files run: | sh scripts/delete_legacy.sh - name: Setup PHP - uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # 2.30.0 + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # 2.31.1 with: php-version: 8.2 coverage: none @@ -168,14 +168,14 @@ jobs: egress-policy: audit - name: Checkout code - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Removing legacy files run: | sh scripts/delete_legacy.sh - name: Setup PHP - uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # 2.30.0 + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # 2.31.1 with: php-version: 8.2 extensions: ${{ env.extensions }} @@ -187,7 +187,7 @@ jobs: composer-options: --no-dev - name: Use Node.js 20 - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 + uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 with: node-version: 20 @@ -202,7 +202,7 @@ jobs: make clean dist - name: Upload a Build Artifact - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 with: name: Lychee-Dist.zip path: Lychee.zip diff --git a/.github/workflows/js_check.yml b/.github/workflows/js_check.yml index c3370b07d86..5248d26deb2 100644 --- a/.github/workflows/js_check.yml +++ b/.github/workflows/js_check.yml @@ -19,10 +19,10 @@ jobs: egress-policy: audit - name: Checkout code - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 + uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 with: node-version: ${{ matrix.node-version }} diff --git a/.github/workflows/php_dist.yml b/.github/workflows/php_dist.yml index fcc864bdd64..136e88d630a 100644 --- a/.github/workflows/php_dist.yml +++ b/.github/workflows/php_dist.yml @@ -43,7 +43,7 @@ jobs: egress-policy: audit - name: Checkout code - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Set Up Imagick, FFmpeg & Exiftools run: | @@ -58,7 +58,7 @@ jobs: mysql -uroot -proot -e 'create database homestead_test;' - name: Setup PHP Action - uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # 2.30.0 + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # 2.31.1 with: php-version: ${{ matrix.php-version }} extensions: ${{ env.extensions }} diff --git a/.github/workflows/php_no_legacy_dist.yml b/.github/workflows/php_no_legacy_dist.yml index f853ab74953..ca7c42cd5a6 100644 --- a/.github/workflows/php_no_legacy_dist.yml +++ b/.github/workflows/php_no_legacy_dist.yml @@ -43,7 +43,7 @@ jobs: egress-policy: audit - name: Checkout code - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Removing legacy files run: | @@ -62,7 +62,7 @@ jobs: mysql -uroot -proot -e 'create database homestead_test;' - name: Setup PHP Action - uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # 2.30.0 + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # 2.31.1 with: php-version: ${{ matrix.php-version }} extensions: ${{ env.extensions }} diff --git a/.github/workflows/php_no_legacy_tests.yml b/.github/workflows/php_no_legacy_tests.yml index 66e81f82063..10b43e3c9c1 100644 --- a/.github/workflows/php_no_legacy_tests.yml +++ b/.github/workflows/php_no_legacy_tests.yml @@ -60,7 +60,7 @@ jobs: egress-policy: audit - name: Checkout code - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Removing legacy files run: | @@ -79,7 +79,7 @@ jobs: mysql -uroot -proot -e 'create database homestead_test;' - name: Setup PHP Action - uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # 2.30.0 + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # 2.31.1 with: php-version: ${{ matrix.php-version }} extensions: ${{ env.extensions }} diff --git a/.github/workflows/php_tests.yml b/.github/workflows/php_tests.yml index f208f369e6c..625f43cfcb4 100644 --- a/.github/workflows/php_tests.yml +++ b/.github/workflows/php_tests.yml @@ -60,7 +60,7 @@ jobs: egress-policy: audit - name: Checkout code - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Set Up Imagick, FFmpeg & Exiftools run: | @@ -75,7 +75,7 @@ jobs: mysql -uroot -proot -e 'create database homestead_test;' - name: Setup PHP Action - uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # 2.30.0 + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # 2.31.1 with: php-version: ${{ matrix.php-version }} extensions: ${{ env.extensions }} diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 7b287cfa75d..d7b7af9042e 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -37,12 +37,12 @@ jobs: egress-policy: audit - name: "Checkout code" - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1 + uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0 with: results_file: results.sarif results_format: sarif @@ -64,7 +64,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 with: name: SARIF file path: results.sarif diff --git a/app/Http/Controllers/WebAuthn/WebAuthnLoginController.php b/app/Http/Controllers/WebAuthn/WebAuthnLoginController.php index da1651dbcf1..7572a5fad85 100644 --- a/app/Http/Controllers/WebAuthn/WebAuthnLoginController.php +++ b/app/Http/Controllers/WebAuthn/WebAuthnLoginController.php @@ -11,6 +11,7 @@ use Laragear\WebAuthn\Assertion\Validator\AssertionValidator; use Laragear\WebAuthn\Http\Requests\AssertedRequest; use Laragear\WebAuthn\Http\Requests\AssertionRequest; +use Laragear\WebAuthn\JsonTransport; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\HttpException; @@ -64,8 +65,10 @@ public function login(AssertedRequest $request, AssertionValidator $validator): throw new HttpException(Response::HTTP_UNPROCESSABLE_ENTITY, 'Associated user does not exists.'); } + $jsonTransport = new JsonTransport($request->only(AssertionValidation::REQUEST_KEYS)); + $credential = $validator - ->send(new AssertionValidation($request, $associatedUser)) + ->send(new AssertionValidation($jsonTransport, $associatedUser)) ->thenReturn() ->credential; diff --git a/composer.json b/composer.json index be37248e8c4..b819927f5e5 100644 --- a/composer.json +++ b/composer.json @@ -49,13 +49,13 @@ "ext-pdo": "*", "ext-tokenizer": "*", "ext-xml": "*", - "bepsvpt/secure-headers": "^7.2", + "bepsvpt/secure-headers": "^8.0", "doctrine/dbal": "^3.1", "geocoder-php/cache-provider": "^4.3", "geocoder-php/nominatim-provider": "^5.5", "graham-campbell/markdown": "^15.0", "laminas/laminas-text": "^2.9", - "laragear/webauthn": "^2.0", + "laragear/webauthn": "^3.1", "laravel/framework": "^11.0", "laravel/socialite": "^5.11", "league/flysystem-aws-s3-v3": "^3.22", @@ -82,7 +82,7 @@ "spatie/laravel-feed": "^4.0", "spatie/laravel-image-optimizer": "^1.8", "spatie/laravel-typescript-transformer": "^2.4", - "symfony/cache": "^v6.0.0", + "symfony/cache": "^v7.1.5", "thecodingmachine/safe": "^2.4" }, "require-dev": { diff --git a/composer.lock b/composer.lock index a66a56234ec..112654c9054 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "98c3bd77cb220e44b8187f60936e80fd", + "content-hash": "944eebb86d8d8411624c23982cf8a9c4", "packages": [ { "name": "amphp/amp", @@ -921,16 +921,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.324.9", + "version": "3.324.11", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "e6cb2597e6365c420f42d218a3a4e82a20df700d" + "reference": "a667ca29db288af083c3d8cff2e7f32d89fd4cf0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/e6cb2597e6365c420f42d218a3a4e82a20df700d", - "reference": "e6cb2597e6365c420f42d218a3a4e82a20df700d", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a667ca29db288af083c3d8cff2e7f32d89fd4cf0", + "reference": "a667ca29db288af083c3d8cff2e7f32d89fd4cf0", "shasum": "" }, "require": { @@ -1013,30 +1013,30 @@ "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.324.9" + "source": "https://github.com/aws/aws-sdk-php/tree/3.324.11" }, - "time": "2024-10-23T18:06:30+00:00" + "time": "2024-10-25T18:07:16+00:00" }, { "name": "bepsvpt/secure-headers", - "version": "7.5.0", + "version": "8.0.0", "source": { "type": "git", "url": "https://github.com/bepsvpt/secure-headers.git", - "reference": "946c4050bae960ccc50579dd2d24a2ca3cb7cdf9" + "reference": "d2a520195221eac497c753893eb03c81572ab330" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bepsvpt/secure-headers/zipball/946c4050bae960ccc50579dd2d24a2ca3cb7cdf9", - "reference": "946c4050bae960ccc50579dd2d24a2ca3cb7cdf9", + "url": "https://api.github.com/repos/bepsvpt/secure-headers/zipball/d2a520195221eac497c753893eb03c81572ab330", + "reference": "d2a520195221eac497c753893eb03c81572ab330", "shasum": "" }, "require": { + "ext-json": "*", "php": "^7.0 || ^8.0" }, "require-dev": { "ergebnis/composer-normalize": "^2.42", - "ext-json": "*", "ext-xdebug": "*", "laravel/pint": "^1.14", "orchestra/testbench": "^3.1 || ^4.18 || ^5.20 || ^6.43 || ^7.41 || ^8.22 || ^9.0", @@ -1066,7 +1066,7 @@ "authors": [ { "name": "bepsvpt", - "email": "og7lsrszah6y3lz@infinitefa.email" + "email": "6ibrl@cpp.tw" } ], "description": "Add security related headers to HTTP response. The package includes Service Providers for easy Laravel integration.", @@ -1085,7 +1085,7 @@ ], "support": { "issues": "https://github.com/bepsvpt/secure-headers/issues", - "source": "https://github.com/bepsvpt/secure-headers/tree/7.5.0" + "source": "https://github.com/bepsvpt/secure-headers/tree/8.0.0" }, "funding": [ { @@ -1093,7 +1093,7 @@ "type": "open_collective" } ], - "time": "2024-03-14T01:20:05+00:00" + "time": "2024-10-13T11:50:22+00:00" }, { "name": "brick/math", @@ -3351,16 +3351,16 @@ }, { "name": "laragear/webauthn", - "version": "v2.0.3", + "version": "v3.1.0", "source": { "type": "git", "url": "https://github.com/Laragear/WebAuthn.git", - "reference": "15b29db0edb0a12c0fa45c404e57b0d5f1789465" + "reference": "5136b8fee90abb5c0b50b644594fb3142191f3b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Laragear/WebAuthn/zipball/15b29db0edb0a12c0fa45c404e57b0d5f1789465", - "reference": "15b29db0edb0a12c0fa45c404e57b0d5f1789465", + "url": "https://api.github.com/repos/Laragear/WebAuthn/zipball/5136b8fee90abb5c0b50b644594fb3142191f3b9", + "reference": "5136b8fee90abb5c0b50b644594fb3142191f3b9", "shasum": "" }, "require": { @@ -3437,7 +3437,7 @@ "type": "Paypal" } ], - "time": "2024-03-18T22:38:29+00:00" + "time": "2024-08-15T07:50:06+00:00" }, { "name": "laravel/framework", @@ -8752,31 +8752,32 @@ }, { "name": "symfony/cache", - "version": "v6.4.12", + "version": "v7.1.5", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "a463451b7f6ac4a47b98dbfc78ec2d3560c759d8" + "reference": "86e5296b10e4dec8c8441056ca606aedb8a3be0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/a463451b7f6ac4a47b98dbfc78ec2d3560c759d8", - "reference": "a463451b7f6ac4a47b98dbfc78ec2d3560c759d8", + "url": "https://api.github.com/repos/symfony/cache/zipball/86e5296b10e4dec8c8441056ca606aedb8a3be0a", + "reference": "86e5296b10e4dec8c8441056ca606aedb8a3be0a", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "psr/cache": "^2.0|^3.0", "psr/log": "^1.1|^2|^3", "symfony/cache-contracts": "^2.5|^3", + "symfony/deprecation-contracts": "^2.5|^3.0", "symfony/service-contracts": "^2.5|^3", - "symfony/var-exporter": "^6.3.6|^7.0" + "symfony/var-exporter": "^6.4|^7.0" }, "conflict": { - "doctrine/dbal": "<2.13.1", - "symfony/dependency-injection": "<5.4", - "symfony/http-kernel": "<5.4", - "symfony/var-dumper": "<5.4" + "doctrine/dbal": "<3.6", + "symfony/dependency-injection": "<6.4", + "symfony/http-kernel": "<6.4", + "symfony/var-dumper": "<6.4" }, "provide": { "psr/cache-implementation": "2.0|3.0", @@ -8785,15 +8786,15 @@ }, "require-dev": { "cache/integration-tests": "dev-master", - "doctrine/dbal": "^2.13.1|^3|^4", + "doctrine/dbal": "^3.6|^4", "predis/predis": "^1.1|^2.0", "psr/simple-cache": "^1.0|^2.0|^3.0", - "symfony/config": "^5.4|^6.0|^7.0", - "symfony/dependency-injection": "^5.4|^6.0|^7.0", - "symfony/filesystem": "^5.4|^6.0|^7.0", - "symfony/http-kernel": "^5.4|^6.0|^7.0", - "symfony/messenger": "^5.4|^6.0|^7.0", - "symfony/var-dumper": "^5.4|^6.0|^7.0" + "symfony/config": "^6.4|^7.0", + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/filesystem": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/messenger": "^6.4|^7.0", + "symfony/var-dumper": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -8828,7 +8829,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v6.4.12" + "source": "https://github.com/symfony/cache/tree/v7.1.5" }, "funding": [ { @@ -8844,7 +8845,7 @@ "type": "tidelift" } ], - "time": "2024-09-16T16:01:33+00:00" + "time": "2024-09-17T09:16:35+00:00" }, { "name": "symfony/cache-contracts", diff --git a/package-lock.json b/package-lock.json index f90e7b282cf..484f59c472d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "laravel-vite-plugin": "^1.0.1", "laravel-vue-i18n": "^2.7.7", "leaflet": "^1.9.4", - "leaflet-gpx": "^1.7.0", + "leaflet-gpx": "^2.1.2", "leaflet-rotatedmarker": "^0.2.0", "leaflet.markercluster": "^1.5.3", "pinia": "^2.1.7", @@ -37,7 +37,7 @@ "vite-plugin-commonjs": "^0.10.1", "vue": "^3.2.37", "vue-collapsed": "^1.3.3", - "vue-i18n": "^9.2.0", + "vue-i18n": "^10.0.4", "vue-router": "^4.4.0" }, "devDependencies": { @@ -49,12 +49,12 @@ "@types/leaflet-rotatedmarker": "^0.2.5", "@types/leaflet.markercluster": "^1.5.4", "@types/mousetrap": "^1.6.15", - "@types/node": "^20.14.9", + "@types/node": "^22.8.1", "@types/photoswipe": "^4.1.6", "@types/qrcode": "^1.5.5", "@types/sprintf-js": "^1.1.4", - "@vitejs/plugin-vue": "^4.5.0", - "sass": "^1.77.6", + "@vitejs/plugin-vue": "^5.1.4", + "sass": "^1.80.4", "vue-tsc": "^2.0.24" } }, @@ -86,11 +86,11 @@ } }, "node_modules/@babel/parser": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.9.tgz", - "integrity": "sha512-aI3jjAAO1fh7vY/pBGsn1i9LDbRP43+asrRlkPuTXW5yHXtd1NgTEMudbBoDDxrf1daEEfPJqR+JBMakzrR4Dg==", + "version": "7.26.1", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.1.tgz", + "integrity": "sha512-reoQYNiAJreZNsJzyrDNzFQ+IQ5JFiIzAHJg9bn94S3l+4++J7RsIhNMoB+lgP/9tpmiAQqspv+xfdxTSzREOw==", "dependencies": { - "@babel/types": "^7.25.9" + "@babel/types": "^7.26.0" }, "bin": { "parser": "bin/babel-parser.js" @@ -100,9 +100,9 @@ } }, "node_modules/@babel/types": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.9.tgz", - "integrity": "sha512-OwS2CM5KocvQ/k7dFJa8i5bNGJP0hXWfVCfDkqRFP1IreH1JDC7wG6eCYCi0+McbfT8OR/kNqsI0UU0xP9H6PQ==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz", + "integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==", "dependencies": { "@babel/helper-string-parser": "^7.25.9", "@babel/helper-validator-identifier": "^7.25.9" @@ -465,12 +465,12 @@ } }, "node_modules/@intlify/core-base": { - "version": "9.14.1", - "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.14.1.tgz", - "integrity": "sha512-rG5/hlNW6Qfve41go37szEf0mVLcfhYuOu83JcY0jZKasnwsrcZYYWDzebCcuO5I/6Sy1JFWo9p+nvkQS1Dy+w==", + "version": "10.0.4", + "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-10.0.4.tgz", + "integrity": "sha512-GG428DkrrWCMhxRMRQZjuS7zmSUzarYcaHJqG9VB8dXAxw4iQDoKVQ7ChJRB6ZtsCsX3Jse1PEUlHrJiyQrOTg==", "dependencies": { - "@intlify/message-compiler": "9.14.1", - "@intlify/shared": "9.14.1" + "@intlify/message-compiler": "10.0.4", + "@intlify/shared": "10.0.4" }, "engines": { "node": ">= 16" @@ -480,11 +480,11 @@ } }, "node_modules/@intlify/message-compiler": { - "version": "9.14.1", - "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.14.1.tgz", - "integrity": "sha512-MY8hwukJBnXvGAncVKlHsqKDQ5ZcQx4peqEmI8wBUTXn4pezrtTGYXNoz81cLyEEHB+L/zlKWVBSh5TiX4gYoQ==", + "version": "10.0.4", + "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-10.0.4.tgz", + "integrity": "sha512-AFbhEo10DP095/45EauinQJ5hJ3rJUmuuqltGguvc3WsvezZN+g8qNHLGWKu60FHQVizMrQY7VJ+zVlBXlQQkQ==", "dependencies": { - "@intlify/shared": "9.14.1", + "@intlify/shared": "10.0.4", "source-map-js": "^1.0.2" }, "engines": { @@ -495,9 +495,9 @@ } }, "node_modules/@intlify/shared": { - "version": "9.14.1", - "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.14.1.tgz", - "integrity": "sha512-XjHu6PEQup9MnP1x0W9y0nXXfq9jFftAYSfV11hryjtH4XqXP8HrzMvXI+ZVifF+jZLszaTzIhvukllplxTQTg==", + "version": "10.0.4", + "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-10.0.4.tgz", + "integrity": "sha512-ukFn0I01HsSgr3VYhYcvkTCLS7rGa0gw4A4AMpcy/A9xx/zRJy7PS2BElMXLwUazVFMAr5zuiTk3MQeoeGXaJg==", "engines": { "node": ">= 16" }, @@ -1240,11 +1240,11 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.16.15", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.15.tgz", - "integrity": "sha512-DV58qQz9dBMqVVn+qnKwGa51QzCD4YM/tQM16qLKxdf5tqz5W4QwtrMzjSTbabN1cFTSuyxVYBy+QWHjWW8X/g==", + "version": "22.8.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.1.tgz", + "integrity": "sha512-k6Gi8Yyo8EtrNtkHXutUu2corfDf9su95VYVP10aGYMMROM6SAItZi0w1XszA6RtWTHSVp5OeFof37w0IEqCQg==", "dependencies": { - "undici-types": "~6.19.2" + "undici-types": "~6.19.8" } }, "node_modules/@types/photoswipe": { @@ -1274,40 +1274,40 @@ "integrity": "sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==" }, "node_modules/@vitejs/plugin-vue": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-4.6.2.tgz", - "integrity": "sha512-kqf7SGFoG+80aZG6Pf+gsZIVvGSCKE98JbiWqcCV9cThtg91Jav0yvYFC9Zb+jKetNGF6ZKeoaxgZfND21fWKw==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.1.4.tgz", + "integrity": "sha512-N2XSI2n3sQqp5w7Y/AN/L2XDjBIRGqXko+eDp42sydYSBeJuSm5a1sLf8zakmo8u7tA8NmBgoDLA1HeOESjp9A==", "dev": true, "engines": { - "node": "^14.18.0 || >=16.0.0" + "node": "^18.0.0 || >=20.0.0" }, "peerDependencies": { - "vite": "^4.0.0 || ^5.0.0", + "vite": "^5.0.0", "vue": "^3.2.25" } }, "node_modules/@volar/language-core": { - "version": "2.4.6", - "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.6.tgz", - "integrity": "sha512-FxUfxaB8sCqvY46YjyAAV6c3mMIq/NWQMVvJ+uS4yxr1KzOvyg61gAuOnNvgCvO4TZ7HcLExBEsWcDu4+K4E8A==", + "version": "2.4.8", + "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.8.tgz", + "integrity": "sha512-K/GxMOXGq997bO00cdFhTNuR85xPxj0BEEAy+BaqqayTmy9Tmhfgmq2wpJcVspRhcwfgPoE2/mEJa26emUhG/g==", "dev": true, "dependencies": { - "@volar/source-map": "2.4.6" + "@volar/source-map": "2.4.8" } }, "node_modules/@volar/source-map": { - "version": "2.4.6", - "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.6.tgz", - "integrity": "sha512-Nsh7UW2ruK+uURIPzjJgF0YRGP5CX9nQHypA2OMqdM2FKy7rh+uv3XgPnWPw30JADbKvZ5HuBzG4gSbVDYVtiw==", + "version": "2.4.8", + "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.8.tgz", + "integrity": "sha512-jeWJBkC/WivdelMwxKkpFL811uH/jJ1kVxa+c7OvG48DXc3VrP7pplSWPP2W1dLMqBxD+awRlg55FQQfiup4cA==", "dev": true }, "node_modules/@volar/typescript": { - "version": "2.4.6", - "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.6.tgz", - "integrity": "sha512-NMIrA7y5OOqddL9VtngPWYmdQU03htNKFtAYidbYfWA0TOhyGVd9tfcP4TsLWQ+RBWDZCbBqsr8xzU0ZOxYTCQ==", + "version": "2.4.8", + "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.8.tgz", + "integrity": "sha512-6xkIYJ5xxghVBhVywMoPMidDDAFT1OoQeXwa27HSgJ6AiIKRe61RXLoik+14Z7r0JvnblXVsjsRLmCr42SGzqg==", "dev": true, "dependencies": { - "@volar/language-core": "2.4.6", + "@volar/language-core": "2.4.8", "path-browserify": "^1.0.1", "vscode-uri": "^3.0.8" } @@ -1939,9 +1939,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001669", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001669.tgz", - "integrity": "sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w==", + "version": "1.0.30001671", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001671.tgz", + "integrity": "sha512-jocyVaSSfXg2faluE6hrWkMgDOiULBMca4QLtDT39hw1YxaIPHWc1CcTCKkPmHgGH6tKji6ZNbMSmUAvENf2/A==", "funding": [ { "type": "opencollective", @@ -2181,9 +2181,9 @@ "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" }, "node_modules/electron-to-chromium": { - "version": "1.5.43", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.43.tgz", - "integrity": "sha512-NxnmFBHDl5Sachd2P46O7UJiMaMHMLSofoIWVJq3mj8NJgG0umiSeljAVP9lGzjI0UDLJJ5jjoGjcrB8RSbjLQ==" + "version": "1.5.47", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.47.tgz", + "integrity": "sha512-zS5Yer0MOYw4rtK2iq43cJagHZ8sXN0jDHDKzB+86gSBSAI4v07S97mcq+Gs2vclAxSh1j7vOAHxSVgduiiuVQ==" }, "node_modules/emoji-regex": { "version": "9.2.2", @@ -2723,9 +2723,9 @@ "integrity": "sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==" }, "node_modules/leaflet-gpx": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/leaflet-gpx/-/leaflet-gpx-1.7.0.tgz", - "integrity": "sha512-5NS5WKfp5zaAHMB2KM6OUaIng+SZ3e/UHK2++ABl2wELojYlmLqIL8t1Mj6DaZGkIh3kld+mAUvMGdIzC1yGRA==" + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/leaflet-gpx/-/leaflet-gpx-2.1.2.tgz", + "integrity": "sha512-lKoEPlAWel9KXn9keg6Dmyt7gmj5IYyD8CKuxivN+77GpZr2bpKliwFvZJxLUHmNu4fICmCySyxhm5qjZuvvQg==" }, "node_modules/leaflet-rotatedmarker": { "version": "0.2.0", @@ -3520,9 +3520,9 @@ "peer": true }, "node_modules/sass": { - "version": "1.80.3", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.3.tgz", - "integrity": "sha512-ptDWyVmDMVielpz/oWy3YP3nfs7LpJTHIJZboMVs8GEC9eUmtZTZhMHlTW98wY4aEorDfjN38+Wr/XjskFWcfA==", + "version": "1.80.4", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.4.tgz", + "integrity": "sha512-rhMQ2tSF5CsuuspvC94nPM9rToiAFw2h3JTrLlgmNw1MH79v8Cr3DH6KF6o6r+8oofY3iYVPUf66KzC8yuVN1w==", "devOptional": true, "dependencies": { "@parcel/watcher": "^2.4.1", @@ -4187,12 +4187,12 @@ "integrity": "sha512-W92b+QT3n5iTrfrH6kyvx3TsriYPfy/Ymsb6DaanjeMkJYMdVl1S4wzKRYVDsxWQPDxiC+5m+UwPwT/8YAYodA==" }, "node_modules/vue-i18n": { - "version": "9.14.1", - "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.14.1.tgz", - "integrity": "sha512-xjxV0LYc1xQ8TbAVfIyZiOSS8qoU1R0YwV7V5I8I6Fd64+zvsTsdPgtylPsie3Vdt9wekeYhr+smKDeaK6RBuA==", + "version": "10.0.4", + "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-10.0.4.tgz", + "integrity": "sha512-1xkzVxqBLk2ZFOmeI+B5r1J7aD/WtNJ4j9k2mcFcQo5BnOmHBmD7z4/oZohh96AAaRZ4Q7mNQvxc9h+aT+Md3w==", "dependencies": { - "@intlify/core-base": "9.14.1", - "@intlify/shared": "9.14.1", + "@intlify/core-base": "10.0.4", + "@intlify/shared": "10.0.4", "@vue/devtools-api": "^6.5.0" }, "engines": { diff --git a/package.json b/package.json index d43f32deaa1..9c96e39d709 100644 --- a/package.json +++ b/package.json @@ -17,12 +17,12 @@ "@types/leaflet-rotatedmarker": "^0.2.5", "@types/leaflet.markercluster": "^1.5.4", "@types/mousetrap": "^1.6.15", - "@types/node": "^20.14.9", + "@types/node": "^22.8.1", "@types/photoswipe": "^4.1.6", "@types/qrcode": "^1.5.5", "@types/sprintf-js": "^1.1.4", - "@vitejs/plugin-vue": "^4.5.0", - "sass": "^1.77.6", + "@vitejs/plugin-vue": "^5.1.4", + "sass": "^1.80.4", "vue-tsc": "^2.0.24" }, "dependencies": { @@ -39,7 +39,7 @@ "laravel-vite-plugin": "^1.0.1", "laravel-vue-i18n": "^2.7.7", "leaflet": "^1.9.4", - "leaflet-gpx": "^1.7.0", + "leaflet-gpx": "^2.1.2", "leaflet-rotatedmarker": "^0.2.0", "leaflet.markercluster": "^1.5.3", "pinia": "^2.1.7", @@ -58,7 +58,7 @@ "vite-plugin-commonjs": "^0.10.1", "vue": "^3.2.37", "vue-collapsed": "^1.3.3", - "vue-i18n": "^9.2.0", + "vue-i18n": "^10.0.4", "vue-router": "^4.4.0" }, "browserslist": [ diff --git a/tests/Feature_v1/WebAuthTest.php b/tests/Feature_v1/WebAuthTest.php index 8cbcf9addab..015775d715a 100644 --- a/tests/Feature_v1/WebAuthTest.php +++ b/tests/Feature_v1/WebAuthTest.php @@ -16,7 +16,7 @@ use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Session; use Laragear\WebAuthn\ByteBuffer; -use Laragear\WebAuthn\Challenge; +use Laragear\WebAuthn\Challenge\Challenge; use Tests\AbstractTestCase; use Tests\Traits\RequiresEmptyWebAuthnCredentials; diff --git a/tests/Feature_v2/WebAuthTest.php b/tests/Feature_v2/WebAuthTest.php index 7ce64ca79e0..868ff02c786 100644 --- a/tests/Feature_v2/WebAuthTest.php +++ b/tests/Feature_v2/WebAuthTest.php @@ -15,7 +15,7 @@ use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Session; use Laragear\WebAuthn\ByteBuffer; -use Laragear\WebAuthn\Challenge; +use Laragear\WebAuthn\Challenge\Challenge; use Tests\Feature_v2\Base\BaseApiV2Test; class WebAuthTest extends BaseApiV2Test