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.

Sign up for GitHub

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

Jump to bottom

Fixes for legacy solid apps (poddit launcher in solid-nextcloud) #140

Merged
merged 18 commits into from
Jan 17, 2024
Merged

Fixes for legacy solid apps (poddit launcher in solid-nextcloud) #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4133edb
update solid-auth-fetcher-bundle
ylebre Nov 16, 2023
f5c64e1
add storageUrl as a prefix for filename / container
ylebre Nov 16, 2023
37fc822
use oidcIssuer instead of webId
ylebre Nov 16, 2023
7de995c
add support for legacy ID token
ylebre Nov 16, 2023
513cdae
add bearer support
ylebre Nov 16, 2023
314cd1c
remove double trait bit
ylebre Nov 16, 2023
d5c2dba
case fix
ylebre Jan 17, 2024
d5745cf
also store the 'origin' as a client registration instead of only a hash.
ylebre Jan 17, 2024
23613ed
add liberal content security policy, add isset check for client_name …
ylebre Jan 17, 2024
438479e
fix sending headers
ylebre Jan 17, 2024
c2a14e2
whitespace
ylebre Jan 17, 2024
d2a5361
fix namespace syntax
ylebre Jan 17, 2024
5b6c363
handle clients that register with an URL
ylebre Jan 17, 2024
92e7cc8
remove error log
ylebre Jan 17, 2024
b829899
bump versions for solid-auth and solid-crud
ylebre Jan 17, 2024
b3d5256
dropping support for php 8.0
ylebre Jan 17, 2024
52a1b78
update composer.lock
ylebre Jan 17, 2024
d38df18
drop support for Nextcloud 24
ylebre Jan 17, 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
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
runs-on: ubuntu-latest
strategy:
matrix:
# For the latest version information see: https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule

Check warning on line 31 in .github/workflows/ci.yml

View workflow job for this annotation

GitHub Actions / lint-yaml 

31:121 [line-length] line too long (123 > 120 characters)

Check warning on line 31 in .github/workflows/ci.yml

View workflow job for this annotation

GitHub Actions / lint-yaml 

31:121 [line-length] line too long (123 > 120 characters)
# Versions before 22 are not tested as they run on PHP versions lower than 8.0
# Versions before 24 are not tested as they do not support `.well-known` entries
# Version 24 comes with PHP 8.0, which is no longer supported;
# Latest is not tested here, as that could cause failures unrelated to project changes
nextcloud_version:
- 24
- 25

steps:
Expand Down Expand Up @@ -67,7 +67,7 @@
.
docker push "ghcr.io/pdsinterop/solid-nextcloud:${{ env.TAG }}"
mkdir -p cache/solid-nextcloud
docker image save solid-nextcloud:${{ env.TAG }} --output ./cache/solid-nextcloud/${{ github.sha }}-${{ matrix.nextcloud_version }}.tar

Check warning on line 70 in .github/workflows/ci.yml

View workflow job for this annotation

GitHub Actions / lint-yaml 

70:121 [line-length] line too long (145 > 120 characters)

Check warning on line 70 in .github/workflows/ci.yml

View workflow job for this annotation

GitHub Actions / lint-yaml 

70:121 [line-length] line too long (145 > 120 characters)

solid-testsuite:
timeout-minutes: 30
Expand All @@ -80,15 +80,14 @@
fail-fast: false
matrix:
nextcloud_version:
- 24
- 25
test:
- 'solidtestsuite/solid-crud-tests:v7.0.5'
- 'solidtestsuite/web-access-control-tests:v7.1.0'
- 'solidtestsuite/webid-provider-tests:v2.1.0'

# Prevent EOL or non-stable versions of Nextcloud to fail the test-suite
continue-on-error: ${{ contains(fromJson('[24, 25]'), matrix.nextcloud_version) == false }}
continue-on-error: ${{ contains(fromJson('[25]'), matrix.nextcloud_version) == false }}

steps:
- name: Create docker tag from git reference
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependancy-security-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

strategy:
matrix:
php: ['8.0', '8.1']
php: ['8.1']

steps:
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/php-version-sniff.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
php-codesniffer:
strategy:
matrix:
php: [ '8.0', '8.1' ]
php: [ '8.1' ]
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions solid/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ IMPORTANT: See https://github.com/pdsinterop/solid-nextcloud/blob/main/INSTALL.m
<category>integration</category>
<bugs>https://github.com/pdsinterop/solid-nextcloud/issues</bugs>
<dependencies>
<nextcloud min-version="24" max-version="25"/>
<nextcloud min-version="25" max-version="25"/>
</dependencies>
<settings>
<admin>OCASolidSettings</admin>
<admin>\OCA\Solid\Settings</admin>
</settings>
<navigations>
<navigation>
Expand Down
6 changes: 3 additions & 3 deletions solid/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
}
],
"require": {
"php": "^8.0",
"php": "^8.1",
"ext-dom": "*",
"ext-json": "*",
"ext-mbstring": "*",
Expand All @@ -31,8 +31,8 @@
"lcobucci/jwt": "^4.1",
"pdsinterop/flysystem-nextcloud": "^0.2",
"pdsinterop/flysystem-rdf": "^0.5",
"pdsinterop/solid-auth": "v0.10.2",
"pdsinterop/solid-crud": "^0.7.1",
"pdsinterop/solid-auth": "v0.10.3",
"pdsinterop/solid-crud": "^0.7.3",
"psr/log": "^1.1"
},
"require-dev": {
Expand Down
Loading
Loading