From 0e69ea57b3f9d1efb59038deae03663082a76042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Fri, 29 Nov 2024 09:20:23 +0100 Subject: [PATCH 1/3] Enable all request by default --- .../mapserver/mapserver.map.tmpl | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/mapserver/mapserver.map.tmpl b/geoportal/c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/mapserver/mapserver.map.tmpl index c632df76e8..70d772c17b 100644 --- a/geoportal/c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/mapserver/mapserver.map.tmpl +++ b/geoportal/c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/mapserver/mapserver.map.tmpl @@ -66,12 +66,11 @@ MAP END WEB METADATA - "wms_title" "changeme" - "wms_abstract" "changeme" + "ows_enable_request" "*" + "ows_title" "changeme" + "ows_abstract" "changeme" "ows_onlineresource" "${VISIBLE_WEB_PROTOCOL}://${VISIBLE_WEB_HOST}${VISIBLE_ENTRY_POINT}mapserv_proxy?ogcserver=MapServer" - "wms_srs" "EPSG:{{cookiecutter.srid}}" - "wms_enable_request" "*" - "wfs_enable_request" "!*" + "ows_srs" "EPSG:{{cookiecutter.srid}}" "wms_allow_getmap_without_styles" "true" END END From f295c2c0ff7d5db54b205dbe3a76340588188949 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Fri, 29 Nov 2024 09:28:27 +0100 Subject: [PATCH 2/3] Update OGC API documentation --- doc/integrator/ogc_api.rst | 6 ++++++ .../update/{{cookiecutter.project}}/CONST_CHANGELOG.txt | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/doc/integrator/ogc_api.rst b/doc/integrator/ogc_api.rst index fdf6c55229..5f46c2fc1c 100644 --- a/doc/integrator/ogc_api.rst +++ b/doc/integrator/ogc_api.rst @@ -26,6 +26,12 @@ e.g.: ``config://mapserver/mapserv_proxy/ExampleOGCserver``. It is also recommended for any server type, to remove all special characters in the OGC Server names because they appear in the path of the URL. +The OGC Server should have the same name than the alias and use the following URL: +``config://mapserver/mapserv_proxy/?MAP=``, where ```` is the name of the alias. +The alias is at two place in the URL to make working both the WMS and the OGC API. + +For QGIS Server, the URL didn't changes, it is ``config://qgisserver?MAP=``. + QGIS Server and MapServer are already configured to support the OGC API and detect automatically if the compatible path is requested. Landing pages for both MapServer and QGIS Server are not supported yet. diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/CONST_CHANGELOG.txt b/geoportal/c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/CONST_CHANGELOG.txt index 1544b6c808..41280ba843 100644 --- a/geoportal/c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/CONST_CHANGELOG.txt +++ b/geoportal/c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/CONST_CHANGELOG.txt @@ -23,7 +23,10 @@ Information to know before starting the upgrade - Update Webpack to version 5 and remove Babel transpilation to ES05, See the related pull request: https://github.com/camptocamp/ngeo/pull/9463. - Update FontAwesome to version 6, - See the related pull request: https://github.com/camptocamp/ngeo/pull/9470 + See the related pull request: https://github.com/camptocamp/ngeo/pull/9470. + +3. For the OGC API, the MapServer configuration changes, now multi map files are supported by default and the URL in + the admin interface should be updated, see the OGC APT - Features documentation for more information. Information =========== From 5fd37b658b33206bac02fd89216c93ce5b9a289e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Fri, 29 Nov 2024 09:35:57 +0100 Subject: [PATCH 3/3] Complete the OIDC documentation --- doc/integrator/authentication_oidc.rst | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/integrator/authentication_oidc.rst b/doc/integrator/authentication_oidc.rst index 4d56c7f0ac..c123ad7e9a 100644 --- a/doc/integrator/authentication_oidc.rst +++ b/doc/integrator/authentication_oidc.rst @@ -180,12 +180,16 @@ Implementation When we implement OpenID Connect, we have to possibilities: * Implement it in the backend. -* Implement it in the frontend, and give a token to the backend that allows to be authenticated on an other service. +* Implement it in the frontend, and give a token to the backend that allows to be authenticated + on an other service. In c2cgeoportal we have implemented booth method. The backend implementation is used by ngeo an the admin interface, where se store the user information (including the access and refresh token) in an encrypted JSON as a cookie. +To use the backend implementation, the ``/oidc/login`` endpoint should be called with +an optional ``came_from`` parameter to redirect the user after the login. -The frontend implementation is used by application like QGIS desktop, on every call we have to call the -user info endpoint to get the user information. +The frontend implementation is used by application like QGIS desktop, +on every call the Bearer Token should be provided in the Authorization header, +we have to call the user info endpoint to get the user information.