Configure Blazor and Frontdoor

.github/workflows/ssw-rulesgpt-prod.yml

@@ -12,6 +12,7 @@ on:
 env:
   # DeploymentEnvironment: 'Production'
   AzureWebAppName: 'ssw-rulesgpt-api' # The name of the resource in Azure
+  AzureWebAppUrl: 'https:\/\/ssw-rulesgpt-api.azurewebsites.net' # Escape slashes for regex
   AzureWebAppSecret: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_1FEDFC8C3C4A497399C6318E5C173C42 }}
   AzureStaticWebAppsApiToken: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_WHITE_DESERT_00E3FB600 }}
   GithubRepoToken: ${{ secrets.GITHUB_TOKEN }}
@@ -31,16 +32,19 @@ jobs:
       - name: Build with dotnet
         run: dotnet build --configuration Release
 
+      - name: Change ApiBaseUrl in appsettings.json from localhost to Azure Web App
+        run: sed -i 's/https:\/\/localhost:7104/${{env.AzureWebAppUrl}}/g' ./src/WebUI/wwwroot/appsettings.json
+
       - name: dotnet publish WebAPI
         run: dotnet publish ./src/WebAPI -c Release --property PublishDir=${{env.DOTNET_ROOT}}/myapp/api
 
       - name: dotnet publish WebUI
         run: dotnet publish ./src/WebUI -c Release --property PublishDir=${{env.DOTNET_ROOT}}/myapp/webui
       # TODO: Build and run unit tests
-      
-      # Changes the base-tag in index.html from '/' to 'rulesgpt' to match SSW subdirectory
-      #      - name: Change base-tag in index.html from / to rulesgpt
-      #        run: sed -i 's/<base href="\/" \/>/<base href="\/rulesgpt\/" \/>/g' ${{env.DOTNET_ROOT}}/myapp/webui/wwwroot/index.html
+
+      # Changes the basehref in index.html from '/' to '/rulesgpt/' to match SSW subdirectory
+      - name: Change basehref in index.html from / to /rulesgpt/
+        run: sed -i 's/<base href="\/" \/>/<base href="\/rulesgpt\/" \/>/g' ${{env.DOTNET_ROOT}}/myapp/webui/wwwroot/index.html
 
       - name: Upload API artifact for deployment job
         uses: actions/[email protected]

.github/workflows/ssw-rulesgpt-stage.yml

@@ -12,6 +12,7 @@ on:
 env:
   # DeploymentEnvironment: 'Staging'
   AzureWebAppName: 'ssw-rulesgpt-api-stage' # The name of the resource in Azure
+  AzureWebAppUrl: 'https:\/\/ssw-rulesgpt-api-stage.azurewebsites.net' # Escape slashes for regex
   AzureWebAppSecret: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_706C909B7DCB4379927A9D3AF3D8B5EF }}
   AzureStaticWebAppsApiToken: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_ASHY_MEADOW_0A2BAD900 }}
   GithubRepoToken: ${{ secrets.GITHUB_TOKEN }}
@@ -31,16 +32,19 @@ jobs:
       - name: Build with dotnet
         run: dotnet build --configuration Release
 
+      - name: Change ApiBaseUrl in appsettings.json from localhost to Azure Web App
+        run: sed -i 's/https:\/\/localhost:7104/${{env.AzureWebAppUrl}}/g' ./src/WebUI/wwwroot/appsettings.json
+
       - name: dotnet publish WebAPI
         run: dotnet publish ./src/WebAPI -c Release --property PublishDir=${{env.DOTNET_ROOT}}/myapp/api
 
       - name: dotnet publish WebUI
         run: dotnet publish ./src/WebUI -c Release --property PublishDir=${{env.DOTNET_ROOT}}/myapp/webui
-# TODO: Build and run unit tests
+      # TODO: Build and run unit tests
 
-# Changes the base-tag in index.html from '/' to 'rulesgpt' to match SSW subdirectory
-#      - name: Change base-tag in index.html from / to rulesgpt
-#        run: sed -i 's/<base href="\/" \/>/<base href="\/rulesgpt\/" \/>/g' ${{env.DOTNET_ROOT}}/myapp/webui/wwwroot/index.html
+      # Changes the basehref in index.html from '/' to '/rulesgpt/' to match SSW subdirectory
+      - name: Change basehref in index.html from / to /rulesgpt/
+        run: sed -i 's/<base href="\/" \/>/<base href="\/rulesgpt\/" \/>/g' ${{env.DOTNET_ROOT}}/myapp/webui/wwwroot/index.html
 
       - name: Upload API artifact for deployment job
         uses: actions/[email protected]

