fix dependencies between JWT & Health

src/main/java/tech/jhipster/lite/generator/client/angular/admin/health/domain/AngularHealthDomainService.java

@@ -55,35 +55,35 @@ private void updateAngularFilesForHealth(Project project) {
     String oldHtml = "// jhipster-needle-angular-route";
     String newHtml =
       """
-      // jhipster-needle-angular-route
       {
         path: 'admin',
         loadChildren: () => import('./admin/admin-routing.module').then(m => m.AdminRoutingModule),
-      },""";
+      },
+      // jhipster-needle-angular-route""";
     projectRepository.replaceText(project, APP, APP_ROUTING_MODULE, oldHtml, newHtml);
 
     oldHtml = "<!-- jhipster-needle-angular-menu -->";
-    newHtml =
-      """
+    newHtml = """
       <a routerLink="admin/health" mat-menu-item><span>Health</span></a>
-      <!-- jhipster-needle-angular-menu -->
-      """;
+      <!-- jhipster-needle-angular-menu -->""";
     projectRepository.replaceText(project, APP, APP_COMPONENT_HTML, oldHtml, newHtml);
 
-    oldHtml = "// jhipster-needle-angular-health";
-    newHtml = """
+    oldHtml = "// jhipster-needle-angular-menu";
+    newHtml =
+      """
       it('should navigate on admin endpoint', () => {
           router.navigateByUrl('/admin');
       });
-      """;
+      // jhipster-needle-angular-menu""";
     projectRepository.replaceText(project, APP, APP_ROUTING_MODULE_SPEC, oldHtml, newHtml);
 
-    oldHtml = "// jhipster-needle-angular-health";
-    newHtml = """
+    oldHtml = "// jhipster-needle-angular-menu";
+    newHtml =
+      """
         it('should navigate on health endpoint', () => {
             router.navigateByUrl('/health');
         });
-        """;
+        // jhipster-needle-angular-menu""";
     projectRepository.replaceText(project, APP, ADMIN_ROUTING_MODULE_SPEC, oldHtml, newHtml);
   }
 }

src/main/java/tech/jhipster/lite/generator/client/angular/common/domain/AngularCommonDomainService.java

