From a9a1a1fb65ba4a99c41049c054c3d25b1007916c Mon Sep 17 00:00:00 2001
From: Josh Lozensky <joshlozensky@microsoft.com>
Date: Mon, 4 Nov 2024 14:53:00 -0800
Subject: [PATCH 1/4] move sample one level up for consistency
---
.../2-6-BFF-Proxy/{CallGraphBFF => }/.gitignore | 0
.../{CallGraphBFF => }/CallGraphBFF.csproj | 0
2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF.sln | 2 +-
.../2-6-BFF-Proxy/{CallGraphBFF => }/ClientApp/.env | 0
.../{CallGraphBFF => }/ClientApp/.env.development | 0
.../{CallGraphBFF => }/ClientApp/.gitignore | 0
.../{CallGraphBFF => }/ClientApp/README.md | 0
.../ClientApp/aspnetcore-https.js | 0
.../ClientApp/aspnetcore-react.js | 0
.../{CallGraphBFF => }/ClientApp/package-lock.json | 0
.../{CallGraphBFF => }/ClientApp/package.json | 0
.../{CallGraphBFF => }/ClientApp/public/favicon.ico | Bin
.../{CallGraphBFF => }/ClientApp/public/index.html | 0
.../ClientApp/public/manifest.json | 0
.../{CallGraphBFF => }/ClientApp/src/App.js | 0
.../{CallGraphBFF => }/ClientApp/src/App.test.js | 0
.../ClientApp/src/AuthProvider.js | 0
.../ClientApp/src/components/FetchGraph.js | 0
.../ClientApp/src/components/Home.js | 0
.../ClientApp/src/components/Layout.js | 0
.../ClientApp/src/components/NavMenu.css | 0
.../ClientApp/src/components/NavMenu.js | 0
.../{CallGraphBFF => }/ClientApp/src/custom.css | 0
.../{CallGraphBFF => }/ClientApp/src/index.js | 0
.../ClientApp/src/reportWebVitals.js | 0
.../ClientApp/src/service-worker.js | 0
.../ClientApp/src/serviceWorkerRegistration.js | 0
.../{CallGraphBFF => }/ClientApp/src/setupProxy.js | 0
.../Controllers/AuthController.cs | 0
.../Controllers/ProfileController.cs | 0
.../{CallGraphBFF => }/Pages/Error.cshtml | 0
.../{CallGraphBFF => }/Pages/Error.cshtml.cs | 0
.../{CallGraphBFF => }/Pages/_ViewImports.cshtml | 0
.../2-6-BFF-Proxy/{CallGraphBFF => }/Program.cs | 0
.../Properties/launchSettings.json | 0
.../Utils/CustomCookieAuthenticationEvents.cs | 0
.../{CallGraphBFF => }/appsettings.Development.json | 0
.../{CallGraphBFF => }/appsettings.json | 4 ++--
38 files changed, 3 insertions(+), 3 deletions(-)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/.gitignore (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/CallGraphBFF.csproj (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/ClientApp/.env (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/ClientApp/.env.development (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/ClientApp/.gitignore (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/ClientApp/README.md (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/ClientApp/aspnetcore-https.js (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/ClientApp/aspnetcore-react.js (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/ClientApp/package-lock.json (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/ClientApp/package.json (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/ClientApp/public/favicon.ico (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/ClientApp/public/index.html (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/ClientApp/public/manifest.json (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/ClientApp/src/App.js (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/ClientApp/src/App.test.js (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/ClientApp/src/AuthProvider.js (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/ClientApp/src/components/FetchGraph.js (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/ClientApp/src/components/Home.js (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/ClientApp/src/components/Layout.js (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/ClientApp/src/components/NavMenu.css (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/ClientApp/src/components/NavMenu.js (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/ClientApp/src/custom.css (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/ClientApp/src/index.js (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/ClientApp/src/reportWebVitals.js (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/ClientApp/src/service-worker.js (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/ClientApp/src/serviceWorkerRegistration.js (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/ClientApp/src/setupProxy.js (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/Controllers/AuthController.cs (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/Controllers/ProfileController.cs (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/Pages/Error.cshtml (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/Pages/Error.cshtml.cs (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/Pages/_ViewImports.cshtml (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/Program.cs (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/Properties/launchSettings.json (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/Utils/CustomCookieAuthenticationEvents.cs (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/appsettings.Development.json (100%)
rename 2-WebApp-graph-user/2-6-BFF-Proxy/{CallGraphBFF => }/appsettings.json (98%)
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/.gitignore b/2-WebApp-graph-user/2-6-BFF-Proxy/.gitignore
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/.gitignore
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/.gitignore
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/CallGraphBFF.csproj b/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF.csproj
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/CallGraphBFF.csproj
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF.csproj
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF.sln b/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF.sln
index 84f0e526..7057694a 100644
--- a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF.sln
+++ b/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.4.33110.190
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CallGraphBFF", "CallGraphBFF\CallGraphBFF.csproj", "{1E7F0004-16EB-42EB-89FF-31D6EBB1965E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CallGraphBFF", "CallGraphBFF.csproj", "{1E7F0004-16EB-42EB-89FF-31D6EBB1965E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/.env b/2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/.env
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/.env
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/.env
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/.env.development b/2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/.env.development
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/.env.development
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/.env.development
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/.gitignore b/2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/.gitignore
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/.gitignore
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/.gitignore
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/README.md b/2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/README.md
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/README.md
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/README.md
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/aspnetcore-https.js b/2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/aspnetcore-https.js
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/aspnetcore-https.js
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/aspnetcore-https.js
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/aspnetcore-react.js b/2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/aspnetcore-react.js
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/aspnetcore-react.js
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/aspnetcore-react.js
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/package-lock.json b/2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/package-lock.json
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/package-lock.json
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/package-lock.json
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/package.json b/2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/package.json
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/package.json
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/package.json
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/public/favicon.ico b/2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/public/favicon.ico
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/public/favicon.ico
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/public/favicon.ico
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/public/index.html b/2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/public/index.html
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/public/index.html
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/public/index.html
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/public/manifest.json b/2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/public/manifest.json
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/public/manifest.json
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/public/manifest.json
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/App.js b/2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/App.js
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/App.js
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/App.js
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/App.test.js b/2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/App.test.js
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/App.test.js
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/App.test.js
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/AuthProvider.js b/2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/AuthProvider.js
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/AuthProvider.js
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/AuthProvider.js
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/components/FetchGraph.js b/2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/components/FetchGraph.js
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/components/FetchGraph.js
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/components/FetchGraph.js
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/components/Home.js b/2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/components/Home.js
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/components/Home.js
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/components/Home.js
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/components/Layout.js b/2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/components/Layout.js
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/components/Layout.js
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/components/Layout.js
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/components/NavMenu.css b/2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/components/NavMenu.css
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/components/NavMenu.css
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/components/NavMenu.css
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/components/NavMenu.js b/2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/components/NavMenu.js
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/components/NavMenu.js
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/components/NavMenu.js
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/custom.css b/2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/custom.css
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/custom.css
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/custom.css
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/index.js b/2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/index.js
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/index.js
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/index.js
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/reportWebVitals.js b/2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/reportWebVitals.js
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/reportWebVitals.js
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/reportWebVitals.js
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/service-worker.js b/2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/service-worker.js
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/service-worker.js
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/service-worker.js
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/serviceWorkerRegistration.js b/2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/serviceWorkerRegistration.js
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/serviceWorkerRegistration.js
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/serviceWorkerRegistration.js
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/setupProxy.js b/2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/setupProxy.js
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/ClientApp/src/setupProxy.js
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/ClientApp/src/setupProxy.js
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/Controllers/AuthController.cs b/2-WebApp-graph-user/2-6-BFF-Proxy/Controllers/AuthController.cs
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/Controllers/AuthController.cs
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/Controllers/AuthController.cs
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/Controllers/ProfileController.cs b/2-WebApp-graph-user/2-6-BFF-Proxy/Controllers/ProfileController.cs
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/Controllers/ProfileController.cs
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/Controllers/ProfileController.cs
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/Pages/Error.cshtml b/2-WebApp-graph-user/2-6-BFF-Proxy/Pages/Error.cshtml
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/Pages/Error.cshtml
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/Pages/Error.cshtml
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/Pages/Error.cshtml.cs b/2-WebApp-graph-user/2-6-BFF-Proxy/Pages/Error.cshtml.cs
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/Pages/Error.cshtml.cs
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/Pages/Error.cshtml.cs
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/Pages/_ViewImports.cshtml b/2-WebApp-graph-user/2-6-BFF-Proxy/Pages/_ViewImports.cshtml
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/Pages/_ViewImports.cshtml
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/Pages/_ViewImports.cshtml
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/Program.cs b/2-WebApp-graph-user/2-6-BFF-Proxy/Program.cs
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/Program.cs
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/Program.cs
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/Properties/launchSettings.json b/2-WebApp-graph-user/2-6-BFF-Proxy/Properties/launchSettings.json
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/Properties/launchSettings.json
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/Properties/launchSettings.json
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/Utils/CustomCookieAuthenticationEvents.cs b/2-WebApp-graph-user/2-6-BFF-Proxy/Utils/CustomCookieAuthenticationEvents.cs
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/Utils/CustomCookieAuthenticationEvents.cs
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/Utils/CustomCookieAuthenticationEvents.cs
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/appsettings.Development.json b/2-WebApp-graph-user/2-6-BFF-Proxy/appsettings.Development.json
similarity index 100%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/appsettings.Development.json
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/appsettings.Development.json
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/appsettings.json b/2-WebApp-graph-user/2-6-BFF-Proxy/appsettings.json
similarity index 98%
rename from 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/appsettings.json
rename to 2-WebApp-graph-user/2-6-BFF-Proxy/appsettings.json
index b2fdcee3..17d3ba70 100644
--- a/2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF/appsettings.json
+++ b/2-WebApp-graph-user/2-6-BFF-Proxy/appsettings.json
@@ -7,7 +7,7 @@
{
"SourceType": "ClientSecret",
"ClientSecret": "Enter_the_Client_Secret_Here"
- },
+ }
// {
// "SourceType": "StoreWithDistinguishedName",
// "CertificateStorePath": "CurrentUser/My",
@@ -32,4 +32,4 @@
}
},
"AllowedHosts": "*"
-}
+}
\ No newline at end of file
From cf40b10a8da6dc3355bdad1ef622eb7228df4b21 Mon Sep 17 00:00:00 2001
From: Josh Lozensky <joshlozensky@microsoft.com>
Date: Mon, 4 Nov 2024 18:21:11 -0800
Subject: [PATCH 2/4] Fixing files affected by directory change
---
.../Configure-WithCertificates.ps1 | 4 ++--
.../AppCreationScripts/Configure.ps1 | 4 ++--
.../AppCreationScripts/sample.json | 4 ++--
.../2-6-BFF-Proxy/README-use-certificate.md | 4 ++--
2-WebApp-graph-user/2-6-BFF-Proxy/README.md | 20 +++++++++---------
.../2-6-BFF-Proxy/appsettings.json | 21 +++++++++----------
6 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/AppCreationScripts/Configure-WithCertificates.ps1 b/2-WebApp-graph-user/2-6-BFF-Proxy/AppCreationScripts/Configure-WithCertificates.ps1
index 2e5de1e8..f23b7017 100644
--- a/2-WebApp-graph-user/2-6-BFF-Proxy/AppCreationScripts/Configure-WithCertificates.ps1
+++ b/2-WebApp-graph-user/2-6-BFF-Proxy/AppCreationScripts/Configure-WithCertificates.ps1
@@ -319,8 +319,8 @@ Function ConfigureApplications
Write-Host "Successfully registered and configured that app registration for 'CallGraphBFF' at `n $clientPortalUrl" -ForegroundColor Green
# Update config file for 'client'
- # $configFile = $pwd.Path + "\..\CallGraphBFF\appsettings.json"
- $configFile = $(Resolve-Path ($pwd.Path + "\..\CallGraphBFF\appsettings.json"))
+ # $configFile = $pwd.Path + "\..\appsettings.json"
+ $configFile = $(Resolve-Path ($pwd.Path + "\..\appsettings.json"))
$dictionary = @{ "Enter_the_Tenant_Id_Here" = $tenantId;"Enter_the_Application_Id_Here" = $clientAadApplication.AppId;"Enter_the_Client_Secret_Here" = $clientAppKey };
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/AppCreationScripts/Configure.ps1 b/2-WebApp-graph-user/2-6-BFF-Proxy/AppCreationScripts/Configure.ps1
index 41202cba..b2d41872 100644
--- a/2-WebApp-graph-user/2-6-BFF-Proxy/AppCreationScripts/Configure.ps1
+++ b/2-WebApp-graph-user/2-6-BFF-Proxy/AppCreationScripts/Configure.ps1
@@ -301,8 +301,8 @@ Function ConfigureApplications
Write-Host "Successfully registered and configured that app registration for 'CallGraphBFF' at `n $clientPortalUrl" -ForegroundColor Green
# Update config file for 'client'
- # $configFile = $pwd.Path + "\..\CallGraphBFF\appsettings.json"
- $configFile = $(Resolve-Path ($pwd.Path + "\..\CallGraphBFF\appsettings.json"))
+ # $configFile = $pwd.Path + "\..\appsettings.json"
+ $configFile = $(Resolve-Path ($pwd.Path + "\..\appsettings.json"))
$dictionary = @{ "Enter_the_Tenant_Id_Here" = $tenantId;"Enter_the_Application_Id_Here" = $clientAadApplication.AppId;"Enter_the_Client_Secret_Here" = $clientAppKey };
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/AppCreationScripts/sample.json b/2-WebApp-graph-user/2-6-BFF-Proxy/AppCreationScripts/sample.json
index 083529d8..ae2869bc 100644
--- a/2-WebApp-graph-user/2-6-BFF-Proxy/AppCreationScripts/sample.json
+++ b/2-WebApp-graph-user/2-6-BFF-Proxy/AppCreationScripts/sample.json
@@ -27,7 +27,7 @@
"HomePage": "https://localhost:7000",
"ReplyUrls": "https://localhost:7000/api/auth/signin-oidc, https://localhost:7000/api/auth/signout-oidc",
"SDK": "MicrosoftIdentityWeb",
- "SampleSubPath": "2-WebApp-graph-user\\2-6-BFF-Proxy\\CallGraphBFF",
+ "SampleSubPath": "2-WebApp-graph-user\\2-6-BFF-Proxy",
"PasswordCredentials": "Auto",
"Certificate": "Auto",
"RequiredResourcesAccess": [
@@ -49,7 +49,7 @@
{
"App": "client",
"SettingKind": "Replace",
- "SettingFile": "\\..\\CallGraphBFF\\appsettings.json",
+ "SettingFile": "\\..\\appsettings.json",
"Mappings": [
{
"key": "Enter_the_Tenant_Id_Here",
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/README-use-certificate.md b/2-WebApp-graph-user/2-6-BFF-Proxy/README-use-certificate.md
index b3bca354..2c813897 100644
--- a/2-WebApp-graph-user/2-6-BFF-Proxy/README-use-certificate.md
+++ b/2-WebApp-graph-user/2-6-BFF-Proxy/README-use-certificate.md
@@ -147,7 +147,7 @@ Finally, you need to modify the app's configuration files.
> Perform the steps below for the client app (CallGraphBFF)
-1. Open the `CallGraphBFF\appsettings.json` file.
+1. Open the `appsettings.json` file.
2. *Comment out* the next line:
```json
@@ -174,7 +174,7 @@ You can now start the application as instructed in the [README](./README#setup-t
> Perform the steps below for the client app (CallGraphBFF)
-1. Open the `CallGraphBFF\appsettings.json` file.
+1. Open the `appsettings.json` file.
2. *Comment out* the next line:
```json
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/README.md b/2-WebApp-graph-user/2-6-BFF-Proxy/README.md
index 9b9d0bce..f8218cbf 100644
--- a/2-WebApp-graph-user/2-6-BFF-Proxy/README.md
+++ b/2-WebApp-graph-user/2-6-BFF-Proxy/README.md
@@ -85,7 +85,7 @@ or download and extract the repository *.zip* file.
### Step 2: Navigate to project folder
```console
- cd 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF
+ cd 2-WebApp-graph-user/2-6-BFF-Proxy
```
### Step 3. Trust development certificates
@@ -183,7 +183,7 @@ Open the project in your IDE (like Visual Studio or Visual Studio Code) to confi
> In the steps below, "ClientID" is the same as "Application ID" or "AppId".
-1. Open the `2-6-BFF-Proxy/CallGraphBFF/appsettings.json` file.
+1. Open the `2-6-BFF-Proxy/appsettings.json` file.
1. Find the string `Enter_the_Tenant_Id_Here` and replace it with your Microsoft Entra tenant/directory ID.
1. Find the string `Enter_the_Application_Id_Here` and replace it with the application ID (clientId) of `CallGraphBFF` app copied from the Microsoft Entra admin center.
1. Find the string `Enter_the_Client_Secret_Here` and replace it with the generated secret that you saved during the creation of `CallGraphBFF` copied from the Microsoft Entra admin center.
@@ -193,7 +193,7 @@ Open the project in your IDE (like Visual Studio or Visual Studio Code) to confi
From your shell or command line, execute the following commands:
```console
- cd 2-WebApp-graph-user/2-6-BFF-Proxy/CallGraphBFF
+ cd 2-WebApp-graph-user/2-6-BFF-Proxy/
dotnet run
```
@@ -227,7 +227,7 @@ To provide feedback on or suggest features for Microsoft Entra ID, visit [User V
### Login and logout
-In [Program.cs](./CallGraphBFF/Program.cs), **Microsoft Identity Web** service is configured to obtain tokens to call downstream web APIs (here, Microsoft Graph):
+In [Program.cs](./Program.cs), **Microsoft Identity Web** service is configured to obtain tokens to call downstream web APIs (here, Microsoft Graph):
```csharp
// Add Microsoft.Identity.Web services to the container.
@@ -237,7 +237,7 @@ builder.Services.AddMicrosoftIdentityWebAppAuthentication(builder.Configuration)
.AddInMemoryTokenCaches();
```
-On the frontend side, the React SPA uses the [AuthProvider HOC](./CallGraphBFF/ClientApp/src/AuthProvider.js), which makes a GET call to the `/api/auth/login` endpoint of the ASP.NET Core web app.
+On the frontend side, the React SPA uses the [AuthProvider HOC](./ClientApp/src/AuthProvider.js), which makes a GET call to the `/api/auth/login` endpoint of the ASP.NET Core web app.
```javascript
login = (postLoginRedirectUri) => {
@@ -255,7 +255,7 @@ login = (postLoginRedirectUri) => {
}
```
-The controller in [AuthController.cs](./CallGraphBFF/Controllers/AuthController.cs) processes the request and initiates a token request against Microsoft Entra ID via the `Challenge()` method:
+The controller in [AuthController.cs](./Controllers/AuthController.cs) processes the request and initiates a token request against Microsoft Entra ID via the `Challenge()` method:
```csharp
[HttpGet("login")]
@@ -274,7 +274,7 @@ Once the authentication is successful, the authentication state can be shared wi
### Cookie policies
-The sample makes use of HTTP only, strict cookies to secure the calls between the frontend and the backend. The default ASP.NET Core authentication cookie behavior will attempt to redirect unauthenticated requests to the identity provider (in this case, Microsoft Entra ID). As this is not the desired behavior in BFF proxy architecture, custom cookie authenticated events is used to modify the default behavior (see [CustomCookieAuthenticationEvents.cs](./CallGraphBFF/Utils/CustomCookieAuthenticationEvents.cs)).
+The sample makes use of HTTP only, strict cookies to secure the calls between the frontend and the backend. The default ASP.NET Core authentication cookie behavior will attempt to redirect unauthenticated requests to the identity provider (in this case, Microsoft Entra ID). As this is not the desired behavior in BFF proxy architecture, custom cookie authenticated events is used to modify the default behavior (see [CustomCookieAuthenticationEvents.cs](./Utils/CustomCookieAuthenticationEvents.cs)).
```csharp
// Configure cookie properties for ASP.NET Core cookie authentication.
@@ -298,7 +298,7 @@ Microsoft Graph is now CAE-enabled in Preview. This means that it can ask its cl
#### Declare the CAE capability in the configuration
-This sample app declares that it's CAE-capable by adding the `ClientCapabilities` field to the configuration in [appsettings.json](./CallGraphBFF/appsettings.json):
+This sample app declares that it's CAE-capable by adding the `ClientCapabilities` field to the configuration in [appsettings.json](./appsettings.json):
```json
{
@@ -362,7 +362,7 @@ For more details on what's inside the access token, clients should use the token
### Calling Microsoft Graph
-To make bearer token calls to the Microsoft Graph API, **Microsoft.Identity.Web** makes use of the Microsoft Graph SDK internally. This is shown in [Program.cs](./CallGraphBFF/Program.cs):
+To make bearer token calls to the Microsoft Graph API, **Microsoft.Identity.Web** makes use of the Microsoft Graph SDK internally. This is shown in [Program.cs](./Program.cs):
```csharp
// Add services to the container.
@@ -372,7 +372,7 @@ builder.Services.AddMicrosoftIdentityWebAppAuthentication(builder.Configuration)
.AddInMemoryTokenCaches();
```
-The service can then be injected into controllers to make Graph calls afterwards. See [ProfileController.cs](./CallGraphBFF/Controllers/ProfileController.cs) for more.
+The service can then be injected into controllers to make Graph calls afterwards. See [ProfileController.cs](./Controllers/ProfileController.cs) for more.
### Deploying Web app to Azure App Service
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/appsettings.json b/2-WebApp-graph-user/2-6-BFF-Proxy/appsettings.json
index 17d3ba70..b0184418 100644
--- a/2-WebApp-graph-user/2-6-BFF-Proxy/appsettings.json
+++ b/2-WebApp-graph-user/2-6-BFF-Proxy/appsettings.json
@@ -1,18 +1,17 @@
{
"AzureAd": {
"Instance": "https://login.microsoftonline.com/",
- "TenantId": "Enter_the_Tenant_Id_Here",
- "ClientId": "Enter_the_Application_Id_Here",
- "ClientCredentials": [
+ "Domain": "msidlab4.onmicrosoft.com",
+ "TenantId": "f645ad92-e38d-4d1a-b510-d1b09a74a8ca",
+ "ClientId": "9a192b78-6580-4f8a-aace-f36ffea4f7be",
+ //"CallbackPath": "/signin-oidc",
+ //"SignedOutCallbackPath": "/signout-callback-oidc",
+ "ClientCertificates": [
{
- "SourceType": "ClientSecret",
- "ClientSecret": "Enter_the_Client_Secret_Here"
+ "SourceType": "KeyVault",
+ "KeyVaultUrl": "https://webappsapistests.vault.azure.net",
+ "KeyVaultCertificateName": "Self-Signed-5-5-22"
}
- // {
- // "SourceType": "StoreWithDistinguishedName",
- // "CertificateStorePath": "CurrentUser/My",
- // "CertificateDistinguishedName": "CN=CallGraphBFF"
- // }
],
"ClientCapabilities": [
"CP1"
@@ -32,4 +31,4 @@
}
},
"AllowedHosts": "*"
-}
\ No newline at end of file
+}
From 4f6930a90a1e18a58e0b12336578ea09c81d8ad0 Mon Sep 17 00:00:00 2001
From: Josh Lozensky <joshlozensky@microsoft.com>
Date: Mon, 4 Nov 2024 18:27:39 -0800
Subject: [PATCH 3/4] change appsettings back to example
---
.../2-6-BFF-Proxy/appsettings.json | 53 ++++++++++---------
1 file changed, 27 insertions(+), 26 deletions(-)
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/appsettings.json b/2-WebApp-graph-user/2-6-BFF-Proxy/appsettings.json
index b0184418..4fc59d73 100644
--- a/2-WebApp-graph-user/2-6-BFF-Proxy/appsettings.json
+++ b/2-WebApp-graph-user/2-6-BFF-Proxy/appsettings.json
@@ -1,34 +1,35 @@
{
"AzureAd": {
- "Instance": "https://login.microsoftonline.com/",
- "Domain": "msidlab4.onmicrosoft.com",
- "TenantId": "f645ad92-e38d-4d1a-b510-d1b09a74a8ca",
- "ClientId": "9a192b78-6580-4f8a-aace-f36ffea4f7be",
- //"CallbackPath": "/signin-oidc",
- //"SignedOutCallbackPath": "/signout-callback-oidc",
- "ClientCertificates": [
- {
- "SourceType": "KeyVault",
- "KeyVaultUrl": "https://webappsapistests.vault.azure.net",
- "KeyVaultCertificateName": "Self-Signed-5-5-22"
- }
- ],
- "ClientCapabilities": [
- "CP1"
- ],
- "CallbackPath": "/api/auth/signin-oidc",
- "SignedOutCallbackPath": "/api/auth/signout-oidc"
+ "Instance": "https://login.microsoftonline.com/",
+ "TenantId": "Enter_the_Tenant_Id_Here",
+ "ClientId": "Enter_the_Application_Id_Here",
+ "ClientCredentials": [
+ {
+ "SourceType": "ClientSecret",
+ "ClientSecret": "Enter_the_Client_Secret_Here"
+ }
+ // {
+ // "SourceType": "StoreWithDistinguishedName",
+ // "CertificateStorePath": "CurrentUser/My",
+ // "CertificateDistinguishedName": "CN=CallGraphBFF"
+ // }
+ ],
+ "ClientCapabilities": [
+ "CP1"
+ ],
+ "CallbackPath": "/api/auth/signin-oidc",
+ "SignedOutCallbackPath": "/api/auth/signout-oidc"
},
"DownstreamApi": {
- "BaseUrl": "https://graph.microsoft.com/v1.0",
- "Scopes": "User.Read"
+ "BaseUrl": "https://graph.microsoft.com/v1.0",
+ "Scopes": "User.Read"
},
"Logging": {
- "LogLevel": {
- "Default": "Information",
- "Microsoft": "Warning",
- "Microsoft.Hosting.Lifetime": "Information"
- }
+ "LogLevel": {
+ "Default": "Information",
+ "Microsoft": "Warning",
+ "Microsoft.Hosting.Lifetime": "Information"
+ }
},
"AllowedHosts": "*"
-}
+}
\ No newline at end of file
From 9cc2078f97f97ee4a7ac74aee26cc440ea6eb6e3 Mon Sep 17 00:00:00 2001
From: Josh Lozensky <joshlozensky@microsoft.com>
Date: Mon, 4 Nov 2024 18:29:18 -0800
Subject: [PATCH 4/4] minor adjustment
---
.../2-6-BFF-Proxy/appsettings.json | 52 +++++++++----------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/2-WebApp-graph-user/2-6-BFF-Proxy/appsettings.json b/2-WebApp-graph-user/2-6-BFF-Proxy/appsettings.json
index 4fc59d73..17d3ba70 100644
--- a/2-WebApp-graph-user/2-6-BFF-Proxy/appsettings.json
+++ b/2-WebApp-graph-user/2-6-BFF-Proxy/appsettings.json
@@ -1,35 +1,35 @@
{
"AzureAd": {
- "Instance": "https://login.microsoftonline.com/",
- "TenantId": "Enter_the_Tenant_Id_Here",
- "ClientId": "Enter_the_Application_Id_Here",
- "ClientCredentials": [
- {
- "SourceType": "ClientSecret",
- "ClientSecret": "Enter_the_Client_Secret_Here"
- }
- // {
- // "SourceType": "StoreWithDistinguishedName",
- // "CertificateStorePath": "CurrentUser/My",
- // "CertificateDistinguishedName": "CN=CallGraphBFF"
- // }
- ],
- "ClientCapabilities": [
- "CP1"
- ],
- "CallbackPath": "/api/auth/signin-oidc",
- "SignedOutCallbackPath": "/api/auth/signout-oidc"
+ "Instance": "https://login.microsoftonline.com/",
+ "TenantId": "Enter_the_Tenant_Id_Here",
+ "ClientId": "Enter_the_Application_Id_Here",
+ "ClientCredentials": [
+ {
+ "SourceType": "ClientSecret",
+ "ClientSecret": "Enter_the_Client_Secret_Here"
+ }
+ // {
+ // "SourceType": "StoreWithDistinguishedName",
+ // "CertificateStorePath": "CurrentUser/My",
+ // "CertificateDistinguishedName": "CN=CallGraphBFF"
+ // }
+ ],
+ "ClientCapabilities": [
+ "CP1"
+ ],
+ "CallbackPath": "/api/auth/signin-oidc",
+ "SignedOutCallbackPath": "/api/auth/signout-oidc"
},
"DownstreamApi": {
- "BaseUrl": "https://graph.microsoft.com/v1.0",
- "Scopes": "User.Read"
+ "BaseUrl": "https://graph.microsoft.com/v1.0",
+ "Scopes": "User.Read"
},
"Logging": {
- "LogLevel": {
- "Default": "Information",
- "Microsoft": "Warning",
- "Microsoft.Hosting.Lifetime": "Information"
- }
+ "LogLevel": {
+ "Default": "Information",
+ "Microsoft": "Warning",
+ "Microsoft.Hosting.Lifetime": "Information"
+ }
},
"AllowedHosts": "*"
}
\ No newline at end of file