Update SWA settings (#3)

Author: justinyoo

.github/workflows/azure-dev.yml

@@ -56,9 +56,11 @@ jobs:
           AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
 
       - name: Provision Infrastructure
+        if: ${{ env.AZURE_ENV_NAME != '' }}
         run: azd provision --no-prompt
         env:
           AZD_INITIAL_ENVIRONMENT_CONFIG: ${{ secrets.AZD_INITIAL_ENVIRONMENT_CONFIG }}
 
       - name: Deploy Application
+        if: ${{ env.AZURE_ENV_NAME != '' }}
         run: azd deploy --no-prompt

src/EasyAuth.ContainerApp/Services/RequestService.cs

@@ -49,14 +49,22 @@ public async Task<string> GetPayload()
 
     public async Task<string> GetAuthMe()
     {
+        var context = accessor.HttpContext;
+        var request = context!.Request;
+        var headers = request.Headers;
         var authMe = default(string);
         try
         {
-            authMe = await http.GetStringAsync("/.auth/me");
+            http.DefaultRequestHeaders.Clear();
+            foreach (var header in headers)
+            {
+                http.DefaultRequestHeaders.Add(header.Key, header.Value.ToArray());
+            }
+            authMe = JsonSerializer.Serialize(await http.GetFromJsonAsync<object>("/.auth/me"), options);
         }
-        catch
+        catch (Exception ex)
         {
-            authMe = "Not authenticated";
+            authMe = ex.Message;
         }
 
         return authMe;

src/EasyAuth.FunctionApp/EasyAuth.FunctionApp.csproj

@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <!-- <TargetFrameworks>net8.0;net9.0</TargetFrameworks> -->
-    <!-- <TargetFramework>net9.0</TargetFramework> -->
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
     <OutputType>Exe</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>

src/EasyAuth.SwaApp/Properties/launchSettings.json

@@ -6,7 +6,7 @@
       "dotnetRunMessages": true,
       "launchBrowser": true,
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "applicationUrl": "http://localhost:5000",
+      "applicationUrl": "http://localhost:8080",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
@@ -16,7 +16,7 @@
       "dotnetRunMessages": true,
       "launchBrowser": true,
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "applicationUrl": "https://localhost:5050;http://localhost:5000",
+      "applicationUrl": "https://localhost:8081;http://localhost:8080",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

src/EasyAuth.SwaApp/staticwebapp.config.json

@@ -49,14 +49,22 @@ public async Task<string> GetPayload()
 
     public async Task<string> GetAuthMe()
     {
+        var context = accessor.HttpContext;
+        var request = context!.Request;
+        var headers = request.Headers;
         var authMe = default(string);
         try
         {
-            authMe = await http.GetStringAsync("/.auth/me");
+            http.DefaultRequestHeaders.Clear();
+            foreach (var header in headers)
+            {
+                http.DefaultRequestHeaders.Add(header.Key, header.Value.ToArray());
+            }
+            authMe = JsonSerializer.Serialize(await http.GetFromJsonAsync<object>("/.auth/me"), options);
         }
-        catch
+        catch (Exception ex)
         {
-            authMe = "Not authenticated";
+            authMe = ex.Message;
         }
 
         return authMe;

src/EasyAuth.WebApp/Services/RequestService.cs

@@ -3,12 +3,14 @@
   "configurations": {
     "azure-easyauth-sample": {
       "appLocation": "src/EasyAuth.SwaApp",
-      "apiLocation": "src/EasyAuth.FunctionApp/bin/Release/net8.0/publish",
+      "apiLocation": "src/EasyAuth.FunctionApp/bin/Release/net9.0",
       "outputLocation": "bin/wwwroot",
+      "apiLanguage": "dotnetisolated",
+      "apiVersion": "9.0",
       "appBuildCommand": "dotnet publish -c Release -o bin",
       "apiBuildCommand": "dotnet publish -c Release",
       "run": "dotnet watch run",
-      "appDevserverUrl": "http://localhost:5000"
+      "appDevserverUrl": "http://localhost:8080"
     }
   }
 }