fix(all): in-memory not overriding http client (#3052)

graycoreio · Sep 17, 2024 · 57d215b · 57d215b
1 parent caead1a
commit 57d215b
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 36 deletions.
diff --git a/apps/demo/src/app/app.module.ts b/apps/demo/src/app/app.module.ts
@@ -2,7 +2,10 @@ import {
   provideHttpClient,
   withInterceptorsFromDi,
 } from '@angular/common/http';
-import { NgModule } from '@angular/core';
+import {
+  importProvidersFrom,
+  NgModule,
+} from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { EffectsModule } from '@ngrx/effects';
@@ -37,8 +40,6 @@ import { environment } from '../environments/environment';
     BrowserModule,
     BrowserAnimationsModule,
 
-    DemoDriverModule,
-
     StoreModule.forRoot({}),
     EffectsModule.forRoot([]),
 
@@ -72,7 +73,17 @@ import { environment } from '../environments/environment';
       },
     ),
     provideRouterStore(),
+    // network providers
     provideHttpClient(withInterceptorsFromDi()),
+    // this must be after http client! ^
+    // this is mostly relevant for the in memory backend
+    // it seems that the way Angular loads providers
+    // means that the full provider tree will be loaded before
+    // importing modules. therefore, the in memory web API
+    // will not be able override the HTTP client backend
+    // when imported as a module
+    importProvidersFrom(DemoDriverModule),
+    //
   ],
   bootstrap: [AppComponent],
 })

diff --git a/apps/design-land/src/app/app.module.ts b/apps/design-land/src/app/app.module.ts
@@ -21,25 +21,31 @@ import { DesignLandAppComponent } from './app.component';
 import { DesignLandNavModule } from './core/nav/nav.module';
 import { DesignLandTemplateModule } from './core/template/template.module';
 
-@NgModule({ declarations: [
-  DesignLandAppComponent,
-],
-bootstrap: [
-  DesignLandAppComponent,
-], imports: [BrowserModule,
-  BrowserAnimationsModule,
-  DesignLandAppRoutingModule,
-  DaffSidebarModule,
-  DaffLinkSetModule,
-  DaffArticleModule,
-  DaffThemeSwitchButtonModule,
-  DaffNavbarModule,
-  DaffButtonModule,
-  FontAwesomeModule,
-  DesignLandNavModule,
-  DesignLandTemplateModule,
-  DaffToastModule], providers: [
-  DAFF_THEME_INITIALIZER,
-  provideHttpClient(withInterceptorsFromDi()),
-] })
+@NgModule({
+  declarations: [
+    DesignLandAppComponent,
+  ],
+  bootstrap: [
+    DesignLandAppComponent,
+  ],
+  imports: [
+    BrowserModule,
+    BrowserAnimationsModule,
+    DesignLandAppRoutingModule,
+    DaffSidebarModule,
+    DaffLinkSetModule,
+    DaffArticleModule,
+    DaffThemeSwitchButtonModule,
+    DaffNavbarModule,
+    DaffButtonModule,
+    FontAwesomeModule,
+    DesignLandNavModule,
+    DesignLandTemplateModule,
+    DaffToastModule,
+  ],
+  providers: [
+    DAFF_THEME_INITIALIZER,
+    provideHttpClient(withInterceptorsFromDi()),
+  ],
+})
 export class AppModule { }
diff --git a/libs/auth/driver/in-memory/src/backend/auth.service.integration.spec.ts b/libs/auth/driver/in-memory/src/backend/auth.service.integration.spec.ts
@@ -3,6 +3,7 @@ import {
   provideHttpClient,
   withInterceptorsFromDi,
 } from '@angular/common/http';