.gitignore

@@ -9,7 +9,7 @@
 *.user
 *.userosscache
 *.sln.docstates
-**/appsettings.json
+**/appsettings.Development.json
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

src/WebAPI/DependencyInjection.cs

@@ -39,9 +39,17 @@ string rulesGptCorsPolicy
         // TODO: Set CORS in Bicep
         var productionCorsUrls = new string[]
         {
+            // Static Web Apps
             "https://white-desert-00e3fb600.3.azurestaticapps.net",
+            "https://ashy-meadow-0a2bad900.3.azurestaticapps.net",
+            // Production
             "https://rulesgpt.ssw.com.au",
-            "https://ssw.com.au/rulesgpt"
+            "https://ssw.com.au/rulesgpt",
+            "https://ssw.com.au", // TODO: Fix Host Origin Header
+            // Staging
+            "https://www.tfs365.com/rulesgpt",
+            "https://www.tfs365.com", // TODO: Fix Host Origin Header
+            "https://tfs365.com" // TODO: Fix Host Origin Header
         };
 
         var developmentCorsUrls = new string[] { "https://localhost:5001" };

src/WebAPI/appsettings.json

@@ -0,0 +1,10 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning",
+      "Microsoft.EntityFrameworkCore.Database.Command": "Information"
+    }
+  },
+  "AllowedHosts": "*"
+}

src/WebUI/Program.cs

@@ -37,9 +37,7 @@
 
 const string ApiClient = nameof(ApiClient);
 
-var apiBaseUrl = builder.HostEnvironment.IsDevelopment()
-    ? "https://localhost:7104"
-    : "https://ssw-rulesgpt-api.azurewebsites.net";
+var apiBaseUrl = builder.Configuration["ApiBaseUrl"];
 
 builder.Services
     .AddHttpClient(

src/WebUI/SignalRClient.cs

@@ -3,37 +3,33 @@
 using Microsoft.AspNetCore.SignalR.Client;
 using OpenAI.GPT3.ObjectModels.RequestModels;
 using WebUI.Models;
-using WebUI.Services;
 
 namespace WebUI;
 
 public class SignalRClient
 {
-    private readonly DataState _dataState;
-    private readonly NotifierService _notifierService;
     private readonly HubConnection _connection;
     private readonly ILogger<SignalRClient> _logger;
+    private readonly DataState _dataState;
 
     public SignalRClient(
-        DataState dataState,
         IWebAssemblyHostEnvironment hostEnvironment,
-        NotifierService notifierService, 
-        ILogger<SignalRClient> logger)
+        IConfiguration config,
+        ILogger<SignalRClient> logger,
+        DataState dataState
+    )
     {
-        _dataState = dataState;
-        _notifierService = notifierService;
         _logger = logger;
-        var hubeBaseUrl = hostEnvironment.IsDevelopment()
-            ? "https://localhost:7104"
-            : "https://ssw-rulesgpt-api.azurewebsites.net";
-        var hubUrl = $"{hubeBaseUrl}/ruleshub";
+        _dataState = dataState;
+        var hubBaseUrl = config["ApiBaseUrl"];
+        var hubUrl = $"{hubBaseUrl}/ruleshub";
         _connection = new HubConnectionBuilder().WithUrl(hubUrl).WithAutomaticReconnect().Build();
         RegisterHandlers();
         _connection.Closed += async (exception) =>
         {
             if (exception != null)
             {
-                _logger.LogInformation("Connection closed due to an error: {Exception}", exception);        
+                _logger.LogInformation("Connection closed due to an error: {Exception}", exception);
             }
         };
     }

src/WebUI/WebUI.csproj

@@ -17,5 +17,11 @@
 		<PackageReference Include="MudBlazor.Markdown" Version="0.1.0" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 	</ItemGroup>
+
+	<ItemGroup>
+	  <Content Update="wwwroot\appsettings.json">
+	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+	  </Content>
+	</ItemGroup>
 
 </Project>

src/WebUI/wwwroot/appsettings.json

@@ -0,0 +1,3 @@
+{
+  "ApiBaseUrl": "https://localhost:7104"
+}

src/WebUI/wwwroot/index.html

@@ -53,7 +53,7 @@
 <body>
     <div id="app">
         <!--Loading...-->
-        <script src="/js/lottie-player.js"></script>
+        <!--<script src="js/lottie-player.js"></script>-->
 
         <div class="gpt-loading-info">
             <img src="images/SSWlogo.svg" />