generator-jhipster 8.0.0 → 8.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (258) hide show
  1. package/README.md +61 -57
  2. package/dist/cli/environment-builder.mjs +11 -4
  3. package/dist/cli/program.mjs +1 -1
  4. package/dist/generators/angular/cleanup.mjs +7 -0
  5. package/dist/generators/angular/files-angular.mjs +3 -4
  6. package/dist/generators/angular/generator.mjs +2 -15
  7. package/dist/generators/angular/needle-api/needle-client-angular.mjs +2 -8
  8. package/dist/generators/angular/resources/package.json +23 -23
  9. package/dist/generators/angular/support/translate-angular.mjs +2 -2
  10. package/dist/generators/angular/templates/README.md.jhi.client.angular.ejs +1 -1
  11. package/dist/generators/angular/templates/angular.json.ejs +3 -7
  12. package/dist/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.html.ejs +6 -4
  13. package/dist/generators/angular/templates/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.ts.ejs +1 -1
  14. package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.component.html.ejs +39 -33
  15. package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html.ejs +44 -36
  16. package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html.ejs +24 -23
  17. package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.component.html.ejs +74 -62
  18. package/dist/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.html.ejs +12 -4
  19. package/dist/generators/angular/templates/src/main/webapp/app/account/settings/settings.component.html.ejs +54 -48
  20. package/dist/generators/angular/templates/src/main/webapp/app/admin/admin.routes.ts.ejs +74 -0
  21. package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.component.html.ejs +15 -5
  22. package/dist/generators/angular/templates/src/main/webapp/app/admin/docs/docs.component.ts.ejs +1 -1
  23. package/dist/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.html.ejs +20 -7
  24. package/dist/generators/angular/templates/src/main/webapp/app/admin/health/health.component.html.ejs +10 -7
  25. package/dist/generators/angular/templates/src/main/webapp/app/admin/health/modal/health-modal.component.html.ejs +9 -3
  26. package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.html.ejs +12 -4
  27. package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs +13 -7
  28. package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.ejs +6 -2
  29. package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html.ejs +3 -1
  30. package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html.ejs +13 -9
  31. package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs +13 -5
  32. package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html.ejs +21 -7
  33. package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html.ejs +6 -2
  34. package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.html.ejs +3 -1
  35. package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.component.html.ejs +16 -7
  36. package/dist/generators/angular/templates/src/main/webapp/app/admin/tracker/tracker.component.html.ejs +3 -1
  37. package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.html.ejs +3 -1
  38. package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.html.ejs +11 -4
  39. package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.html.ejs +20 -11
  40. package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.ejs +48 -34
  41. package/dist/generators/angular/templates/src/main/webapp/app/app.component.ts.ejs +73 -0
  42. package/dist/generators/angular/templates/src/main/webapp/app/app.config.ts.ejs +67 -0
  43. package/dist/generators/angular/templates/src/main/webapp/app/app.routes.ts.ejs +85 -0
  44. package/dist/generators/angular/templates/src/main/webapp/app/core/microfrontend/index.ts.ejs +5 -4
  45. package/dist/generators/angular/templates/src/main/webapp/app/core/util/alert.service.spec.ts.ejs +1 -1
  46. package/dist/generators/angular/templates/src/main/webapp/app/core/util/data-util.service.ts.ejs +2 -2
  47. package/dist/generators/angular/templates/src/main/webapp/app/core/util/event-manager.service.spec.ts.ejs +12 -12
  48. package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.model.ts.ejs +4 -4
  49. package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.html.ejs +3 -1
  50. package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.html.ejs +26 -14
  51. package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.html.ejs +38 -25
  52. package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.ts.ejs +1 -1
  53. package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-form.service.spec.ts.ejs +2 -2
  54. package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-form.service.ts.ejs +5 -12
  55. package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.html.ejs +55 -21
  56. package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.spec.ts.ejs +2 -2
  57. package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.ts.ejs +10 -10
  58. package/dist/generators/angular/templates/src/main/webapp/app/entities/entity.routes.ts.ejs +25 -0
  59. package/dist/generators/angular/templates/src/main/webapp/app/home/home.component.html.ejs +21 -17
  60. package/dist/generators/angular/templates/src/main/webapp/app/home/home.component.ts.ejs +1 -1
  61. package/dist/generators/angular/templates/src/main/webapp/app/layouts/error/error.component.html.ejs +3 -3
  62. package/dist/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs +5 -2
  63. package/dist/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.ts.ejs +5 -1
  64. package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.component.html.ejs +97 -78
  65. package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs +1 -1
  66. package/dist/generators/angular/templates/src/main/webapp/app/layouts/profiles/page-ribbon.component.scss.ejs +1 -1
  67. package/dist/generators/angular/templates/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts.ejs +6 -4
  68. package/dist/generators/angular/templates/src/main/webapp/app/login/login.component.html.ejs +3 -3
  69. package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.component.html.ejs +6 -2
  70. package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.html.ejs +6 -2
  71. package/dist/generators/angular/templates/src/main/webapp/app/shared/filter/filter.component.html.ejs +11 -7
  72. package/dist/generators/angular/templates/src/main/webapp/app/shared/filter/filter.model.spec.ts.ejs +1 -1
  73. package/dist/generators/angular/templates/src/main/webapp/app/shared/sort/sort-by.directive.spec.ts.ejs +3 -3
  74. package/dist/generators/angular/templates/src/main/webapp/bootstrap.ts.ejs +5 -5
  75. package/dist/generators/angular/templates/src/main/webapp/content/scss/global.scss.ejs +1 -1
  76. package/dist/generators/angular/templates/webpack/webpack.microfrontend.js.ejs +2 -2
  77. package/dist/generators/app/README.md +108 -0
  78. package/dist/generators/app/USAGE +3 -0
  79. package/dist/generators/app/command.mjs +3 -3
  80. package/dist/generators/app/generator.mjs +11 -0
  81. package/dist/generators/base/command.mjs +0 -11
  82. package/dist/generators/base-application/generator.mjs +5 -6
  83. package/dist/generators/base-application/support/entities.mjs +2 -2
  84. package/dist/generators/base-application/support/index.mjs +1 -0
  85. package/dist/generators/base-application/support/prepare-entity.mjs +0 -1
  86. package/dist/generators/base-application/support/prepare-relationship.mjs +4 -0
  87. package/dist/generators/base-application/support/update-application-entities-transform.mjs +52 -0
  88. package/dist/generators/base-core/generator.mjs +17 -4
  89. package/dist/generators/base-entity-changes/generator.mjs +1 -1
  90. package/dist/generators/bootstrap/command.mjs +6 -0
  91. package/dist/generators/bootstrap/generator.mjs +27 -9
  92. package/dist/generators/bootstrap-application/generator.mjs +1 -19
  93. package/dist/generators/bootstrap-application-base/command.mjs +30 -0
  94. package/dist/generators/bootstrap-application-base/generator.mjs +27 -5
  95. package/dist/generators/bootstrap-application-base/index.mjs +1 -0
  96. package/dist/generators/bootstrap-application-base/support/export-jdl-transform.mjs +61 -0
  97. package/dist/generators/bootstrap-application-base/support/import-jdl-transform.mjs +64 -0
  98. package/dist/generators/bootstrap-application-base/support/index.mjs +2 -0
  99. package/dist/generators/client/command.mjs +2 -0
  100. package/dist/generators/client/resources/package.json +4 -4
  101. package/dist/generators/client/support/entity-definition.mjs +3 -3
  102. package/dist/generators/client/templates/README.md.jhi.client.ejs +2 -2
  103. package/dist/generators/client/templates/src/main/webapp/index.html.ejs +2 -2
  104. package/dist/generators/common/command.mjs +2 -0
  105. package/dist/generators/common/resources/package.json +3 -3
  106. package/dist/generators/common/templates/sonar-project.properties.ejs +1 -1
  107. package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/entity/_entity_.cy.ts.ejs +0 -1
  108. package/dist/generators/docker/generator.mjs +1 -1
  109. package/dist/generators/docker/templates/docker/cassandra.yml.ejs +2 -2
  110. package/dist/generators/docker/templates/docker/keycloak.yml.ejs +1 -1
  111. package/dist/generators/docker/templates/docker/realm-config/jhipster-realm.json.ejs +4 -1
  112. package/dist/generators/docker-compose/generator.mjs +4 -11
  113. package/dist/generators/docker-compose/templates/docker-compose.yml.ejs +1 -1
  114. package/dist/generators/docker-compose/templates/realm-config/jhipster-realm.json.ejs +4 -1
  115. package/dist/generators/export-jdl/generator.mjs +1 -1
  116. package/dist/generators/feign-client/cleanup.mjs +12 -0
  117. package/dist/generators/feign-client/files.mjs +35 -0
  118. package/dist/generators/feign-client/generator.mjs +65 -0
  119. package/dist/generators/feign-client/index.mjs +19 -0
  120. package/dist/generators/feign-client/templates/src/main/java/_package_/client/AuthorizationHeaderUtil.java.ejs +174 -0
  121. package/dist/generators/feign-client/templates/src/main/java/_package_/client/AuthorizedFeignClient.java.ejs +72 -0
  122. package/dist/generators/feign-client/templates/src/main/java/_package_/client/OAuth2InterceptedFeignConfiguration.java.ejs +35 -0
  123. package/dist/generators/feign-client/templates/src/main/java/_package_/client/OAuthIdpTokenResponseDTO.java.ejs +161 -0
  124. package/dist/generators/feign-client/templates/src/main/java/_package_/client/TokenRelayRequestInterceptor.java.ejs +42 -0
  125. package/dist/generators/feign-client/templates/src/main/java/_package_/client/UserFeignClientInterceptor_jwt.java.ejs +36 -0
  126. package/dist/generators/feign-client/templates/src/main/java/_package_/config/FeignConfiguration.java.ejs +45 -0
  127. package/dist/generators/feign-client/templates/src/test/java/_package_/client/AuthorizationHeaderUtilTest.java.ejs +263 -0
  128. package/dist/generators/generate-blueprint/command.mjs +1 -1
  129. package/dist/generators/generate-blueprint/resources/package.json +1 -1
  130. package/dist/generators/generate-blueprint/templates/vitest.config.ts.ejs +1 -1
  131. package/dist/generators/generator-constants.mjs +9 -5
  132. package/dist/generators/generator-list.mjs +1 -0
  133. package/dist/generators/git/generator.mjs +3 -5
  134. package/dist/generators/gradle/constants.mjs +1 -1
  135. package/dist/generators/java/command.mjs +6 -0
  136. package/dist/generators/java/entity-files.mjs +4 -0
  137. package/dist/generators/java/generator.mjs +3 -2
  138. package/dist/generators/java/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.jackson_identity_info.ejs +30 -0
  139. package/dist/generators/jdl/generator.mjs +18 -23
  140. package/dist/generators/kubernetes/templates/keycloak/keycloak-configmap.yml.ejs +4 -1
  141. package/dist/generators/kubernetes/templates/keycloak/keycloak.yml.ejs +1 -1
  142. package/dist/generators/languages/generator.mjs +24 -15
  143. package/dist/generators/languages/prompts.mjs +3 -1
  144. package/dist/generators/languages/support/translate.mjs +1 -1
  145. package/dist/generators/languages/templates/entity/i18n/entity_pt-br.json.ejs +1 -1
  146. package/dist/generators/liquibase/README.md +19 -0
  147. package/dist/generators/project-name/generator.mjs +14 -19
  148. package/dist/generators/project-name/support/name-resolver.mjs +35 -6
  149. package/dist/generators/react/resources/package.json +24 -24
  150. package/dist/generators/react/templates/src/main/webapp/app/config/notification-middleware.spec.ts.ejs +4 -4
  151. package/dist/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-detail.tsx.ejs +1 -2
  152. package/dist/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.tsx.ejs +12 -13
  153. package/dist/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.tsx.ejs +3 -8
  154. package/dist/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityModel_.model.ts.ejs +1 -1
  155. package/dist/generators/react/templates/src/main/webapp/app/shared/layout/header/header.scss.ejs +1 -1
  156. package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/reducer.utils.ts.ejs +1 -1
  157. package/dist/generators/react/templates/src/main/webapp/app/shared/util/date-utils.ts.ejs +1 -1
  158. package/dist/generators/server/cleanup.mjs +5 -0
  159. package/dist/generators/server/command.mjs +13 -2
  160. package/dist/generators/server/entity-files.mjs +3 -3
  161. package/dist/generators/server/files.mjs +2 -38
  162. package/dist/generators/server/generator.mjs +35 -19
  163. package/dist/generators/server/jdl/application-definition.mjs +5 -2
  164. package/dist/generators/server/options/feign-client.mjs +24 -0
  165. package/dist/generators/server/options/index.mjs +1 -0
  166. package/dist/generators/server/resources/Dockerfile +16 -16
  167. package/dist/generators/server/resources/gradle/libs.versions.toml +4 -4
  168. package/dist/generators/server/resources/pom.xml +11 -11
  169. package/dist/generators/server/support/config.mjs +1 -0
  170. package/dist/generators/server/support/prepare-entity.mjs +4 -1
  171. package/dist/generators/server/templates/build.gradle.ejs +1 -2
  172. package/dist/generators/server/templates/gradle/profile_dev.gradle.ejs +3 -21
  173. package/dist/generators/server/templates/gradle/profile_prod.gradle.ejs +5 -15
  174. package/dist/generators/server/templates/pom.xml.ejs +1 -4
  175. package/dist/generators/server/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/get_all_template.ejs +7 -7
  176. package/dist/generators/server/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/search_template.ejs +4 -4
  177. package/dist/generators/server/templates/src/main/java/_package_/_entityPackage_/repository/_entityClass_Repository.java.ejs +1 -1
  178. package/dist/generators/server/templates/src/main/java/_package_/_entityPackage_/service/mapper/_entityClass_Mapper.java.ejs +2 -2
  179. package/dist/generators/server/templates/src/main/java/_package_/_entityPackage_/web/rest/_entityClass_Resource.java.ejs +3 -3
  180. package/dist/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs +20 -2
  181. package/dist/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs +4 -1
  182. package/dist/generators/server/templates/src/main/java/_package_/security/oauth2/CustomClaimConverter.java.ejs +1 -5
  183. package/dist/generators/server/templates/src/main/java/_package_/service/MailService.java.ejs +48 -12
  184. package/dist/generators/server/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs +1 -1
  185. package/dist/generators/server/templates/src/main/java/_package_/web/rest/LogoutResource_imperative.java.ejs +4 -13
  186. package/dist/generators/server/templates/src/main/java/_package_/web/rest/LogoutResource_reactive.java.ejs +5 -11
  187. package/dist/generators/server/templates/src/main/java/_package_/web/rest/PublicUserResource.java.ejs +3 -3
  188. package/dist/generators/server/templates/src/main/java/_package_/web/rest/UserResource.java.ejs +6 -6
  189. package/dist/generators/server/templates/src/main/resources/config/application.yml.ejs +8 -7
  190. package/dist/generators/server/templates/src/test/java/_package_/TechnicalStructureTest.java.ejs +1 -1
  191. package/dist/generators/server/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs +8 -8
  192. package/dist/generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorTestController.java.ejs +2 -2
  193. package/dist/generators/spring-cache/internal/dependencies.mjs +1 -1
  194. package/dist/generators/spring-cache/templates/gradle/cache.gradle.ejs +1 -1
  195. package/dist/generators/spring-cache/templates/src/main/java/_package_/config/CacheFactoryConfiguration.java.ejs +1 -1
  196. package/dist/generators/spring-cloud-stream/templates/src/main/java/_package_/web/rest/KafkaResource_imperative.java.ejs +1 -1
  197. package/dist/generators/spring-cloud-stream/templates/src/main/java/_package_/web/rest/KafkaResource_reactive.java.ejs +1 -1
  198. package/dist/generators/spring-cloud-stream/templates/src/test/java/_package_/web/rest/KafkaResourceIT_reactive.java.ejs +3 -0
  199. package/dist/generators/spring-data-elasticsearch/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.elastic_search.ejs +1 -1
  200. package/dist/generators/spring-data-elasticsearch/templates/src/main/java/_package_/_entityPackage_/repository/search/_entityClass_SearchRepository.java.ejs +1 -1
  201. package/dist/generators/spring-data-elasticsearch/templates/src/main/java/_package_/repository/search/UserSearchRepository.java.ejs +4 -4
  202. package/dist/generators/spring-data-neo4j/generator.mjs +43 -1
  203. package/dist/generators/spring-data-neo4j/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.spring_data_neo4j.ejs +1 -1
  204. package/dist/generators/spring-data-relational/README.md +7 -0
  205. package/dist/generators/spring-data-relational/generator.mjs +2 -1
  206. package/dist/generators/spring-data-relational/internal/dependencies.mjs +29 -8
  207. package/dist/generators/spring-data-relational/support/database-data.mjs +4 -0
  208. package/dist/generators/spring-data-relational/templates/src/main/java/_package_/repository/EntityManager_reactive.java.ejs +49 -8
  209. package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainersSpringContextCustomizerFactory.java.ejs +1 -1
  210. package/dist/generators/upgrade/generator.mjs +3 -3
  211. package/dist/generators/vue/resources/package.json +21 -21
  212. package/dist/generators/vue/templates/package.json.ejs +1 -0
  213. package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-details.vue.ejs +1 -2
  214. package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.component.spec.ts.ejs +1 -1
  215. package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.component.ts.ejs +3 -3
  216. package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.vue.ejs +2 -15
  217. package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.vue.ejs +2 -7
  218. package/dist/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.js +1 -0
  219. package/dist/jdl/converters/json-to-jdl-converter.js +1 -1
  220. package/dist/jdl/converters/json-to-jdl-entity-converter.js +1 -0
  221. package/dist/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.js +5 -0
  222. package/dist/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js +0 -27
  223. package/dist/jdl/exporters/jhipster-entity-exporter.js +3 -2
  224. package/dist/jdl/jhipster/default-application-options.js +1 -1
  225. package/dist/jdl/jhipster/field-types.js +1 -1
  226. package/dist/jdl/jhipster/json-entity.js +6 -0
  227. package/dist/jdl/models/jdl-entity.js +16 -1
  228. package/dist/jdl/models/jdl-field.js +13 -0
  229. package/dist/jdl/models/jdl-object.js +3 -3
  230. package/dist/jdl/models/jdl-relationship.js +23 -5
  231. package/dist/jdl/parsing/lexer/application-tokens.js +1 -1
  232. package/dist/testing/helpers.mjs +10 -3
  233. package/dist/types/cli/environment-builder.d.mts +2 -0
  234. package/dist/types/generators/angular/needle-api/needle-client-angular.d.mts +0 -1
  235. package/dist/types/generators/base/api.d.mts +12 -0
  236. package/dist/types/generators/base/support/needles.d.mts +1 -1
  237. package/dist/types/generators/base-application/generator.d.mts +2 -2
  238. package/dist/types/generators/base-application/support/index.d.mts +1 -0
  239. package/dist/types/generators/base-application/support/update-application-entities-transform.d.mts +4 -0
  240. package/dist/types/generators/base-application/types/relationship.d.mts +4 -0
  241. package/dist/types/generators/base-core/generator.d.mts +7 -1
  242. package/dist/types/generators/bootstrap-application-base/support/export-jdl-transform.d.mts +8 -0
  243. package/dist/types/generators/bootstrap-application-base/support/import-jdl-transform.d.mts +6 -0
  244. package/dist/types/generators/bootstrap-application-base/support/index.d.mts +2 -0
  245. package/dist/types/generators/client/support/entity-definition.d.mts +2 -2
  246. package/dist/types/generators/feign-client/types-export.d.ts +1 -0
  247. package/dist/types/generators/generator-constants.d.mts +52 -48
  248. package/dist/types/generators/generator-list.d.mts +1 -0
  249. package/dist/types/generators/project-name/support/name-resolver.d.mts +9 -1
  250. package/dist/types/generators/server/options/feign-client.d.mts +21 -0
  251. package/dist/types/generators/server/options/index.d.mts +1 -0
  252. package/dist/types/jdl/converters/json-to-jdl-converter.d.ts +1 -0
  253. package/dist/types/jdl/converters/parsed-jdl-to-jdl-object/option-converter.d.ts +1 -1
  254. package/dist/types/jdl/jhipster/json-entity.d.ts +2 -0
  255. package/dist/types/jdl/models/jdl-entity.d.ts +1 -0
  256. package/dist/types/jdl/models/jdl-relationship.d.ts +0 -18
  257. package/dist/types/jdl/types/types.d.mts +2 -2
  258. package/package.json +27 -27
