generator-jhipster 8.9.0 → 8.11.0

package/dist/generators/vue/templates/src/main/webapp/app/admin/user-management/user-management.service.ts.ejs

@@ -7,27 +7,27 @@ import { type IUser } from '@/shared/model/user.model';
 
 export default class UserManagementService {
 
-  public get(userId: string): Promise<any> {
+  get(userId: string): Promise<any> {
     return axios.get(`api/admin/users/${userId}`);
   }
 
-  public create(user: IUser): Promise<any> {
+  create(user: IUser): Promise<any> {
     return axios.post('api/admin/users', user);
   }
 
-  public update(user: IUser): Promise<any> {
+  update(user: IUser): Promise<any> {
     return axios.put('api/admin/users', user);
   }
 
-  public remove(userId: <%- user.primaryKey.tsType %>): Promise<any> {
+  remove(userId: <%- user.primaryKey.tsType %>): Promise<any> {
     return axios.delete(`api/admin/users/${userId}`);
   }
 
-  public retrieve(<%_ if (!databaseTypeCassandra) { _%>req?: any <%_ } _%>): Promise<any> {
+  retrieve(<%_ if (!databaseTypeCassandra) { _%>req?: any <%_ } _%>): Promise<any> {
     return axios.get(`api/admin/users<%_ if (!databaseTypeCassandra) { _%>?${buildPaginationQueryOpts(req)}<%_ } _%>`);
   }
 
-  public retrieveAuthorities(): Promise<any> {
+  retrieveAuthorities(): Promise<any> {
 <%_ if (!databaseTypeCassandra) { _%>
     return axios.get('api/authorities').then(response => {
       response.data = response.data.map(authority => authority.name);

package/dist/generators/vue/templates/src/main/webapp/app/app.component.ts.ejs

@@ -1,15 +1,33 @@
+<%#
+ Copyright 2013-2025 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 { defineComponent, provide } from 'vue';
-<%_ if (enableTranslation) { _%>
 import { useI18n } from 'vue-i18n';
+import { storeToRefs } from 'pinia';
+
+<%_ if (!authenticationTypeOauth2) { _%>
+import { useLoginModal } from '@/account/login-modal';
+import LoginForm from '@/account/login-form/login-form.vue';
 <%_ } _%>
 import Ribbon from '@/core/ribbon/ribbon.vue';
 import JhiFooter from '@/core/jhi-footer/jhi-footer.vue';
 import JhiNavbar from '@/core/jhi-navbar/jhi-navbar.vue';
-<%_ if (!authenticationTypeOauth2) { _%>
-import LoginForm from '@/account/login-form/login-form.vue';
-<%_ } %>
 import { useAlertService } from '@/shared/alert/alert.service';
-
 import '@/shared/config/dayjs';
 
 export default defineComponent({
@@ -25,11 +43,15 @@ export default defineComponent({
   },
   setup() {
     provide('alertService', useAlertService());
+<%_ if (!authenticationTypeOauth2) { _%>
+    const { loginModalOpen } = storeToRefs(useLoginModal());
+<%_ } _%>
 
     return {
-<%_ if (enableTranslation) { _%>
-      t$: useI18n().t,
+<%_ if (!authenticationTypeOauth2) { _%>
+      loginModalOpen,
 <%_ } _%>
+      t$: useI18n().t,
     };
   },
 });

package/dist/generators/vue/templates/src/main/webapp/app/app.vue.ejs

@@ -1,3 +1,21 @@
+<%#
+ Copyright 2013-2025 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.
+-%>
 <template>
   <div id="app">
     <ribbon></ribbon>
@@ -9,7 +27,7 @@
         <router-view></router-view>
       </div>
 <%_ if (!authenticationTypeOauth2) { _%>
-      <b-modal id="login-page" hide-footer lazy>
+      <b-modal id="login-page" v-model="loginModalOpen" hide-footer lazy>
         <template #modal-title>
           <span data-cy="loginTitle" id="login-title" v-text="t$('login.title')">Sign in</span>
         </template>

package/dist/generators/vue/templates/src/main/webapp/app/core/error/error.component.spec.ts.ejs

@@ -1,11 +1,32 @@
+<%#
+ Copyright 2013-2025 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 { vitest } from 'vitest';
 import { type Ref, ref } from 'vue';
-import { shallowMount } from '@vue/test-utils';
+import { shallowMount, type ComponentMountingOptions } from '@vue/test-utils';
 import { type RouteLocation } from 'vue-router';
+import { createTestingPinia } from '@pinia/testing';
 
-import Error from './error.vue';
+<%_ if (generateUserManagement) { _%>
+import { useLoginModal } from '@/account/login-modal';
 
-import <% if (authenticationTypeOauth2) { %>type <% } %>LoginService from '@/account/login.service';
+<%_ } _%>
+import Error from './error.vue';
 
 type ErrorComponentType = InstanceType<typeof Error>;
 
@@ -19,22 +40,32 @@ const customErrorMsg = 'An error occurred.';
 
 describe('Error component', () => {
   let error: ErrorComponentType;
+<%_ if (authenticationTypeOauth2) { _%>
   let loginService: LoginService;
+<%_ } _%>
+<%_ if (generateUserManagement) { _%>
+  let login: ReturnType<typeof useLoginModal>;
+<%_ } _%>
   let authenticated: Ref<boolean>;
+  let mountOptions: ComponentMountingOptions<ErrorComponentType>;
 
   beforeEach(() => {
     route = {};
     authenticated = ref(false);
-<%_ if (authenticationTypeJwt) { _%>
-    loginService = new LoginService({ emit: vitest.fn() });
-    vitest.spyOn(loginService, 'openLogin');
-<%_ } else if (authenticationTypeSession) { _%>
-    loginService = new LoginService({ emit: vitest.fn() });
-    vitest.spyOn(loginService, 'openLogin');
-    vitest.spyOn(loginService, 'logout');
-<%_ } else if (authenticationTypeOauth2) { _%>
+<%_ if (authenticationTypeOauth2) { _%>
     loginService = { login: vitest.fn(), logout: vitest.fn() };
 <%_ } _%>
+    mountOptions = {
+      global: {
+        plugins: [createTestingPinia()],
+        provide: {
+<%_ if (authenticationTypeOauth2) { _%>
+          loginService,
+<%_ } _%>
+          authenticated,
+        },
+      },
+    };
   });
 
   it('should have retrieve custom error on routing', () => {
@@ -43,21 +74,17 @@ describe('Error component', () => {
       name: 'CustomMessage',
       meta: { errorMessage: customErrorMsg },
     };
-    const wrapper = shallowMount(Error, {
-      global: {
-        provide: {
-          loginService,
-          authenticated,
-        },
-      },
-    });
+    const wrapper = shallowMount(Error, mountOptions);
     error = wrapper.vm;
+<%_ if (generateUserManagement) { _%>
+    login = useLoginModal();
+<%_ } _%>
 
     expect(error.errorMessage).toBe(customErrorMsg);
     expect(error.error403).toBeFalsy();
     expect(error.error404).toBeFalsy();
-<%_ if (!authenticationTypeOauth2) { _%>
-    expect(loginService.openLogin).toHaveBeenCalledTimes(0);
+<%_ if (generateUserManagement) { _%>
+    expect(login.showLogin).not.toHaveBeenCalled();
 <%_ } else { _%>
     expect(loginService.login).toHaveBeenCalledTimes(0);
 <%_ } _%>
@@ -67,21 +94,17 @@ describe('Error component', () => {
     route = {
       meta: { error403: true },
     };
-    const wrapper = shallowMount(Error, {
-      global: {
-        provide: {
-          loginService,
-          authenticated,
-        },
-      },
-    });
+    const wrapper = shallowMount(Error, mountOptions);
     error = wrapper.vm;
+<%_ if (generateUserManagement) { _%>
+    login = useLoginModal();
+<%_ } _%>
 
     expect(error.errorMessage).toBeNull();
     expect(error.error403).toBeTruthy();
     expect(error.error404).toBeFalsy();
-<%_ if (!authenticationTypeOauth2) { _%>
-    expect(loginService.openLogin).toHaveBeenCalled();
+<%_ if (generateUserManagement) { _%>
+    expect(login.showLogin).toHaveBeenCalled();
 <%_ } else { _%>
     expect(loginService.login).toHaveBeenCalled();
 <%_ } _%>
@@ -91,42 +114,34 @@ describe('Error component', () => {
     route = {
       meta: { error404: true },
     };
-    const wrapper = shallowMount(Error, {
-      global: {
-        provide: {
-          loginService,
-          authenticated,
-        },
-      },
-    });
+    const wrapper = shallowMount(Error, mountOptions);
     error = wrapper.vm;
+<%_ if (generateUserManagement) { _%>
+    login = useLoginModal();
+<%_ } _%>
 
     expect(error.errorMessage).toBeNull();
     expect(error.error403).toBeFalsy();
     expect(error.error404).toBeTruthy();
-<%_ if (!authenticationTypeOauth2) { _%>
-    expect(loginService.openLogin).toHaveBeenCalledTimes(0);
+<%_ if (generateUserManagement) { _%>
+    expect(login.showLogin).not.toHaveBeenCalled();
 <%_ } else { _%>
     expect(loginService.login).toHaveBeenCalledTimes(0);
 <%_ } _%>
   });
 
   it('should have set default on no error', () => {
-    const wrapper = shallowMount(Error, {
-      global: {
-        provide: {
-          loginService,
-          authenticated,
-        },
-      },
-    });
+    const wrapper = shallowMount(Error, mountOptions);
     error = wrapper.vm;
+<%_ if (generateUserManagement) { _%>
+    login = useLoginModal();
+<%_ } _%>
 
     expect(error.errorMessage).toBeNull();
     expect(error.error403).toBeFalsy();
     expect(error.error404).toBeFalsy();
-<%_ if (!authenticationTypeOauth2) { _%>
-    expect(loginService.openLogin).toHaveBeenCalledTimes(0);
+<%_ if (generateUserManagement) { _%>
+    expect(login.showLogin).not.toHaveBeenCalled();
 <%_ } else { _%>
     expect(loginService.login).toHaveBeenCalledTimes(0);
 <%_ } _%>

package/dist/generators/vue/templates/src/main/webapp/app/core/error/error.component.ts.ejs

@@ -1,15 +1,41 @@
-import { type ComputedRef, defineComponent, inject, type Ref, ref } from 'vue';
+<%#
+ Copyright 2013-2025 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 { type ComputedRef, type Ref, defineComponent, inject, ref } from 'vue';
 <%_ if (enableTranslation) { _%>
 import { useI18n } from 'vue-i18n';
 <%_ } _%>
-import type LoginService from '@/account/login.service';
 import { useRoute } from 'vue-router';
+<%_ if (authenticationTypeOauth2) { _%>
+import type LoginService from '@/account/login.service';
+<%_ } else { _%>
+import { useLoginModal } from '@/account/login-modal';
+<%_ } _%>
 
 export default defineComponent({
   compatConfig: { MODE: 3 },
   name: 'Error',
   setup() {
-    const loginService = inject<LoginService>('loginService');
+<%_ if (authenticationTypeOauth2) { _%>
+    const { login } = inject<LoginService>('loginService');
+<%_ } else { _%>
+    const { showLogin } = useLoginModal();
+<%_ } _%>
     const authenticated = inject<ComputedRef<boolean>>('authenticated');
     const errorMessage: Ref<string> = ref(null);
     const error403: Ref<boolean> = ref(false);
@@ -21,11 +47,7 @@ export default defineComponent({
       error403.value = route.meta.error403 ?? false;
       error404.value = route.meta.error404 ?? false;
       if (!authenticated.value && error403.value) {
-<%_ if (!authenticationTypeOauth2) { _%>
-        loginService.openLogin();
-<%_ } else { %>
-        loginService.login();
-<%_ } %>
+        <% if (authenticationTypeOauth2) { %>login<% } else { %>showLogin<% } %>();
       }
     }
 

package/dist/generators/vue/templates/src/main/webapp/app/core/home/home.component.spec.ts.ejs

@@ -1,6 +1,28 @@
-import { vitest } from 'vitest';
+<%#
+ Copyright 2013-2025 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 { beforeEach, describe, expect, it } from 'vitest';
 import { ref } from 'vue';
 import { shallowMount } from '@vue/test-utils';
+<%_ if (!authenticationTypeOauth2) { _%>
+import { createTestingPinia } from '@pinia/testing';
+import { useLoginModal } from '@/account/login-modal';
+<%_ } _%>
 import Home from './home.vue';
 
 type HomeComponentType = InstanceType<typeof Home>;
@@ -9,30 +31,37 @@ describe('Home', () => {
   let home: HomeComponentType;
   let authenticated;
   let currentUsername;
-<%_ if (authenticationTypeJwt) { _%>
-  const loginService = { openLogin: vitest.fn() };
-<%_ } else if (authenticationTypeSession) { _%>
-  const loginService = { openLogin: vitest.fn(), logout: vitest.fn() };
-<%_ } else if (authenticationTypeOauth2) { _%>
-  const loginService = { login: vitest.fn(), logout: vitest.fn() };
+<%_ if (!authenticationTypeOauth2) { _%>
+  let login: ReturnType<typeof useLoginModal>;
 <%_ } _%>
 
+<%_ if (authenticationTypeOauth2) { _%>
+  const loginService = { login: vitest.fn(), logout: vitest.fn() };
+<%_ } _%>
   beforeEach(() => {
     authenticated = ref(false);
     currentUsername = ref('');
     const wrapper = shallowMount(Home, {
       global: {
+<%_ if (!authenticationTypeOauth2) { _%>
+        plugins: [createTestingPinia()],
+<%_ } _%>
         stubs: {
           'router-link': true,
         },
         provide: {
+<%_ if (authenticationTypeOauth2) { _%>
           loginService,
+<%_ } _%>
           authenticated,
           currentUsername,
         },
       },
     });
     home = wrapper.vm;
+<%_ if (!authenticationTypeOauth2) { _%>
+    login = useLoginModal();
+<%_ } _%>
   });
 
   it('should not have user data set', () => {
@@ -49,12 +78,13 @@ describe('Home', () => {
   });
 
   it('should use login service', () => {
-    home.openLogin();
 
-<%_ if (!authenticationTypeOauth2) { _%>
-    expect(loginService.openLogin).toHaveBeenCalled();
-<%_ } else { %>
+<%_ if (authenticationTypeOauth2) { _%>
+    home.login();
     expect(loginService.login).toHaveBeenCalled();
+<%_ } else { %>
+    home.showLogin();
+    expect(login.showLogin).toHaveBeenCalled();
 <%_ } %>
   });
 });

package/dist/generators/vue/templates/src/main/webapp/app/core/home/home.component.ts.ejs

@@ -3,28 +3,27 @@ import { type ComputedRef, defineComponent, inject } from 'vue';
 import { useI18n } from 'vue-i18n';
 <%_ } _%>
 
+<%_ if (authenticationTypeOauth2) { _%>
 import type LoginService from '@/account/login.service';
+<%_ } else { _%>
+import { useLoginModal } from '@/account/login-modal';
+<%_ } _%>
 
 export default defineComponent({
   compatConfig: { MODE: 3 },
   setup() {
-    const loginService = inject<LoginService>('loginService');
-
+<%_ if (authenticationTypeOauth2) { _%>
+    const { login } = inject<LoginService>('loginService');
+<%_ } else { _%>
+    const { showLogin } = useLoginModal();
+<%_ } _%>
     const authenticated = inject<ComputedRef<boolean>>('authenticated');
     const username = inject<ComputedRef<string>>('currentUsername');
 
-    const openLogin = () => {
-<%_ if (!authenticationTypeOauth2) { _%>
-      loginService.openLogin();
-<%_ } else { %>
-      loginService.login();
-<%_ } _%>
-    };
-
     return {
       authenticated,
       username,
-      openLogin,
+      <% if (authenticationTypeOauth2) { %>login<% } else { %>showLogin<% } %>,
 <%_ if (enableTranslation) { _%>
       t$: useI18n().t,
 <%_ } _%>

package/dist/generators/vue/templates/src/main/webapp/app/core/home/home.vue.ejs

@@ -9,12 +9,12 @@
 
       <div>
         <div class="alert alert-success" v-if="authenticated">
-          <span v-if="username" v-text="t$('home.logged.message', { username: username })">You are logged in as user "{{ username }}"</span>
+          <span v-if="username" v-text="t$('home.logged.message', { username })">You are logged in as user "{{ username }}"</span>
         </div>
 
         <div class="alert alert-warning" v-if="!authenticated">
           <span v-text="t$('global.messages.info.authenticated.prefix')">If you want to </span>
-          <a class="alert-link" @click="openLogin()" v-text="t$('global.messages.info.authenticated.link')">sign in</a
+          <a class="alert-link" @click="<% if (authenticationTypeOauth2) { %>login<% } else { %>showLogin<% } %>()" v-text="t$('global.messages.info.authenticated.link')">sign in</a
           ><span v-html="t$('global.messages.info.authenticated.suffix')"
             >, you can try the default accounts:<br />- Administrator (login="admin" and password="admin") <br />- User (login="user" and
             password="user").</span

package/dist/generators/vue/templates/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.spec.ts.ejs

@@ -1,14 +1,36 @@
+<%#
+ Copyright 2013-2025 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 { vitest } from 'vitest';
 import { computed } from 'vue';
 import { shallowMount } from '@vue/test-utils';
-import JhiNavbar from './jhi-navbar.vue';
 import { type Router } from 'vue-router';
 import { createTestingPinia } from '@pinia/testing';
 
 import { useStore } from '@/store';
 import { createRouter } from '@/router';
-import <% if (authenticationTypeOauth2) { %>type <% } %>LoginService from '@/account/login.service';
-
+<%_ if (authenticationUsesCsrf) { _%>
+import type LoginService from '@/account/login.service';
+<%_ } _%>
+<%_ if (generateUserManagement) { _%>
+import { useLoginModal } from '@/account/login-modal';
+<%_ } _%>
+import JhiNavbar from './jhi-navbar.vue';
 <%_ if (applicationTypeGateway && microfrontend) { _%>
 
 vitest.mock('@module-federation/enhanced/runtime', () => ({
@@ -23,7 +45,12 @@ const store = useStore();
 
 describe('JhiNavbar', () => {
   let jhiNavbar: JhiNavbarComponentType;
+<%_ if (authenticationUsesCsrf) { _%>
   let loginService: LoginService;
+<%_ } _%>
+<%_ if (generateUserManagement) { _%>
+  let login: ReturnType<typeof useLoginModal>;
+<%_ } _%>
   const accountService = { hasAnyAuthorityAndCheckAuth: vitest.fn().mockImplementation(() => Promise.resolve(true)) };
 <%_ if (enableTranslation) { _%>
   const changeLanguage = vitest.fn();
@@ -32,14 +59,7 @@ describe('JhiNavbar', () => {
 
   beforeEach(() => {
     router = createRouter();
-<%_ if (authenticationTypeJwt) { _%>
-    loginService = new LoginService({ emit: vitest.fn() });
-    vitest.spyOn(loginService, 'openLogin');
-<%_ } else if (authenticationTypeSession) { _%>
-    loginService = new LoginService({ emit: vitest.fn() });
-    vitest.spyOn(loginService, 'openLogin');
-    vitest.spyOn(loginService, 'logout');
-<%_ } else if (authenticationTypeOauth2) { _%>
+<%_ if (authenticationUsesCsrf) { _%>
     loginService = { login: vitest.fn(), logout: vitest.fn() };
 <%_ } _%>
     const wrapper = shallowMount(JhiNavbar, {
@@ -57,7 +77,9 @@ describe('JhiNavbar', () => {
           'b-navbar-brand': true,
         },
         provide: {
+<%_ if (authenticationUsesCsrf) { _%>
           loginService,
+<%_ } _%>
           currentLanguage: computed(() => 'foo'),
 <%_ if (enableTranslation) { _%>
           changeLanguage,
@@ -67,6 +89,9 @@ describe('JhiNavbar', () => {
       },
     });
     jhiNavbar = wrapper.vm;
+<%_ if (generateUserManagement) { _%>
+    login = useLoginModal();
+<%_ } _%>
   });
 
   it('should not have user data set', () => {
@@ -89,11 +114,12 @@ describe('JhiNavbar', () => {
   });
 
   it('should use login service', () => {
-    jhiNavbar.openLogin();
-<%_ if (!authenticationTypeOauth2) { _%>
-    expect(loginService.openLogin).toHaveBeenCalled();
-<%_ } else { _%>
+    jhiNavbar.<% if (authenticationTypeOauth2) { %>login<% } else { %>showLogin<% } %>();
+
+<%_ if (authenticationTypeOauth2) { _%>
     expect(loginService.login).toHaveBeenCalled();
+<%_ } else { _%>
+    expect(login.showLogin).toHaveBeenCalled();
 <%_ } _%>
   });
 
@@ -108,9 +134,10 @@ describe('JhiNavbar', () => {
 <%_ if (authenticationTypeOauth2) { _%>
     const logoutUrl = '/to-match';
     (loginService.logout as any).mockReturnValue(Promise.resolve({ data: { logoutUrl } }));
-<%_ } else if (!authenticationTypeJwt) { _%>
+<%_ } else if (authenticationUsesCsrf) { _%>
     (loginService.logout as any).mockReturnValue(Promise.resolve({}));
 <%_ } _%>
+
     await jhiNavbar.logout();
 
 <%_ if (!authenticationTypeJwt) { _%>