Merge branch 'develop' into cines_feature_pastis_integration (36d0ac0c) · Commits · dad / Cines Vitamui

Commit 36d0ac0c authored 3 years ago by

zikas96

Merge branch 'develop' into cines_feature_pastis_integration

No related branches found

No related tags found

3 merge requests!65Retour vitamui pull request,!64Retour commentaires vitamui pull request,!62Ajout de l'application pastis dans le portail des application web de vitam

Hide whitespace changes

Inline Side-by-side

Showing

Jenkinsfile 6 additions, 3 deletions

Jenkinsfile
api/api-archive-search/archive-search-commons/src/main/java/fr/gouv/vitamui/archives/search/common/dsl/VitamQueryHelper.java 0 additions, 44 deletions

.../vitamui/archives/search/common/dsl/VitamQueryHelper.java
api/api-archive-search/archive-search-commons/src/main/java/fr/gouv/vitamui/archives/search/common/dto/CriteriaValue.java 1 addition, 0 deletions

...ouv/vitamui/archives/search/common/dto/CriteriaValue.java
api/api-archive-search/archive-search-external/pom.xml 1 addition, 1 deletion

api/api-archive-search/archive-search-external/pom.xml
api/api-archive-search/archive-search-internal/pom.xml 1 addition, 1 deletion

api/api-archive-search/archive-search-internal/pom.xml
api/api-archive-search/archive-search-internal/src/main/java/fr/gouv/vitamui/archive/internal/server/service/ArchivesSearchFieldsQueryBuilderService.java 33 additions, 1 deletion

...rver/service/ArchivesSearchFieldsQueryBuilderService.java
api/api-iam/iam-commons/pom.xml 6 additions, 1 deletion

api/api-iam/iam-commons/pom.xml
api/api-iam/iam-commons/src/main/java/fr/gouv/vitamui/iam/common/dto/IdentityProviderDto.java 31 additions, 5 deletions

...a/fr/gouv/vitamui/iam/common/dto/IdentityProviderDto.java
api/api-iam/iam-commons/src/main/java/fr/gouv/vitamui/iam/common/utils/Pac4jClientBuilder.java 67 additions, 9 deletions

.../fr/gouv/vitamui/iam/common/utils/Pac4jClientBuilder.java
api/api-iam/iam-external/pom.xml 1 addition, 1 deletion

api/api-iam/iam-external/pom.xml
api/api-iam/iam-internal/pom.xml 33 additions, 1 deletion

api/api-iam/iam-internal/pom.xml
api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/config/ApiIamServerConfig.java 3 additions, 3 deletions

...itamui/iam/internal/server/config/ApiIamServerConfig.java
api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/idp/converter/IdentityProviderConverter.java 39 additions, 7 deletions

...ernal/server/idp/converter/IdentityProviderConverter.java
api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/idp/domain/IdentityProvider.java 31 additions, 5 deletions

...amui/iam/internal/server/idp/domain/IdentityProvider.java
api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/idp/service/IdentityProviderInternalService.java 48 additions, 11 deletions

...l/server/idp/service/IdentityProviderInternalService.java
api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/idp/service/SpMetadataGenerator.java 10 additions, 16 deletions

.../iam/internal/server/idp/service/SpMetadataGenerator.java
api/api-iam/iam-internal/src/main/resources/spring.properties 1 addition, 0 deletions

...api-iam/iam-internal/src/main/resources/spring.properties
api/api-iam/iam-internal/src/test/java/fr/gouv/vitamui/iam/internal/server/idp/converter/IdentityProviderConverterTest.java 108 additions, 52 deletions

...l/server/idp/converter/IdentityProviderConverterTest.java
api/api-iam/iam-internal/src/test/java/fr/gouv/vitamui/iam/internal/server/idp/service/IdentityProviderInternalIntegrationTest.java 9 additions, 1 deletion

.../idp/service/IdentityProviderInternalIntegrationTest.java
api/api-iam/iam-internal/src/test/java/fr/gouv/vitamui/iam/internal/server/idp/service/IdentityProviderInternalServiceTest.java 20 additions, 0 deletions

...rver/idp/service/IdentityProviderInternalServiceTest.java

with 449 additions and 162 deletions

Please register or to comment