@@ -126,6 +126,7 @@ public void addAllowedCommonJsDependenciesAngularJson(Project project, String li
   public List<String> getAngularModules() {
     return List.of(
       "BrowserAnimationsModule",
+      "HttpClientModule",
       "MatMenuModule",
       "MatToolbarModule",
       "MatIconModule",

src/main/java/tech/jhipster/lite/generator/client/angular/core/domain/Angular.java

@@ -63,7 +63,7 @@ public static Map<String, String> scripts() {
   }
 
   public static List<String> files() {
-    return List.of("angular.json", "jest.conf.js", "tsconfig.app.json", "tsconfig.json", "tsconfig.spec.json");
+    return List.of("angular.json", "jest.conf.js", "proxy.conf.json", "tsconfig.app.json", "tsconfig.json", "tsconfig.spec.json");
   }
 
   public static Map<String, String> angularFiles() {

src/main/java/tech/jhipster/lite/generator/client/angular/security/jwt/domain/AngularJwt.java

@@ -11,10 +11,6 @@ public static List<String> jwtDependencies() {
     return List.of("ngx-webstorage");
   }
 
-  public static Map<String, String> jwtFiles() {
-    return Map.ofEntries(Map.entry("proxy.conf.json", ""));
-  }
-
   public static Map<String, String> angularJwtFiles() {
     String primaryAppAuth = "app/auth";
     String primaryAppLogin = "app/login";

src/main/java/tech/jhipster/lite/generator/client/angular/security/jwt/domain/AngularJwtDomainService.java

@@ -40,7 +40,6 @@ public void addAppJwtFiles(Project project) {
 
     addJwtDependencies(project);
     addAngularJwtFiles(project);
-    addJwtFiles(project);
     updateAngularFilesForJwt(project);
   }
 
@@ -62,7 +61,6 @@ public void updateAngularFilesForJwt(Project project) {
     oldHtml = "import \\{ NgModule \\} from '@angular/core';";
     newHtml =
       """
-        import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
         import { NgModule } from '@angular/core';
         import { ReactiveFormsModule } from '@angular/forms';
         import { NgxWebstorageModule } from 'ngx-webstorage';""";
@@ -80,7 +78,7 @@ public void updateAngularFilesForJwt(Project project) {
     newHtml =
       "imports: \\[" +
       angularCommonService.getAngularModules().stream().collect(Collectors.joining(", ")) +
-      ", HttpClientModule, ReactiveFormsModule, NgxWebstorageModule.forRoot()\\],";
+      ", ReactiveFormsModule, NgxWebstorageModule.forRoot()\\],";
     projectRepository.replaceText(project, APP, APP_MODULE, oldHtml, newHtml);
 
     oldHtml = "bootstrap: \\[AppComponent\\],";
@@ -95,30 +93,6 @@ public void updateAngularFilesForJwt(Project project) {
             },
           ],""";
     projectRepository.replaceText(project, APP, APP_MODULE, oldHtml, newHtml);
-
-    oldHtml = "9000";
-    newHtml = """
-        9000,
-                    "proxyConfig": "proxy.conf.json" """;
-    projectRepository.replaceText(project, "", "angular.json", oldHtml, newHtml);
-  }
-
-  public void addJwtFiles(Project project) {
-    project.addConfig("serverPort", 8080);
-
-    List<ProjectFile> files = AngularJwt
-      .jwtFiles()
-      .entrySet()
-      .stream()
-      .map(entry ->
-        ProjectFile
-          .forProject(project)
-          .withSource(getPath(SOURCE, entry.getValue()), entry.getKey())
-          .withDestinationFolder(getPath("", entry.getValue()))
-      )
-      .toList();
-
-    projectRepository.template(files);
   }
 
   public void addAngularJwtFiles(Project project) {

src/main/java/tech/jhipster/lite/generator/client/angular/security/oauth2/domain/AngularOauth2DomainService.java

@@ -83,7 +83,6 @@ private void updateAppModuleTsFile(Project project) {
       project,
       APP_MODULE_TS_FILE_PATH,
       """
-        import { HTTP_INTERCEPTORS } from '@angular/common/http';
         import { LoginComponent } from './login/login.component';
         import { Oauth2AuthService } from './auth/oauth2-auth.service';
         import { HttpAuthInterceptor } from './auth/http-auth.interceptor';

src/main/resources/generator/client/angular/admin/src/main/webapp/app/admin/admin-routing.module.spec.ts.mustache

@@ -18,5 +18,5 @@ describe('AdminRoutingModule', () => {
     expect(AdminRoutingModule).toBeDefined();
   });
 
-  // jhipster-needle-angular-health
+  // jhipster-needle-angular-menu
 });

src/main/resources/generator/client/angular/core/angular.json

@@ -69,7 +69,8 @@
         },
         "serve": {
           "options": {
-            "port": 9000
+            "port": 9000,
+            "proxyConfig": "proxy.conf.json"
           },
           "builder": "@angular-devkit/build-angular:dev-server",
           "configurations": {

src/main/resources/generator/client/angular/core/proxy.conf.json

@@ -0,0 +1,10 @@
+{
+  "/api": {
+    "target": "http://localhost:8080",
+    "secure": false
+  },
+  "/management": {
+    "target": "http://localhost:8080",
+    "secure": false
+  }
+}

src/main/resources/generator/client/angular/core/src/main/webapp/app/app-routing.module.spec.ts.mustache

@@ -18,5 +18,5 @@ describe('AppRoutingModule', () => {
     expect(AppRoutingModule).toBeDefined();
   });
 
-  // jhipster-needle-angular-health
+  // jhipster-needle-angular-menu
 });

src/main/resources/generator/client/angular/core/src/main/webapp/app/app-routing.module.ts.mustache

@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
 export const routes: Routes = [
-  // jhipster-needle-angular-route
+// jhipster-needle-angular-route
 ];
 
 @NgModule({

src/main/resources/generator/client/angular/core/src/main/webapp/app/app.module.ts.mustache

@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
+import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
 
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
@@ -13,7 +14,7 @@ import { MatMenuModule } from '@angular/material/menu';
 
 @NgModule({
   declarations: [AppComponent],
-  imports: [BrowserAnimationsModule, MatMenuModule, MatToolbarModule, MatIconModule, MatButtonModule, MatButtonToggleModule, BrowserModule, AppRoutingModule],
+  imports: [BrowserAnimationsModule, HttpClientModule, MatMenuModule, MatToolbarModule, MatIconModule, MatButtonModule, MatButtonToggleModule, BrowserModule, AppRoutingModule],
   bootstrap: [AppComponent],
 })
 export class AppModule {}

src/test/java/tech/jhipster/lite/generator/client/angular/admin/health/application/AngularHealthAssert.java

@@ -31,7 +31,8 @@ public static void assertUpdatedFiles(Project project) throws IOException {
       {
         path: 'admin',
         loadChildren: () => import('./admin/admin-routing.module').then(m => m.AdminRoutingModule),
-      },""".lines()
+      },
+      // jhipster-needle-angular-route""".lines()
         .toList();
     assertThat(appRoutingModuleTsLines).containsAll(expectedContentLines);
 

src/test/java/tech/jhipster/lite/generator/client/angular/common/domain/AngularCommonDomainServiceTest.java

@@ -386,6 +386,7 @@ void shouldGetAngularModules() {
         .isEqualTo(
           List.of(
             "BrowserAnimationsModule",
+            "HttpClientModule",
             "MatMenuModule",
             "MatToolbarModule",
             "MatIconModule",

src/test/java/tech/jhipster/lite/generator/client/angular/core/application/AngularAssert.java

@@ -33,6 +33,7 @@ public static void assertConfigFiles(Project project) {
     assertFileExist(project, "angular.json");
     assertFileContent(project, "angular.json", "\"port\": 9000");
     assertFileExist(project, "jest.conf.js");
+    assertFileExist(project, "proxy.conf.json");
     assertFileExist(project, "tsconfig.app.json");
     assertFileExist(project, "tsconfig.json");
     assertFileExist(project, "tsconfig.spec.json");

src/test/java/tech/jhipster/lite/generator/client/angular/core/domain/AngularDomainServiceTest.java

@@ -96,7 +96,7 @@ void shouldAddFiles() {
 
     angularDomainService.addFiles(project);
 
-    verify(projectRepository).add(filesCountArgument(5));
+    verify(projectRepository).add(filesCountArgument(6));
   }
 
   @Test

src/test/java/tech/jhipster/lite/generator/client/angular/security/jwt/domain/AngularJwtDomainServiceTest.java

@@ -67,15 +67,6 @@ void shouldNotAddJwtDependencies() {
     assertThatThrownBy(() -> angularJwtDomainService.addJwtDependencies(project)).isExactlyInstanceOf(GeneratorException.class);
   }
 
-  @Test
-  void shouldAddJwtFiles() {
-    Project project = tmpProjectWithPackageJson();
-
-    angularJwtDomainService.addJwtFiles(project);
-
-    verify(projectRepository).template(ProjectFilesAsserter.filesCountArgument(1));
-  }
-
   @Test
   void shouldAddAngularJwtFiles() {
     Project project = tmpProjectWithPackageJson();

src/test/java/tech/jhipster/lite/generator/client/angular/security/oauth2/application/AngularOauth2Assert.java

@@ -45,7 +45,7 @@ public static void assertUpdatedFiles(Project project) throws IOException {
       """
         import { NgModule, APP_INITIALIZER} from '@angular/core';
         import { MatButtonToggleModule } from '@angular/material/button-toggle';
-        import { HTTP_INTERCEPTORS } from '@angular/common/http';
+        import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
         import { LoginComponent } from './login/login.component';
         import { Oauth2AuthService } from './auth/oauth2-auth.service';
         import { HttpAuthInterceptor } from './auth/http-auth.interceptor';

src/test/java/tech/jhipster/lite/generator/client/angular/security/oauth2/domain/AngularOauth2DomainServiceTest.java

@@ -104,7 +104,6 @@ private void verifyUpdatedFiles(Project project) {
         project,
         APP_MODULE_TS_FILE_PATH,
         """
-        import { HTTP_INTERCEPTORS } from '@angular/common/http';
         import { LoginComponent } from './login/login.component';
         import { Oauth2AuthService } from './auth/oauth2-auth.service';
         import { HttpAuthInterceptor } from './auth/http-auth.interceptor';