fix(@angular/ssr): correctly set config URL

When calling `renderApplication` or `renderModule` the URL would be overridden to undefined as the `url` option was not provided as an option. (cherry picked from commit f6a088b)
angular · Oct 24, 2023 · 6224b05 · 6224b05
1 parent 2afe760
commit 6224b05
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 28 deletions.
diff --git a/packages/angular/ssr/src/common-engine.ts b/packages/angular/ssr/src/common-engine.ts
@@ -7,12 +7,7 @@
  */
 
 import { ApplicationRef, StaticProvider, Type } from '@angular/core';
-import {
-  INITIAL_CONFIG,
-  renderApplication,
-  renderModule,
-  ɵSERVER_CONTEXT,
-} from '@angular/platform-server';
+import { renderApplication, renderModule, ɵSERVER_CONTEXT } from '@angular/platform-server';
 import * as fs from 'node:fs';
 import { dirname, resolve } from 'node:path';
 import { URL } from 'node:url';
@@ -151,6 +146,11 @@ export class CommonEngine {
   }
 
   private async renderApplication(opts: CommonEngineRenderOptions): Promise<string> {
+    const moduleOrFactory = this.options?.bootstrap ?? opts.bootstrap;
+    if (!moduleOrFactory) {
+      throw new Error('A module or bootstrap option must be provided.');
+    }
+
     const extraProviders: StaticProvider[] = [
       { provide: ɵSERVER_CONTEXT, useValue: 'ssr' },
       ...(opts.providers ?? []),
@@ -162,24 +162,17 @@ export class CommonEngine {
       document = await this.getDocument(opts.documentFilePath);
     }
 
-    if (document) {
-      extraProviders.push({
-        provide: INITIAL_CONFIG,
-        useValue: {
-          document,
-          url: opts.url,
-        },
-      });
-    }
-
-    const moduleOrFactory = this.options?.bootstrap ?? opts.bootstrap;
-    if (!moduleOrFactory) {
-      throw new Error('A module or bootstrap option must be provided.');
-    }
+    const commonRenderingOptions = {
+      url: opts.url,
+      document,
+    };
 
     return isBootstrapFn(moduleOrFactory)
-      ? renderApplication(moduleOrFactory, { platformProviders: extraProviders })
-      : renderModule(moduleOrFactory, { extraProviders });
+      ? renderApplication(moduleOrFactory, {
+          platformProviders: extraProviders,
+          ...commonRenderingOptions,
+        })
+      : renderModule(moduleOrFactory, { extraProviders, ...commonRenderingOptions });
   }
 
   /** Retrieve the document from the cache or the filesystem */

diff --git a/packages/schematics/angular/migrations/update-17/replace-nguniversal-engines.ts b/packages/schematics/angular/migrations/update-17/replace-nguniversal-engines.ts
@@ -137,13 +137,15 @@ export function app(): express.Express {
 
   // All regular routes use the Angular engine
   server.get('*', (req, res, next) => {
+    const { protocol, originalUrl, baseUrl, headers } = req;
+
     commonEngine
       .render({
         bootstrap,
         documentFilePath: indexHtml,
-        url: req.originalUrl,
+        url: \`\${protocol}://\${headers.host}\${originalUrl}\`,
         publicPath: distFolder,
-        providers: [{ provide: APP_BASE_HREF, useValue: req.baseUrl }],
+        providers: [{ provide: APP_BASE_HREF, useValue: baseUrl }],
       })
       .then((html) => res.send(html))
       .catch((err) => next(err));

diff --git a/packages/schematics/angular/ssr/files/application-builder/server.ts.template b/packages/schematics/angular/ssr/files/application-builder/server.ts.template
@@ -26,13 +26,15 @@ export function app(): express.Express {
 
   // All regular routes use the Angular engine
   server.get('*', (req, res, next) => {
+    const { protocol, originalUrl, baseUrl, headers } = req;
+
     commonEngine
       .render({
         <% if (isStandalone) { %>bootstrap<% } else { %>bootstrap: AppServerModule<% } %>,
         documentFilePath: indexHtml,
-        url: req.originalUrl,
+        url: `${protocol}://${headers.host}${originalUrl}`,
         publicPath: browserDistFolder,
-        providers: [{ provide: APP_BASE_HREF, useValue: req.baseUrl }],
+        providers: [{ provide: APP_BASE_HREF, useValue: baseUrl }],
       })
       .then((html) => res.send(html))
       .catch((err) => next(err));

diff --git a/packages/schematics/angular/ssr/files/server-builder/server.ts.template b/packages/schematics/angular/ssr/files/server-builder/server.ts.template
@@ -29,13 +29,15 @@ export function app(): express.Express {
 
   // All regular routes use the Angular engine
   server.get('*', (req, res, next) => {
+    const { protocol, originalUrl, baseUrl, headers } = req;
+
     commonEngine
       .render({
         <% if (isStandalone) { %>bootstrap<% } else { %>bootstrap: AppServerModule<% } %>,
         documentFilePath: indexHtml,
-        url: req.originalUrl,
+        url: `${protocol}://${headers.host}${originalUrl}`,
         publicPath: distFolder,
-        providers: [{ provide: APP_BASE_HREF, useValue: req.baseUrl }],
+        providers: [{ provide: APP_BASE_HREF, useValue: baseUrl }],
       })
       .then((html) => res.send(html))
       .catch((err) => next(err));