@@ -0,0 +1,35 @@
1
+ <%#
2
+ Copyright 2013-2023 the original author or authors from the JHipster project.
3
+
4
+ This file is part of the JHipster project, see https://www.jhipster.tech/
5
+ for more information.
6
+
7
+ Licensed under the Apache License, Version 2.0 (the "License");
8
+ you may not use this file except in compliance with the License.
9
+ You may obtain a copy of the License at
10
+
11
+ https://www.apache.org/licenses/LICENSE-2.0
12
+
13
+ Unless required by applicable law or agreed to in writing, software
14
+ distributed under the License is distributed on an "AS IS" BASIS,
15
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16
+ See the License for the specific language governing permissions and
17
+ limitations under the License.
18
+ -%>
19
+ package <%= packageName %>.client;
20
+
21
+ <%_ if (authenticationTypeOauth2) { _%>
22
+ import org.springframework.context.annotation.Bean;
23
+
24
+ import feign.RequestInterceptor;
25
+
26
+ import <%= packageName %>.client.AuthorizationHeaderUtil;
27
+
28
+ public class OAuth2InterceptedFeignConfiguration {
29
+
30
+ @Bean(name = "oauth2RequestInterceptor")
31
+ public RequestInterceptor getOAuth2RequestInterceptor(AuthorizationHeaderUtil authorizationHeaderUtil) {
32
+ return new TokenRelayRequestInterceptor(authorizationHeaderUtil);
33
+ }
34
+ }
35
+ <%_ } _%>
@@ -0,0 +1,161 @@
1
+ <%#
2
+ Copyright 2013-2023 the original author or authors from the JHipster project.
3
+
4
+ This file is part of the JHipster project, see https://www.jhipster.tech/
5
+ for more information.
6
+
7
+ Licensed under the Apache License, Version 2.0 (the "License");
8
+ you may not use this file except in compliance with the License.
9
+ You may obtain a copy of the License at
10
+
11
+ https://www.apache.org/licenses/LICENSE-2.0
12
+
13
+ Unless required by applicable law or agreed to in writing, software
14
+ distributed under the License is distributed on an "AS IS" BASIS,
15
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16
+ See the License for the specific language governing permissions and
17
+ limitations under the License.
18
+ -%>
19
+ package <%= packageName %>.client;
20
+
21
+ import com.fasterxml.jackson.annotation.JsonProperty;
22
+
23
+ import java.io.Serializable;
24
+ import java.util.UUID;
25
+
26
+ public class OAuthIdpTokenResponseDTO implements Serializable {
27
+
28
+ @JsonProperty("token_type")
29
+ private String tokenType;
30
+
31
+ private String scope;
32
+
33
+ @JsonProperty("expires_in")
34
+ private Long expiresIn;
35
+
36
+ @JsonProperty("ext_expires_in")
37
+ private Long extExpiresIn;
38
+
39
+ @JsonProperty("expires_on")
40
+ private Long expiresOn;
41
+
42
+ @JsonProperty("not-before-policy")
43
+ private Long notBefore;
44
+
45
+ private UUID resource;
46
+
47
+ @JsonProperty("access_token")
48
+ private String accessToken;
49
+
50
+ @JsonProperty("refresh_token")
51
+ private String refreshToken;
52
+
53
+ @JsonProperty("id_token")
54
+ private String idToken;
55
+
56
+ @JsonProperty("session_state")
57
+ private String sessionState;
58
+
59
+ @JsonProperty("refresh_expires_in")
60
+ private String refreshExpiresIn;
61
+
62
+ public OAuthIdpTokenResponseDTO() {
63
+ // Empty constructor for serialization.
64
+ }
65
+
66
+ public String getRefreshExpiresIn() {
67
+ return refreshExpiresIn;
68
+ }
69
+
70
+ public void setRefreshExpiresIn(String refreshExpiresIn) {
71
+ this.refreshExpiresIn = refreshExpiresIn;
72
+ }
73
+
74
+ public String getSessionState() {
75
+ return sessionState;
76
+ }
77
+
78
+ public void setSessionState(String sessionState) {
79
+ this.sessionState = sessionState;
80
+ }
81
+
82
+ public String getTokenType() {
83
+ return tokenType;
84
+ }
85
+
86
+ public void setTokenType(String tokenType) {
87
+ this.tokenType = tokenType;
88
+ }
89
+
90
+ public String getScope() {
91
+ return scope;
92
+ }
93
+
94
+ public void setScope(String scope) {
95
+ this.scope = scope;
96
+ }
97
+
98
+ public Long getExpiresIn() {
99
+ return expiresIn;
100
+ }
101
+
102
+ public void setExpiresIn(Long expiresIn) {
103
+ this.expiresIn = expiresIn;
104
+ }
105
+
106
+ public Long getExtExpiresIn() {
107
+ return extExpiresIn;
108
+ }
109
+
110
+ public void setExtExpiresIn(Long extExpiresIn) {
111
+ this.extExpiresIn = extExpiresIn;
112
+ }
113
+
114
+ public Long getExpiresOn() {
115
+ return expiresOn;
116
+ }
117
+
118
+ public void setExpiresOn(Long expiresOn) {
119
+ this.expiresOn = expiresOn;
120
+ }
121
+
122
+ public Long getNotBefore() {
123
+ return notBefore;
124
+ }
125
+
126
+ public void setNotBefore(Long notBefore) {
127
+ this.notBefore = notBefore;
128
+ }
129
+
130
+ public UUID getResource() {
131
+ return resource;
132
+ }
133
+
134
+ public void setResource(UUID resource) {
135
+ this.resource = resource;
136
+ }
137
+
138
+ public String getAccessToken() {
139
+ return accessToken;
140
+ }
141
+
142
+ public void setAccessToken(String accessToken) {
143
+ this.accessToken = accessToken;
144
+ }
145
+
146
+ public String getRefreshToken() {
147
+ return refreshToken;
148
+ }
149
+
150
+ public void setRefreshToken(String refreshToken) {
151
+ this.refreshToken = refreshToken;
152
+ }
153
+
154
+ public String getIdToken() {
155
+ return idToken;
156
+ }
157
+
158
+ public void setIdToken(String idToken) {
159
+ this.idToken = idToken;
160
+ }
161
+ }
@@ -0,0 +1,42 @@
1
+ <%#
2
+ Copyright 2013-2023 the original author or authors from the JHipster project.
3
+
4
+ This file is part of the JHipster project, see https://www.jhipster.tech/
5
+ for more information.
6
+
7
+ Licensed under the Apache License, Version 2.0 (the "License");
8
+ you may not use this file except in compliance with the License.
9
+ You may obtain a copy of the License at
10
+
11
+ https://www.apache.org/licenses/LICENSE-2.0
12
+
13
+ Unless required by applicable law or agreed to in writing, software
14
+ distributed under the License is distributed on an "AS IS" BASIS,
15
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16
+ See the License for the specific language governing permissions and
17
+ limitations under the License.
18
+ -%>
19
+ package <%= packageName %>.client;
20
+
21
+ import feign.RequestInterceptor;
22
+ import feign.RequestTemplate;
23
+
24
+ import java.util.Optional;
25
+
26
+ public class TokenRelayRequestInterceptor implements RequestInterceptor {
27
+
28
+ public static final String AUTHORIZATION = "Authorization";
29
+
30
+ private final AuthorizationHeaderUtil authorizationHeaderUtil;
31
+
32
+ public TokenRelayRequestInterceptor(AuthorizationHeaderUtil authorizationHeaderUtil) {
33
+ super();
34
+ this.authorizationHeaderUtil = authorizationHeaderUtil;
35
+ }
36
+
37
+ @Override
38
+ public void apply(RequestTemplate template) {
39
+ Optional<String> authorizationHeader = authorizationHeaderUtil.getAuthorizationHeader();
40
+ authorizationHeader.ifPresent(s -> template.header(AUTHORIZATION, s));
41
+ }
42
+ }
@@ -0,0 +1,36 @@
1
+ <%#
2
+ Copyright 2013-2023 the original author or authors from the JHipster project.
3
+
4
+ This file is part of the JHipster project, see https://www.jhipster.tech/
5
+ for more information.
6
+
7
+ Licensed under the Apache License, Version 2.0 (the "License");
8
+ you may not use this file except in compliance with the License.
9
+ You may obtain a copy of the License at
10
+
11
+ https://www.apache.org/licenses/LICENSE-2.0
12
+
13
+ Unless required by applicable law or agreed to in writing, software
14
+ distributed under the License is distributed on an "AS IS" BASIS,
15
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16
+ See the License for the specific language governing permissions and
17
+ limitations under the License.
18
+ -%>
19
+ package <%= packageName %>.client;
20
+
21
+ import <%= packageName %>.security.SecurityUtils;
22
+ import feign.RequestInterceptor;
23
+ import feign.RequestTemplate;
24
+ import org.springframework.stereotype.Component;
25
+
26
+ @Component
27
+ public class UserFeignClientInterceptor implements RequestInterceptor {
28
+ private static final String AUTHORIZATION_HEADER = "Authorization";
29
+ private static final String BEARER = "Bearer";
30
+
31
+ @Override
32
+ public void apply(RequestTemplate template) {
33
+ SecurityUtils.getCurrentUserJWT()
34
+ .ifPresent(s -> template.header(AUTHORIZATION_HEADER,String.format("%s %s", BEARER, s)));
35
+ }
36
+ }
@@ -0,0 +1,45 @@
1
+ <%#
2
+ Copyright 2013-2023 the original author or authors from the JHipster project.
3
+
4
+ This file is part of the JHipster project, see https://www.jhipster.tech/
5
+ for more information.
6
+
7
+ Licensed under the Apache License, Version 2.0 (the "License");
8
+ you may not use this file except in compliance with the License.
9
+ You may obtain a copy of the License at
10
+
11
+ https://www.apache.org/licenses/LICENSE-2.0
12
+
13
+ Unless required by applicable law or agreed to in writing, software
14
+ distributed under the License is distributed on an "AS IS" BASIS,
15
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16
+ See the License for the specific language governing permissions and
17
+ limitations under the License.
18
+ -%>
19
+ package <%= packageName %>.config;
20
+
21
+ import org.springframework.cloud.openfeign.EnableFeignClients;
22
+ import org.springframework.cloud.openfeign.FeignClientsConfiguration;
23
+ import org.springframework.context.annotation.Bean;
24
+ import org.springframework.context.annotation.Configuration;
25
+ import org.springframework.context.annotation.Import;
26
+ <%_ if (reactive) { _%>
27
+ import reactivefeign.spring.config.EnableReactiveFeignClients;
28
+ <%_ } _%>
29
+ @Configuration
30
+ @EnableFeignClients(basePackages = "<%= packageName %>")
31
+ <%_ if (reactive) { _%>
32
+ @EnableReactiveFeignClients(basePackages = "<%= packageName %>")
33
+ <%_ } _%>
34
+ @Import(FeignClientsConfiguration.class)
35
+ public class FeignConfiguration {
36
+
37
+ /**
38
+ * Set the Feign specific log level to log client REST requests.
39
+ */
40
+ @Bean
41
+ feign.Logger.Level feignLoggerLevel() {
42
+ return feign.Logger.Level.BASIC;
43
+ }
44
+
45
+ }
@@ -0,0 +1,263 @@
1
+ <%#
2
+ Copyright 2013-2023 the original author or authors from the JHipster project.
3
+
4
+ This file is part of the JHipster project, see https://www.jhipster.tech/
5
+ for more information.
6
+
7
+ Licensed under the Apache License, Version 2.0 (the "License");
8
+ you may not use this file except in compliance with the License.
9
+ You may obtain a copy of the License at
10
+
11
+ https://www.apache.org/licenses/LICENSE-2.0
12
+
13
+ Unless required by applicable law or agreed to in writing, software
14
+ distributed under the License is distributed on an "AS IS" BASIS,
15
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16
+ See the License for the specific language governing permissions and
17
+ limitations under the License.
18
+ -%>
19
+ package <%= packageName %>.client;
20
+
21
+ import static org.junit.jupiter.api.Assertions.fail;
22
+ import static org.mockito.ArgumentMatchers.*;
23
+ import static org.mockito.Mockito.*;
24
+
25
+ import java.time.Duration;
26
+ import java.time.Instant;
27
+ import java.util.List;
28
+ import java.util.Map;
29
+ import java.util.Optional;
30
+ import org.assertj.core.api.Assertions;
31
+ import org.junit.jupiter.api.BeforeEach;
32
+ import org.junit.jupiter.api.Test;
33
+ import org.junit.jupiter.api.extension.ExtendWith;
34
+ import org.mockito.InjectMocks;
35
+ import org.mockito.Mock;
36
+ import org.mockito.junit.jupiter.MockitoExtension;
37
+ import org.springframework.boot.web.client.RestTemplateBuilder;
38
+ import org.springframework.http.RequestEntity;
39
+ import org.springframework.http.ResponseEntity;
40
+ import org.springframework.http.converter.HttpMessageConverter;
41
+ import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
42
+ import org.springframework.security.core.authority.SimpleGrantedAuthority;
43
+ import org.springframework.security.core.context.SecurityContext;
44
+ import org.springframework.security.core.context.SecurityContextHolder;
45
+ import org.springframework.security.oauth2.client.OAuth2AuthorizedClient;
46
+ import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService;
47
+ import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
48
+ import org.springframework.security.oauth2.client.registration.ClientRegistration;
49
+ import org.springframework.security.oauth2.core.*;
50
+ import org.springframework.security.oauth2.core.oidc.OidcIdToken;
51
+ import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
52
+ import org.springframework.security.oauth2.jwt.Jwt;
53
+ import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
54
+ import org.springframework.web.client.ResponseErrorHandler;
55
+ import org.springframework.web.client.RestTemplate;
56
+
57
+ /**
58
+ * Test class for the {@link AuthorizationHeaderUtil} utility class.
59
+ */
60
+ @ExtendWith(MockitoExtension.class)
61
+ class AuthorizationHeaderUtilTest {
62
+
63
+ public static final String VALID_REGISTRATION_ID = "OIDC";
64
+ public static final String SUB_VALUE = "123456";
65
+
66
+ @Mock
67
+ private OAuth2AuthorizedClientService clientService;
68
+
69
+ @Mock
70
+ private RestTemplateBuilder restTemplateBuilder;
71
+
72
+ @Mock
73
+ private SecurityContext securityContext;
74
+
75
+ @InjectMocks
76
+ private AuthorizationHeaderUtil authorizationHeaderUtil;
77
+
78
+ @BeforeEach
79
+ public void setup() {
80
+ SecurityContextHolder.setContext(securityContext);
81
+ }
82
+
83
+ @Test
84
+ void getAuthorizationHeader_Authentication() {
85
+ UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken("principal", "credentials");
86
+ doReturn(authenticationToken).when(securityContext).getAuthentication();
87
+
88
+ Optional<String> header = authorizationHeaderUtil.getAuthorizationHeader();
89
+
90
+ Assertions.assertThat(header).isNotNull().isEmpty();
91
+ }
92
+
93
+ @Test
94
+ void getAuthorizationHeader_JwtAuthentication() {
95
+ JwtAuthenticationToken jwtToken = new JwtAuthenticationToken(
96
+ new Jwt("tokenVal", Instant.now(), Instant.now().plus(Duration.ofMinutes(3)), Map.of("alg", "HS256"), Map.of("sub", SUB_VALUE))
97
+ );
98
+ doReturn(jwtToken).when(securityContext).getAuthentication();
99
+
100
+ Optional<String> header = authorizationHeaderUtil.getAuthorizationHeader();
101
+
102
+ Assertions.assertThat(header).isNotNull().isNotEmpty().get().isEqualTo("Bearer tokenVal");
103
+ }
104
+
105
+ @Test
106
+ void getAuthorizationHeader_OAuth2Authentication_InvalidClient() {
107
+ OAuth2AuthenticationToken oauth2Token = getTestOAuth2AuthenticationToken("INVALID");
108
+
109
+ doReturn(oauth2Token).when(securityContext).getAuthentication();
110
+
111
+ Assertions
112
+ .assertThatThrownBy(() -> {
113
+ authorizationHeaderUtil.getAuthorizationHeader();
114
+ })
115
+ .isInstanceOf(OAuth2AuthorizationException.class)
116
+ .hasMessageContaining("[access_denied] The token is expired");
117
+ }
118
+
119
+ @Test
120
+ void getAuthorizationHeader_OAuth2Authentication() {
121
+ OAuth2AuthenticationToken oauth2Token = getTestOAuth2AuthenticationToken(VALID_REGISTRATION_ID);
122
+ OAuth2AuthorizedClient authorizedClient = getTestOAuth2AuthorizedClient();
123
+
124
+ doReturn(oauth2Token).when(securityContext).getAuthentication();
125
+ doReturn(authorizedClient).when(clientService).loadAuthorizedClient(eq(VALID_REGISTRATION_ID), eq(SUB_VALUE));
126
+
127
+ Optional<String> header = authorizationHeaderUtil.getAuthorizationHeader();
128
+ Assertions.assertThat(header).isNotNull().isNotEmpty().get().isEqualTo("Bearer tokenVal");
129
+ }
130
+
131
+ @Test
132
+ void getAuthorizationHeader_OAuth2Authentication_RefreshToken() {
133
+ doReturn(restTemplateBuilder)
134
+ .when(restTemplateBuilder)
135
+ .additionalMessageConverters(any(HttpMessageConverter.class), any(HttpMessageConverter.class));
136
+ doReturn(restTemplateBuilder).when(restTemplateBuilder).errorHandler(any(ResponseErrorHandler.class));
137
+ doReturn(restTemplateBuilder).when(restTemplateBuilder).basicAuthentication(anyString(), anyString());
138
+
139
+ OAuth2AuthenticationToken oauth2Token = getTestOAuth2AuthenticationToken(VALID_REGISTRATION_ID);
140
+ OAuth2AuthorizedClient authorizedClient = getTestOAuth2AuthorizedClient(true);
141
+
142
+ doReturn(oauth2Token).when(securityContext).getAuthentication();
143
+ doReturn(authorizedClient).when(clientService).loadAuthorizedClient(eq(VALID_REGISTRATION_ID), eq(SUB_VALUE));
144
+
145
+ RestTemplate restTemplate = mock(RestTemplate.class);
146
+ ResponseEntity<OAuthIdpTokenResponseDTO> refreshResponse = ResponseEntity.of(getTestOAuthIdpTokenResponseDTO(true));
147
+ doReturn(refreshResponse).when(restTemplate).exchange(any(RequestEntity.class), eq(OAuthIdpTokenResponseDTO.class));
148
+ doReturn(restTemplate).when(restTemplateBuilder).build();
149
+
150
+ Optional<String> header = authorizationHeaderUtil.getAuthorizationHeader();
151
+ Assertions.assertThat(header).isNotNull().isNotEmpty().get().isEqualTo("Bearer tokenVal");
152
+ }
153
+
154
+ @Test
155
+ void getAuthorizationHeader_OAuth2Authentication_RefreshToken_NoRefreshToken() {
156
+ doReturn(restTemplateBuilder)
157
+ .when(restTemplateBuilder)
158
+ .additionalMessageConverters(any(HttpMessageConverter.class), any(HttpMessageConverter.class));
159
+ doReturn(restTemplateBuilder).when(restTemplateBuilder).errorHandler(any(ResponseErrorHandler.class));
160
+ doReturn(restTemplateBuilder).when(restTemplateBuilder).basicAuthentication(anyString(), anyString());
161
+
162
+ OAuth2AuthenticationToken oauth2Token = getTestOAuth2AuthenticationToken(VALID_REGISTRATION_ID);
163
+ OAuth2AuthorizedClient authorizedClient = getTestOAuth2AuthorizedClient(true);
164
+
165
+ doReturn(oauth2Token).when(securityContext).getAuthentication();
166
+ doReturn(authorizedClient).when(clientService).loadAuthorizedClient(eq(VALID_REGISTRATION_ID), eq(SUB_VALUE));
167
+
168
+ RestTemplate restTemplate = mock(RestTemplate.class);
169
+ ResponseEntity<OAuthIdpTokenResponseDTO> refreshResponse = ResponseEntity.of(getTestOAuthIdpTokenResponseDTO(false));
170
+ doReturn(refreshResponse).when(restTemplate).exchange(any(RequestEntity.class), eq(OAuthIdpTokenResponseDTO.class));
171
+ doReturn(restTemplate).when(restTemplateBuilder).build();
172
+
173
+ Optional<String> header = authorizationHeaderUtil.getAuthorizationHeader();
174
+ Assertions.assertThat(header).isNotNull().isNotEmpty().get().isEqualTo("Bearer tokenVal");
175
+ }
176
+
177
+ @Test
178
+ void getAuthorizationHeader_OAuth2Authentication_RefreshTokenFails() {
179
+ doReturn(restTemplateBuilder)
180
+ .when(restTemplateBuilder)
181
+ .additionalMessageConverters(any(HttpMessageConverter.class), any(HttpMessageConverter.class));
182
+ doReturn(restTemplateBuilder).when(restTemplateBuilder).errorHandler(any(ResponseErrorHandler.class));
183
+ doReturn(restTemplateBuilder).when(restTemplateBuilder).basicAuthentication(anyString(), anyString());
184
+
185
+ OAuth2AuthenticationToken oauth2Token = getTestOAuth2AuthenticationToken(VALID_REGISTRATION_ID);
186
+ OAuth2AuthorizedClient authorizedClient = getTestOAuth2AuthorizedClient(true);
187
+
188
+ doReturn(oauth2Token).when(securityContext).getAuthentication();
189
+ doReturn(authorizedClient).when(clientService).loadAuthorizedClient(eq(VALID_REGISTRATION_ID), eq(SUB_VALUE));
190
+
191
+ RestTemplate restTemplate = mock(RestTemplate.class);
192
+ doThrow(new OAuth2AuthorizationException(new OAuth2Error("E"), "error"))
193
+ .when(restTemplate)
194
+ .exchange(any(RequestEntity.class), eq(OAuthIdpTokenResponseDTO.class));
195
+ doReturn(restTemplate).when(restTemplateBuilder).build();
196
+
197
+ Assertions
198
+ .assertThatThrownBy(() -> {
199
+ authorizationHeaderUtil.getAuthorizationHeader();
200
+ })
201
+ .isInstanceOf(OAuth2AuthenticationException.class)
202
+ .hasMessageContaining("error");
203
+ }
204
+
205
+ private OAuth2AuthorizedClient getTestOAuth2AuthorizedClient() {
206
+ return getTestOAuth2AuthorizedClient(false);
207
+ }
208
+
209
+ private OAuth2AuthorizedClient getTestOAuth2AuthorizedClient(boolean accessTokenExpired) {
210
+ Instant issuedAt = Instant.now();
211
+ Instant expiresAt;
212
+ if (accessTokenExpired) {
213
+ expiresAt = issuedAt.plus(Duration.ofNanos(1));
214
+ try {
215
+ Thread.sleep(1);
216
+ } catch (Exception e) {
217
+ fail("Error in Thread.sleep(1) : " + e.getMessage());
218
+ }
219
+ } else {
220
+ expiresAt = issuedAt.plus(Duration.ofMinutes(3));
221
+ }
222
+ OAuth2AccessToken token = new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER, "tokenVal", issuedAt, expiresAt);
223
+
224
+ return new OAuth2AuthorizedClient(
225
+ ClientRegistration
226
+ .withRegistrationId(VALID_REGISTRATION_ID)
227
+ .authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE)
228
+ .clientId("web-app")
229
+ .clientSecret("secret")
230
+ .redirectUri("/login/oauth2/code/oidc")
231
+ .authorizationUri("http://localhost:8080/auth/realms/master/protocol/openid-connect/auth")
232
+ .tokenUri("https://localhost:8080/auth/realms/master/protocol/openid-connect/token")
233
+ .build(),
234
+ "sub",
235
+ token,
236
+ new OAuth2RefreshToken("refreshVal", Instant.now())
237
+ );
238
+ }
239
+
240
+ private OAuth2AuthenticationToken getTestOAuth2AuthenticationToken(String registrationId) {
241
+ return new OAuth2AuthenticationToken(
242
+ new DefaultOidcUser(
243
+ List.of(new SimpleGrantedAuthority("USER")),
244
+ OidcIdToken.withTokenValue("tokenVal").claim("sub", SUB_VALUE).build()
245
+ ),
246
+ List.of(new SimpleGrantedAuthority("USER")),
247
+ registrationId
248
+ );
249
+ }
250
+
251
+ private Optional<OAuthIdpTokenResponseDTO> getTestOAuthIdpTokenResponseDTO(boolean hasRefreshToken) {
252
+ OAuthIdpTokenResponseDTO dto = new OAuthIdpTokenResponseDTO();
253
+ dto.setAccessToken("tokenVal");
254
+ dto.setIdToken("tokenVal");
255
+ dto.setNotBefore(0l);
256
+ dto.setRefreshExpiresIn("1800");
257
+ dto.setSessionState("ccea4a55");
258
+ dto.setExpiresIn(300l);
259
+ dto.setRefreshToken(hasRefreshToken ? "tokenVal" : null);
260
+ dto.setScope("openid email profile offline_access");
261
+ return Optional.of(dto);
262
+ }
263
+ }
@@ -22,7 +22,7 @@ const command = {
22
22
  scope: 'storage',
23
23
  },
