chore: fixes after testing (#1191)

eclipse-tractusx · Apr 5, 2024 · d97a021 · d97a021
1 parent fd5e27b
commit d97a021
Show file tree

Hide file tree

Showing 43 changed files with 169 additions and 95 deletions.
diff --git a/DEPENDENCIES b/DEPENDENCIES
@@ -508,6 +508,7 @@ maven/mavencentral/org.eclipse.edc/validator-spi/0.6.1-SNAPSHOT, Apache-2.0, app
 maven/mavencentral/org.eclipse.edc/vault-azure/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/vault-hashicorp/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/verifiable-credentials-spi/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/verifiable-credentials/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/web-spi/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.jetty.toolchain/jetty-jakarta-servlet-api/5.0.2, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty.toolchain/jetty-jakarta-websocket-api/2.0.0, EPL-2.0 OR Apache-2.0, approved, rt.jetty

diff --git a/charts/tractusx-connector-azure-vault/README.md b/charts/tractusx-connector-azure-vault/README.md
@@ -178,8 +178,6 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.
 | dataplane.debug.enabled | bool | `false` |  |
 | dataplane.debug.port | int | `1044` |  |
 | dataplane.debug.suspendOnStart | bool | `false` |  |
-| dataplane.endpoints.control.path | string | `"/api/dataplane/control"` |  |
-| dataplane.endpoints.control.port | int | `8083` |  |
 | dataplane.endpoints.default.path | string | `"/api"` |  |
 | dataplane.endpoints.default.port | int | `8080` |  |
 | dataplane.endpoints.metrics.path | string | `"/metrics"` |  |
@@ -189,6 +187,8 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.
 | dataplane.endpoints.proxy.port | int | `8186` |  |
 | dataplane.endpoints.public.path | string | `"/api/public"` |  |
 | dataplane.endpoints.public.port | int | `8081` |  |
+| dataplane.endpoints.signaling.path | string | `"/api/signaling"` |  |
+| dataplane.endpoints.signaling.port | int | `8083` |  |
 | dataplane.env | object | `{}` |  |
 | dataplane.envConfigMapNames | list | `[]` |  |
 | dataplane.envSecretNames | list | `[]` |  |

diff --git a/charts/tractusx-connector-azure-vault/templates/_helpers.tpl b/charts/tractusx-connector-azure-vault/templates/_helpers.tpl
@@ -8,6 +8,7 @@ Expand the name of the chart.
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
 {{- define "txdc.fullname" -}}
@@ -143,10 +144,10 @@ Control Plane URL
 {{- end }}
 
 {{/*
-Data Control URL
+Data Signaling URL
 */}}
-{{- define "txdc.dataplane.url.control" -}}
-{{- printf "http://%s-dataplane:%v%s" (include "txdc.fullname" . ) .Values.dataplane.endpoints.control.port .Values.dataplane.endpoints.control.path -}}
+{{- define "txdc.dataplane.url.signaling" -}}
+{{- printf "http://%s-dataplane:%v%s" (include "txdc.fullname" . ) .Values.dataplane.endpoints.signaling.port .Values.dataplane.endpoints.signaling.path -}}
 {{- end }}
 
 {{/*

diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
@@ -299,18 +299,19 @@ spec:
 
             # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/dataplane-selector-configuration
             - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_URL"
-              value: {{ include "txdc.dataplane.url.control" . }}/transfer
+              value: {{ include "txdc.dataplane.url.signaling" . }}/v1/dataflows
+            - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_TRANSFERTYPES"
+              value: "HttpData-PULL,AmazonS3-PUSH,AzureStorage-PUSH"
             - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_SOURCETYPES"
-              value: "HttpData,AmazonS3"
+              value: "HttpData,AmazonS3,AzureStorage"
             - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_DESTINATIONTYPES"
-              value: "HttpProxy,AmazonS3"
+              value: "HttpProxy,AmazonS3,AzureStorage"
             - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_PROPERTIES"
               value: |-
                 {{ printf "{ \"publicApiUrl\": \"%s\" }" (include "txdc.dataplane.url.public" . ) }}
 
 
 
-
             ###########
             ## VAULT ##
             ###########

diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml
@@ -157,10 +157,10 @@ spec:
               value: {{ .Values.dataplane.endpoints.default.port | quote }}
             - name: "WEB_HTTP_DEFAULT_PATH"
               value: {{ .Values.dataplane.endpoints.default.path | quote }}
-            - name: "WEB_HTTP_CONTROL_PORT"
-              value: {{ .Values.dataplane.endpoints.control.port | quote }}
-            - name: "WEB_HTTP_CONTROL_PATH"
-              value: {{ .Values.dataplane.endpoints.control.path | quote }}
+            - name: "WEB_HTTP_SIGNALING_PORT"
+              value: {{ .Values.dataplane.endpoints.signaling.port | quote }}
+            - name: "WEB_HTTP_SIGNALING_PATH"
+              value: {{ .Values.dataplane.endpoints.signaling.path | quote }}
             - name: "WEB_HTTP_PUBLIC_PORT"
               value: {{ .Values.dataplane.endpoints.public.port | quote }}
             - name: "WEB_HTTP_PUBLIC_PATH"
@@ -274,6 +274,9 @@ spec:
             {{- if .Values.dataplane.token.refresh.refresh_endpoint }}
             - name: "EDC_DATAPLANE_TOKEN_REFRESH_ENDPOINT"
               value: {{ .Values.dataplane.token.refresh.refresh_endpoint }}
+            {{- else}}
+            - name: "EDC_DATAPLANE_TOKEN_REFRESH_ENDPOINT"
+              value: {{ include "txdc.dataplane.url.public" . }}/token
             {{- end}}
 
             - name: "EDC_TRANSFER_PROXY_TOKEN_SIGNER_PRIVATEKEY_ALIAS"

diff --git a/charts/tractusx-connector-azure-vault/templates/service-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/service-dataplane.yaml
@@ -32,10 +32,10 @@ spec:
       targetPort: default
       protocol: TCP
       name: default
-    - port: {{ .Values.dataplane.endpoints.control.port }}
-      targetPort: control
+    - port: {{ .Values.dataplane.endpoints.signaling.port }}
+      targetPort: signaling
       protocol: TCP
-      name: control
+      name: signaling
     - port: {{ .Values.dataplane.endpoints.public.port }}
       targetPort: public
       protocol: TCP

diff --git a/charts/tractusx-connector-azure-vault/values.yaml b/charts/tractusx-connector-azure-vault/values.yaml
@@ -353,9 +353,9 @@ dataplane:
     public:
       port: 8081
       path: /api/public
-    control:
+    signaling:
       port: 8083
-      path: /api/dataplane/control
+      path: /api/signaling
     proxy:
       port: 8186
       path: /proxy

diff --git a/charts/tractusx-connector-memory/README.md b/charts/tractusx-connector-memory/README.md
@@ -76,7 +76,7 @@ helm install my-release tractusx-edc/tractusx-connector-memory --version 0.6.0 \
 | runtime.debug.enabled | bool | `false` |  |
 | runtime.debug.port | int | `1044` |  |
 | runtime.debug.suspendOnStart | bool | `false` |  |
-| runtime.endpoints | object | `{"control":{"path":"/control","port":8083},"default":{"path":"/api","port":8080},"management":{"authKey":"password","path":"/management","port":8081},"protocol":{"path":"/api/v1/dsp","port":8084},"proxy":{"path":"/proxy","port":8186},"public":{"path":"/api/public","port":8086}}` | endpoints of the control plane |
+| runtime.endpoints | object | `{"control":{"path":"/control","port":8083},"default":{"path":"/api","port":8080},"management":{"authKey":"password","path":"/management","port":8081},"protocol":{"path":"/api/v1/dsp","port":8084},"proxy":{"path":"/proxy","port":8186},"public":{"path":"/api/public","port":8086},"signaling":{"path":"/api/signaling","port":8087}}` | endpoints of the control plane |
 | runtime.endpoints.control | object | `{"path":"/control","port":8083}` | control api, used for internal control calls. can be added to the internal ingress, but should probably not |
 | runtime.endpoints.control.path | string | `"/control"` | path for incoming api calls |
 | runtime.endpoints.control.port | int | `8083` | port for incoming api calls |
@@ -90,6 +90,8 @@ helm install my-release tractusx-edc/tractusx-connector-memory --version 0.6.0 \
 | runtime.endpoints.protocol | object | `{"path":"/api/v1/dsp","port":8084}` | dsp api, used for inter connector communication and must be internet facing |
 | runtime.endpoints.protocol.path | string | `"/api/v1/dsp"` | path for incoming api calls |
 | runtime.endpoints.protocol.port | int | `8084` | port for incoming api calls |
+| runtime.endpoints.signaling.path | string | `"/api/signaling"` | path for incoming api calls |
+| runtime.endpoints.signaling.port | int | `8087` | port for incoming api calls |
 | runtime.env | object | `{}` |  |
 | runtime.envConfigMapNames | list | `[]` |  |
 | runtime.envSecretNames | list | `[]` |  |

diff --git a/charts/tractusx-connector-memory/templates/_helpers.tpl b/charts/tractusx-connector-memory/templates/_helpers.tpl
@@ -118,10 +118,10 @@ Control URL
 {{- end }}
 
 {{/*
-Data Control URL
+Data Signaling URL
 */}}
-{{- define "txdc.dataplane.url.control" -}}
-{{- printf "http://%s-dataplane:%v%s" (include "txdc.fullname" . ) .Values.runtime.endpoints.control.port .Values.runtime.endpoints.control.path -}}
+{{- define "txdc.dataplane.url.signaling" -}}
+{{- printf "http://%s-dataplane:%v%s" (include "txdc.fullname" . ) .Values.runtime.endpoints.signaling.port .Values.runtime.endpoints.signaling.path -}}
 {{- end }}
 
 {{/*

diff --git a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
@@ -177,6 +177,10 @@ spec:
               value: {{ .Values.runtime.endpoints.control.port | quote }}
             - name: "WEB_HTTP_CONTROL_PATH"
               value: {{ .Values.runtime.endpoints.control.path | quote }}
+            - name: "WEB_HTTP_SIGNALING_PORT"
+              value: {{ .Values.runtime.endpoints.signaling.port | quote }}
+            - name: "WEB_HTTP_SIGNALING_PATH"
+              value: {{ .Values.runtime.endpoints.signaling.path | quote }}
             - name: "WEB_HTTP_PROTOCOL_PORT"
               value: {{ .Values.runtime.endpoints.protocol.port | quote }}
             - name: "WEB_HTTP_PROTOCOL_PATH"
@@ -230,7 +234,7 @@ spec:
 
             # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/edc-extensions/dataplane-selector-configuration
             - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_URL"
-              value: {{ include "txdc.dataplane.url.control" . }}/transfer
+              value: {{ include "txdc.dataplane.url.signaling" . }}/v1/dataflows
             - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_SOURCETYPES"
               value: "HttpData,AmazonS3"
             - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_DESTINATIONTYPES"
@@ -260,6 +264,9 @@ spec:
             {{- if .Values.runtime.token.refresh.refresh_endpoint }}
             - name: "EDC_DATAPLANE_TOKEN_REFRESH_ENDPOINT"
               value: {{ .Values.runtime.token.refresh.refresh_endpoint }}
+            {{- else }}
+            - name: "EDC_DATAPLANE_TOKEN_REFRESH_ENDPOINT"
+              value: {{ include "txdc.dataplane.url.public" . }}/token
             {{- end}}
 
             - name: "EDC_TRANSFER_PROXY_TOKEN_SIGNER_PRIVATEKEY_ALIAS"

diff --git a/charts/tractusx-connector-memory/templates/service-runtime.yaml b/charts/tractusx-connector-memory/templates/service-runtime.yaml
@@ -51,5 +51,9 @@ spec:
       targetPort: public
       protocol: TCP
       name: public
+    - port: {{ .Values.runtime.endpoints.signaling.port }}
+      targetPort: signaling
+      protocol: TCP
+      name: signaling
   selector:
     {{- include "txdc.runtime.selectorLabels" . | nindent 4 }}
diff --git a/charts/tractusx-connector-memory/values.yaml b/charts/tractusx-connector-memory/values.yaml
@@ -121,6 +121,11 @@ runtime:
     proxy:
       port: 8186
       path: /proxy
+    signaling:
+      # -- port for incoming api calls
+      port: 8087
+      # -- path for incoming api calls
+      path: /api/signaling
 
   businessPartnerValidation:
     log:

diff --git a/charts/tractusx-connector/README.md b/charts/tractusx-connector/README.md
@@ -172,8 +172,6 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.6.0 \
 | dataplane.debug.enabled | bool | `false` |  |
 | dataplane.debug.port | int | `1044` |  |
 | dataplane.debug.suspendOnStart | bool | `false` |  |
-| dataplane.endpoints.control.path | string | `"/api/dataplane/control"` |  |
-| dataplane.endpoints.control.port | int | `8083` |  |
 | dataplane.endpoints.default.path | string | `"/api"` |  |
 | dataplane.endpoints.default.port | int | `8080` |  |
 | dataplane.endpoints.metrics.path | string | `"/metrics"` |  |
@@ -183,6 +181,8 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.6.0 \
 | dataplane.endpoints.proxy.port | int | `8186` |  |
 | dataplane.endpoints.public.path | string | `"/api/public"` |  |
 | dataplane.endpoints.public.port | int | `8081` |  |
+| dataplane.endpoints.signaling.path | string | `"/api/signaling"` |  |
+| dataplane.endpoints.signaling.port | int | `8083` |  |
 | dataplane.env | object | `{}` |  |
 | dataplane.envConfigMapNames | list | `[]` |  |
 | dataplane.envSecretNames | list | `[]` |  |

diff --git a/charts/tractusx-connector/templates/_helpers.tpl b/charts/tractusx-connector/templates/_helpers.tpl
@@ -143,10 +143,10 @@ Control Plane URL
 {{- end }}
 
 {{/*
-Data Control URL
+Data Signaling URL
 */}}
-{{- define "txdc.dataplane.url.control" -}}
-{{- printf "http://%s-dataplane:%v%s" (include "txdc.fullname" . ) .Values.dataplane.endpoints.control.port .Values.dataplane.endpoints.control.path -}}
+{{- define "txdc.dataplane.url.signaling" -}}
+{{- printf "http://%s-dataplane:%v%s" (include "txdc.fullname" . ) .Values.dataplane.endpoints.signaling.port .Values.dataplane.endpoints.signaling.path -}}
 {{- end }}
 
 {{/*

diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -300,11 +300,13 @@ spec:
 
             # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/dataplane-selector-configuration
             - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_URL"
-              value: {{ include "txdc.dataplane.url.control" . }}/transfer
+              value: {{ include "txdc.dataplane.url.signaling" . }}/v1/dataflows
+            - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_TRANSFERTYPES"
+              value: "HttpData-PULL,AmazonS3-PUSH,AzureStorage-PUSH"
             - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_SOURCETYPES"
-              value: "HttpData,AmazonS3"
+              value: "HttpData,AmazonS3,AzureStorage"
             - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_DESTINATIONTYPES"
-              value: "HttpProxy,AmazonS3"
+              value: "HttpProxy,AmazonS3,AzureStorage"
             - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_PROPERTIES"
               value: |-
                 {{ printf "{ \"publicApiUrl\": \"%s\" }" (include "txdc.dataplane.url.public" . ) }}

diff --git a/charts/tractusx-connector/templates/deployment-dataplane.yaml b/charts/tractusx-connector/templates/deployment-dataplane.yaml
@@ -157,10 +157,10 @@ spec:
               value: {{ .Values.dataplane.endpoints.default.port | quote }}
             - name: "WEB_HTTP_DEFAULT_PATH"
               value: {{ .Values.dataplane.endpoints.default.path | quote }}
-            - name: "WEB_HTTP_CONTROL_PORT"
-              value: {{ .Values.dataplane.endpoints.control.port | quote }}
-            - name: "WEB_HTTP_CONTROL_PATH"
-              value: {{ .Values.dataplane.endpoints.control.path | quote }}
+            - name: "WEB_HTTP_SIGNALING_PORT"
+              value: {{ .Values.dataplane.endpoints.signaling.port | quote }}
+            - name: "WEB_HTTP_SIGNALING_PATH"
+              value: {{ .Values.dataplane.endpoints.signaling.path | quote }}
             - name: "WEB_HTTP_PUBLIC_PORT"
               value: {{ .Values.dataplane.endpoints.public.port | quote }}
             - name: "WEB_HTTP_PUBLIC_PATH"
@@ -273,6 +273,9 @@ spec:
             {{- if .Values.dataplane.token.refresh.refresh_endpoint }}
             - name: "EDC_DATAPLANE_TOKEN_REFRESH_ENDPOINT"
               value: {{ .Values.dataplane.token.refresh.refresh_endpoint }}
+            {{- else}}
+            - name: "EDC_DATAPLANE_TOKEN_REFRESH_ENDPOINT"
+              value: {{ include "txdc.dataplane.url.public" . }}/token
             {{- end}}
 
             - name: "EDC_TRANSFER_PROXY_TOKEN_SIGNER_PRIVATEKEY_ALIAS"

diff --git a/charts/tractusx-connector/templates/service-dataplane.yaml b/charts/tractusx-connector/templates/service-dataplane.yaml
@@ -36,10 +36,10 @@ spec:
       targetPort: default
       protocol: TCP
       name: default
-    - port: {{ .Values.dataplane.endpoints.control.port }}
-      targetPort: control
+    - port: {{ .Values.dataplane.endpoints.signaling.port }}
+      targetPort: signaling
       protocol: TCP
-      name: control
+      name: signaling
     - port: {{ .Values.dataplane.endpoints.public.port }}
       targetPort: public
       protocol: TCP

diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml
@@ -351,9 +351,9 @@ dataplane:
     public:
       port: 8081
       path: /api/public
-    control:
+    signaling:
       port: 8083
-      path: /api/dataplane/control
+      path: /api/signaling
     proxy:
       port: 8186
       path: /proxy

diff --git a/core/json-ld-core/src/main/java/org/eclipse/tractusx/edc/jsonld/JsonLdExtension.java b/core/json-ld-core/src/main/java/org/eclipse/tractusx/edc/jsonld/JsonLdExtension.java
@@ -35,6 +35,8 @@
 import static java.lang.String.format;
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 import static org.eclipse.tractusx.edc.edr.spi.CoreConstants.EDC_CONTEXT;
+import static org.eclipse.tractusx.edc.edr.spi.CoreConstants.TX_AUTH_NS;
+import static org.eclipse.tractusx.edc.edr.spi.CoreConstants.TX_AUTH_PREFIX;
 import static org.eclipse.tractusx.edc.edr.spi.CoreConstants.TX_CONTEXT;
 import static org.eclipse.tractusx.edc.edr.spi.CoreConstants.TX_NAMESPACE;
 import static org.eclipse.tractusx.edc.edr.spi.CoreConstants.TX_PREFIX;
@@ -66,6 +68,7 @@ public class JsonLdExtension implements ServiceExtension {
     @Override
     public void initialize(ServiceExtensionContext context) {
         jsonLdService.registerNamespace(TX_PREFIX, TX_NAMESPACE);
+        jsonLdService.registerNamespace(TX_AUTH_PREFIX, TX_AUTH_NS);
         FILES.entrySet().stream().map(this::mapToFile)
                 .forEach(result -> result.onSuccess(entry -> jsonLdService.registerCachedDocument(entry.getKey(), entry.getValue().toURI()))
                         .onFailure(failure -> monitor.warning("Failed to register cached json-ld document: " + failure.getFailureDetail())));

diff --git a/edc-controlplane/edc-controlplane-base/build.gradle.kts b/edc-controlplane/edc-controlplane-base/build.gradle.kts
@@ -41,7 +41,11 @@ dependencies {
     // needed for IATP integration
     runtimeOnly(project(":core:json-ld-core"))
     runtimeOnly(libs.edc.core.did)
+    runtimeOnly(libs.edc.identity.did.web)
     runtimeOnly(libs.edc.core.identitytrust)
+    runtimeOnly(libs.edc.identity.trust.transform)
+    runtimeOnly(libs.edc.identity.trust.issuers.configuration)
+    runtimeOnly(project(":edc-extensions:iatp:tx-iatp"))
     runtimeOnly(project(":edc-extensions:iatp:tx-iatp-sts-dim"))
     runtimeOnly(project(":edc-extensions:bdrs-client"))
     runtimeOnly(project(":edc-extensions:data-flow-properties-provider"))

diff --git a/edc-dataplane/edc-dataplane-base/build.gradle.kts b/edc-dataplane/edc-dataplane-base/build.gradle.kts
@@ -32,6 +32,7 @@ dependencies {
 
     runtimeOnly(libs.edc.jsonld) // needed by the DataPlaneSignalingApi
     runtimeOnly(libs.edc.core.did) // for the DID Public Key Resolver
+    runtimeOnly(libs.edc.identity.did.web)
     runtimeOnly(libs.edc.config.filesystem)
     runtimeOnly(libs.edc.auth.tokenbased)
     runtimeOnly(libs.edc.dpf.awss3)

diff --git a/edc-extensions/data-flow-properties-provider/build.gradle.kts b/edc-extensions/data-flow-properties-provider/build.gradle.kts
@@ -24,6 +24,7 @@ plugins {
 
 dependencies {
     implementation(libs.edc.spi.transfer)
+    implementation(project(":spi:core-spi"))
     implementation(project(":spi:bdrs-client-spi"))
 
     testImplementation(libs.edc.junit)

diff --git a/...es-provider/src/main/java/org/eclipse/tractusx/edc/flow/TxDataFlowPropertiesProvider.java b/...es-provider/src/main/java/org/eclipse/tractusx/edc/flow/TxDataFlowPropertiesProvider.java
@@ -29,13 +29,14 @@
 
 import java.util.Map;
 
+import static org.eclipse.tractusx.edc.edr.spi.CoreConstants.AUDIENCE_PROPERTY;
+
 /**
  * Extension of {@link DataFlowPropertiesProvider} which provides additional properties in the {@link DataFlowStartMessage}
  * like the DID of the counter-party BPN. The resolution is made with the {@link BdrsClient}
  */
 public class TxDataFlowPropertiesProvider implements DataFlowPropertiesProvider {
 
-    private static final String AUDIENCE_PROPERTY = "audience";
 
     private final BdrsClient bdrsClient;
 

diff --git a/...rovider/src/test/java/org/eclipse/tractusx/edc/flow/TxDataFlowPropertiesProviderTest.java b/...rovider/src/test/java/org/eclipse/tractusx/edc/flow/TxDataFlowPropertiesProviderTest.java
@@ -26,6 +26,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat;
+import static org.eclipse.tractusx.edc.edr.spi.CoreConstants.AUDIENCE_PROPERTY;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -45,7 +46,7 @@ void propertiesFor() {
         var result = provider.propertiesFor(TransferProcess.Builder.newInstance().build(), Policy.Builder.newInstance().assignee(bpn).build());
 
         assertThat(result).isSucceeded().satisfies(properties -> {
-            Assertions.assertThat(properties).containsEntry("audience", did);
+            Assertions.assertThat(properties).containsEntry(AUDIENCE_PROPERTY, did);
         });
     }
 

diff --git a/...lipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ConsumerAssetRequestController.java b/...lipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ConsumerAssetRequestController.java
@@ -149,7 +149,7 @@ private DataAddress dataPlaneAddress(DataAddress edr) {
                 .baseUrl(endpoint)
                 .proxyQueryParams("true")
                 .proxyPath("true")
-                .property(HEADER_AUTHORIZATION, BEARER_PREFIX + token)
+                .property(HEADER_AUTHORIZATION, token)
                 .build();
     }