Skip to content

NIFI-9648 Fixed the dependsOn logic in StandardOauth2AccessTokenProvi… #5734

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

Closed
MikeThomsen wants to merge 1 commit into from
Closed

NIFI-9648 Fixed the dependsOn logic in StandardOauth2AccessTokenProvi… #5734

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions ...vider-service/src/main/java/org/apache/nifi/oauth2/StandardOauth2AccessTokenProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,16 @@ public class StandardOauth2AccessTokenProvider extends AbstractControllerService
public static final PropertyDescriptor CLIENT_ID = new PropertyDescriptor.Builder()
.name("client-id")
.displayName("Client ID")
.required(false)
.dependsOn(GRANT_TYPE, CLIENT_CREDENTIALS_GRANT_TYPE)
Copy link
Contributor

@tpalfy tpalfy Feb 2, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is incorrect. Resource Owner Password Credentials Grant also may require these parameters.

.required(true)
.addValidator(StandardValidators.NON_BLANK_VALIDATOR)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();

public static final PropertyDescriptor CLIENT_SECRET = new PropertyDescriptor.Builder()
.name("client-secret")
.displayName("Client secret")
.dependsOn(CLIENT_ID)
.dependsOn(GRANT_TYPE, CLIENT_CREDENTIALS_GRANT_TYPE)
Copy link
Contributor

@tpalfy tpalfy Feb 2, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is incorrect. Resource Owner Password Credentials Grant also may require these parameters.

Copy link
Contributor Author

@MikeThomsen MikeThomsen Feb 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think what I was seeing was a UX issue with dependsOn in this case. The client secret was not showing, and that was kinda confusing to me. So I'm going to play around with this and add some custom validation where appropriate to make it cleaner.

.required(true)
.sensitive(true)
.addValidator(StandardValidators.NON_BLANK_VALIDATOR)
Expand Down