Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Full updates. #2600

Merged
merged 26 commits into from
Oct 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
23fd107
Bump ossf/scorecard-action from 2.3.1 to 2.4.0
dependabot[bot] Oct 26, 2024
53183f7
Bump actions/checkout from 4.1.1 to 4.2.2
dependabot[bot] Oct 26, 2024
cd98dbf
Bump shivammathur/setup-php from 2.30.0 to 2.31.1
dependabot[bot] Oct 26, 2024
b88c6ad
Bump sass from 1.80.3 to 1.80.4
dependabot[bot] Oct 26, 2024
97c5bf5
Bump actions/setup-node from 4.0.2 to 4.1.0
dependabot[bot] Oct 26, 2024
cb7e042
Bump actions/upload-artifact from 4.3.1 to 4.4.3
dependabot[bot] Oct 26, 2024
e60de6e
Bump @vitejs/plugin-vue from 4.6.2 to 5.1.4
dependabot[bot] Oct 26, 2024
d0eb75d
Bump symfony/cache from 6.4.12 to 7.1.5
dependabot[bot] Oct 26, 2024
0d18ed2
Bump @types/node from 20.16.15 to 22.8.1
dependabot[bot] Oct 26, 2024
d9c3d46
Bump leaflet-gpx from 1.7.0 to 2.1.2
dependabot[bot] Oct 26, 2024
de74c5d
Bump laragear/webauthn from 2.0.3 to 3.1.0
dependabot[bot] Oct 26, 2024
c12d419
Bump vue-i18n from 9.14.1 to 10.0.4
dependabot[bot] Oct 26, 2024
980de77
Bump bepsvpt/secure-headers from 7.5.0 to 8.0.0
dependabot[bot] Oct 26, 2024
bd3abc3
Merge branch 'dependabot/github_actions/actions/upload-artifact-4.4.3…
ildyria Oct 26, 2024
dc607ab
Merge branch 'dependabot/github_actions/actions/setup-node-4.1.0' int…
ildyria Oct 26, 2024
b24fec6
Merge branch 'dependabot/github_actions/shivammathur/setup-php-2.31.1…
ildyria Oct 26, 2024
b7990c0
Merge branch 'dependabot/github_actions/ossf/scorecard-action-2.4.0' …
ildyria Oct 26, 2024
c49ceb5
Merge branch 'dependabot/composer/bepsvpt/secure-headers-8.0.0' into …
ildyria Oct 26, 2024
011443f
Merge branch 'dependabot/composer/laragear/webauthn-3.1.0' into compo…
ildyria Oct 26, 2024
5769f08
Merge branch 'dependabot/composer/symfony/cache-7.1.5' into composer-…
ildyria Oct 26, 2024
df7114f
fix phpstan & tests
ildyria Oct 26, 2024
5471883
Merge branch 'dependabot/npm_and_yarn/sass-1.80.4' into npm-updates
ildyria Oct 26, 2024
b624d09
Merge branch 'dependabot/npm_and_yarn/types/node-22.8.1' into npm-upd…
ildyria Oct 26, 2024
34943f6
Merge branch 'dependabot/npm_and_yarn/leaflet-gpx-2.1.2' into npm-upd…
ildyria Oct 26, 2024
c562d0f
Merge branch 'dependabot/npm_and_yarn/vitejs/plugin-vue-5.1.4' into n…
ildyria Oct 26, 2024
4e936d9
Merge branch 'dependabot/npm_and_yarn/vue-i18n-10.0.4' into npm-updates
ildyria Oct 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/CICD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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 }}
Expand All @@ -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

Expand All @@ -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
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/CICD_no_legacy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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: |
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand All @@ -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

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/js_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/php_dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/php_no_legacy_dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/php_no_legacy_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/php_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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 }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 4 additions & 1 deletion app/Http/Controllers/WebAuthn/WebAuthnLoginController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": {
Expand Down
Loading