Skip to content

Token refactoring #11

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

Merged
swalter-letsdev merged 3 commits into from
Oct 30, 2025
Merged

Token refactoring #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff34b1e
update deployment scripts
swalter-letsdev Oct 27, 2025
86de7e0
replace tokenManagement with fixed api token
swalter-letsdev Oct 28, 2025
0f41fd5
replace tokenManagement with fixed api token
swalter-letsdev Oct 30, 2025
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
54 changes: 27 additions & 27 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
```shell
PROJECT_ROOT=~/workspace/twinmap/letsdev-basyx-java-server-sdk
MODULE=basyx.aasenvironment/basyx.aasenvironment.component
ARTIFACT_VERSION=2.0.1
ARTIFACT_VERSION=2.0.0

cd ${PROJECT_ROOT}

Expand All @@ -15,22 +15,22 @@ mvn -DskipTests install
mvn -f "$MODULE/pom.xml" clean package -DskipTests -Pdockerbuild -Ddocker.namespace=letsdev -Ddocker.image.tag="$ARTIFACT_VERSION"

IMAGE_NAME=aas-env-oauth
IMAGE_VERSION=0.4.0
IMAGE_VERSION=0.3.28
JAR="$(find "$MODULE/target" -name '*.jar' ! -name '*sources*' ! -name '*javadoc*' ! -name '*-tests.jar' | head -n1)"
JAR_NAME="$(basename "$JAR" .jar)"
JAR_NAME_WITH_EXT=${JAR_NAME}.jar

cd ${PROJECT_ROOT}/${MODULE}

docker build --platform linux/amd64 -t docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION} --build-arg FINAL_NAME=${JAR_NAME} --load .
docker build --platform linux/amd64 -t docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION} --build-arg FINAL_NAME=${JAR_NAME} .
docker tag docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION} docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION}
docker push docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION}
```
### Run locally
```shell
PROJECT_ROOT=~/workspace/twinmap/letsdev-basyx-java-server-sdk
MODULE=basyx.aasenvironment/basyx.aasenvironment.component
ARTIFACT_VERSION=2.0.1
ARTIFACT_VERSION=2.0.0

cd ${PROJECT_ROOT}

Expand All @@ -40,14 +40,14 @@ mvn -DskipTests install
mvn -f "$MODULE/pom.xml" clean package -DskipTests -Pdockerbuild -Ddocker.namespace=letsdev -Ddocker.image.tag="$ARTIFACT_VERSION"

IMAGE_NAME=aas-env-oauth
IMAGE_VERSION=0.4.0
IMAGE_VERSION=0.3.28
JAR="$(find "$MODULE/target" -name '*.jar' ! -name '*sources*' ! -name '*javadoc*' ! -name '*-tests.jar' | head -n1)"
JAR_NAME="$(basename "$JAR" .jar)"
JAR_NAME_WITH_EXT=${JAR_NAME}.jar

cd ${PROJECT_ROOT}/${MODULE}

docker build --platform linux/arm64 -t docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION} --build-arg FINAL_NAME=${JAR_NAME} --load .
docker build --platform linux/arm64 -t docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION} --build-arg FINAL_NAME=${JAR_NAME} .
docker run -p 8081:8081 docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION}
```

