You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@isis.apache.org by da...@apache.org on 2021/04/10 17:30:40 UTC

[isis] 01/01: Merge branch 'ISIS-2605'

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 81608750e282539916a8d62d16b25daa9ddb5f5d
Merge: cccf7c6 224fe26
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Apr 10 18:30:14 2021 +0100

    Merge branch 'ISIS-2605'

 .../pages/index/annotation/ActionLayout.adoc       |   2 -
 .../pages/index/annotation/CollectionLayout.adoc   |   2 -
 .../pages/index/annotation/PropertyLayout.adoc     |   2 -
 .../pages/index/services/user/UserMemento.adoc     |   1 +
 .../impl/IsisModuleExtJaxRsClientImpl.adoc         |  12 ++
 .../authconverters/AuthenticationConverter.adoc    |  37 ++++++
 .../partials/_application-layer-spi.adoc           |   6 +
 .../modules/applib-svc/partials/module-nav.adoc    |   2 -
 .../isis/applib/services/user/UserMemento.java     |   7 ++
 security/spring/pom.xml                            |  30 +++--
 security/spring/src/main/adoc/antora.yml           |   2 +-
 .../src/main/adoc/modules/spring/pages/about.adoc  | 132 ++-------------------
 .../security/spring/IsisModuleSecuritySpring.java  |  18 ++-
 .../authconverters/AuthenticationConverter.java    |  55 +++++++++
 ...nticationConverterOfAuthenticatedPrincipal.java |  26 ++++
 ...thenticationConverterOfOAuth2UserPrincipal.java |  51 ++++++++
 .../AuthenticationConverterOfStringPrincipal.java  |  26 ++++
 ...henticationConverterOfUserDetailsPrincipal.java |  27 +++++
 .../spring/webmodule/SpringSecurityFilter.java     |  44 +++++--
 19 files changed, 332 insertions(+), 150 deletions(-)