Adds authorization support for preconfigured AAS Environment #325
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: FriedJannik <Jannik.Fried@iese.fraunhofer.de> Co-authored-by: Aaron Zielstorff <aaron.zielstorff@iese.fraunhofer.de> Co-authored-by: Mohammad Ghazanfar Ali Danish <ghazanfar.danish@iese.fraunhofer.de>
- Embeds Preconfiguration to current Test Classes Signed-off-by: FriedJannik <Jannik.Fried@iese.fraunhofer.de> Co-authored-by: Aaron Zielstorff <aaron.zielstorff@iese.fraunhofer.de>
This reverts commit cd32396.
| private Logger logger = LoggerFactory.getLogger(AasEnvironmentPreconfigurationLoader.class); | ||
|
|
||
| @Value("${basyx.environment:#{null}}") | ||
| private List<String> pathsToLoad; | ||
|
|
||
| private ResourceLoader resourceLoader; | ||
|
|
||
|
|
||
| @Value("${basyx.aasenvironment.authorization.preconfiguration.token-endpoint:#{null}}") |
There was a problem hiding this comment.
I suggest documenting this new pars in the README
| @@ -80,10 +125,15 @@ public void loadPreconfiguredEnvironments(AasEnvironment aasEnvironment) | |||
| int filesCount = files.size(); | |||
| int currenFileIndex = 0; | |||
|
|
|||
| if(authorizationEnabled) { | |||
There was a problem hiding this comment.
I suggest moving these changes to a new class: AuthorizedAasEnvironmentPreconfig... in aasenvironment-feature-authorization
There was a problem hiding this comment.
We need this part here, because we need to authorize the Action performed by the PreConfiguration Loader, so imo it is not possible to extract this
| @@ -106,7 +106,6 @@ | |||
| <dependency> | |||
| <groupId>org.apache.httpcomponents.client5</groupId> | |||
| <artifactId>httpclient5</artifactId> | |||
There was a problem hiding this comment.
Is this change necessary? (line 109)
| this.password = password; | ||
| } | ||
|
|
||
| public AccessTokenProvider create(){ |
There was a problem hiding this comment.
Consider adding unit tests to this factory
Signed-off-by: FriedJannik <Jannik.Fried@iese.fraunhofer.de>
Co-authored-by: Aaron Zielstorff <aaron.zielstorff@iese.fraunhofer.de> Signed-off-by: FriedJannik <Jannik.Fried@iese.fraunhofer.de>
mateusmolina-iese
suggested changes
Jul 23, 2024
| @@ -31,9 +31,11 @@ | |||
| import org.eclipse.digitaltwin.basyx.aasenvironment.AasEnvironmentFactory; | |||
| import org.eclipse.digitaltwin.basyx.aasenvironment.feature.AasEnvironmentFeature; | |||
| import org.eclipse.digitaltwin.basyx.aasenvironment.feature.DecoratedAasEnvironmentFactory; | |||
| import org.eclipse.digitaltwin.basyx.aasenvironment.preconfiguration.AasEnvironmentPreconfigurationLoader; | |||
There was a problem hiding this comment.
Imports not needed
| @@ -71,6 +71,10 @@ | |||
| <groupId>org.eclipse.digitaltwin.basyx</groupId> | |||
| <artifactId>basyx.http</artifactId> | |||
| </dependency> | |||
| <dependency> | |||
| <groupId>org.eclipse.digitaltwin.basyx</groupId> | |||
| <artifactId>basyx.client</artifactId> | |||
There was a problem hiding this comment.
Is this dep. required?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.