+import { importProvidersFrom } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import {
   HttpClientInMemoryWebApiModule,
@@ -19,7 +20,6 @@ import {
 } from '@daffodil/auth';
 import { DaffAccountRegistrationFactory } from '@daffodil/auth/testing';
 
-
 import { DaffInMemoryBackendAuthService } from './auth.service';
 
 describe('DaffAuthInMemoryBackend | Integration', () => {
@@ -32,8 +32,10 @@ describe('DaffAuthInMemoryBackend | Integration', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientInMemoryWebApiModule.forRoot(DaffInMemoryBackendAuthService)],
-      providers: [provideHttpClient(withInterceptorsFromDi())],
+      providers: [
+        provideHttpClient(withInterceptorsFromDi()),
+        importProvidersFrom(HttpClientInMemoryWebApiModule.forRoot(DaffInMemoryBackendAuthService, { delay: 0 })),
+      ],
     });
 
     httpClient = TestBed.inject(HttpClient);

diff --git a/libs/cart/driver/in-memory/src/backend/cart-root.service.integration.spec.ts b/libs/cart/driver/in-memory/src/backend/cart-root.service.integration.spec.ts
@@ -3,6 +3,7 @@ import {
   provideHttpClient,
   withInterceptorsFromDi,
 } from '@angular/common/http';
+import { importProvidersFrom } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { HttpClientInMemoryWebApiModule } from 'angular-in-memory-web-api';
 
@@ -49,9 +50,14 @@ describe('DaffInMemoryBackendCartRootService | Integration', () => {
 
   beforeEach(done => {
     TestBed.configureTestingModule({
-      imports: [HttpClientInMemoryWebApiModule.forRoot(DaffInMemoryBackendCartRootService, { delay: 0 }),
-        DaffProductTestingModule],
-      providers: [provideHttpClient(withInterceptorsFromDi())],
+      imports: [
+        DaffProductTestingModule,
+      ],
+      providers: [
+        provideHttpClient(withInterceptorsFromDi()),
+        // this must be loaded after provideHttpClient!
+        importProvidersFrom(HttpClientInMemoryWebApiModule.forRoot(DaffInMemoryBackendCartRootService, { delay: 0 })),
+      ],
     });
 
     httpClient = TestBed.inject(HttpClient);

diff --git a/libs/geography/driver/in-memory/src/backend/geography.service.integration.spec.ts b/libs/geography/driver/in-memory/src/backend/geography.service.integration.spec.ts
@@ -3,6 +3,7 @@ import {
   provideHttpClient,
   withInterceptorsFromDi,
 } from '@angular/common/http';
+import { importProvidersFrom } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { HttpClientInMemoryWebApiModule } from 'angular-in-memory-web-api';
 
@@ -21,8 +22,10 @@ describe('DaffInMemoryBackendGeographyService | Integration', () => {
 
   beforeEach(done => {
     TestBed.configureTestingModule({
-      imports: [HttpClientInMemoryWebApiModule.forRoot(DaffInMemoryBackendGeographyService, { delay: 0 })],
-      providers: [provideHttpClient(withInterceptorsFromDi())],
+      providers: [
+        provideHttpClient(withInterceptorsFromDi()),
+        importProvidersFrom(HttpClientInMemoryWebApiModule.forRoot(DaffInMemoryBackendGeographyService, { delay: 0 })),
+      ],
     });
 
     httpClient = TestBed.inject(HttpClient);

diff --git a/libs/order/driver/in-memory/src/backend/order.service.integration.spec.ts b/libs/order/driver/in-memory/src/backend/order.service.integration.spec.ts
@@ -3,6 +3,7 @@ import {
   provideHttpClient,
   withInterceptorsFromDi,
 } from '@angular/common/http';
+import { importProvidersFrom } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { HttpClientInMemoryWebApiModule } from 'angular-in-memory-web-api';
 
@@ -24,8 +25,10 @@ describe('@daffodil/order/driver/in-memory | DaffInMemoryBackendOrderService | I
 
   beforeEach(done => {
     TestBed.configureTestingModule({
-      imports: [HttpClientInMemoryWebApiModule.forRoot(DaffInMemoryBackendOrderService, { delay: 0 })],
-      providers: [provideHttpClient(withInterceptorsFromDi())],
+      providers: [
+        provideHttpClient(withInterceptorsFromDi()),
+        importProvidersFrom(HttpClientInMemoryWebApiModule.forRoot(DaffInMemoryBackendOrderService, { delay: 0 })),
+      ],
     });
 
     httpClient = TestBed.inject(HttpClient);

diff --git a/libs/reviews/driver/in-memory/src/backend/reviews.service.integration.spec.ts b/libs/reviews/driver/in-memory/src/backend/reviews.service.integration.spec.ts
@@ -3,6 +3,7 @@ import {
   provideHttpClient,
   withInterceptorsFromDi,
 } from '@angular/common/http';
+import { importProvidersFrom } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { HttpClientInMemoryWebApiModule } from 'angular-in-memory-web-api';
 
@@ -21,8 +22,10 @@ describe('@daffodil/reviews/driver/in-memory | DaffReviewsInMemoryBackendService
 
   beforeEach(done => {
     TestBed.configureTestingModule({
-      imports: [HttpClientInMemoryWebApiModule.forRoot(DaffReviewsInMemoryBackendService, { delay: 0 })],
-      providers: [provideHttpClient(withInterceptorsFromDi())],
+      providers: [
+        provideHttpClient(withInterceptorsFromDi()),
+        importProvidersFrom(HttpClientInMemoryWebApiModule.forRoot(DaffReviewsInMemoryBackendService, { delay: 0 })),
+      ],
     });
 
     httpClient = TestBed.inject(HttpClient);