Merge pull request #78 from pdsinterop/feature/nextcloud-24

Feature/nextcloud 24

Author: Potherca

Dockerfile

@@ -1,4 +1,4 @@
-FROM nextcloud:21
+FROM nextcloud:24.0.1
 COPY site.conf /etc/apache2/sites-enabled/000-default.conf
 RUN a2enmod ssl
 RUN mkdir /tls
@@ -18,7 +18,6 @@ ADD ./solid /usr/src/nextcloud/apps/solid
 # Run composer:
 WORKDIR /usr/src/nextcloud/apps/solid
 RUN ls
-RUN php /install/composer.phar require lcobucci/jwt:3.3.3
 RUN php /install/composer.phar update
 RUN php /install/composer.phar install --no-dev --prefer-dist
 WORKDIR /var/www/html

init.sh

@@ -3,7 +3,6 @@ export PHP_MEMORY_LIMIT="512M"
 php console.php maintenance:install --admin-user alice --admin-pass alice123
 php console.php status
 php console.php app:enable solid
-sed -i '96 i\  RewriteRule ^\\.well-known/openid-configuration /apps/solid/openid [R=302,L]' /var/www/html/.htaccess
 sed -i "25 i\    1 => 'server'," /var/www/html/config/config.php
 sed -i "26 i\    2 => 'nextcloud.local'," /var/www/html/config/config.php
 sed -i "27 i\    3 => 'thirdparty'," /var/www/html/config/config.php

site.conf

@@ -12,8 +12,8 @@
     Header always set Access-Control-Allow-Origin %{AccessControlAllowOrigin}e env=AccessControlAllowOrigin
 
     Header always set Access-Control-Allow-Credentials true
-    Header always set Access-Control-Allow-Headers "*, allow, authorization, content-type, dpop, slug"
+    Header always set Access-Control-Allow-Headers "*, allow, accept, authorization, content-type, dpop, slug"
     Header always set Access-Control-Allow-Methods "GET, PUT, POST, OPTIONS, DELETE, PATCH"
-    Header always set Accept-Patch: application/sparql-update
+    Header always set Accept-Patch: text/n3
     Header always set Access-Control-Expose-Headers "Authorization, User, Location, Link, Vary, Last-Modified, ETag, Accept-Patch, Accept-Post, Updates-Via, Allow, WAC-Allow, Content-Length, WWW-Authenticate, MS-Author-Via"
 </VirtualHost>

solid/appinfo/app.php

@@ -18,7 +18,7 @@ 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="15" max-version="25"/>
+        <nextcloud min-version="24" max-version="24"/>
     </dependencies>
     <settings>
         <admin>OCASolidSettings</admin>

solid/appinfo/info.xml

@@ -15,7 +15,6 @@
         ['name' => 'page#handleApproval', 'url' => '/sharing/{clientId}', 'verb' => 'POST'],
         ['name' => 'page#dataJson', 'url' => '/@{userId}/data.json', 'verb' => 'GET' ],
 
-        ['name' => 'server#openid', 'url' => '/openid', 'verb' => 'GET'],
         ['name' => 'server#cors', 'url' => '/{path}', 'verb' => 'OPTIONS', 'requirements' => array('path' => '.+') ],
         ['name' => 'server#authorize', 'url' => '/authorize', 'verb' => 'GET'],
         ['name' => 'server#jwks', 'url' => '/jwks', 'verb' => 'GET'],

solid/appinfo/routes.php

@@ -21,16 +21,17 @@
         }
     ],
     "require": {
-        "php": "^7.3",
+        "php": "^8.0",
         "ext-json": "*",
         "ext-openssl": "*",
-        "easyrdf/easyrdf": "^0.9.1",
-        "laminas/laminas-diactoros": "^2.4",
-        "lcobucci/jwt": "3.3.3",
-        "pdsinterop/flysystem-nextcloud":"^0.1",
-        "pdsinterop/flysystem-rdf": "^0.3",
-        "pdsinterop/solid-auth": "^v0.6.3",
-        "pdsinterop/solid-crud": "^0.3"
+        "easyrdf/easyrdf": "^1.1.1",
+        "laminas/laminas-diactoros": "^2.8",
+        "lcobucci/jwt": "^4.1",
+        "pdsinterop/flysystem-nextcloud":"^0.2",
+        "pdsinterop/flysystem-rdf": "^0.5",
+        "pdsinterop/solid-auth": "^0.7",
+        "pdsinterop/solid-crud": "^0.6",
+        "psr/log" : "^1.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^8 || ^9"