Expand All @@ -56,49 +56,49 @@ docker run -p 8081:8081 docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION}
```shell
PROJECT_ROOT=~/workspace/twinmap/letsdev-basyx-java-server-sdk
MODULE=basyx.aasdiscoveryservice/basyx.aasdiscoveryservice.component
ARTIFACT_VERSION=2.0.1
ARTIFACT_VERSION=2.0.0

cd ${PROJECT_ROOT}

mvn clean
mvn -DskipTests install

mvn -f "$MODULE/pom.xml" clean package -DskipTests -Pdockerbuild -Ddocker.namespace=letsdev -Ddocker.image.tag="$ARTIFACT_VERSION"
mvn -f "$MODULE/pom.xml" clean package -DskipTests -Pdocker -Ddocker.namespace=letsdev -Ddocker.image.tag="$ARTIFACT_VERSION"

IMAGE_NAME=aas-discovery-oauth
IMAGE_VERSION=0.4.0
IMAGE_VERSION=0.3.28
JAR="$(find "$MODULE/target" -name '*.jar' ! -name '*sources*' ! -name '*javadoc*' ! -name '*-tests.jar' | head -n1)"
JAR_NAME="$(basename "$JAR" .jar)"
JAR_NAME_WITH_EXT=${JAR_NAME}.jar

cd ${PROJECT_ROOT}/${MODULE}

docker build --platform linux/amd64 -t docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION} --build-arg FINAL_NAME=${JAR_NAME} --load .
docker build --platform linux/amd64 -t docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION} --build-arg FINAL_NAME=${JAR_NAME} .
docker tag docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION} docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION}
docker push docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION}
```
### Run locally
```shell
PROJECT_ROOT=~/workspace/twinmap/letsdev-basyx-java-server-sdk
MODULE=basyx.aasdiscoveryservice/basyx.aasdiscoveryservice.component
ARTIFACT_VERSION=2.0.1
ARTIFACT_VERSION=2.0.0

cd ${PROJECT_ROOT}

mvn clean
mvn -DskipTests install

mvn -f "$MODULE/pom.xml" clean package -DskipTests -Pdockerbuild -Ddocker.namespace=letsdev -Ddocker.image.tag="$ARTIFACT_VERSION"
mvn -f "$MODULE/pom.xml" clean package -DskipTests

IMAGE_NAME=aas-discovery-oauth
IMAGE_VERSION=0.4.0
IMAGE_VERSION=0.3.28
JAR="$(find "$MODULE/target" -name '*.jar' ! -name '*sources*' ! -name '*javadoc*' ! -name '*-tests.jar' | head -n1)"
JAR_NAME="$(basename "$JAR" .jar)"
JAR_NAME_WITH_EXT=${JAR_NAME}.jar

cd ${PROJECT_ROOT}/${MODULE}

docker build --platform linux/arm64 -t docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION} --build-arg FINAL_NAME=${JAR_NAME} --load .
docker build --platform linux/arm64 -t docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION} --build-arg FINAL_NAME=${JAR_NAME} .
docker run -p 8082:8081 docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION}
```

Expand All @@ -107,7 +107,7 @@ docker run -p 8082:8081 docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION}
```shell
PROJECT_ROOT=~/workspace/twinmap/letsdev-basyx-java-server-sdk
MODULE=basyx.aasregistry/basyx.aasregistry-service-release-log-mem
ARTIFACT_VERSION=2.0.1
ARTIFACT_VERSION=2.0.0

cd ${PROJECT_ROOT}

Expand All @@ -117,7 +117,7 @@ mvn -DskipTests install
mvn -f "$MODULE/pom.xml" clean package -DskipTests -Pdockerbuild -Ddocker.namespace=letsdev -Ddocker.image.tag="$ARTIFACT_VERSION"

IMAGE_NAME=aas-registry-log-mem-oauth
IMAGE_VERSION=0.4.0
IMAGE_VERSION=0.3.28
JAR="$(find "$MODULE/target" -name '*.jar' ! -name '*sources*' ! -name '*javadoc*' ! -name '*-tests.jar' | head -n1)"
JAR_NAME="$(basename "$JAR" .jar)"
JAR_NAME_WITH_EXT=${JAR_NAME}.jar
Expand All @@ -126,7 +126,7 @@ mkdir ${PROJECT_ROOT}/${MODULE}/src/main/docker/maven
cp ${PROJECT_ROOT}/${MODULE}/target/${JAR_NAME_WITH_EXT} ${PROJECT_ROOT}/${MODULE}/src/main/docker/maven/${JAR_NAME_WITH_EXT}
cd ${PROJECT_ROOT}/${MODULE}/src/main/docker

docker build --platform linux/amd64 -t docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION} --build-arg FINAL_NAME=${JAR_NAME} --load .
docker build --platform linux/amd64 -t docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION} --build-arg FINAL_NAME=${JAR_NAME} .
docker tag docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION} docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION}
docker push docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION}

Expand All @@ -136,7 +136,7 @@ rm -rf ${PROJECT_ROOT}/${MODULE}/src/main/docker/maven
```shell
PROJECT_ROOT=~/workspace/twinmap/letsdev-basyx-java-server-sdk
MODULE=basyx.aasregistry/basyx.aasregistry-service-release-log-mem
ARTIFACT_VERSION=2.0.1
ARTIFACT_VERSION=2.0.0

