generator-jhipster 8.5.0 → 8.6.0

package/dist/generators/jdl/generator.js

@@ -174,7 +174,7 @@ export default class JdlGenerator extends BaseGenerator {
                     return;
                 }
                 const generatorOptions = { defaults: true, reproducible: this.options.reproducible ?? this.reproducible, force: this.force };
-                if (this.ignoreApplication || this.applications.length === 0) {
+                if (this.ignoreApplication !== false && (this.ignoreApplication || this.applications.length === 0)) {
                     if (this.applications.length === 0) {
                         const entities = this.exportedEntities;
                         await this.composeWithJHipster(this.entitiesGenerator, {
@@ -194,11 +194,7 @@ export default class JdlGenerator extends BaseGenerator {
                         }
                     }
                 }
-                else if (this.applications.length === 1) {
-                    this.log.info('Generating 1 application');
-                    await this.composeWithJHipster(this.entrypointGenerator, { generatorOptions });
-                }
-                else {
+                else if (this.applications.length > 1) {
                     this.log.info(`Generating ${this.applications.length} applications`);
                     await this.composeWithJHipster(this.workspacesGenerator, {
                         generatorOptions: {
@@ -207,6 +203,10 @@ export default class JdlGenerator extends BaseGenerator {
                         },
                     });
                 }
+                else {
+                    this.log.info('Generating 1 application');
+                    await this.composeWithJHipster(this.entrypointGenerator, { generatorOptions });
+                }
             },
         });
     }

package/dist/generators/kubernetes/templates/db/mysql.yml.ejs

@@ -70,6 +70,7 @@ spec:
           value: <%= app.baseName.toLowerCase() %>
         args:
         - --lower_case_table_names=1
+        - --skip-mysqlx
         - --character_set_server=utf8mb4
         - --explicit_defaults_for_timestamp
         ports:

package/dist/generators/languages/generator.js

@@ -310,6 +310,7 @@ export default class LanguagesGenerator extends BaseApplicationGenerator {
                 if (application.enableTranslation &&
                     application.generateUserManagement &&
                     !application.skipServer &&
+                    application.backendTypeJavaAny &&
                     application.backendTypeSpringBoot) {
                     updateLanguagesInJava.call(this, { application, control });
                 }

package/dist/generators/liquibase/templates/src/main/java/_package_/config/LiquibaseConfiguration.java.ejs

@@ -55,7 +55,7 @@ import org.springframework.core.env.Profiles;
 @Configuration
 public class LiquibaseConfiguration {
 
-    private final Logger log = LoggerFactory.getLogger(LiquibaseConfiguration.class);
+    private static final Logger log = LoggerFactory.getLogger(LiquibaseConfiguration.class);
 
     private final Environment env;
 

package/dist/generators/maven/command.js

@@ -0,0 +1,15 @@
+const command = {
+    options: {},
+    configs: {
+        sortMavenPom: {
+            description: 'Sort the pom.xml file',
+            cli: {
+                type: Boolean,
+                hide: true,
+            },
+            scope: 'generator',
+        },
+    },
+    import: [],
+};
+export default command;

package/dist/generators/maven/generator.js

@@ -25,6 +25,7 @@ import cleanupOldServerFilesTask from './cleanup.js';
 import { createPomStorage } from './support/index.js';
 export default class MavenGenerator extends BaseApplicationGenerator {
     pomStorage;
+    sortMavenPom;
     async beforeQueue() {
         if (!this.fromBlueprint) {
             await this.composeWithBlueprints();
@@ -35,8 +36,11 @@ export default class MavenGenerator extends BaseApplicationGenerator {
     }
     get initializing() {
         return this.asInitializingTaskGroup({
+            async parseCommand() {
+                await this.parseCurrentJHipsterCommand();
+            },
             pomStorage() {
-                this.pomStorage = createPomStorage(this);
+                this.pomStorage = createPomStorage(this, { sortFile: this.sortMavenPom });
             },
         });
     }
@@ -72,6 +76,7 @@ export default class MavenGenerator extends BaseApplicationGenerator {
                         }
                     };
                 }
+                source.mergeMavenPomContent = content => this.pomStorage.merge(content);
                 source.addMavenAnnotationProcessor = createForEach(artifact => this.pomStorage.addAnnotationProcessor(artifact));
                 source.addMavenDependency = createForEach(artifact => this.pomStorage.addDependency(artifact));
                 source.addMavenDependencyManagement = createForEach(artifact => this.pomStorage.addDependencyManagement(artifact));

package/dist/generators/maven/index.js

@@ -16,4 +16,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+export { default as command } from './command.js';
 export { default } from './generator.js';

package/dist/generators/maven/internal/xml-store.js

@@ -36,19 +36,20 @@ const defaultXmlBuildOptions = {
     indentBy: '    ',
 };
 export default class XmlStorage {
-    sortFile = true;
+    sortFile;
     saveFile;
     loadFile;
     parser;
     builder;
     _cachedStore;
-    constructor({ saveFile, loadFile, xmlParserOptions, xmlBuildOptions, }) {
+    constructor({ saveFile, loadFile, xmlParserOptions, xmlBuildOptions, sortFile, }) {
         assert(saveFile, 'saveFile callback is required to create a storage');
         assert(loadFile, 'loadFile callback is required to create a storage');
         this.parser = new XMLParser({ ...defaultXmlParserOptions, ...xmlParserOptions });
         this.builder = new XMLBuilder({ ...defaultXmlBuildOptions, ...xmlBuildOptions });
         this.saveFile = saveFile;
         this.loadFile = loadFile;
+        this.sortFile = sortFile ?? true;
     }
     clearCache() {
         delete this._cachedStore;
@@ -59,6 +60,10 @@ export default class XmlStorage {
         }
         this.persist(false);
     }
+    merge(source) {
+        assert(typeof source === 'object', 'Storage `merge` method only accept objects');
+        this._cachedStore = merge({}, this.store, source);
+    }
     sort() { }
     persist(sort = this.sortFile) {
         if (this._cachedStore) {
@@ -77,10 +82,6 @@ export default class XmlStorage {
             this._cachedStore = this.parser.parse(this.loadFile());
         }
     }
-    merge(source) {
-        assert(typeof source === 'object', 'Storage `merge` method only accept objects');
-        this._cachedStore = merge({}, this.store, source);
-    }
     mergeContent(existing, newContent) {
         return newContent ? { ...existing, ...this.parser.parse(newContent) } : existing;
     }

package/dist/generators/maven/support/pom-store.js

@@ -55,6 +55,17 @@ const propertiesOrder = [
     'spring-boot.version',
 ];
 const formatFirstXmlLevel = content => content.replace(/(\n {4}<(?:groupId|distributionManagement|repositories|pluginRepositories|properties|dependencyManagement|dependencies|build|profiles)>)/g, '\n$1');
+const sortSection = section => {
+    return Object.fromEntries(Object.entries(section).sort(([key1, value1], [key2, value2]) => {
+        if (typeof value1 === typeof value2)
+            key1.localeCompare(key2);
+        if (typeof value1 === 'string')
+            return -1;
+        if (typeof value2 === 'string')
+            return 1;
+        return 0;
+    }));
+};
 const isComment = name => name.startsWith('#');
 const toMaxInt = nr => (nr === -1 ? Number.MAX_SAFE_INTEGER : nr);
 const sortWithTemplate = (template, a, b) => {
@@ -129,7 +140,7 @@ const sortArtifacts = (artifacts) => artifacts.sort((a, b) => {
     }
     return a.artifactId.localeCompare(b.artifactId);
 });
-const sortProfiles = (profiles) => profiles.sort((a, b) => a.id.localeCompare(b.id));
+const sortProfiles = (profiles) => profiles.sort((a, b) => a.id?.localeCompare(b.id) ?? 1);
 const ensureChildPath = (node, childPath) => {
     let child = get(node, childPath);
     if (child)
@@ -158,8 +169,8 @@ const ensureChild = (current, ...childPath) => {
 const reorderArtifact = ({ groupId, artifactId, inProfile, version, ...rest }) => ({ inProfile, groupId, artifactId, version, ...rest });
 const reorderDependency = ({ groupId, artifactId, inProfile, version, type, scope, classifier, ...rest }) => ({ inProfile, groupId, artifactId, version, type, scope, classifier, ...rest });
 export default class PomStorage extends XmlStorage {
-    constructor({ saveFile, loadFile }) {
-        super({ saveFile, loadFile });
+    constructor({ saveFile, loadFile, sortFile }) {
+        super({ saveFile, loadFile, sortFile });
     }
     addProperty({ inProfile, property, value = null }) {
         const node = this.getNode({ nodePath: 'properties', profile: inProfile });
@@ -262,11 +273,14 @@ export default class PomStorage extends XmlStorage {
             if (Array.isArray(project.dependencyManagement?.dependencies?.dependency)) {
                 project.dependencyManagement.dependencies.dependency = sortArtifacts(project.dependencyManagement.dependencies.dependency);
             }
-            if (Array.isArray(project.build?.plugins?.plugin)) {
-                project.build.plugins.plugin = sortArtifacts(project.build.plugins.plugin);
-            }
-            if (Array.isArray(project.build?.pluginManagement?.plugins?.plugin)) {
-                project.build.pluginManagement.plugins.plugin = sortArtifacts(project.build.pluginManagement.plugins.plugin);
+            if (project.build) {
+                project.build = sortSection(project.build);
+                if (Array.isArray(project.build.plugins?.plugin)) {
+                    project.build.plugins.plugin = sortArtifacts(project.build.plugins.plugin);
+                }
+                if (Array.isArray(project.build.pluginManagement?.plugins?.plugin)) {
+                    project.build.pluginManagement.plugins.plugin = sortArtifacts(project.build.pluginManagement.plugins.plugin);
+                }
             }
             if (Array.isArray(project.profiles?.profile)) {
                 project.profiles.profile = sortProfiles(project.profiles.profile);
@@ -280,11 +294,12 @@ const emptyPomFile = `<?xml version="1.0" encoding="UTF-8"?>
     <modelVersion>4.0.0</modelVersion>
 </project>
 `;
-export const createPomStorage = (generator) => {
+export const createPomStorage = (generator, { sortFile } = {}) => {
     const loadFile = () => generator.readDestination('pom.xml', { defaults: emptyPomFile })?.toString() ?? '';
     const pomStorage = new PomStorage({
         loadFile,
         saveFile: content => generator.writeDestination('pom.xml', formatFirstXmlLevel(content)),
+        sortFile,
     });
     generator.fs.store.on('change', filename => {
         if (filename === generator.destinationPath('pom.xml')) {

package/dist/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties

@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 wrapperVersion=3.3.2
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip

package/dist/generators/react/entity-files-react.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { clientApplicationTemplatesBlock, filterEntitiesAndPropertiesForClient, filterEntitiesForClient } from '../client/support/index.js';
+import { clientApplicationTemplatesBlock } from '../client/support/index.js';
 export const reactFiles = {
     client: [
         {
@@ -48,16 +48,16 @@ export const reactFiles = {
         },
     ],
 };
-export async function writeEntitiesFiles({ application, entities }) {
-    for (const entity of filterEntitiesAndPropertiesForClient(entities).filter(entity => !entity.builtInUser)) {
+export async function writeEntitiesFiles({ control, application, entities }) {
+    for (const entity of (control.filterEntitiesAndPropertiesForClient ?? (entities => entities))(entities).filter(entity => !entity.builtInUser)) {
         await this.writeFiles({
             sections: reactFiles,
             context: { ...application, ...entity },
         });
     }
 }
-export async function postWriteEntitiesFiles({ application, entities }) {
-    for (const entity of filterEntitiesForClient(entities).filter(entity => !entity.builtInUser)) {
+export async function postWriteEntitiesFiles({ control, application, entities }) {
+    for (const entity of (control.filterEntitiesForClient ?? (entities => entities))(entities).filter(entity => !entity.builtInUser)) {
         if (!entity.embedded) {
             const { entityInstance, entityClass, entityAngularName, entityFolderName, entityFileName } = entity;
             const { applicationTypeMicroservice, clientSrcDir } = application;
@@ -69,8 +69,8 @@ export async function postWriteEntitiesFiles({ application, entities }) {
         }
     }
 }
-export function cleanupEntitiesFiles({ application, entities }) {
-    for (const entity of filterEntitiesForClient(entities).filter(entity => !entity.builtInUser)) {
+export function cleanupEntitiesFiles({ control, application, entities }) {
+    for (const entity of (control.filterEntitiesForClient ?? (entities => entities))(entities).filter(entity => !entity.builtInUser)) {
         const { entityFolderName, entityFileName } = entity;
         if (this.isJhipsterVersionLessThan('7.0.0-beta.1')) {
             this.removeFile(`${application.clientTestDir}spec/app/entities/${entityFolderName}/${entityFileName}-reducer.spec.ts`);

package/dist/generators/react/resources/package.json

@@ -11,7 +11,7 @@
     "path-browserify": "1.0.1",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-hook-form": "7.51.5",
+    "react-hook-form": "7.52.0",
     "react-jhipster": "0.25.3",
     "react-loadable": "5.5.0",
     "react-redux": "9.1.2",
@@ -24,23 +24,23 @@
     "rxjs": "7.8.1",
     "sockjs-client": "1.6.1",
     "sonar-scanner": "3.1.0",
-    "tslib": "2.6.2",
-    "uuid": "9.0.1",
+    "tslib": "2.6.3",
+    "uuid": "10.0.0",
     "webstomp-client": "1.2.6"
   },
   "devDependencies": {
     "@module-federation/utilities": "3.0.3-0",
-    "@testing-library/react": "15.0.7",
+    "@testing-library/react": "16.0.0",
     "@types/jest": "29.5.12",
-    "@types/lodash": "4.17.4",
+    "@types/lodash": "4.17.5",
     "@types/node": "20.11.25",
     "@types/react": "18.3.3",
     "@types/react-dom": "18.3.0",
     "@types/react-redux": "7.1.33",
     "@types/redux": "3.6.31",
     "@types/webpack-env": "1.18.5",
-    "@typescript-eslint/eslint-plugin": "7.11.0",
-    "@typescript-eslint/parser": "7.11.0",
+    "@typescript-eslint/eslint-plugin": "7.13.1",
+    "@typescript-eslint/parser": "7.13.1",
     "autoprefixer": "10.4.19",
     "browser-sync": "2.29.3",
     "browser-sync-webpack-plugin": "2.3.0",
@@ -51,7 +51,7 @@
     "css-minimizer-webpack-plugin": "7.0.0",
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
-    "eslint-plugin-react": "7.34.2",
+    "eslint-plugin-react": "7.34.3",
     "eslint-webpack-plugin": "4.2.0",
     "folder-hash": "4.0.4",
     "fork-ts-checker-webpack-plugin": "9.0.2",
@@ -69,7 +69,7 @@
     "react-infinite-scroll-component": "6.1.0",
     "redux-mock-store": "1.5.4",
     "rimraf": "5.0.7",
-    "sass": "1.77.4",
+    "sass": "1.77.6",
     "sass-loader": "14.2.1",
     "simple-progress-webpack-plugin": "2.0.0",
     "sinon": "18.0.0",
@@ -78,10 +78,10 @@
     "style-loader": "4.0.0",
     "terser-webpack-plugin": "5.3.10",
     "thread-loader": "4.0.2",
-    "ts-jest": "29.1.4",
+    "ts-jest": "29.1.5",
     "ts-loader": "9.5.1",
-    "typescript": "5.4.5",
-    "webpack": "5.91.0",
+    "typescript": "5.5.2",
+    "webpack": "5.92.1",
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "5.0.4",
     "webpack-merge": "5.10.0",

package/dist/generators/react/templates/src/main/webapp/app/app.tsx.ejs

@@ -34,6 +34,9 @@ import { hasAnyAuthority } from 'app/shared/auth/private-route';
 import ErrorBoundary from 'app/shared/error/error-boundary';
 import { AUTHORITIES } from 'app/config/constants';
 import AppRoutes from 'app/routes';
+<%_ if (enableTranslation &&  enableI18nRTL) { _%>
+import { setTextDirection } from './config/translation';
+<%_ } _%>
 
 const baseHref = document.querySelector('base').getAttribute('href').replace(/\/$/, '');
 
@@ -54,6 +57,12 @@ export const App = () => {
   const isInProduction = useAppSelector(state => state.applicationProfile.inProduction);
   const isOpenAPIEnabled = useAppSelector(state => state.applicationProfile.isOpenAPIEnabled);
 
+<%_ if (enableTranslation && enableI18nRTL) { _%>
+  useEffect(() => {
+    setTextDirection(currentLocale);
+  }, [currentLocale]);
+<%_ } _%>
+
   const paddingTop = '60px';
   return (
     <BrowserRouter basename={baseHref}>

package/dist/generators/react/templates/src/main/webapp/app/config/translation.ts.ejs

@@ -34,6 +34,10 @@ export const locales = Object.keys(languages).sort();
 
 <%_ if (enableI18nRTL) { _%>
 export const isRTL = (lang: string): boolean => languages[lang] && languages[lang].rtl;
+
+export const setTextDirection = (lang: string) => {
+  document.querySelector('html').setAttribute('dir', isRTL(lang) ? 'rtl' : 'ltr');
+};
 <%_ } _%>
 
 export const registerLocale = store => {

package/dist/generators/react/templates/src/main/webapp/app/modules/home/home.tsx.ejs

@@ -23,7 +23,11 @@ import React, { useEffect } from 'react';
 <%_ } else { _%>
 import React from 'react';
 <%_ } _%>
+<%_ if (authenticationTypeOauth2) { _%>
+import { useLocation, useNavigate } from 'react-router-dom';
+<%_ } else { _%>
 import { Link } from 'react-router-dom';
+<%_ } _%>
 import { Translate } from 'react-jhipster';
 import { Row, Col, Alert } from 'reactstrap';
 
@@ -35,6 +39,9 @@ import { useAppSelector } from 'app/config/store';
 export const Home = () => {
   const account = useAppSelector(state => state.authentication.account);
 <%_ if (authenticationTypeOauth2) { _%>
+  const pageLocation = useLocation();
+  const navigate = useNavigate();
+
   useEffect(() => {
     const redirectURL = localStorage.getItem(REDIRECT_URL);
     if (redirectURL) {
@@ -65,7 +72,14 @@ export const Home = () => {
                 <Translate contentKey="global.messages.info.authenticated.prefix">If you want to </Translate>
                 <% if (!enableTranslation) { %><span>&nbsp;</span><% } %>
 <%_ if (authenticationTypeOauth2) { _%>
-                <a href={getLoginUrl()} className="alert-link">
+                <a
+                  className="alert-link"
+                  onClick={() =>
+                    navigate(getLoginUrl(), {
+                      state: { from: pageLocation },
+                    })
+                  }
+                >
                   <Translate contentKey="global.messages.info.authenticated.link">sign in</Translate>
                 </a>
 <%_ } else { _%>

package/dist/generators/react/templates/src/main/webapp/app/modules/login/login-redirect.tsx.ejs

@@ -7,7 +7,11 @@ export const LoginRedirect = () => {
 
   useEffect(() => {
     localStorage.setItem(REDIRECT_URL, pageLocation.state.from.pathname);
+<%_ if (authenticationTypeOauth2) { _%>
+    window.location.href = '/oauth2/authorization/oidc';
+<%_ } else { _%>
     window.location.reload();
+<%_ } _%>
   });
 
   return null;

package/dist/generators/react/templates/src/main/webapp/app/modules/login/logout.tsx.ejs

@@ -22,13 +22,15 @@ import { useAppDispatch, useAppSelector } from 'app/config/store';
 import { logout } from 'app/shared/reducers/authentication';
 
 export const Logout = () => {
-  const logoutUrl = useAppSelector(state => state.authentication.logoutUrl);
+  const authentication = useAppSelector(state => state.authentication);
   const dispatch = useAppDispatch();
 
   useLayoutEffect(() => {
     dispatch(logout());
-    if (logoutUrl) {
-      window.location.href = logoutUrl;
+    if (authentication.logoutUrl) {
+      window.location.href = authentication.logoutUrl;
+    } else if (!authentication.isAuthenticated) {
+      window.location.href = '/';
     }
   });
 

package/dist/generators/react/templates/src/main/webapp/app/routes.tsx.ejs

@@ -112,7 +112,7 @@ const AppRoutes = () => {
           }
         />
 <%_ if (authenticationTypeOauth2) { _%>
-        <Route path="oauth2/authorization/oidc" element={<LoginRedirect />} />
+        <Route path="sign-in" element={<LoginRedirect />} />
 <%_ } _%>
 <%_ if (applicationTypeGateway && microfrontend) { _%>
   <%_ for (const remote of microfrontends) { _%>

package/dist/generators/react/templates/src/main/webapp/app/shared/auth/private-route.spec.tsx.ejs

@@ -92,7 +92,7 @@ describe('private-route component', () => {
             </PrivateRoute>
           }
         />
-        <Route path="<% if(authenticationTypeOauth2) { %>/oauth2/authorization/oidc<% } else { %>/login<% } %>" element={<div>Login</div>} />
+        <Route path="<% if(authenticationTypeOauth2) { %>/sign-in<% } else { %>/login<% } %>" element={<div>Login</div>} />
       </Routes>,
       {
         isAuthenticated: false,

package/dist/generators/react/templates/src/main/webapp/app/shared/auth/private-route.tsx.ejs

@@ -42,7 +42,7 @@ export const PrivateRoute = ({ children, hasAnyAuthorities = [], ...rest }: IOwn
   return (
     <Navigate
       to={{
-        pathname: '<%_ if (authenticationTypeOauth2) { _%>/oauth2/authorization/oidc<%_ } else {_%>/login<%_ } _%>',
+        pathname: '<%_ if (authenticationTypeOauth2) { _%>/sign-in<%_ } else {_%>/login<%_ } _%>',
         search: pageLocation.search,
       }}
       replace

package/dist/generators/react/templates/src/main/webapp/app/shared/layout/header/header.tsx.ejs

@@ -28,9 +28,6 @@ import {
 } from 'reactstrap';
 import LoadingBar from 'react-redux-loading-bar';
 
-<%_ if (enableTranslation && enableI18nRTL) { _%>
-import { isRTL } from 'app/config/translation';
-<%_ } _%>
 import { Home, Brand } from './header-components';
 import { AdminMenu, EntitiesMenu, AccountMenu<%_ if (enableTranslation) { _%>, LocaleMenu<%_ } _%>} from '../menus';
 <%_ if (enableTranslation) { _%>
@@ -52,9 +49,6 @@ export interface IHeaderProps {
 
 const Header = (props: IHeaderProps) => {
   const [menuOpen, setMenuOpen] = useState(false);
-<%_ if (enableI18nRTL) { _%>
-  useEffect(() => document.querySelector('html').setAttribute('dir', isRTL(Storage.session.get('locale')) ? 'rtl' : 'ltr'));
-<%_ } _%>
 
 <%_ if (enableTranslation) { _%>
   const dispatch = useAppDispatch();
@@ -63,9 +57,6 @@ const Header = (props: IHeaderProps) => {
     const langKey = event.target.value;
     Storage.session.set('locale', langKey);
     dispatch(setLocale(langKey));
-  <%_ if (enableI18nRTL) { _%>
-    document.querySelector('html').setAttribute('dir', isRTL(langKey) ? 'rtl' : 'ltr');
-  <%_ } _%>
   }
 <%_ } _%>
 

package/dist/generators/react/templates/src/main/webapp/app/shared/layout/menus/account.spec.tsx.ejs

@@ -68,9 +68,7 @@ describe('AccountMenu', () => {
   it('Renders a guest AccountMenu component', () => {
     const html = guestWrapper();
 
-<%_ if (authenticationTypeOauth2) { _%>
-    expect(html).toContain(getLoginUrl());
-<%_ } else { _%>
+<%_ if (!authenticationTypeOauth2) { _%>
     expect(html).toContain('/login');
 <%_ } _%>
     expect(html).not.toContain('/logout');

package/dist/generators/react/templates/src/main/webapp/app/shared/layout/menus/account.tsx.ejs

@@ -27,6 +27,9 @@ import { Translate, translate } from 'react-jhipster';
 import { getLoginUrl } from 'app/shared/util/url-utils';
 <%_ } _%>
 import { NavDropdown } from './menu-components';
+<%_ if (authenticationTypeOauth2) { _%>
+import { useLocation, useNavigate } from 'react-router';
+<%_ } _%>
 
 
 const accountMenuItemsAuthenticated = () => (
@@ -42,18 +45,38 @@ const accountMenuItemsAuthenticated = () => (
   </>
   );
 
+<%_ if (authenticationTypeOauth2) { _%>
+const accountMenuItems = () => {
+  const navigate = useNavigate();
+  const pageLocation = useLocation();
+
+  return (
+    <>
+      <DropdownItem
+        id="login-item"
+        tag="a"
+        data-cy="login"
+        onClick={() =>
+          navigate(getLoginUrl(), {
+            state: { from: pageLocation },
+          })
+        }
+      >
+        <FontAwesomeIcon icon="sign-in-alt" /> <Translate contentKey="global.menu.account.login">Sign in</Translate>
+      </DropdownItem>
+    </>
+  );
+};
+<%_ } else { _%>
 const accountMenuItems = () => (
   <>
-<%_ if (!authenticationTypeOauth2) { _%>
     <MenuItem id="login-item" icon="sign-in-alt" to="/login" data-cy="login"><Translate contentKey="global.menu.account.login">Sign in</Translate></MenuItem>
-<%_ } else { _%>
-    <DropdownItem id="login-item" tag="a" href={getLoginUrl()} data-cy="login"><FontAwesomeIcon icon="sign-in-alt" /> <Translate contentKey="global.menu.account.login">Sign in</Translate></DropdownItem>
-<%_ } _%>
-<%_ if (generateUserManagement) { _%>
+  <%_ if (generateUserManagement) { _%>
     <MenuItem icon="user-plus" to="/account/register" data-cy="register"><Translate contentKey="global.menu.account.register">Register</Translate></MenuItem>
-<%_ } _%>
+  <%_ } _%>
   </>
 );
+<%_ } _%>
 
 export const AccountMenu = ({ isAuthenticated = false }) => (
   <NavDropdown icon="user" name={translate('global.menu.account.main')} id="account-menu" data-cy="accountMenu">

package/dist/generators/react/templates/src/main/webapp/app/shared/util/url-utils.ts.ejs

@@ -21,7 +21,7 @@ export const getLoginUrl = () => {
 
   // If you have configured multiple OIDC providers, then, you can update this URL to /login.
   // It will show a Spring Security generated login page with links to configured OIDC providers.
-  return `//${location.hostname}${port}${location.pathname}oauth2/authorization/oidc`;
+  return `//${location.hostname}${port}/sign-in`;
 }
 <%_ if (authenticationTypeOauth2) { _%>
 export const REDIRECT_URL = 'redirectURL';

package/dist/generators/server/generator.js

@@ -428,14 +428,16 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
             packageJsonE2eScripts({ application }) {
                 const scriptsStorage = this.packageJson.createStorage('scripts');
                 const buildCmd = application.buildToolGradle ? 'gradlew' : 'mvnw';
+                const applicationWaitTimeout = WAIT_TIMEOUT * (application.applicationTypeGateway ? 2 : 1);
+                const applicationEndpoint = application.applicationTypeMicroservice
+                    ? `http-get://127.0.0.1:${application.gatewayServerPort}/${application.endpointPrefix}/management/health/readiness`
+                    : 'http-get://127.0.0.1:$npm_package_config_backend_port/management/health';
+                scriptsStorage.set({
+                    'ci:server:await': `echo "Waiting for server at port $npm_package_config_backend_port to start" && wait-on -t ${applicationWaitTimeout} ${applicationEndpoint} && echo "Server at port $npm_package_config_backend_port started"`,
+                });
                 // TODO add e2eTests property to application.
                 if (this.jhipsterConfig.testFrameworks?.includes('cypress')) {
-                    const applicationWaitTimeout = WAIT_TIMEOUT * (application.applicationTypeGateway ? 2 : 1);
-                    const applicationEndpoint = application.applicationTypeMicroservice
-                        ? `http-get://127.0.0.1:${application.gatewayServerPort}/${application.endpointPrefix}/management/health/readiness`
-                        : 'http-get://127.0.0.1:$npm_package_config_backend_port/management/health';
                     scriptsStorage.set({
-                        'ci:server:await': `echo "Waiting for server at port $npm_package_config_backend_port to start" && wait-on -t ${applicationWaitTimeout} ${applicationEndpoint} && echo "Server at port $npm_package_config_backend_port started"`,
                         'pree2e:headless': 'npm run ci:server:await',
                         'ci:e2e:run': 'concurrently -k -s first "npm run ci:e2e:server:start" "npm run e2e:headless"',
                         'e2e:dev': `concurrently -k -s first "./${buildCmd}" "npm run e2e"`,