From 472fc5058ecbddd4cd546a40628ec5a0545b8125 Mon Sep 17 00:00:00 2001
From: Michael Randers-Pehrson <michael.rp@gmail.com>
Date: Fri, 17 Jul 2020 11:21:37 -0400
Subject: [PATCH] [Blazor][Fixes #20935] Adds an Environment parameter to
 WebAssemblyStartOptions to provide or override the Environment value set by
 the host

---
 .../Web.JS/dist/Release/blazor.webassembly.js | Bin 65170 -> 65208 bytes
 src/Components/Web.JS/src/Boot.WebAssembly.ts |   5 ++++-
 .../Web.JS/src/Platform/BootConfig.ts         |   6 +++---
 .../src/Platform/WebAssemblyStartOptions.ts   |   5 +++++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/Components/Web.JS/dist/Release/blazor.webassembly.js b/src/Components/Web.JS/dist/Release/blazor.webassembly.js
index 578dbea90e4a28d2e08b6cab050c13777ce8b23d..f4eeebb6339762a6cd6ba7788a32d084e5b2c296 100644
GIT binary patch
delta 658
zcmYL_QD{<89L71bSR3}BHJUm$g@SwaB2$dP^wh=@ccCUh(Zdo`yXp-+cj)zu%k-(&
z_2B-bt%w+wu!q3956y?Dh#J_-pr;snh<fNHgdlp-I@3unhx0$*|NDJ>XQN}-=@=Sw
zW<+7$Y_(`O=cchtLCSNK7vgM6C<UT&6jZYZX?opkbdFP;btR947%ylz>(>I*uR$wt
zmhH3y&qfb%cpRRGP9LYd17mPp8iV~%dW7;NImxXQi*OK{fb`-z(%|>v9<zNE4~7hs
zlQ+T^{mo^|5JP-fdXK37IQ$MVJ$f~7U~iwVJz|4$z2-kbG2za$e6W_U3=0cbP0M-s
z`pYsY@@x53Sxuxl(VdCKr3}B8h~*{w^eoHPpjMt?i2d>$V!R1hXBpe@9iau-s@Y)s
z{_bQPlR_qgv2>9t@@?jm+!CR3P9a%|sGw9FV{ty>??FAYIY}+#h&_cxcv`uDQt+)Z
z<4f_8!G?Es70d3}%1TD#`aEG-bmtj~;{{KI7lL?oc{(D9uv9&RL`YWcr-B2sZ-5tJ
zvuZO$S;(vE42nX#>Oeu=^k8F{ec@EYp?`R?%L?iDwi?G+uXf#`N9)d!o_H5dHcY+S
zW`EWLFT#D_P57~MgYC~X<Ls<8-A2kuyvyfOouni{Y|pCyY5p|W4qw-fno2H@x0Ec9
zgeoh<uIYbYmyFC@YWZ1yvqik{@YX1NdU+1s)&fxOWK9GsgTgti7K;RoT^}Ma-<=x$
JufUxy_Yb;=_~rlr

delta 590
zcmXv~UuaTM80XB5QdXcXnltQPD7a_4n3^G|H#TnKf=Ys-hh@X-u6n^;MXy&5&WGrw
zhXv_Ja}hBjwjLxh?n@FCBig{HpqIw*p%L^Lw0cxJx%u*OzVrL{ec#)zsn#_$r)`M9
zjBUcM3wf6w&lKeXM=&qZE|D#&8b?60d5~^w*hVMEiLf}8JOtvH*M-HP9wI><+M%<Q
z^DDG&`EMtT!>h>H2*Io%0DJi)>_*aNf-6dr%PlQICvqCnv&%?_zq4PcZ0kyA$V51$
z7PT86uiA&G#m@Clh#1eJn~37`Hwq^D_x0ve+GKCN2p%PZ%3Y-SFj2h*fjy^F#N|Rs
z(GqD+bY<d_oWbQpydX2~0L|24z3QjZPIVelA15qR?*{xpXdb@*c0l9tHdI%bF&qo_
zMV>%j){1$RkpvO8RxTk4M(Tc_gkuASH;@t(S3H-?5Khl33yhne6I}(F-V5`d80Jet
zYR(<wMab1pArT(bnG>af*f+2j;a%Nf3e%9Cx*vtXy2_%GabdM~gq~)m$r?Y`w&}pe
z>*vj3I=A&DYuwwIH21;#aK35nzn&cQ#@#p31Kl04v~E+r)RJiZ+;UNiKP}s^gK#n~
zAFd`(dAyZmQB7z{R%LX9{ZJXD?6r1~vUl667aHHpaD4AvZ9fd}y9@Ae{}|H1+w;+y
P>YcIV2kWZvsK@;SOF`gv

diff --git a/src/Components/Web.JS/src/Boot.WebAssembly.ts b/src/Components/Web.JS/src/Boot.WebAssembly.ts
index 99b117ad78d..b0e4546681e 100644
--- a/src/Components/Web.JS/src/Boot.WebAssembly.ts
+++ b/src/Components/Web.JS/src/Boot.WebAssembly.ts
@@ -66,8 +66,11 @@ async function boot(options?: Partial<WebAssemblyStartOptions>): Promise<void> {
     );
   });
 
+  // Get the custom environment setting if defined
+  const environment = options?.environment;
+
   // Fetch the resources and prepare the Mono runtime
-  const bootConfigResult = await BootConfigResult.initAsync();
+  const bootConfigResult = await BootConfigResult.initAsync(environment);
 
   const [resourceLoader] = await Promise.all([
     WebAssemblyResourceLoader.initAsync(bootConfigResult.bootConfig, options || {}),
diff --git a/src/Components/Web.JS/src/Platform/BootConfig.ts b/src/Components/Web.JS/src/Platform/BootConfig.ts
index fbf88ef0925..5ff23f860f8 100644
--- a/src/Components/Web.JS/src/Platform/BootConfig.ts
+++ b/src/Components/Web.JS/src/Platform/BootConfig.ts
@@ -2,7 +2,7 @@ export class BootConfigResult {
   private constructor(public bootConfig: BootJsonData, public applicationEnvironment: string) {
   }
 
-  static async initAsync(): Promise<BootConfigResult> {
+  static async initAsync(environment?: string): Promise<BootConfigResult> {
     const bootConfigResponse = await fetch('_framework/blazor.boot.json', {
       method: 'GET',
       credentials: 'include',
@@ -10,8 +10,8 @@ export class BootConfigResult {
     });
 
     // While we can expect an ASP.NET Core hosted application to include the environment, other
-    // hosts may not. Assume 'Production' in the absenc of any specified value.
-    const applicationEnvironment = bootConfigResponse.headers.get('Blazor-Environment') || 'Production';
+    // hosts may not. Assume 'Production' in the absence of any specified value.
+    const applicationEnvironment = environment || bootConfigResponse.headers.get('Blazor-Environment') || 'Production';
     const bootConfig: BootJsonData = await bootConfigResponse.json();
 
     return new BootConfigResult(bootConfig, applicationEnvironment);
diff --git a/src/Components/Web.JS/src/Platform/WebAssemblyStartOptions.ts b/src/Components/Web.JS/src/Platform/WebAssemblyStartOptions.ts
index c6710e74059..5c3dee8692c 100644
--- a/src/Components/Web.JS/src/Platform/WebAssemblyStartOptions.ts
+++ b/src/Components/Web.JS/src/Platform/WebAssemblyStartOptions.ts
@@ -9,6 +9,11 @@ export interface WebAssemblyStartOptions {
    * @returns A URI string or a Response promise to override the loading process, or null/undefined to allow the default loading behavior.
    */
   loadBootResource(type: WebAssemblyBootResourceType, name: string, defaultUri: string, integrity: string) : string | Promise<Response> | null | undefined;
+
+  /**
+   * Override built-in environment setting on start.
+   */
+  environment?: string;
 }
 
 // This type doesn't have to align with anything in BootConfig.
-- 
GitLab