generator-jhipster 8.10.0 → 8.11.0

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

@@ -1,14 +1,32 @@
-import { defineComponent, inject, onMounted, ref, type 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 Ref, defineComponent, inject, onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import type LoginService from '@/account/login.service';
-import ActivateService from './activate.service';
 import { useRoute } from 'vue-router';
+import { useLoginModal } from '@/account/login-modal';
+import ActivateService from './activate.service';
 
 export default defineComponent({
   compatConfig: { MODE: 3 },
   setup() {
     const activateService = inject('activateService', () => new ActivateService(), true);
-    const loginService = inject<LoginService>('loginService');
+    const { showLogin } = useLoginModal();
     const route = useRoute();
 
     const success: Ref<boolean> = ref(false);
@@ -26,13 +44,9 @@ export default defineComponent({
       }
     });
 
-    const openLogin = () => {
-      loginService.openLogin();
-    };
-
     return {
       activateService,
-      openLogin,
+      showLogin,
       success,
       error,
       t$: useI18n().t,

package/dist/generators/vue/templates/src/main/webapp/app/account/activate/activate.service.ts.ejs

@@ -7,7 +7,7 @@ export default class ActivateService {
     this.axios = axios;
   }
 
-  public activateAccount(key: string): Promise<any> {
+  activateAccount(key: string): Promise<any> {
     return this.axios.get(`api/activate?key=${key}`);
   }
 }

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

@@ -5,7 +5,7 @@
         <h1 v-text="t$('activate.title')">Activation</h1>
         <div class="alert alert-success" v-if="success">
           <span v-html="t$('activate.messages.success')"><strong>Your user account has been activated.</strong> Please </span>
-          <a class="alert-link" @click="openLogin" v-text="t$('global.messages.info.authenticated.link')">sign in</a>.
+          <a class="alert-link" @click="showLogin()" v-text="t$('global.messages.info.authenticated.link')">sign in</a>.
         </div>
         <div class="alert alert-danger" v-if="error" v-html="t$('activate.messages.error')">
           <strong>Your user could not be activated.</strong> Please use the registration form to sign up.

package/dist/generators/vue/templates/src/main/webapp/app/account/change-password/change-password.vue.ejs

@@ -3,7 +3,7 @@
     <div class="row justify-content-center">
       <div class="col-md-8 toastify-container">
         <h2 v-if="username" id="password-title">
-          <span v-html="t$('password.title', { username: username })">
+          <span v-html="t$('password.title', { username })">
             Password for [<strong>{{ username }}</strong
             >]</span
           >

package/dist/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.component.spec.ts.ejs

@@ -1,15 +1,31 @@
+<%#
+ 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 { shallowMount, type MountingOptions } from '@vue/test-utils';
+import { type MountingOptions, shallowMount } from '@vue/test-utils';
 import axios from 'axios';
 import sinon from 'sinon';
 import { type RouteLocation } from 'vue-router';
-import { PiniaVuePlugin } from 'pinia';
 import { createTestingPinia } from '@pinia/testing';
 
-import LoginService from '../login.service';
 import AccountService from '../account.service';
-import { useStore } from '@/store';
 import LoginForm from './login-form.vue';
+import { useStore } from '@/store';
 
 type LoginFormComponentType = InstanceType<typeof LoginForm>;
 
@@ -20,10 +36,6 @@ vitest.mock('vue-router', () => ({
   useRouter: () => ({ go: routerGoMock }),
 }));
 
-const pinia = createTestingPinia();
-
-const store = useStore();
-
 const axiosStub = {
   get: sinon.stub(axios, 'get'),
   post: sinon.stub(axios, 'post'),
@@ -37,7 +49,8 @@ describe('LoginForm Component', () => {
     axiosStub.get.resolves({});
     axiosStub.post.reset();
 
-    const loginService = new LoginService({ emit: vitest.fn() });
+    const pinia = createTestingPinia();
+    const store = useStore();
 
     const globalOptions: MountingOptions<LoginFormComponentType>['global'] = {
       stubs: {
@@ -51,7 +64,6 @@ describe('LoginForm Component', () => {
       },
       plugins: [pinia],
       provide: {
-        loginService,
         accountService: new AccountService(store),
       },
     };

package/dist/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.component.ts.ejs

@@ -1,11 +1,29 @@
+<%#
+ 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 axios from 'axios';
-import { defineComponent, inject, ref, type Ref } from 'vue';
+import { type Ref, defineComponent, inject, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 <%_ if (enableTranslation) { _%>
 import { useI18n } from 'vue-i18n';
 <%_ } _%>
+import { useLoginModal } from '@/account/login-modal';
 import type AccountService from '../account.service';
-import type LoginService from '@/account/login.service';
 
 export default defineComponent({
   compatConfig: { MODE: 3 },
@@ -14,13 +32,14 @@ export default defineComponent({
     const login: Ref<string> = ref(null);
     const password: Ref<string> = ref(null);
     const rememberMe: Ref<boolean> = ref(false);
+
+    const { hideLogin } = useLoginModal();
     const route = useRoute();
     const router = useRouter();
 
     const previousState = () => router.go(-1);
 
     const accountService = inject<AccountService>('accountService');
-    const loginService = inject<LoginService>('loginService');
 
     const doLogin = async () => {
 <%_ if (authenticationTypeJwt) { _%>
@@ -49,12 +68,12 @@ export default defineComponent({
 <%_ } _%>
 
         authenticationError.value = false;
-        loginService.hideLogin();
+        hideLogin();
         await accountService.retrieveAccount();
         if (route.path === '/forbidden') {
           previousState();
         }
-      } catch (_error) {
+      } catch {
         authenticationError.value = true;
       }
     };

package/dist/generators/vue/templates/src/main/webapp/app/account/login-modal.ts.ejs

@@ -0,0 +1,38 @@
+<%#
+ 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 { ref } from 'vue';
+import { defineStore } from 'pinia';
+
+export const useLoginModal = defineStore('login', () => {
+  const loginModalOpen = ref(false);
+
+  function showLogin() {
+    loginModalOpen.value = true;
+  }
+
+  function hideLogin() {
+    loginModalOpen.value = false;
+  }
+
+  return {
+    loginModalOpen,
+    showLogin,
+    hideLogin,
+  };
+});

package/dist/generators/vue/templates/src/main/webapp/app/account/login.service.spec.ts.ejs

@@ -1,5 +1,4 @@
 import LoginService from './login.service';
-<%_ if (!authenticationTypeJwt) { _%>
 import axios from 'axios';
 import sinon from 'sinon';
 
@@ -7,7 +6,6 @@ const axiosStub = {
   get: sinon.stub(axios, 'get'),
   post: sinon.stub(axios, 'post'),
 };
-<%_ } _%>
 
 describe('Login Service test suite', () => {
   let loginService: LoginService;
@@ -66,11 +64,9 @@ describe('Login Service test suite', () => {
   });
 <%_ } _%>
 
-<%_ if (!authenticationTypeJwt) { _%>
   it('should call global logout when asked to', () => {
     loginService.logout();
 
     expect(axiosStub.post.calledWith('api/logout')).toBeTruthy();
   });
-<%_ } _%>
 });

package/dist/generators/vue/templates/src/main/webapp/app/account/login.service.ts.ejs

@@ -1,28 +1,8 @@
-<%_ if (!authenticationTypeOauth2) { _%>
-import Vue from 'vue';
-<%_ } _%>
-<%_ if (!authenticationTypeJwt) { _%>
 import axios, { type AxiosPromise } from 'axios';
-<%_ } _%>
 
 export default class LoginService {
-<%_ if (!authenticationTypeOauth2) { _%>
-  private readonly emit: (event: string, ...args: any[]) => void;
-
-  constructor({ emit }: { emit: (event: string, ...args: any[]) => void }) {
-    this.emit = emit;
-  }
-
-  public openLogin(): void {
-    this.emit('bv::show::modal', 'login-page');
-  }
-
-  public hideLogin(): void {
-    this.emit('bv::hide::modal', 'login-page');
-  }
-<%_ } else { _%>
-
-  public login(loc: { href: string; hostname: string; pathname: string; port?: string } = window.location) {
+<%_ if (authenticationTypeOauth2) { _%>
+  login(loc: { href: string; hostname: string; pathname: string; port?: string } = window.location) {
     const port = loc.port ? `:${loc.port}` : '';
     let contextPath = loc.pathname;
     if (contextPath.endsWith('accessdenied')) {
@@ -39,10 +19,8 @@ export default class LoginService {
     loc.href = `//${loc.hostname}${port}${contextPath}oauth2/authorization/oidc`;
   }
 <%_ } _%>
-<%_ if (!authenticationTypeJwt) { _%>
 
-  public logout(): AxiosPromise<any> {
+  logout(): AxiosPromise<any> {
     return axios.post('api/logout');
   }
-<%_ } _%>
 }

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

@@ -1,13 +1,31 @@
+<%#
+ 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 { createTestingPinia } from '@pinia/testing';
 import axios from 'axios';
 import sinon from 'sinon';
 
 import { EMAIL_ALREADY_USED_TYPE, LOGIN_ALREADY_USED_TYPE } from '@/constants';
+import { useLoginModal } from '@/account/login-modal';
 import Register from './register.vue';
-import RegisterService from './register.service';
-import LoginService from '../login.service';
 
 type RegisterComponentType = InstanceType<typeof Register>;
 
@@ -18,7 +36,6 @@ const axiosStub = {
 
 describe('Register Component', () => {
   let register: RegisterComponentType;
-  let loginService: LoginService;
   const filledRegisterAccount = {
     email: 'jhi@pster.net',
     langKey: '<%= nativeLanguage %>',
@@ -29,13 +46,11 @@ describe('Register Component', () => {
   beforeEach(() => {
     axiosStub.get.resolves({});
     axiosStub.post.reset();
-    loginService = new LoginService({ emit: vitest.fn() });
-    vitest.spyOn(loginService, 'openLogin');
 
     const wrapper = shallowMount(Register, {
       global: {
+        plugins: [createTestingPinia()],
         provide: {
-          loginService,
           currentLanguage: computed(() => '<%= nativeLanguage %>'),
         },
       },
@@ -55,8 +70,9 @@ describe('Register Component', () => {
   });
 
   it('should open login modal when asked to', () => {
-    register.openLogin();
-    expect(loginService.openLogin).toBeCalledTimes(1);
+    const login = useLoginModal();
+    register.showLogin();
+    expect(login.showLogin).toHaveBeenCalledOnce();
   });
 
   it('should register when password match', async () => {

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

@@ -1,10 +1,28 @@
-import { computed, defineComponent, inject, ref, type 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 Ref, computed, defineComponent, inject, ref } from 'vue';
 <%_ if (enableTranslation) { _%>
 import { useI18n } from 'vue-i18n';
 <%_ } _%>
-import { useVuelidate } from '@vuelidate/core'
+import { useVuelidate } from '@vuelidate/core';
 import { email, helpers, maxLength, minLength, required, sameAs } from '@vuelidate/validators';
-import type LoginService from '@/account/login.service';
+import { useLoginModal } from '@/account/login-modal';
 import RegisterService from '@/account/register/register.service';
 import { EMAIL_ALREADY_USED_TYPE, LOGIN_ALREADY_USED_TYPE } from '@/constants';
 
@@ -43,7 +61,7 @@ export default defineComponent({
     };
   },
   setup() {
-    const loginService = inject<LoginService>('loginService');
+    const { showLogin } = useLoginModal();
     const registerService = inject('registerService', () => new RegisterService(), true);
     const currentLanguage = inject('currentLanguage', () => computed(() => navigator.language ?? '<%- nativeLanguage %>'), true);
 
@@ -59,12 +77,8 @@ export default defineComponent({
       password: undefined,
     });
 
-    const openLogin = () => {
-      loginService.openLogin();
-    };
-
     return {
-      openLogin,
+      showLogin,
       currentLanguage,
       registerService,
       error,

package/dist/generators/vue/templates/src/main/webapp/app/account/register/register.service.ts.ejs

@@ -1,7 +1,7 @@
 import axios from 'axios';
 
 export default class RegisterService {
-  public processRegistration(account: any): Promise<any> {
+  processRegistration(account: any): Promise<any> {
     return axios.post('api/register', account);
   }
 }

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

@@ -209,7 +209,7 @@
         <p></p>
         <div class="alert alert-warning">
           <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="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/account/reset-password/finish/reset-password-finish.component.spec.ts.ejs

@@ -1,8 +1,26 @@
+<%#
+ 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 axios from 'axios';
 import sinon from 'sinon';
 import { shallowMount } from '@vue/test-utils';
 import ResetPasswordFinish from './reset-password-finish.vue';
-import LoginService from '@/login.service';
+import { createTestingPinia } from '@pinia/testing';
 
 type ResetPasswordFinishComponentType = InstanceType<typeof ResetPasswordFinish>;
 
@@ -18,9 +36,7 @@ describe('Reset Component Finish', () => {
     axiosStub.post.reset();
     const wrapper = shallowMount(ResetPasswordFinish, {
       global: {
-        provide: {
-          loginService: {},
-        },
+        plugins: [createTestingPinia()],
       },
     });
     resetPasswordFinish = wrapper.vm;

package/dist/generators/vue/templates/src/main/webapp/app/account/reset-password/finish/reset-password-finish.component.ts.ejs

@@ -1,11 +1,27 @@
-import { defineComponent, inject, ref, type Ref } from 'vue';
-<%_ if (enableTranslation) { _%>
+<%#
+ 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 Ref, defineComponent, inject, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-<%_ } _%>
 import axios from 'axios';
-import { useVuelidate } from '@vuelidate/core'
+import { useVuelidate } from '@vuelidate/core';
 import { maxLength, minLength, required, sameAs } from '@vuelidate/validators';
-import type LoginService from '@/account/login.service';
+import { useLoginModal } from '@/account/login-modal';
 
 export default defineComponent({
   compatConfig: { MODE: 3 },
@@ -31,7 +47,7 @@ export default defineComponent({
     this.keyMissing = !this.key;
   },
   setup() {
-    const loginService = inject<LoginService>('loginService');
+    const { showLogin } = useLoginModal();
 
     const doNotMatch: Ref<string> = ref(null);
     const success: Ref<string> = ref(null);
@@ -43,12 +59,8 @@ export default defineComponent({
       confirmPassword: null,
     });
 
-    const openLogin = () => {
-      loginService.openLogin();
-    };
-
     return {
-      openLogin,
+      showLogin,
       doNotMatch,
       success,
       error,
@@ -56,9 +68,7 @@ export default defineComponent({
       key,
       resetAccount,
       v$: useVuelidate(),
-<%_ if (enableTranslation) { _%>
       t$: useI18n().t,
-<%_ } _%>
     };
   },
   methods: {

package/dist/generators/vue/templates/src/main/webapp/app/account/reset-password/finish/reset-password-finish.vue.ejs

@@ -16,7 +16,7 @@
 
         <div class="alert alert-success" v-if="success">
           <span v-html="t$('reset.finish.messages.success')"><strong>Your password had been reset.</strong> Please </span>
-          <a class="alert-link" @click="openLogin" v-text="t$('global.messages.info.authenticated.link')">sign in</a>
+          <a class="alert-link" @click="showLogin()" v-text="t$('global.messages.info.authenticated.link')">sign in</a>
         </div>
         <div class="alert alert-danger" v-if="doNotMatch">
           <p v-text="t$('global.messages.error.dontmatch')">The password and its confirmation do not match!</p>

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

@@ -3,7 +3,7 @@
     <div class="row justify-content-center">
       <div class="col-md-8 toastify-container">
         <h2 v-if="username" id="settings-title">
-          <span v-html="t$('settings.title', { username: username })">
+          <span v-html="t$('settings.title', { username })">
             User settings for [
             <strong>
               {{ username }}

package/dist/generators/vue/templates/src/main/webapp/app/admin/configuration/configuration.service.ts.ejs

@@ -1,7 +1,7 @@
 import axios from 'axios';
 
 export default class ConfigurationService {
-  public loadConfiguration(): Promise<any> {
+  loadConfiguration(): Promise<any> {
     return new Promise(resolve => {
       axios.get('management/configprops').then(res => {
         const properties = [];
@@ -21,7 +21,7 @@ export default class ConfigurationService {
     });
   }
 
-  public loadEnvConfiguration(): Promise<any> {
+  loadEnvConfiguration(): Promise<any> {
     return new Promise(resolve => {
       axios.get<any>('management/env').then(res => {
         const properties = {};

package/dist/generators/vue/templates/src/main/webapp/app/admin/gateway/gateway.service.ts.ejs

@@ -1,7 +1,7 @@
 import axios from 'axios';
 
 export default class GatewayService {
-  public findAll() : Promise<any> {
+  findAll() : Promise<any> {
     return new Promise(resolve => {
       axios.get('api/gateway/routes').then(res => {
         resolve(res);