cd ${PROJECT_ROOT}

Expand All @@ -146,7 +146,7 @@ mvn -DskipTests install
mvn -f "$MODULE/pom.xml" clean package -DskipTests -Pdockerbuild -Ddocker.namespace=letsdev -Ddocker.image.tag="$ARTIFACT_VERSION"

IMAGE_NAME=aas-registry-log-mem-oauth
IMAGE_VERSION=0.4.0
IMAGE_VERSION=0.3.28
JAR="$(find "$MODULE/target" -name '*.jar' ! -name '*sources*' ! -name '*javadoc*' ! -name '*-tests.jar' | head -n1)"
JAR_NAME="$(basename "$JAR" .jar)"
JAR_NAME_WITH_EXT=${JAR_NAME}.jar
Expand All @@ -155,8 +155,8 @@ mkdir ${PROJECT_ROOT}/${MODULE}/src/main/docker/maven
cp ${PROJECT_ROOT}/${MODULE}/target/${JAR_NAME_WITH_EXT} ${PROJECT_ROOT}/${MODULE}/src/main/docker/maven/${JAR_NAME_WITH_EXT}
cd ${PROJECT_ROOT}/${MODULE}/src/main/docker

docker build --platform linux/arm64 -t docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION} --build-arg FINAL_NAME=${JAR_NAME} --load .
docker run -p 8080:8081 docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION}
docker build --platform linux/arm64 -t docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION} --build-arg FINAL_NAME=${JAR_NAME} .
docker run -p 8080:8080 docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION}

rm -rf ${PROJECT_ROOT}/${MODULE}/src/main/docker/maven
```
Expand All @@ -166,7 +166,7 @@ rm -rf ${PROJECT_ROOT}/${MODULE}/src/main/docker/maven
```shell
PROJECT_ROOT=~/workspace/twinmap/letsdev-basyx-java-server-sdk
MODULE=basyx.submodelregistry/basyx.submodelregistry-service-release-log-mem
ARTIFACT_VERSION=2.0.1
ARTIFACT_VERSION=2.0.0

cd ${PROJECT_ROOT}

Expand All @@ -176,7 +176,7 @@ mvn -DskipTests install
mvn -f "$MODULE/pom.xml" clean package -DskipTests -Pdockerbuild -Ddocker.namespace=letsdev -Ddocker.image.tag="$ARTIFACT_VERSION"

IMAGE_NAME=aas-submodel-registry-log-mem-oauth
IMAGE_VERSION=0.4.0
IMAGE_VERSION=0.3.28
JAR="$(find "$MODULE/target" -name '*.jar' ! -name '*sources*' ! -name '*javadoc*' ! -name '*-tests.jar' | head -n1)"
JAR_NAME="$(basename "$JAR" .jar)"
JAR_NAME_WITH_EXT=${JAR_NAME}.jar
Expand All @@ -185,7 +185,7 @@ mkdir ${PROJECT_ROOT}/${MODULE}/src/main/docker/maven
cp ${PROJECT_ROOT}/${MODULE}/target/${JAR_NAME_WITH_EXT} ${PROJECT_ROOT}/${MODULE}/src/main/docker/maven/${JAR_NAME_WITH_EXT}
cd ${PROJECT_ROOT}/${MODULE}/src/main/docker

