move sample one level up for consistency

Azure-Samples · JoshLozensky · Nov 4, 2024 · Nov 4, 2024 · Nov 4, 2024 · a9a1a1fb65ba4a99c41049c054c3d25b1007916c
commit a9a1a1fb65ba4a99c41049c054c3d25b1007916c
diff --git a/...ser/2-6-BFF-Proxy/CallGraphBFF/.gitignore → 2-WebApp-graph-user/2-6-BFF-Proxy/.gitignore b/...ser/2-6-BFF-Proxy/CallGraphBFF/.gitignore → 2-WebApp-graph-user/2-6-BFF-Proxy/.gitignore
diff --git a/...FF-Proxy/CallGraphBFF/CallGraphBFF.csproj → ...ph-user/2-6-BFF-Proxy/CallGraphBFF.csproj b/...FF-Proxy/CallGraphBFF/CallGraphBFF.csproj → ...ph-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
@@ -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-6-BFF-Proxy/CallGraphBFF/ClientApp/.env → ...p-graph-user/2-6-BFF-Proxy/ClientApp/.env b/...2-6-BFF-Proxy/CallGraphBFF/ClientApp/.env → ...p-graph-user/2-6-BFF-Proxy/ClientApp/.env
diff --git a/...y/CallGraphBFF/ClientApp/.env.development → .../2-6-BFF-Proxy/ClientApp/.env.development b/...y/CallGraphBFF/ClientApp/.env.development → .../2-6-BFF-Proxy/ClientApp/.env.development
diff --git a/...F-Proxy/CallGraphBFF/ClientApp/.gitignore → ...h-user/2-6-BFF-Proxy/ClientApp/.gitignore b/...F-Proxy/CallGraphBFF/ClientApp/.gitignore → ...h-user/2-6-BFF-Proxy/ClientApp/.gitignore
diff --git a/...FF-Proxy/CallGraphBFF/ClientApp/README.md → ...ph-user/2-6-BFF-Proxy/ClientApp/README.md b/...FF-Proxy/CallGraphBFF/ClientApp/README.md → ...ph-user/2-6-BFF-Proxy/ClientApp/README.md
diff --git a/...allGraphBFF/ClientApp/aspnetcore-https.js → ...6-BFF-Proxy/ClientApp/aspnetcore-https.js b/...allGraphBFF/ClientApp/aspnetcore-https.js → ...6-BFF-Proxy/ClientApp/aspnetcore-https.js
diff --git a/...allGraphBFF/ClientApp/aspnetcore-react.js → ...6-BFF-Proxy/ClientApp/aspnetcore-react.js b/...allGraphBFF/ClientApp/aspnetcore-react.js → ...6-BFF-Proxy/ClientApp/aspnetcore-react.js
diff --git a/.../CallGraphBFF/ClientApp/package-lock.json → ...2-6-BFF-Proxy/ClientApp/package-lock.json b/.../CallGraphBFF/ClientApp/package-lock.json → ...2-6-BFF-Proxy/ClientApp/package-lock.json
diff --git a/...Proxy/CallGraphBFF/ClientApp/package.json → ...user/2-6-BFF-Proxy/ClientApp/package.json b/...Proxy/CallGraphBFF/ClientApp/package.json → ...user/2-6-BFF-Proxy/ClientApp/package.json
diff --git a/...CallGraphBFF/ClientApp/public/favicon.ico → ...-6-BFF-Proxy/ClientApp/public/favicon.ico b/...CallGraphBFF/ClientApp/public/favicon.ico → ...-6-BFF-Proxy/ClientApp/public/favicon.ico
diff --git a/.../CallGraphBFF/ClientApp/public/index.html → ...2-6-BFF-Proxy/ClientApp/public/index.html b/.../CallGraphBFF/ClientApp/public/index.html → ...2-6-BFF-Proxy/ClientApp/public/index.html
diff --git a/...llGraphBFF/ClientApp/public/manifest.json → ...-BFF-Proxy/ClientApp/public/manifest.json b/...llGraphBFF/ClientApp/public/manifest.json → ...-BFF-Proxy/ClientApp/public/manifest.json
diff --git a/...F-Proxy/CallGraphBFF/ClientApp/src/App.js → ...h-user/2-6-BFF-Proxy/ClientApp/src/App.js b/...F-Proxy/CallGraphBFF/ClientApp/src/App.js → ...h-user/2-6-BFF-Proxy/ClientApp/src/App.js
diff --git a/...xy/CallGraphBFF/ClientApp/src/App.test.js → ...r/2-6-BFF-Proxy/ClientApp/src/App.test.js b/...xy/CallGraphBFF/ClientApp/src/App.test.js → ...r/2-6-BFF-Proxy/ClientApp/src/App.test.js
diff --git a/...allGraphBFF/ClientApp/src/AuthProvider.js → ...6-BFF-Proxy/ClientApp/src/AuthProvider.js b/...allGraphBFF/ClientApp/src/AuthProvider.js → ...6-BFF-Proxy/ClientApp/src/AuthProvider.js
diff --git a/...FF/ClientApp/src/components/FetchGraph.js → ...xy/ClientApp/src/components/FetchGraph.js b/...FF/ClientApp/src/components/FetchGraph.js → ...xy/ClientApp/src/components/FetchGraph.js
diff --git a/...GraphBFF/ClientApp/src/components/Home.js → ...FF-Proxy/ClientApp/src/components/Home.js b/...GraphBFF/ClientApp/src/components/Home.js → ...FF-Proxy/ClientApp/src/components/Home.js
diff --git a/...aphBFF/ClientApp/src/components/Layout.js → ...-Proxy/ClientApp/src/components/Layout.js b/...aphBFF/ClientApp/src/components/Layout.js → ...-Proxy/ClientApp/src/components/Layout.js
diff --git a/...hBFF/ClientApp/src/components/NavMenu.css → ...roxy/ClientApp/src/components/NavMenu.css b/...hBFF/ClientApp/src/components/NavMenu.css → ...roxy/ClientApp/src/components/NavMenu.css
diff --git a/...phBFF/ClientApp/src/components/NavMenu.js → ...Proxy/ClientApp/src/components/NavMenu.js b/...phBFF/ClientApp/src/components/NavMenu.js → ...Proxy/ClientApp/src/components/NavMenu.js
diff --git a/...oxy/CallGraphBFF/ClientApp/src/custom.css → ...er/2-6-BFF-Proxy/ClientApp/src/custom.css b/...oxy/CallGraphBFF/ClientApp/src/custom.css → ...er/2-6-BFF-Proxy/ClientApp/src/custom.css
diff --git a/...Proxy/CallGraphBFF/ClientApp/src/index.js → ...user/2-6-BFF-Proxy/ClientApp/src/index.js b/...Proxy/CallGraphBFF/ClientApp/src/index.js → ...user/2-6-BFF-Proxy/ClientApp/src/index.js
diff --git a/...GraphBFF/ClientApp/src/reportWebVitals.js → ...FF-Proxy/ClientApp/src/reportWebVitals.js b/...GraphBFF/ClientApp/src/reportWebVitals.js → ...FF-Proxy/ClientApp/src/reportWebVitals.js
diff --git a/...lGraphBFF/ClientApp/src/service-worker.js → ...BFF-Proxy/ClientApp/src/service-worker.js b/...lGraphBFF/ClientApp/src/service-worker.js → ...BFF-Proxy/ClientApp/src/service-worker.js
diff --git a/...lientApp/src/serviceWorkerRegistration.js → ...lientApp/src/serviceWorkerRegistration.js b/...lientApp/src/serviceWorkerRegistration.js → ...lientApp/src/serviceWorkerRegistration.js
diff --git a/.../CallGraphBFF/ClientApp/src/setupProxy.js → ...2-6-BFF-Proxy/ClientApp/src/setupProxy.js b/.../CallGraphBFF/ClientApp/src/setupProxy.js → ...2-6-BFF-Proxy/ClientApp/src/setupProxy.js
diff --git a/...allGraphBFF/Controllers/AuthController.cs → ...6-BFF-Proxy/Controllers/AuthController.cs b/...allGraphBFF/Controllers/AuthController.cs → ...6-BFF-Proxy/Controllers/AuthController.cs
diff --git a/...GraphBFF/Controllers/ProfileController.cs → ...FF-Proxy/Controllers/ProfileController.cs b/...GraphBFF/Controllers/ProfileController.cs → ...FF-Proxy/Controllers/ProfileController.cs
diff --git a/...BFF-Proxy/CallGraphBFF/Pages/Error.cshtml → ...aph-user/2-6-BFF-Proxy/Pages/Error.cshtml b/...BFF-Proxy/CallGraphBFF/Pages/Error.cshtml → ...aph-user/2-6-BFF-Proxy/Pages/Error.cshtml
diff --git a/...-Proxy/CallGraphBFF/Pages/Error.cshtml.cs → ...-user/2-6-BFF-Proxy/Pages/Error.cshtml.cs b/...-Proxy/CallGraphBFF/Pages/Error.cshtml.cs → ...-user/2-6-BFF-Proxy/Pages/Error.cshtml.cs
diff --git a/...xy/CallGraphBFF/Pages/_ViewImports.cshtml → ...r/2-6-BFF-Proxy/Pages/_ViewImports.cshtml b/...xy/CallGraphBFF/Pages/_ViewImports.cshtml → ...r/2-6-BFF-Proxy/Pages/_ViewImports.cshtml
diff --git a/...ser/2-6-BFF-Proxy/CallGraphBFF/Program.cs → 2-WebApp-graph-user/2-6-BFF-Proxy/Program.cs b/...ser/2-6-BFF-Proxy/CallGraphBFF/Program.cs → 2-WebApp-graph-user/2-6-BFF-Proxy/Program.cs
diff --git a/...llGraphBFF/Properties/launchSettings.json → ...-BFF-Proxy/Properties/launchSettings.json b/...llGraphBFF/Properties/launchSettings.json → ...-BFF-Proxy/Properties/launchSettings.json
diff --git a/...Utils/CustomCookieAuthenticationEvents.cs → ...Utils/CustomCookieAuthenticationEvents.cs b/...Utils/CustomCookieAuthenticationEvents.cs → ...Utils/CustomCookieAuthenticationEvents.cs
diff --git a/...CallGraphBFF/appsettings.Development.json → ...-6-BFF-Proxy/appsettings.Development.json b/...CallGraphBFF/appsettings.Development.json → ...-6-BFF-Proxy/appsettings.Development.json
diff --git a/...6-BFF-Proxy/CallGraphBFF/appsettings.json → ...graph-user/2-6-BFF-Proxy/appsettings.json b/...6-BFF-Proxy/CallGraphBFF/appsettings.json → ...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": "*"
-}
+}
diff --git a/2-WebApp-graph-user/2-5-HybridFlow/Program.cs b/2-WebApp-graph-user/2-5-HybridFlow/Program.cs
   options.Cookie.IsEssential = true;
 });

 var initialScopes = builder.Configuration.GetSection("DownstreamApi:Scopes")
    .Value
    .Split(' ');

 app.UseAuthentication();
 app.UseAuthorization();

 app.UseEndpoints(endpoints =>
 {
    endpoints.MapControllerRoute(
        name: "default",
diff --git a/2-WebApp-graph-user/2-5-HybridFlow/Views/Shared/_Layout.cshtml b/2-WebApp-graph-user/2-5-HybridFlow/Views/Shared/_Layout.cshtml
        (function () {
            const scopes = 
            @{
                var apiScopes = Configuration["DownstreamApi:Scopes"].Split(' ');
                @Html.Raw("[");

                foreach(var scope in apiScopes) {
diff --git a/4-WebApp-your-API/4-3-AnyOrg/TodoListService/Controllers/TodoListController.cs b/4-WebApp-your-API/4-3-AnyOrg/TodoListService/Controllers/TodoListController.cs
            catch (MsalUiRequiredException ex)
            {
                _tokenAcquisition.ReplyForbiddenWithWwwAuthenticateHeader(_graphScopes, ex);
                throw ex;
            }
        }

diff --git a/5-WebApp-AuthZ/5-2-Groups/Services/GraphHelper.cs b/5-WebApp-AuthZ/5-2-Groups/Services/GraphHelper.cs
                    try
                    {
                        // Request to get groups and directory roles that the user is a direct member of.
                        var memberPage = await graphClient.Me.GetMemberGroups.PostAsync(new GetMemberGroupsPostRequestBody() { SecurityEnabledOnly = false});
                        allgroups = memberPage.Value.ToList<string>();

                        if (allgroups?.Count > 0)
	options.Cookie.IsEssential = true;
	});

	var initialScopes = builder.Configuration.GetSection("DownstreamApi:Scopes")
Check warning on line 14 in 2-WebApp-graph-user/2-5-HybridFlow/Program.cs GitHub Actions / build `Dereference of a possibly null reference.` Check warning on line 14 in 2-WebApp-graph-user/2-5-HybridFlow/Program.cs GitHub Actions / build `Dereference of a possibly null reference.`
	.Value
	.Split(' ');

	app.UseAuthentication();
	app.UseAuthorization();

	app.UseEndpoints(endpoints =>
Check warning on line 54 in 2-WebApp-graph-user/2-5-HybridFlow/Program.cs GitHub Actions / build `Suggest using top level route registrations instead of UseEndpoints (https://aka.ms/aspnet/analyzers)` Check warning on line 54 in 2-WebApp-graph-user/2-5-HybridFlow/Program.cs GitHub Actions / build `Suggest using top level route registrations instead of UseEndpoints (https://aka.ms/aspnet/analyzers)`
	{
	endpoints.MapControllerRoute(
	name: "default",
	(function () {
	const scopes =
	@{
	var apiScopes = Configuration["DownstreamApi:Scopes"].Split(' ');
Check warning on line 138 in 2-WebApp-graph-user/2-5-HybridFlow/Views/Shared/_Layout.cshtml GitHub Actions / build `Dereference of a possibly null reference.` Check warning on line 138 in 2-WebApp-graph-user/2-5-HybridFlow/Views/Shared/_Layout.cshtml GitHub Actions / build `Dereference of a possibly null reference.`
	@Html.Raw("[");

	foreach(var scope in apiScopes) {
	catch (MsalUiRequiredException ex)
	{
	_tokenAcquisition.ReplyForbiddenWithWwwAuthenticateHeader(_graphScopes, ex);
	throw ex;
Check warning on line 255 in 4-WebApp-your-API/4-3-AnyOrg/TodoListService/Controllers/TodoListController.cs GitHub Actions / build `Re-throwing caught exception changes stack information (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca2200)` Check warning on line 255 in 4-WebApp-your-API/4-3-AnyOrg/TodoListService/Controllers/TodoListController.cs GitHub Actions / build `Re-throwing caught exception changes stack information (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca2200)`
	}
	}
	try
	{
	// Request to get groups and directory roles that the user is a direct member of.
	var memberPage = await graphClient.Me.GetMemberGroups.PostAsync(new GetMemberGroupsPostRequestBody() { SecurityEnabledOnly = false});
Check warning on line 137 in 5-WebApp-AuthZ/5-2-Groups/Services/GraphHelper.cs GitHub Actions / build `'GetMemberGroupsRequestBuilder.PostAsync(GetMemberGroupsPostRequestBody, Action<RequestConfiguration<DefaultQueryParameters>>?, CancellationToken)' is obsolete: 'This method is obsolete. Use PostAsGetMemberGroupsPostResponse instead.'`
	allgroups = memberPage.Value.ToList<string>();

	if (allgroups?.Count > 0)