Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ 19º ] - Release/v2.1.0 backend agree: Enabled policy selection and handling of more than one contract in the backend #205

Merged
merged 44 commits into from
Feb 2, 2024
Merged

[ 19º ] - Release/v2.1.0 backend agree: Enabled policy selection and handling of more than one contract in the backend #205

Show file tree
Hide file tree
Changes from 43 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
90ec283
Merge branch 'develop' of https://github.com/catenax-ng/tx-digital-pr…
saudkhan116 Jun 26, 2023
bc19394
Merge branch 'main' of https://github.com/catenax-ng/tx-digital-produ…
saudkhan116 Jul 4, 2023
11aa28f
Merge branch 'main' of https://github.com/catenax-ng/tx-digital-produ…
saudkhan116 Aug 18, 2023
f2fcdc2
Merge branch 'main' of https://github.com/catenax-ng/tx-digital-produ…
saudkhan116 Aug 22, 2023
ca85e2d
feat: updated models to fix new generic structures
Dec 5, 2023
1b78248
feat: added policy control by id
Dec 5, 2023
8e89ecf
feat: added policy selection
Dec 5, 2023
ff732fb
fix: renamed from '/sign' api to '/agree'
Dec 8, 2023
e30eddf
Merge branch 'bugfix/cmp-983/dtr-lookup' of https://github.com/catena…
saudkhan116 Dec 14, 2023
09a37b2
Merge branch 'catenax-ng-bugfix/cmp-983/dtr-lookup'
saudkhan116 Dec 14, 2023
fef3acc
merge: merge main and resolved conflicts
Jan 5, 2024
291606a
feat: adapted returns to more than one contract
Jan 5, 2024
51aa877
feat: started frontend refactor
Jan 5, 2024
dd026db
Merge branch 'main' of https://github.com/catenax-ng/tx-digital-produ…
saudkhan116 Jan 5, 2024
811279d
chore: remove passport aspects from dpp helm values to test trivy wor…
saudkhan116 Jan 5, 2024
67d27bf
Merge pull request #216 from catenax-ng/bugfix/trivy-check
saudkhan116 Jan 15, 2024
c0941c3
feat: added two steps negotiation
Jan 16, 2024
021bcf3
feat: added two steps negotiation in frontend
Jan 23, 2024
b28b0bd
fix: fix decline configuration and logic
Jan 23, 2024
244f3db
feat: configured token validation in backend
Jan 23, 2024
de9d9ea
fix: fixed token for decline api
Jan 23, 2024
8a0e659
chore: updated spring boot to version 3.2.2
Jan 26, 2024
f2a8a74
feat: added cancel api method to frontend
Jan 26, 2024
2a0a2d2
fix: added timetoleave and ignored extra fields in bpn, edc and disco…
Jan 29, 2024
1444ce9
chore: updated backend version
Jan 29, 2024
9132c5c
Merge branch 'develop' of https://github.com/catenax-ng/tx-digital-pr…
Jan 29, 2024
80d78df
fix: fixed merge conflicts
Jan 29, 2024
d33b4ec
chore: removed the version parameter
Jan 29, 2024
cdb22cc
feat: added dtr datasets storage in temporary dir until process creation
Jan 29, 2024
b59ae56
feat: added dtr to the status file
Jan 29, 2024
5e2c7db
feat: added dtr contracts and selected contract id
Jan 29, 2024
febce41
chore: updated vite to not vulnerable version and runned IP checks
Jan 30, 2024
5af9cb8
feat: added frontend option to reload
Jan 30, 2024
e0c12cc
fix: solved problem in frontend
Jan 30, 2024
57aef3f
chore: updated response message
Jan 30, 2024
d362f8b
chore: removed console.logs fro debugging
Jan 31, 2024
ca6d236
fix: fixed contract dataset retrival at end
Jan 31, 2024
36a1e06
Merge branch 'main' of https://github.com/catenax-ng/tx-digital-produ…
Jan 31, 2024
74162ad
fix: readedd tranmission pass aspect in frontend schemas
Jan 31, 2024
637609f
feat: re-added passport aspects with dpp v2.0.0
Jan 31, 2024
d294c85
chore: removed debugging logs
Feb 2, 2024
de2de2b
merge: solved all merged conflicts
Feb 2, 2024
9b4fee8
Merge pull request #203 from catenax-ng/feature/cmp-951/policy-selection
matbmoser Feb 2, 2024
860c3f8
merge: resolved conflict in merge
Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ repos:
- repo: https://github.com/gitguardian/ggshield
rev: v1.13.6
hooks:
# - id: ggshield
# language_version: python3
# stages: [commit]
- id: ggshield
language_version: python3
stages: [commit]
- id: ggshield
language_version: python3
stages: [push]
stages: [push]
102 changes: 51 additions & 51 deletions DEPENDENCIES_BACKEND
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,28 +27,28 @@ maven/mavencentral/commons-lang/commons-lang/2.6, Apache-2.0, approved, CQ6183
maven/mavencentral/commons-logging/commons-logging/1.2, Apache-2.0, approved, CQ10162
maven/mavencentral/commons-net/commons-net/3.9.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/io.github.classgraph/classgraph/4.8.149, MIT, approved, CQ22530
maven/mavencentral/io.micrometer/micrometer-commons/1.12.1, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #11679
maven/mavencentral/io.micrometer/micrometer-observation/1.12.1, Apache-2.0, approved, #11680
maven/mavencentral/io.netty/netty-buffer/4.1.104.Final, Apache-2.0, approved, CQ21842
maven/mavencentral/io.netty/netty-codec-dns/4.1.104.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
maven/mavencentral/io.netty/netty-codec-http/4.1.104.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
maven/mavencentral/io.netty/netty-codec-http2/4.1.104.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
maven/mavencentral/io.netty/netty-codec-socks/4.1.104.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
maven/mavencentral/io.netty/netty-codec/4.1.104.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
maven/mavencentral/io.netty/netty-common/4.1.104.Final, Apache-2.0 AND MIT AND CC0-1.0, approved, CQ21843
maven/mavencentral/io.netty/netty-handler-proxy/4.1.104.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
maven/mavencentral/io.netty/netty-handler/4.1.104.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
maven/mavencentral/io.netty/netty-resolver-dns-classes-macos/4.1.104.Final, Apache-2.0, approved, #6367
maven/mavencentral/io.netty/netty-resolver-dns-native-macos/4.1.104.Final, Apache-2.0, approved, #7004
maven/mavencentral/io.netty/netty-resolver-dns/4.1.104.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
maven/mavencentral/io.netty/netty-resolver/4.1.104.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
maven/mavencentral/io.netty/netty-transport-classes-epoll/4.1.104.Final, Apache-2.0, approved, #6366
maven/mavencentral/io.netty/netty-transport-native-epoll/4.1.104.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
maven/mavencentral/io.netty/netty-transport-native-unix-common/4.1.104.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
maven/mavencentral/io.netty/netty-transport/4.1.104.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
maven/mavencentral/io.projectreactor.netty/reactor-netty-core/1.1.14, Apache-2.0, approved, #5946
maven/mavencentral/io.projectreactor.netty/reactor-netty-http/1.1.14, Apache-2.0, approved, #6999
maven/mavencentral/io.projectreactor/reactor-core/3.6.1, Apache-2.0, approved, clearlydefined
maven/mavencentral/io.micrometer/micrometer-commons/1.12.2, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #11679
maven/mavencentral/io.micrometer/micrometer-observation/1.12.2, Apache-2.0, approved, #11680
maven/mavencentral/io.netty/netty-buffer/4.1.105.Final, Apache-2.0, approved, CQ21842
maven/mavencentral/io.netty/netty-codec-dns/4.1.105.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
maven/mavencentral/io.netty/netty-codec-http/4.1.105.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
maven/mavencentral/io.netty/netty-codec-http2/4.1.105.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
maven/mavencentral/io.netty/netty-codec-socks/4.1.105.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
maven/mavencentral/io.netty/netty-codec/4.1.105.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
maven/mavencentral/io.netty/netty-common/4.1.105.Final, Apache-2.0 AND MIT AND CC0-1.0, approved, CQ21843
maven/mavencentral/io.netty/netty-handler-proxy/4.1.105.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
maven/mavencentral/io.netty/netty-handler/4.1.105.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
maven/mavencentral/io.netty/netty-resolver-dns-classes-macos/4.1.105.Final, Apache-2.0, approved, #6367
maven/mavencentral/io.netty/netty-resolver-dns-native-macos/4.1.105.Final, Apache-2.0, approved, #7004
maven/mavencentral/io.netty/netty-resolver-dns/4.1.105.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
maven/mavencentral/io.netty/netty-resolver/4.1.105.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
maven/mavencentral/io.netty/netty-transport-classes-epoll/4.1.105.Final, Apache-2.0, approved, #6366
maven/mavencentral/io.netty/netty-transport-native-epoll/4.1.105.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
maven/mavencentral/io.netty/netty-transport-native-unix-common/4.1.105.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
maven/mavencentral/io.netty/netty-transport/4.1.105.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
maven/mavencentral/io.projectreactor.netty/reactor-netty-core/1.1.15, Apache-2.0, approved, #5946
maven/mavencentral/io.projectreactor.netty/reactor-netty-http/1.1.15, Apache-2.0, approved, #6999
maven/mavencentral/io.projectreactor/reactor-core/3.6.2, Apache-2.0, approved, clearlydefined
maven/mavencentral/io.swagger.core.v3/swagger-annotations-jakarta/2.2.7, Apache-2.0, approved, #5947
maven/mavencentral/io.swagger.core.v3/swagger-core-jakarta/2.2.7, Apache-2.0, approved, #5929
maven/mavencentral/io.swagger.core.v3/swagger-models-jakarta/2.2.7, Apache-2.0, approved, #5919
Expand All @@ -65,9 +65,9 @@ maven/mavencentral/org.apache.commons/commons-text/1.10.0, Apache-2.0, approved,
maven/mavencentral/org.apache.logging.log4j/log4j-api/2.21.1, Apache-2.0 AND (Apache-2.0 AND LGPL-2.0-or-later), approved, #11079
maven/mavencentral/org.apache.logging.log4j/log4j-core/2.21.1, Apache-2.0 AND (Apache-2.0 AND LGPL-2.0-or-later), approved, #12592
maven/mavencentral/org.apache.logging.log4j/log4j-to-slf4j/2.21.1, Apache-2.0, approved, #11919
maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/10.1.17, Apache-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND (CDDL-1.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND W3C AND CC0-1.0, approved, #5949
maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/10.1.17, Apache-2.0, approved, #6997
maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/10.1.17, Apache-2.0, approved, #7920
maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/10.1.18, Apache-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND (CDDL-1.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND W3C AND CC0-1.0, approved, #5949
maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/10.1.18, Apache-2.0, approved, #6997
maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/10.1.18, Apache-2.0, approved, #7920
maven/mavencentral/org.atteo/evo-inflector/1.3, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.bouncycastle/bcpkix-jdk15on/1.69, MIT, approved, clearlydefined
maven/mavencentral/org.bouncycastle/bcprov-jdk15on/1.69, MIT, approved, clearlydefined
Expand All @@ -76,34 +76,34 @@ maven/mavencentral/org.checkerframework/checker-qual/3.33.0, MIT, approved, clea
maven/mavencentral/org.codehaus.plexus/plexus-utils/3.2.1, , approved, CQ20774
maven/mavencentral/org.ow2.asm/asm/9.3, BSD-3-Clause, approved, clearlydefined
maven/mavencentral/org.reactivestreams/reactive-streams/1.0.4, CC0-1.0, approved, CQ16332
maven/mavencentral/org.slf4j/jul-to-slf4j/2.0.9, MIT, approved, #7698
maven/mavencentral/org.slf4j/slf4j-api/2.0.9, MIT, approved, #5915
maven/mavencentral/org.slf4j/jul-to-slf4j/2.0.11, MIT, approved, #7698
maven/mavencentral/org.slf4j/slf4j-api/2.0.11, MIT, approved, #5915
maven/mavencentral/org.sonarsource.scanner.api/sonar-scanner-api/2.16.2.588, LGPL-3.0-or-later, approved, #6945
maven/mavencentral/org.sonarsource.scanner.maven/sonar-maven-plugin/3.9.1.2184, LGPL-3.0-or-later, approved, #6944
maven/mavencentral/org.sonatype.plexus/plexus-cipher/1.4, Apache-2.0, approved, CQ4600
maven/mavencentral/org.sonatype.plexus/plexus-sec-dispatcher/1.4, Apache-2.0, approved, CQ16491
maven/mavencentral/org.springdoc/springdoc-openapi-starter-common/2.0.2, Apache-2.0, approved, #5920
maven/mavencentral/org.springdoc/springdoc-openapi-starter-webmvc-api/2.0.2, Apache-2.0, approved, #5950
maven/mavencentral/org.springdoc/springdoc-openapi-starter-webmvc-ui/2.0.2, Apache-2.0, approved, #5923
maven/mavencentral/org.springframework.boot/spring-boot-autoconfigure/3.2.1, Apache-2.0, approved, #11751
maven/mavencentral/org.springframework.boot/spring-boot-starter-data-rest/3.2.1, Apache-2.0, approved, #12594
maven/mavencentral/org.springframework.boot/spring-boot-starter-json/3.2.1, Apache-2.0, approved, #11894
maven/mavencentral/org.springframework.boot/spring-boot-starter-logging/3.2.1, Apache-2.0, approved, #11890
maven/mavencentral/org.springframework.boot/spring-boot-starter-oauth2-client/3.2.1, Apache-2.0, approved, #12587
maven/mavencentral/org.springframework.boot/spring-boot-starter-reactor-netty/3.2.1, Apache-2.0, approved, #12590
maven/mavencentral/org.springframework.boot/spring-boot-autoconfigure/3.2.2, Apache-2.0, approved, #11751
maven/mavencentral/org.springframework.boot/spring-boot-starter-data-rest/3.2.2, Apache-2.0, approved, #12594
maven/mavencentral/org.springframework.boot/spring-boot-starter-json/3.2.2, Apache-2.0, approved, #11894
maven/mavencentral/org.springframework.boot/spring-boot-starter-logging/3.2.2, Apache-2.0, approved, #11890
maven/mavencentral/org.springframework.boot/spring-boot-starter-oauth2-client/3.2.2, Apache-2.0, approved, #12587
maven/mavencentral/org.springframework.boot/spring-boot-starter-reactor-netty/3.2.2, Apache-2.0, approved, #12590
maven/mavencentral/org.springframework.boot/spring-boot-starter-security/3.0.2, Apache-2.0, approved, #7329
maven/mavencentral/org.springframework.boot/spring-boot-starter-tomcat/3.2.1, Apache-2.0, approved, #11923
maven/mavencentral/org.springframework.boot/spring-boot-starter-tomcat/3.2.2, Apache-2.0, approved, #11923
maven/mavencentral/org.springframework.boot/spring-boot-starter-web/3.0.2, Apache-2.0, approved, #5945
maven/mavencentral/org.springframework.boot/spring-boot-starter-webflux/3.2.1, Apache-2.0, approved, #12589
maven/mavencentral/org.springframework.boot/spring-boot-starter/3.2.1, Apache-2.0, approved, #11935
maven/mavencentral/org.springframework.boot/spring-boot/3.2.1, Apache-2.0, approved, #11752
maven/mavencentral/org.springframework.boot/spring-boot-starter-webflux/3.2.2, Apache-2.0, approved, #12589
maven/mavencentral/org.springframework.boot/spring-boot-starter/3.2.2, Apache-2.0, approved, #11935
maven/mavencentral/org.springframework.boot/spring-boot/3.2.2, Apache-2.0, approved, #11752
maven/mavencentral/org.springframework.cloud/spring-cloud-commons/3.1.5, Apache-2.0, approved, #4726
maven/mavencentral/org.springframework.cloud/spring-cloud-context/3.1.5, Apache-2.0, approved, #4722
maven/mavencentral/org.springframework.cloud/spring-cloud-starter-bootstrap/3.1.5, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.springframework.cloud/spring-cloud-starter/3.1.5, Apache-2.0, approved, #4723
maven/mavencentral/org.springframework.data/spring-data-commons/3.2.1, Apache-2.0, approved, #11917
maven/mavencentral/org.springframework.data/spring-data-rest-core/4.2.1, Apache-2.0, approved, #12591
maven/mavencentral/org.springframework.data/spring-data-rest-webmvc/4.2.1, Apache-2.0, approved, #12595
maven/mavencentral/org.springframework.data/spring-data-commons/3.2.2, Apache-2.0, approved, #11917
maven/mavencentral/org.springframework.data/spring-data-rest-core/4.2.2, Apache-2.0, approved, #12591
maven/mavencentral/org.springframework.data/spring-data-rest-webmvc/4.2.2, Apache-2.0, approved, #12595
maven/mavencentral/org.springframework.hateoas/spring-hateoas/2.2.0, Apache-2.0, approved, #11883
maven/mavencentral/org.springframework.plugin/spring-plugin-core/3.0.0, Apache-2.0, approved, #7104
maven/mavencentral/org.springframework.security/spring-security-config/6.2.1, Apache-2.0, approved, #11896
Expand All @@ -116,17 +116,17 @@ maven/mavencentral/org.springframework.security/spring-security-rsa/1.0.11.RELEA
maven/mavencentral/org.springframework.security/spring-security-web/6.2.1, Apache-2.0, approved, #11911
maven/mavencentral/org.springframework.session/spring-session-core/3.2.1, Apache-2.0, approved, #12588
maven/mavencentral/org.springframework.session/spring-session-jdbc/3.2.1, Apache-2.0, approved, #12596
maven/mavencentral/org.springframework/spring-aop/6.1.2, Apache-2.0, approved, #11755
maven/mavencentral/org.springframework/spring-beans/6.1.2, Apache-2.0, approved, #11754
maven/mavencentral/org.springframework/spring-context/6.1.2, Apache-2.0, approved, #11753
maven/mavencentral/org.springframework/spring-core/6.1.2, Apache-2.0 AND BSD-3-Clause, approved, #11750
maven/mavencentral/org.springframework/spring-expression/6.1.2, Apache-2.0, approved, #11747
maven/mavencentral/org.springframework/spring-jcl/6.1.2, Apache-2.0, approved, #11749
maven/mavencentral/org.springframework/spring-jdbc/6.1.2, Apache-2.0, approved, #11897
maven/mavencentral/org.springframework/spring-tx/6.1.2, Apache-2.0, approved, #11901
maven/mavencentral/org.springframework/spring-web/6.1.2, Apache-2.0, approved, #11748
maven/mavencentral/org.springframework/spring-webflux/6.1.2, Apache-2.0, approved, #12593
maven/mavencentral/org.springframework/spring-webmvc/6.1.2, Apache-2.0, approved, #11879
maven/mavencentral/org.springframework/spring-aop/6.1.3, Apache-2.0, approved, #11755
maven/mavencentral/org.springframework/spring-beans/6.1.3, Apache-2.0, approved, #11754
maven/mavencentral/org.springframework/spring-context/6.1.3, Apache-2.0, approved, #11753
maven/mavencentral/org.springframework/spring-core/6.1.3, Apache-2.0 AND BSD-3-Clause, approved, #11750
maven/mavencentral/org.springframework/spring-expression/6.1.3, Apache-2.0, approved, #11747
maven/mavencentral/org.springframework/spring-jcl/6.1.3, Apache-2.0, approved, #11749
maven/mavencentral/org.springframework/spring-jdbc/6.1.3, Apache-2.0, approved, #11897
maven/mavencentral/org.springframework/spring-tx/6.1.3, Apache-2.0, approved, #11901
maven/mavencentral/org.springframework/spring-web/6.1.3, Apache-2.0, approved, #11748
maven/mavencentral/org.springframework/spring-webflux/6.1.3, Apache-2.0, approved, #12593
maven/mavencentral/org.springframework/spring-webmvc/6.1.3, Apache-2.0, approved, #11879
maven/mavencentral/org.webjars/swagger-ui/4.15.5, Apache-2.0 AND MIT, approved, #5921
maven/mavencentral/org.webjars/webjars-locator-core/0.55, MIT, approved, clearlydefined
maven/mavencentral/org.yaml/snakeyaml/2.0, Apache-2.0 AND (Apache-2.0 OR BSD-3-Clause OR EPL-1.0 OR GPL-2.0-or-later OR LGPL-2.1-or-later), approved, #7275
Loading
Loading