24
24
  [DYNAMIC]: {
25
- description: 'Genate dynamic generators (advanced)',
25
+ description: 'Generate dynamic generators (advanced)',
26
26
  type: Boolean,
27
27
  scope: 'storage',
28
28
  },
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "dependencies": {
3
- "vitest": "0.34.6"
3
+ "vitest": "1.0.2"
4
4
  }
5
5
  }
@@ -2,7 +2,7 @@ import { defineConfig, defaultExclude } from 'vitest/config';
2
2
 
3
3
  export default defineConfig({
4
4
  test: {
5
- threads: false,
5
+ pool: 'forks',
6
6
  hookTimeout: 20000,
7
7
  exclude: [...defaultExclude.filter(val => val !== '**/cypress/**'), '**/templates/**', '**/resources/**'],
8
8
  },
@@ -18,7 +18,7 @@
18
18
  */
19
19
  export const BLUEPRINT_API_VERSION = 'jhipster-8';
20
20
  // jhipster-bom version
21
- export const JHIPSTER_DEPENDENCIES_VERSION = '8.0.0';
21
+ export const JHIPSTER_DEPENDENCIES_VERSION = '8.1.0';
22
22
  // Version of Java
23
23
  export const JAVA_VERSION = '17';
24
24
  export const JAVA_COMPATIBLE_VERSIONS = ['17', '18', '19', '20', '21'];
@@ -27,27 +27,31 @@ export const ADD_SPRING_MILESTONE_REPOSITORY = false;
27
27
  // Version of Node, NPM
28
28
  export const NODE_VERSION = '18.18.2';
29
29
  export const OPENAPI_GENERATOR_CLI_VERSION = '2.7.0';
30
+ /**
31
+ * @type {Record<string, string>}
32
+ */
30
33
  export const javaDependencies = {
31
34
  /**
32
35
  * spring-boot version should match the one managed by https://mvnrepository.com/artifact/tech.jhipster/jhipster-dependencies/JHIPSTER_DEPENDENCIES_VERSION
33
36
  */
34
- 'spring-boot': '3.1.5',
37
+ 'spring-boot': '3.2.0',
35
38
  /*
36
39
  * hibernate version should match the one managed by https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/SPRING_BOOT_VERSION
37
40
  * Required due to hibernate-jpamodelgen annotation processor.
38
41
  */
39
- hibernate: '6.2.13.Final',
42
+ hibernate: '6.3.1.Final',
40
43
  /*
41
44
  * cassandra driver version should match the one managed by https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/SPRING_BOOT_VERSION
42
45
  * Required due to java-driver-mapper-processor annotation processor.
43
46
  */
44
- cassandra: '4.15.0',
47
+ cassandra: '4.17.0',
45
48
  };
46
49
  Object.freeze(javaDependencies);
47
50
  // The version should be coherent with the one from spring-data-elasticsearch project
48
- export const ELASTICSEARCH_TAG = '8.7.1';
51
+ export const ELASTICSEARCH_TAG = '8.10.4';
49
52
  export const ELASTICSEARCH_IMAGE = 'docker.elastic.co/elasticsearch/elasticsearch';
50
53
  /**
54
+ * @type {Record<string, string>}
51
55
  * Manually updated docker containers
52
56
  */
53
57
  export const dockerContainers = {
@@ -39,6 +39,7 @@ export const GENERATOR_DOCKER_COMPOSE = 'docker-compose';
39
39
  export const GENERATOR_ENTITIES = 'entities';
40
40
  export const GENERATOR_ENTITY = 'entity';
41
41
  export const GENERATOR_EXPORT_JDL = 'export-jdl';
42
+ export const GENERATOR_FEIGN_CLIENT = 'feign-client';
42
43
  export const GENERATOR_GATLING = 'gatling';
43
44
  export const GENERATOR_GENERATE_BLUEPRINT = 'generate-blueprint';
44
45
  export const GENERATOR_GIT = 'git';