Skip to content

Commit

Permalink
Merge pull request #11556 from camptocamp/backport/11555-to-master
Browse files Browse the repository at this point in the history
[Backport master] OGC API feature last fix and documentation
  • Loading branch information
sbrunner authored Nov 29, 2024
2 parents 9b942b3 + 5fd37b6 commit b7c318d
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 9 deletions.
10 changes: 7 additions & 3 deletions doc/integrator/authentication_oidc.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
6 changes: 6 additions & 0 deletions doc/integrator/ogc_api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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/<alias>?MAP=<alias>``, where ``<alias>`` 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=<project_file>``.

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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
===========
Expand Down

0 comments on commit b7c318d

Please sign in to comment.