docker build --platform linux/amd64 -t docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION} --build-arg FINAL_NAME=${JAR_NAME} --load .
docker build --platform linux/amd64 -t docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION} --build-arg FINAL_NAME=${JAR_NAME} .
docker tag docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION} docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION}
docker push docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION}

Expand All @@ -195,7 +195,7 @@ rm -rf ${PROJECT_ROOT}/${MODULE}/src/main/docker/maven
```shell
PROJECT_ROOT=~/workspace/twinmap/letsdev-basyx-java-server-sdk
MODULE=basyx.submodelregistry/basyx.submodelregistry-service-release-log-mem
ARTIFACT_VERSION=2.0.1
ARTIFACT_VERSION=2.0.0

cd ${PROJECT_ROOT}

Expand All @@ -205,7 +205,7 @@ mvn -DskipTests install
mvn -f "$MODULE/pom.xml" clean package -DskipTests -Pdockerbuild -Ddocker.namespace=letsdev -Ddocker.image.tag="$ARTIFACT_VERSION"

IMAGE_NAME=aas-submodel-registry-log-mem-oauth
IMAGE_VERSION=0.4.0
IMAGE_VERSION=0.3.28
JAR="$(find "$MODULE/target" -name '*.jar' ! -name '*sources*' ! -name '*javadoc*' ! -name '*-tests.jar' | head -n1)"
JAR_NAME="$(basename "$JAR" .jar)"
JAR_NAME_WITH_EXT=${JAR_NAME}.jar
Expand All @@ -214,7 +214,7 @@ mkdir ${PROJECT_ROOT}/${MODULE}/src/main/docker/maven
cp ${PROJECT_ROOT}/${MODULE}/target/${JAR_NAME_WITH_EXT} ${PROJECT_ROOT}/${MODULE}/src/main/docker/maven/${JAR_NAME_WITH_EXT}
cd ${PROJECT_ROOT}/${MODULE}/src/main/docker

docker build --platform linux/arm64 -t docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION} --build-arg FINAL_NAME=${JAR_NAME} --load .
docker build --platform linux/arm64 -t docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION} --build-arg FINAL_NAME=${JAR_NAME} .
docker run -p 8083:8081 docker-twinmap.letsdev.de/${IMAGE_NAME}:${IMAGE_VERSION}

rm -rf ${PROJECT_ROOT}/${MODULE}/src/main/docker/maven
Expand Down
12 changes: 10 additions & 2 deletions ...gitaltwin/basyx/aasenvironment/preconfiguration/AasEnvironmentPreconfigurationLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.nio.file.NoSuchFileException;
import java.security.interfaces.RSAPublicKey;
import java.util.ArrayList;

Expand Down Expand Up @@ -127,7 +128,14 @@ private File getFile(String filePath) throws IOException {


private List<File> extractFilesToLoadFromEnvironmentDirectory(String directoryToLoad) throws IllegalArgumentException, IOException {
File rootDirectory = getFile(directoryToLoad);
File rootDirectory;

try {
rootDirectory = getFile(directoryToLoad);
} catch (NoSuchFileException e) {
return new ArrayList<>();
}

RecursiveDirectoryScanner directoryScanner = new RecursiveDirectoryScanner();

List<File> potentialEnvironments = directoryScanner.listFiles(rootDirectory);
Expand All @@ -141,4 +149,4 @@ private void logLoadingProcess(int current, int overall, String filename) {
}


}
}
83 changes: 43 additions & 40 deletions ...epository/feature/registry/integration/RegistryIntegrationAasRepositoryConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
/*******************************************************************************
* Copyright (C) 2023 the Eclipse BaSyx Authors
*
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*
* SPDX-License-Identifier: MIT
******************************************************************************/

Expand All @@ -46,7 +46,7 @@

/**
* Configuration for integrating {@link AasRepository} with AasRegistry
*
*
* @author danish
*/
@Configuration
Expand All @@ -59,38 +59,41 @@ public class RegistryIntegrationAasRepositoryConfiguration {
@Value("#{'${basyx.externalurl}'.split(',')}")
private List<String> aasRepositoryBaseURLs;

@Value("${basyx.aasrepository.feature.registryintegration.authorization.enabled:false}")
private boolean isAuthorizationEnabledOnRegistry;

@Value("${basyx.aasrepository.feature.registryintegration.authorization.token-endpoint:#{null}}")
private String authenticationServerTokenEndpoint;

@Value("${basyx.aasrepository.feature.registryintegration.authorization.grant-type:#{null}}")
private String grantType;

@Value("${basyx.aasrepository.feature.registryintegration.authorization.client-id:#{null}}")
private String clientId;

@Value("${basyx.aasrepository.feature.registryintegration.authorization.client-secret:#{null}}")
private String clientSecret;

@Value("${basyx.aasrepository.feature.registryintegration.authorization.username:#{null}}")
private String username;

@Value("${basyx.aasrepository.feature.registryintegration.authorization.password:#{null}}")
private String password;

@Value("${basyx.aasrepository.feature.registryintegration.authorization.scopes:#{null}}")
private Collection<String> scopes;
@Value("${ld-sso.api-token}")
private String apiToken;

// @Value("${basyx.aasrepository.feature.registryintegration.authorization.enabled:false}")
// private boolean isAuthorizationEnabledOnRegistry;
//
// @Value("${basyx.aasrepository.feature.registryintegration.authorization.token-endpoint:#{null}}")
// private String authenticationServerTokenEndpoint;
//
// @Value("${basyx.aasrepository.feature.registryintegration.authorization.grant-type:#{null}}")
// private String grantType;
//
// @Value("${basyx.aasrepository.feature.registryintegration.authorization.client-id:#{null}}")
// private String clientId;
//
// @Value("${basyx.aasrepository.feature.registryintegration.authorization.client-secret:#{null}}")
// private String clientSecret;
//
// @Value("${basyx.aasrepository.feature.registryintegration.authorization.username:#{null}}")
// private String username;
//
// @Value("${basyx.aasrepository.feature.registryintegration.authorization.password:#{null}}")
// private String password;
//
// @Value("${basyx.aasrepository.feature.registryintegration.authorization.scopes:#{null}}")
// private Collection<String> scopes;

@Bean
@ConditionalOnMissingBean
public AasRepositoryRegistryLink getAasRepositoryRegistryLink() {

if (!isAuthorizationEnabledOnRegistry)
return new AasRepositoryRegistryLink(new RegistryAndDiscoveryInterfaceApi(registryBasePath), aasRepositoryBaseURLs);

TokenManager tokenManager = new TokenManager(authenticationServerTokenEndpoint, createAccessTokenProvider());
// if (!isAuthorizationEnabledOnRegistry)
// return new AasRepositoryRegistryLink(new RegistryAndDiscoveryInterfaceApi(registryBasePath), aasRepositoryBaseURLs);

TokenManager tokenManager = new TokenManager(apiToken);//(authenticationServerTokenEndpoint, createAccessTokenProvider());

return new AasRepositoryRegistryLink(new AuthorizedConnectedAasRegistry(registryBasePath, tokenManager), aasRepositoryBaseURLs);
}
Expand All @@ -102,13 +105,13 @@ public AttributeMapper getAasAttributeMapper(ObjectMapper objectMapper) {
return new AttributeMapper(objectMapper);
}

private AccessTokenProvider createAccessTokenProvider() {

AccessTokenProviderFactory factory = new AccessTokenProviderFactory(GrantType.valueOf(grantType), scopes);
factory.setClientCredentials(clientId, clientSecret);
factory.setPasswordCredentials(username, password);

return factory.create();
}
// private AccessTokenProvider createAccessTokenProvider() {
//
// AccessTokenProviderFactory factory = new AccessTokenProviderFactory(GrantType.valueOf(grantType), scopes);
// factory.setClientCredentials(clientId, clientSecret);
// factory.setPasswordCredentials(username, password);
//
// return factory.create();
// }

}
Loading
Loading