generator-jhipster 8.0.0 → 8.1.0

package/dist/generators/client/resources/package.json

@@ -3,14 +3,14 @@
     "dayjs": "1.11.10"
   },
   "devDependencies": {
-    "@cypress/code-coverage": "3.12.7",
+    "@cypress/code-coverage": "3.12.13",
     "babel-loader": "9.1.3",
     "babel-plugin-istanbul": "6.1.1",
-    "cypress": "13.4.0",
+    "cypress": "13.6.1",
     "cypress-audit": "1.1.0",
     "eslint-plugin-cypress": "2.15.1",
-    "lighthouse": "11.2.0",
+    "lighthouse": "11.3.0",
     "nyc": "15.1.0",
-    "swagger-ui-dist": "5.9.1"
+    "swagger-ui-dist": "5.10.3"
   }
 }

package/dist/generators/client/support/entity-definition.mjs

@@ -34,14 +34,14 @@ const { ANGULAR, VUE } = clientFrameworkTypes;
  * @param {string} dto - dto
  * @param [customDateType]
  * @param {boolean} embedded - either the actual entity is embedded or not
- * @param { string} clientFramwork
+ * @param { string} clientFramework
  * @returns variablesWithTypes: Array
  */
-const generateEntityClientFields = (primaryKey, fields, relationships, dto, customDateType = 'dayjs.Dayjs', embedded = false, clientFramwork = ANGULAR) => {
+const generateEntityClientFields = (primaryKey, fields, relationships, dto, customDateType = 'dayjs.Dayjs', embedded = false, clientFramework = ANGULAR) => {
     const variablesWithTypes = [];
     if (!embedded && primaryKey) {
         const tsKeyType = getTypescriptKeyType(primaryKey);
-        if (clientFramwork === VUE) {
+        if (clientFramework === VUE) {
             variablesWithTypes.push(`id?: ${tsKeyType}`);
         }
     }

package/dist/generators/client/templates/README.md.jhi.client.ejs

@@ -109,7 +109,7 @@ The service worker initialization code is commented out by default. To enable it
 Note: [Workbox](https://developers.google.com/web/tools/workbox/) powers JHipster's service worker. It dynamically generates the `service-worker.js` file.
   <%_ } _%>
   <%_ if (clientFrameworkAngular) { _%>
-The service worker initialization code is disabled by default. To enable it, uncomment the following code in `<%= clientSrcDir %>app/app.module.ts`:
+The service worker initialization code is disabled by default. To enable it, uncomment the following code in `<%= clientSrcDir %>app/app.config.ts`:
 
 ```typescript
 ServiceWorkerModule.register('ngsw-worker.js', { enabled: false }),
@@ -132,7 +132,7 @@ To benefit from TypeScript type definitions from [DefinitelyTyped][] repository
 
 Then you would import the JS and CSS files specified in library's installation instructions so that [Webpack][] knows about them:
   <%_ if (clientFrameworkAngular) { _%>
-Edit [<%= clientSrcDir %>app/app.module.ts](<%= clientSrcDir %>app/app.module.ts) file:
+Edit [<%= clientSrcDir %>app/app.config.ts](<%= clientSrcDir %>app/app.config.ts) file:
 
 ```
 import 'leaflet/dist/leaflet.js';

package/dist/generators/client/templates/src/main/webapp/index.html.ejs

@@ -43,7 +43,7 @@
       </p>
     <![endif]-->
 <%_ if (clientFrameworkAngular) { _%>
-    <<%= jhiPrefixDashed %>-main>
+    <<%= jhiPrefixDashed %>-app>
 <%_ } else { _%>
     <div id="<% if (clientFrameworkReact) { %>root<% } else { %>app<% } %>">
 <%_ } _%>
@@ -95,7 +95,7 @@
         </div>
       </div>
     <%_ if (clientFrameworkAngular) { _%>
-    </<%= jhiPrefixDashed %>-main>
+    </<%= jhiPrefixDashed %>-app>
     <%_ } else { _%>
     </div>
     <%_ } _%>

package/dist/generators/common/command.mjs

@@ -1,3 +1,4 @@
+import { GENERATOR_BOOTSTRAP_APPLICATION_BASE } from '../generator-list.mjs';
 const command = {
     options: {
         prettierTabWidth: {
@@ -11,5 +12,6 @@ const command = {
             scope: 'storage',
         },
     },
+    import: [GENERATOR_BOOTSTRAP_APPLICATION_BASE],
 };
 export default command;

package/dist/generators/common/resources/package.json

@@ -2,8 +2,8 @@
   "devDependencies": {
     "concurrently": "8.2.2",
     "husky": "8.0.3",
-    "lint-staged": "15.0.2",
-    "npm": "10.2.2",
-    "wait-on": "7.0.1"
+    "lint-staged": "15.2.0",
+    "npm": "10.2.4",
+    "wait-on": "7.2.0"
   }
 }

package/dist/generators/common/templates/sonar-project.properties.ejs

@@ -1,7 +1,7 @@
 sonar.projectKey=<%= baseName %>
 sonar.projectName=<%= baseName %> generated by jhipster
 
-# Typescript tests files must be inside sources and tests, othewise `INFO: Test execution data ignored for 80 unknown files, including:` is shown.
+# Typescript tests files must be inside sources and tests, otherwise `INFO: Test execution data ignored for 80 unknown files, including:` is shown.
 sonar.sources=src
 sonar.tests=src
 sonar.host.url=http://localhost:9001

package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/entity/_entity_.cy.ts.ejs

@@ -335,7 +335,6 @@ describe('<%= entityClass %> e2e test', () => {
     <%_ } _%>
   <%_ }); _%>
   <%_ for (relationship of requiredRelationships) {
-    const ownerSide = relationship.ownerSide;
     const relationshipName = relationship.relationshipName;
   _%>
        cy.get(`[data-cy="<%= relationship.relationshipFieldName %>"]`).select(<%= relationship.collection ? '[0]' : '1' %>);

package/dist/generators/docker/generator.mjs

@@ -209,7 +209,7 @@ export default class DockerGenerator extends BaseApplicationGenerator {
                         });
                         if (application.databaseTypeCassandra) {
                             // Wait for migration
-                            postServicesSleep = 5;
+                            postServicesSleep = 10;
                         }
                     }
                     else {

package/dist/generators/docker/templates/docker/cassandra.yml.ejs

@@ -33,10 +33,10 @@ services:
       - 127.0.0.1:9042:9042
       - 127.0.0.1:9160:9160
     healthcheck:
-      test: ['CMD-SHELL', '[ $$(nodetool statusgossip) = running ]']
+      test: ['CMD', 'cqlsh', '-e', 'describe keyspaces']
       interval: 5s
       timeout: 25s
-      retries: 10
+      retries: 20
   cassandra-migration:
     environment:
       - CASSANDRA_CONTACT_POINT=<%= baseName.toLowerCase() %>-cassandra

package/dist/generators/docker/templates/docker/keycloak.yml.ejs

@@ -21,7 +21,7 @@ name: <%= baseName.toLowerCase() %>
 services:
   keycloak:
     image: <%- dockerContainers.keycloak %>
-    command: ['start-dev --import-realm']
+    command: 'start-dev --import-realm'
     volumes:
       - ./realm-config:/opt/keycloak/data/import
       - ./realm-config/keycloak-health-check.sh:/opt/keycloak/health-check.sh

package/dist/generators/docker/templates/docker/realm-config/jhipster-realm.json.ejs

@@ -475,6 +475,7 @@
     "totpAppFreeOTPName",
     "totpAppMicrosoftAuthenticatorName"
   ],
+  "localizationTexts": {},
   "webAuthnPolicyRpEntityName": "keycloak",
   "webAuthnPolicySignatureAlgorithms": [
     "ES256"
@@ -487,6 +488,7 @@
   "webAuthnPolicyCreateTimeout": 0,
   "webAuthnPolicyAvoidSameAuthenticatorRegister": false,
   "webAuthnPolicyAcceptableAaguids": [],
+  "webAuthnPolicyExtraOrigins": [],
   "webAuthnPolicyPasswordlessRpEntityName": "keycloak",
   "webAuthnPolicyPasswordlessSignatureAlgorithms": [
     "ES256"
@@ -499,6 +501,7 @@
   "webAuthnPolicyPasswordlessCreateTimeout": 0,
   "webAuthnPolicyPasswordlessAvoidSameAuthenticatorRegister": false,
   "webAuthnPolicyPasswordlessAcceptableAaguids": [],
+  "webAuthnPolicyPasswordlessExtraOrigins": [],
   "users": [
     {
       "id": "f742ba6f-1d8a-4dec-bf15-e02dab508283",
@@ -2576,7 +2579,7 @@
     "frontendUrl": "",
     "acr.loa.map": "[]"
   },
-  "keycloakVersion": "22.0.1",
+  "keycloakVersion": "23.0.1",
   "userManagedAccessAllowed": false,
   "clientProfiles": {
     "profiles": []

package/dist/generators/docker-compose/generator.mjs

@@ -66,18 +66,11 @@ export default class DockerComposeGenerator extends BaseWorkspacesGenerator {
             async checkDockerCompose() {
                 if (this.skipChecks)
                     return;
-                const { stdout, exitCode } = await this.spawnCommand('docker compose version', { reject: false, stdio: 'pipe' });
+                const { exitCode } = await this.spawnCommand('docker compose version', { reject: false, stdio: 'pipe' });
                 if (exitCode !== 0) {
-                    this.log.error(chalk.red('Docker Compose 1.6.0 or later is not installed on your computer.\n' +
-                        '         Read https://docs.docker.com/compose/install/\n'));
-                }
-                const composeVersion = stdout.split(' ')[2].replace(/,/g, '');
-                const composeVersionMajor = composeVersion.split('.')[0];
-                const composeVersionMinor = composeVersion.split('.')[1];
-                if (composeVersionMajor < 1 || (composeVersionMajor === 1 && composeVersionMinor < 6)) {
-                    this.log.error(chalk.red(`$Docker Compose version 1.6.0 or later is not installed on your computer.
-                                             Docker Compose version found: ${composeVersion}
-                                             Read https://docs.docker.com/compose/install`));
+                    throw new Error(`Docker Compose V2 is not installed on your computer.
+         Read https://docs.docker.com/compose/install/
+`);
                 }
             },
         };

package/dist/generators/docker-compose/templates/docker-compose.yml.ejs

@@ -110,7 +110,7 @@ services:
 <%_ if (usesOauth2) { _%>
   keycloak:
     image: <%- dockerContainers.keycloak %>
-    command: ['start-dev --import-realm']
+    command: 'start-dev --import-realm'
     volumes:
       - ./realm-config:/opt/keycloak/data/import
       - ./realm-config/keycloak-health-check.sh:/opt/keycloak/health-check.sh

package/dist/generators/docker-compose/templates/realm-config/jhipster-realm.json.ejs

@@ -475,6 +475,7 @@
     "totpAppFreeOTPName",
     "totpAppMicrosoftAuthenticatorName"
   ],
+  "localizationTexts": {},
   "webAuthnPolicyRpEntityName": "keycloak",
   "webAuthnPolicySignatureAlgorithms": [
     "ES256"
@@ -487,6 +488,7 @@
   "webAuthnPolicyCreateTimeout": 0,
   "webAuthnPolicyAvoidSameAuthenticatorRegister": false,
   "webAuthnPolicyAcceptableAaguids": [],
+  "webAuthnPolicyExtraOrigins": [],
   "webAuthnPolicyPasswordlessRpEntityName": "keycloak",
   "webAuthnPolicyPasswordlessSignatureAlgorithms": [
     "ES256"
@@ -499,6 +501,7 @@
   "webAuthnPolicyPasswordlessCreateTimeout": 0,
   "webAuthnPolicyPasswordlessAvoidSameAuthenticatorRegister": false,
   "webAuthnPolicyPasswordlessAcceptableAaguids": [],
+  "webAuthnPolicyPasswordlessExtraOrigins": [],
   "users": [
     {
       "id": "f742ba6f-1d8a-4dec-bf15-e02dab508283",
@@ -2578,7 +2581,7 @@
     "frontendUrl": "",
     "acr.loa.map": "[]"
   },
-  "keycloakVersion": "22.0.1",
+  "keycloakVersion": "23.0.1",
   "userManagedAccessAllowed": false,
   "clientProfiles": {
     "profiles": []

package/dist/generators/export-jdl/generator.mjs

@@ -51,7 +51,7 @@ export default class extends BaseGenerator {
                 }
                 catch (error) {
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    throw new Error(`An error occurred while exporting to JDL: ${error.message}\n${error}`);
+                    throw new Error(`An error occurred while exporting to JDL: ${error.message}\n${error}`, { cause: error });
                 }
             },
         });

package/dist/generators/feign-client/cleanup.mjs

@@ -0,0 +1,12 @@
+/**
+ * Removes server files that where generated in previous JHipster versions and therefore
+ * need to be removed.
+ */
+export default function cleanupTask({ application }) {
+    if (this.isJhipsterVersionLessThan('8.0.1')) {
+        if (application.authenticationTypeOauth2) {
+            this.removeFile(`${application.javaPackageSrcDir}security/oauth2/AuthorizationHeaderUtil.java`);
+            this.removeFile(`${application.javaPackageTestDir}security/oauth2/AuthorizationHeaderUtilTest.java`);
+        }
+    }
+}

package/dist/generators/feign-client/files.mjs

@@ -0,0 +1,35 @@
+import { SERVER_MAIN_SRC_DIR, SERVER_TEST_SRC_DIR } from '../generator-constants.mjs';
+import { moveToJavaPackageSrcDir, moveToJavaPackageTestDir } from '../java/support/index.mjs';
+export const feignFiles = {
+    microserviceFeignFiles: [
+        {
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
+            renameTo: moveToJavaPackageSrcDir,
+            templates: ['config/FeignConfiguration.java'],
+        },
+        {
+            condition: generator => generator.authenticationTypeOauth2,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
+            renameTo: moveToJavaPackageSrcDir,
+            templates: [
+                'client/AuthorizationHeaderUtil.java',
+                'client/AuthorizedFeignClient.java',
+                'client/OAuth2InterceptedFeignConfiguration.java',
+                'client/TokenRelayRequestInterceptor.java',
+                'client/OAuthIdpTokenResponseDTO.java',
+            ],
+        },
+        {
+            condition: generator => generator.authenticationTypeJwt,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
+            renameTo: moveToJavaPackageSrcDir,
+            templates: ['client/UserFeignClientInterceptor_jwt.java'],
+        },
+        {
+            condition: generator => generator.authenticationTypeOauth2,
+            path: `${SERVER_TEST_SRC_DIR}_package_/`,
+            renameTo: moveToJavaPackageTestDir,
+            templates: ['client/AuthorizationHeaderUtilTest.java'],
+        },
+    ],
+};

package/dist/generators/feign-client/generator.mjs

@@ -0,0 +1,65 @@
+/**
+ * Copyright 2013-2023 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import BaseApplicationGenerator from '../base-application/index.mjs';
+import { GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_FEIGN_CLIENT } from '../generator-list.mjs';
+import { feignFiles } from './files.mjs';
+import cleanupTask from './cleanup.mjs';
+export default class FeignClientGenerator extends BaseApplicationGenerator {
+    async beforeQueue() {
+        if (!this.fromBlueprint) {
+            await this.composeWithBlueprints(GENERATOR_FEIGN_CLIENT);
+        }
+        if (!this.delegateToBlueprint) {
+            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+        }
+    }
+    get writing() {
+        return this.asWritingTaskGroup({
+            cleanupTask,
+            async writeTask({ application }) {
+                await this.writeFiles({
+                    sections: feignFiles,
+                    context: application,
+                });
+            },
+        });
+    }
+    get [BaseApplicationGenerator.WRITING]() {
+        return this.delegateTasksToBlueprint(() => this.writing);
+    }
+    get postWriting() {
+        return this.asPostWritingTaskGroup({
+            addDependencies({ application, source }) {
+                const openFeignArtifact = { groupId: 'org.springframework.cloud', artifactId: 'spring-cloud-starter-openfeign' };
+                if (application.buildToolMaven) {
+                    source.addMavenDependency?.(openFeignArtifact);
+                }
+                if (application.buildToolGradle) {
+                    source.addGradleDependency?.({
+                        ...openFeignArtifact,
+                        scope: 'implementation',
+                    });
+                }
+            },
+        });
+    }
+    get [BaseApplicationGenerator.POST_WRITING]() {
+        return this.asPostWritingTaskGroup(this.delegateTasksToBlueprint(() => this.postWriting));
+    }
+}

package/dist/generators/feign-client/index.mjs

@@ -0,0 +1,19 @@
+/**
+ * Copyright 2013-2023 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { default } from './generator.mjs';

package/dist/generators/feign-client/templates/src/main/java/_package_/client/AuthorizationHeaderUtil.java.ejs

@@ -0,0 +1,174 @@
+<%#
+ Copyright 2013-2023 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+package <%= packageName %>.client;
+
+import java.net.URI;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.http.MediaType;
+import org.springframework.http.RequestEntity;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.converter.FormHttpMessageConverter;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.oauth2.client.OAuth2AuthorizedClient;
+import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService;
+import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
+import org.springframework.security.oauth2.client.http.OAuth2ErrorResponseErrorHandler;
+import org.springframework.security.oauth2.core.*;
+import org.springframework.security.oauth2.core.endpoint.OAuth2AccessTokenResponse;
+import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
+import org.springframework.security.oauth2.core.http.converter.OAuth2AccessTokenResponseHttpMessageConverter;
+import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
+import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+@Component
+public class AuthorizationHeaderUtil {
+
+    private final OAuth2AuthorizedClientService clientService;
+    private final RestTemplateBuilder restTemplateBuilder;
+    private final Logger log = LoggerFactory.getLogger(AuthorizationHeaderUtil.class);
+
+    public AuthorizationHeaderUtil(OAuth2AuthorizedClientService clientService, RestTemplateBuilder restTemplateBuilder) {
+        this.clientService = clientService;
+        this.restTemplateBuilder = restTemplateBuilder;
+    }
+
+    public Optional<String> getAuthorizationHeader() {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        if (authentication instanceof OAuth2AuthenticationToken) {
+            OAuth2AuthenticationToken oauthToken = (OAuth2AuthenticationToken) authentication;
+            String name = oauthToken.getName();
+            String registrationId = oauthToken.getAuthorizedClientRegistrationId();
+            OAuth2AuthorizedClient client = clientService.loadAuthorizedClient(
+                registrationId,
+                name);
+
+            if (null == client) {
+                throw new OAuth2AuthorizationException(new OAuth2Error("access_denied", "The token is expired", null));
+            }
+            OAuth2AccessToken accessToken = client.getAccessToken();
+
+            if (accessToken != null) {
+                String tokenType = accessToken.getTokenType().getValue();
+                String accessTokenValue = accessToken.getTokenValue();
+                if (isExpired(accessToken)) {
+                    log.info("AccessToken expired, refreshing automatically");
+                    accessTokenValue = refreshToken(client, oauthToken);
+                    if (null == accessTokenValue) {
+                        SecurityContextHolder.getContext().setAuthentication(null);
+                        throw new OAuth2AuthorizationException(new OAuth2Error("access_denied", "The token is expired", null));
+                    }
+                }
+                String authorizationHeaderValue = String.format("%s %s", tokenType, accessTokenValue);
+                return Optional.of(authorizationHeaderValue);
+            }
+
+        } else if (authentication instanceof JwtAuthenticationToken) {
+            JwtAuthenticationToken accessToken = (JwtAuthenticationToken) authentication;
+            String tokenValue = accessToken.getToken().getTokenValue();
+            String authorizationHeaderValue = String.format("%s %s", OAuth2AccessToken.TokenType.BEARER.getValue(), tokenValue);
+            return Optional.of(authorizationHeaderValue);
+        }
+        return Optional.empty();
+    }
+
+    private String refreshToken(OAuth2AuthorizedClient client, OAuth2AuthenticationToken oauthToken) {
+        OAuth2AccessTokenResponse atr = refreshTokenClient(client);
+        if (atr == null || atr.getAccessToken() == null) {
+            log.info("Failed to refresh token for user");
+            return null;
+        }
+
+        OAuth2RefreshToken refreshToken = atr.getRefreshToken() != null ? atr.getRefreshToken(): client.getRefreshToken();
+        OAuth2AuthorizedClient updatedClient = new OAuth2AuthorizedClient(
+            client.getClientRegistration(),
+            client.getPrincipalName(),
+            atr.getAccessToken(),
+            refreshToken
+        );
+
+        clientService.saveAuthorizedClient(updatedClient, oauthToken);
+        return atr.getAccessToken().getTokenValue();
+    }
+
+    private OAuth2AccessTokenResponse refreshTokenClient(OAuth2AuthorizedClient currentClient) {
+
+        MultiValueMap<String, String> formParameters = new LinkedMultiValueMap<>();
+        formParameters.add(OAuth2ParameterNames.GRANT_TYPE, AuthorizationGrantType.REFRESH_TOKEN.getValue());
+        formParameters.add(OAuth2ParameterNames.REFRESH_TOKEN, currentClient.getRefreshToken().getTokenValue());
+        formParameters.add(OAuth2ParameterNames.CLIENT_ID, currentClient.getClientRegistration().getClientId());
+        RequestEntity requestEntity = RequestEntity
+            .post(URI.create(currentClient.getClientRegistration().getProviderDetails().getTokenUri()))
+            .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+            .body(formParameters);
+        try {
+            RestTemplate r = restTemplate(currentClient.getClientRegistration().getClientId(), currentClient.getClientRegistration().getClientSecret());
+            ResponseEntity<OAuthIdpTokenResponseDTO> responseEntity = r.exchange(requestEntity, OAuthIdpTokenResponseDTO.class);
+            return toOAuth2AccessTokenResponse(responseEntity.getBody());
+        } catch (OAuth2AuthorizationException e) {
+            log.error("Unable to refresh token", e);
+            throw new OAuth2AuthenticationException(e.getError(), e);
+        }
+    }
+
+    private OAuth2AccessTokenResponse toOAuth2AccessTokenResponse(OAuthIdpTokenResponseDTO oAuthIdpResponse) {
+        Map<String, Object> additionalParameters = new HashMap<>();
+        additionalParameters.put("id_token", oAuthIdpResponse.getIdToken());
+        additionalParameters.put("not-before-policy", oAuthIdpResponse.getNotBefore());
+        additionalParameters.put("refresh_expires_in", oAuthIdpResponse.getRefreshExpiresIn());
+        additionalParameters.put("session_state", oAuthIdpResponse.getSessionState());
+        return OAuth2AccessTokenResponse.withToken(oAuthIdpResponse.getAccessToken())
+            .expiresIn(oAuthIdpResponse.getExpiresIn())
+            .refreshToken(oAuthIdpResponse.getRefreshToken())
+            .scopes(Pattern.compile("\\s").splitAsStream(oAuthIdpResponse.getScope()).collect(Collectors.toSet()))
+            .tokenType(OAuth2AccessToken.TokenType.BEARER)
+            .additionalParameters(additionalParameters)
+            .build();
+    }
+
+    private RestTemplate restTemplate(String clientId, String clientSecret) {
+        return restTemplateBuilder
+            .additionalMessageConverters(
+                new FormHttpMessageConverter(),
+                new OAuth2AccessTokenResponseHttpMessageConverter())
+            .errorHandler(new OAuth2ErrorResponseErrorHandler())
+            .basicAuthentication(clientId, clientSecret)
+            .build();
+    }
+
+    private boolean isExpired(OAuth2AccessToken accessToken) {
+        Instant now = Instant.now();
+        Instant expiresAt = accessToken.getExpiresAt();
+        return now.isAfter(expiresAt.minus(Duration.ofMinutes(1L)));
+    }
+}

package/dist/generators/feign-client/templates/src/main/java/_package_/client/AuthorizedFeignClient.java.ejs

@@ -0,0 +1,72 @@
+<%#
+ Copyright 2013-2023 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+package <%= packageName %>.client;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.core.annotation.AliasFor;
+
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Documented
+@FeignClient
+public @interface AuthorizedFeignClient {
+
+    @AliasFor(annotation = FeignClient.class, attribute = "name")
+    String name() default "";
+
+    /**
+     * A custom {@code @Configuration} for the feign client.
+     *
+     * Can contain override {@code @Bean} definition for the pieces that
+     * make up the client, for instance {@link feign.codec.Decoder},
+     * {@link feign.codec.Encoder}, {@link feign.Contract}.
+     *
+     * @return the custom {@code @Configuration} for the feign client.
+     * @see org.springframework.cloud.openfeign.FeignClientsConfiguration for the defaults.
+     */
+    @AliasFor(annotation = FeignClient.class, attribute = "configuration")
+    Class<?>[] configuration() default OAuth2InterceptedFeignConfiguration.class;
+
+    /**
+     * An absolute URL or resolvable hostname (the protocol is optional).
+     * @return the URL.
+     */
+    String url() default "";
+
+    /**
+     * Whether 404s should be decoded instead of throwing FeignExceptions.
+     * @return true if 404s will be decoded; false otherwise.
+     */
+    boolean decode404() default false;
+
+    /**
+     * Fallback class for the specified Feign client interface. The fallback class must
+     * implement the interface annotated by this annotation and be a valid Spring bean.
+     * @return the fallback class for the specified Feign client interface.
+     */
+    Class<?> fallback() default void.class;
+
+    /**
+     * Path prefix to be used by all method-level mappings.
+     * @return the path prefix to be used by all method-level mappings.
+     */
+    String path() default "";
+}