Skip to content
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.

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

Split UAA SecurityConfiguration in a distinct template #12986

Merged
merged 1 commit into from
Nov 8, 2020

Conversation

murdos
Copy link
Contributor

@murdos murdos commented Nov 8, 2020

And move security related templates in a dedicated template directory


Please make sure the below checklist is followed for Pull Requests.

When you are still working on the PR, consider converting it to Draft (bellow reviewers) and adding skip-ci label, you can still see CI build result at your branch.

@@ -845,16 +855,6 @@ const serverFiles = {
},
],
},
{
condition: generator => !generator.reactive && generator.authenticationType === 'oauth2',
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This one was redundant with

condition: generator => !generator.reactive && generator.applicationType !== 'uaa' && generator.authenticationType !== 'uaa',
, which means that for a non reactive oauth2 application, the file was written twice.

@mshima
Copy link
Member

mshima commented Nov 8, 2020

Great work on config files reorganisation.

Not convinced about the security folder though.
IMO it can be more confusing because we mimic destination package.

Same for database config, having DatabaseConfiguration_cassandra.java.ejs is already clean enough, don't need database/DatabaseConfiguration_cassandra.java.ejs.

And rename ReactiveSecurityConfiguration template to follow pattern TargetFilename_${option}
@murdos murdos force-pushed the split-SecurityConfiguration branch from 9ce17c1 to ed4f74a Compare November 8, 2020 14:40
@murdos
Copy link
Contributor Author

murdos commented Nov 8, 2020

I've reverted the move to the security subdirectory and applied the Filename_${option} naming pattern for SecurityConfiguration.java

Copy link
Member

@mshima mshima left a comment

Choose a reason for hiding this comment

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

LGTM

@pascalgrimaud pascalgrimaud merged commit 77eafb0 into jhipster:main Nov 8, 2020
@pascalgrimaud
Copy link
Member

I love what you're doing @murdos
It will help a lot for v8, if we decide to use a clean architecture :)

@murdos murdos deleted the split-SecurityConfiguration branch November 8, 2020 17:35
@murdos
Copy link
Contributor Author

murdos commented Nov 8, 2020

@pascalgrimaud: thanks!
These were a few breaking improvements that I had in mind and wanted to do in a major release, inspired by annoyances or pitfalls that I encountered while working on new features or framework upgrades in generator-jhipster.
I hope indeed that it'll easy maintenance and progress of JHipster 😄

@pascalgrimaud pascalgrimaud added this to the 7.0.0-beta.0 milestone Dec 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants