fixup! feat(platform-server): use absolute URLs from Location for HTTP

CaerusKaru · CaerusKaru · commit 2c4f37254474 · 2020-05-12T20:07:33.000-05:00
diff --git a/packages/platform-server/src/http.ts b/packages/platform-server/src/http.ts
@@ -14,7 +14,9 @@ import {DOCUMENT} from '@angular/common';
 import {HttpEvent, HttpRequest, HttpHandler, HttpBackend, XhrFactory, &#629;HttpInterceptingHandler as HttpInterceptingHandler} from '@angular/common/http';
 import {Observable, Observer, Subscription} from 'rxjs';
 
+// @see https://www.w3.org/Protocols/HTTP/1.1/draft-ietf-http-v11-spec-01#URI-syntax
 const isAbsoluteUrl = /^[a-zA-Z\-\+.]+:\/\//;
+const FORWARD_SLASH = '/';
 
 @Injectable()
 export class ServerXhr implements XhrFactory {
@@ -108,8 +110,15 @@ export class ZoneClientBackend extends
   }
 
   handle(request: HttpRequest<any>): Observable<HttpEvent<any>> {
-    if (!isAbsoluteUrl.test(request.url) && this.doc.location.href) {
-      return this.wrap(request.clone({url: this.doc.location.href + request.url}));
+    const href = this.doc.location.href;
+    if (!isAbsoluteUrl.test(request.url) && href) {
+      const urlParts = Array.from(request.url);
+      if (request.url[0] === FORWARD_SLASH && href[href.length - 1] === FORWARD_SLASH) {
+        urlParts.shift();
+      } else if (request.url[0] !== FORWARD_SLASH && href[href.length - 1] !== FORWARD_SLASH) {
+        urlParts.splice(0, 0, FORWARD_SLASH);
+      }
+      return this.wrap(request.clone({url: href + urlParts.join('')}));
     }
     return this.wrap(request);
   }
diff --git a/packages/platform-server/test/integration_spec.ts b/packages/platform-server/test/integration_spec.ts
@@ -793,22 +793,53 @@ describe('platform-server integration', () => {
          });
        }));
 
-    it('can make relative HttpClient requests', async(() => {
-         const platform = platformDynamicServer([
-           {provide: INITIAL_CONFIG, useValue: {document: '<app></app>', url: 'http://localhost'}}
-         ]);
-         platform.bootstrapModule(HttpClientExampleModule).then(ref => {
-           const mock = ref.injector.get(HttpTestingController) as HttpTestingController;
-           const http = ref.injector.get(HttpClient);
-           ref.injector.get<NgZone>(NgZone).run(() => {
-             http.get<string>('/testing').subscribe((body: string) => {
-               NgZone.assertInAngularZone();
-               expect(body).toEqual('success!');
-             });
-             mock.expectOne('http://localhost/testing').flush('success!');
-           });
-         });
-       }));
+    it('can make relative HttpClient requests', async () => {
+      const platform = platformDynamicServer([
+        {provide: INITIAL_CONFIG, useValue: {document: '<app></app>', url: 'http://localhost'}}
+      ]);
+      const ref = await platform.bootstrapModule(HttpClientExampleModule);
+      const mock = ref.injector.get(HttpTestingController) as HttpTestingController;
+      const http = ref.injector.get(HttpClient);
+      ref.injector.get(NgZone).run(() => {
+        http.get<string>('/testing').subscribe((body: string) => {
+          NgZone.assertInAngularZone();
+          expect(body).toEqual('success!');
+        });
+        mock.expectOne('http://localhost/testing').flush('success!');
+      });
+    });
+
+    it('can make relative HttpClient requests two slashes', async () => {
+      const platform = platformDynamicServer([
+        {provide: INITIAL_CONFIG, useValue: {document: '<app></app>', url: 'http://localhost/'}}
+      ]);
+      const ref = await platform.bootstrapModule(HttpClientExampleModule);
+      const mock = ref.injector.get(HttpTestingController) as HttpTestingController;
+      const http = ref.injector.get(HttpClient);
+      ref.injector.get(NgZone).run(() => {
+        http.get<string>('/testing').subscribe((body: string) => {
+          NgZone.assertInAngularZone();
+          expect(body).toEqual('success!');
+        });
+        mock.expectOne('http://localhost/testing').flush('success!');
+      });
+    });
+
+    it('can make relative HttpClient requests no slashes', async () => {
+      const platform = platformDynamicServer([
+        {provide: INITIAL_CONFIG, useValue: {document: '<app></app>', url: 'http://localhost'}}
+      ]);
+      const ref = await platform.bootstrapModule(HttpClientExampleModule);
+      const mock = ref.injector.get(HttpTestingController) as HttpTestingController;
+      const http = ref.injector.get(HttpClient);
+      ref.injector.get(NgZone).run(() => {
+        http.get<string>('testing').subscribe((body: string) => {
+          NgZone.assertInAngularZone();
+          expect(body).toEqual('success!');
+        });
+        mock.expectOne('http://localhost/testing').flush('success!');
+      });
+    });
 
     it('requests are macrotasks', async(() => {
          const platform = platformDynamicServer(
