Merge pull request #6 from letsdev/5-add-ld-api-token-for-internal-requests

add authorization header with ld sso api token to all requests

Author: jgeissler-letsdev

basyx.aasservice/basyx.aasservice-client/src/main/java/org/eclipse/digitaltwin/basyx/aasservice/client/internal/AssetAdministrationShellServiceApi.java

@@ -62,6 +62,8 @@
 import org.eclipse.digitaltwin.basyx.core.pagination.CursorResult;
 import org.eclipse.digitaltwin.basyx.http.description.ServiceDescription;
 import org.eclipse.digitaltwin.basyx.http.pagination.Base64UrlEncodedCursorResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.util.MimeTypeUtils;
 
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -77,6 +79,9 @@ public class AssetAdministrationShellServiceApi {
   private final Consumer<HttpResponse<InputStream>> memberVarResponseInterceptor;
   private TokenManager tokenManager;
 
+  @Autowired
+  private Environment env;
+
   public AssetAdministrationShellServiceApi() {
     this(new ApiClient());
   }
@@ -1162,14 +1167,18 @@ private static String buildUniqueFilename() {
 	}
 
 	private void addAuthorizationHeaderIfAuthIsEnabled(HttpRequest.Builder localVarRequestBuilder) {
-		if (tokenManager != null) {
-	    	try {
-	    		localVarRequestBuilder.header("Authorization", "Bearer " + tokenManager.getAccessToken());
-			} catch (IOException e) {
-				e.printStackTrace();
-				throw new AccessTokenRetrievalException("Unable to request access token");
-			}
-	    }
+        // Using LD SSO
+        String apiToken = env.getProperty("ld-sso.api-token");
+        localVarRequestBuilder.header("Authorization", "Bearer " + apiToken);
+
+//		if (tokenManager != null) {
+//	    	try {
+//	    		localVarRequestBuilder.header("Authorization", "Bearer " + tokenManager.getAccessToken());
+//			} catch (IOException e) {
+//				e.printStackTrace();
+//				throw new AccessTokenRetrievalException("Unable to request access token");
+//			}
+//	    }
 	}
 
 }

basyx.submodelservice/basyx.submodelservice-client/src/main/java/org/eclipse/digitaltwin/basyx/submodelservice/client/internal/SubmodelServiceApi.java

@@ -61,6 +61,8 @@
 import org.eclipse.digitaltwin.basyx.core.pagination.CursorResult;
 import org.eclipse.digitaltwin.basyx.http.pagination.Base64UrlEncodedCursorResult;
 import org.eclipse.digitaltwin.basyx.submodelservice.value.SubmodelElementValue;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.util.MimeTypeUtils;
 
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -79,6 +81,9 @@ public class SubmodelServiceApi {
 
   private TokenManager tokenManager;
 
+	@Autowired
+	private Environment env;
+
   public SubmodelServiceApi() {
     this(new ApiClient());
   }
@@ -1535,13 +1540,17 @@ private static String buildUniqueFilename() {
 		}
 
 		private void addAuthorizationHeaderIfAuthIsEnabled(HttpRequest.Builder localVarRequestBuilder) {
-			if (tokenManager != null) {
-		    	try {
-		    		localVarRequestBuilder.header("Authorization", "Bearer " + tokenManager.getAccessToken());
-				} catch (IOException e) {
-					e.printStackTrace();
-					throw new AccessTokenRetrievalException("Unable to request access token");
-				}
-		    }
+			// Using LD SSO
+			String apiToken = env.getProperty("ld-sso.api-token");
+			localVarRequestBuilder.header("Authorization", "Bearer " + apiToken);
+
+			//			if (tokenManager != null) {
+//		    	try {
+//		    		localVarRequestBuilder.header("Authorization", "Bearer " + tokenManager.getAccessToken());
+//				} catch (IOException e) {
+//					e.printStackTrace();
+//					throw new AccessTokenRetrievalException("Unable to request access token");
+//				}
+//		    }
 		}
 }