Merge branch 'jennyf/pop' of https://github.com/Azure-Samples/active-directory-dotnetcore-daemon-v2 into jennyf/pop

Author: jennyf19

1-Call-MSGraph/README.md

@@ -47,7 +47,7 @@ For more information on the concepts used in this sample, be sure to read the [M
 
 To run this sample, you'll need:
 
-- [Visual Studio 2017](https://aka.ms/vsdownload) or just the [.NET Core SDK](https://www.microsoft.com/net/learn/get-started)
+- [Visual Studio 2017](https://aka.ms/vsdownload) or newer, or just the [.NET Core SDK](https://www.microsoft.com/net/learn/get-started)
 - An Internet connection
 - A Windows machine (necessary if you want to run the app on Windows)
 - An OS X machine (necessary if you want to run the app on Mac)
@@ -158,6 +158,8 @@ Clean the solution, rebuild the solution, and run it.
 
 Start the application, it will display the users in the tenant.
 
+> [Consider taking a moment to share your experience with us.](https://forms.office.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbRy8G199fkJNDjJ9kJaxUJIhUNUJGSDU1UkxFMlRSWUxGVTlFVkpGT0tOTi4u)
+
 ## About the code
 
 The relevant code for this sample is in the `Program.cs` file, in the `RunAsync()` method. The steps are:

1-Call-MSGraph/daemon-console/AuthenticationConfig.cs

@@ -1,26 +1,5 @@
-/*
- The MIT License (MIT)
-
-Copyright (c) 2015 Microsoft Corporation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 using Microsoft.Extensions.Configuration;
 using System;

1-Call-MSGraph/daemon-console/Program.cs

@@ -1,26 +1,6 @@
-/*
- The MIT License (MIT)
-
-Copyright (c) 2015 Microsoft Corporation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 using Microsoft.Identity.Client;
 using Newtonsoft.Json.Linq;
 using System;

1-Call-MSGraph/daemon-console/ProtectedApiCallHelper.cs

@@ -1,26 +1,5 @@
-/*
- The MIT License (MIT)
-
-Copyright (c) 2015 Microsoft Corporation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -50,11 +29,11 @@ public ProtectedApiCallHelper(HttpClient httpClient)
 
 
         /// <summary>
-        /// Calls the protected Web API and processes the result
+        /// Calls the protected web API and processes the result
         /// </summary>
-        /// <param name="webApiUrl">Url of the Web API to call (supposed to return Json)</param>
-        /// <param name="accessToken">Access token used as a bearer security token to call the Web API</param>
-        /// <param name="processResult">Callback used to process the result of the call to the Web API</param>
+        /// <param name="webApiUrl">URL of the web API to call (supposed to return Json)</param>
+        /// <param name="accessToken">Access token used as a bearer security token to call the web API</param>
+        /// <param name="processResult">Callback used to process the result of the call to the web API</param>
         public async Task CallWebApiAndProcessResultASync(string webApiUrl, string accessToken, Action<JObject> processResult)
         {
             if (!string.IsNullOrEmpty(accessToken))
@@ -64,7 +43,7 @@ public async Task CallWebApiAndProcessResultASync(string webApiUrl, string acces
                 {
                     HttpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
                 }
-                defaultRequestHeaders.Authorization = new AuthenticationHeaderValue("bearer", accessToken);
+                defaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken);
 
                 HttpResponseMessage response = await HttpClient.GetAsync(webApiUrl);
                 if (response.IsSuccessStatusCode)
@@ -77,7 +56,7 @@ public async Task CallWebApiAndProcessResultASync(string webApiUrl, string acces
                 else
                 {
                     Console.ForegroundColor = ConsoleColor.Red;
-                    Console.WriteLine($"Failed to call the Web Api: {response.StatusCode}");
+                    Console.WriteLine($"Failed to call the web API: {response.StatusCode}");
                     string content = await response.Content.ReadAsStringAsync();
 
                     // Note that if you got reponse.Code == 403 and reponse.content.code == "Authorization_RequestDenied"

1-Call-MSGraph/daemon-console/daemon-console.csproj

@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.18.0" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.24.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
 

2-Call-OwnApi/README.md

@@ -201,6 +201,8 @@ Clean the solution, rebuild the solution, and run it.  You might want to go into
 
 Start the application, it will display the users in the tenant.
 
+> [Consider taking a moment to share your experience with us.](https://forms.office.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbRy8G199fkJNDjJ9kJaxUJIhUNUJGSDU1UkxFMlRSWUxGVTlFVkpGT0tOTi4u)
+
 ## About the code
 
 The relevant code for this sample is in the `Program.cs` file, in the `RunAsync()` method. The steps are:

2-Call-OwnApi/TodoList-WebApi/Controllers/TodoListController.cs

@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;

2-Call-OwnApi/TodoList-WebApi/Models/TodoItem.cs

@@ -1,4 +1,7 @@
-namespace TodoList_WebApi.Models
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+namespace TodoList_WebApi.Models
 {
     public class TodoItem
     {

2-Call-OwnApi/TodoList-WebApi/Program.cs

@@ -1,4 +1,7 @@
-using Microsoft.AspNetCore.Hosting;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 
 namespace TodoList_WebApi

2-Call-OwnApi/TodoList-WebApi/Startup.cs

@@ -1,4 +1,7 @@
-using Microsoft.AspNetCore.Authentication.JwtBearer;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;