Add license headers, move all configuration items to config

Author: skwan

README.md

@@ -94,10 +94,12 @@ There are two projects in this sample.  Each needs to be separately registered i
 
 #### Configure the TodoListClient project
 
-1. Open `MainPage.xaml.cs'.
-2. Find the declaration of `tenant` and replace the value with the name of your Azure AD tenant.
-3. Find the declaration of `clientId` and replace the value with the Client ID from the Azure portal.
-4. Find the declaration of `todoListResourceId` and `todoListBaseAddress` and ensure their values are set properly for your TodoListService project.
+1. Open `app.config'.
+2. Find the app key `ida:Tenant` and replace the value with your AAD tenant name.
+3. Find the app key `ida:ClientId` and replace the value with the Client ID for the TodoListClient from the Azure portal.
+4. Find the app key `ida:RedirectUri` and replace the value with the Redirect URI for the TodoListClient from the Azure portal, for example `http://TodoListClient`.
+5. Find the app key `todo:TodoListResourceId` and replace the value with the  App ID URI of the TodoListService, for example `https://<your_tenant_name>/TodoListService`
+6. Find the app key `todo:TodoListBaseAddress` and replace the value with the base address of the TodoListService project.
 
 ### Step 5:  Trust the IIS Express SSL certificate
 
@@ -133,11 +135,12 @@ First, in Visual Studio 2013 create an empty solution to host the  projects.  Th
 
 1. In the solution, create a new Windows --> WPF Application called TodoListClient.
 2. Add the (stable) Active Directory Authentication Library (ADAL) NuGet, Microsoft.IdentityModel.Clients.ActiveDirectory, version 1.0.3 (or higher) to the project.
-3. Add  assembly references to `System.Net.Http` and `System.Web.Extensions`.
+3. Add  assembly references to `System.Net.Http`, `System.Web.Extensions`, and `System.Configuration`.
 4. Add a new class to the project called `TodoItem.cs`.  Copy the code from the sample project file of same name into this class, completely replacing the code in the file in the new project.
 5. Add a new class to the project called `CacheHelper.cs`.  Copy the code from the sample project file of same name into this class, completely replacing the code in the file in the new project.
 6. Add a new class to the project called `CredManCache.cs`.  Copy the code from the sample project file of same name into this class, completely replacing the code in the file in the new project.
 7. Copy the markup from `MainWindow.xaml' in the sample project into the file of same name in the new project, completely replacing the markup in the file in the new project.
 8. Copy the code from `MainWindow.xaml.cs` in the sample project into the file of same name in the new project, completely replacing the code in the file in the new project.
+9. In `app.config` create keys for `ida:AADInstance`, `ida:Tenant`, `ida:ClientId`, `ida:RedirectUri`, `todo:TodoListResourceId`, and `todo:TodoListBaseAddress` and set them accordingly.  For the public Azure cloud, the value of `ida:AADInstance` is `https://login.windows.net/{0}`.
 
 Finally, in the properties of the solution itself, set both projects as startup projects.

TodoListClient/App.config

@@ -3,4 +3,12 @@
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
     </startup>
+  <appSettings>
+    <add key="ida:AADInstance" value="https://login.windows.net/{0}" />
+    <add key="ida:Tenant" value="skwantoso.com" />
+    <add key="ida:ClientId" value="fb715b0e-3ca9-45b8-9928-2329a776b42d" />
+    <add key="ida:RedirectUri" value="http://TodoListClient" />
+    <add key="todo:TodoListResourceId" value="https://skwantoso.com/TodoListService" />
+    <add key="todo:TodoListBaseAddress" value="https://localhost:44321" />
+  </appSettings>
 </configuration>

TodoListClient/CacheHelper.cs

@@ -1,9 +1,26 @@
-using System;
+//----------------------------------------------------------------------------------------------
+//    Copyright 2014 Microsoft Corporation
+//
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//----------------------------------------------------------------------------------------------
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
+// The following using statements were added for this sample.
 using Microsoft.IdentityModel.Clients.ActiveDirectory;
 
 namespace TodoListClient

TodoListClient/CredManCache.cs

@@ -1,9 +1,26 @@
-using System;
+//----------------------------------------------------------------------------------------------
+//    Copyright 2014 Microsoft Corporation
+//
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//----------------------------------------------------------------------------------------------
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
+// The following using statements were added for this sample.
 using Microsoft.IdentityModel.Clients.ActiveDirectory;
 using System.Runtime.InteropServices;
 using System.Runtime.ConstrainedExecution;

TodoListClient/MainWindow.xaml.cs

@@ -1,4 +1,20 @@
-using System;
+//----------------------------------------------------------------------------------------------
+//    Copyright 2014 Microsoft Corporation
+//
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//----------------------------------------------------------------------------------------------
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -13,12 +29,14 @@
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
+// The following using statements were added for this sample.
 using System.Globalization;
 using Microsoft.IdentityModel.Clients.ActiveDirectory;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Web.Script.Serialization;
 using System.Runtime.InteropServices;
+using System.Configuration;
 
 namespace TodoListClient
 {
@@ -27,28 +45,26 @@ namespace TodoListClient
     /// </summary>
     public partial class MainWindow : Window
     {
-        const int INTERNET_OPTION_END_BROWSER_SESSION = 42;
-
         //
         // The Client ID is used by the application to uniquely identify itself to Azure AD.
         // The Tenant is the name of the Azure AD tenant in which this application is registered.
         // The AAD Instance is the instance of Azure, for example public Azure or Azure China.
         // The Redirect URI is the URI where Azure AD will return OAuth responses.
         // The Authority is the sign-in URL of the tenant.
         //
-        const string aadInstance = "https://login.windows.net/{0}";
-        const string tenant = "skwantoso.com";
-        const string clientId = "fb715b0e-3ca9-45b8-9928-2329a776b42d";
-        Uri redirectUri = new Uri("http://TodoListClient");
+        private static string aadInstance = ConfigurationManager.AppSettings["ida:AADInstance"];
+        private static string tenant = ConfigurationManager.AppSettings["ida:Tenant"];
+        private static string clientId = ConfigurationManager.AppSettings["ida:ClientId"];
+        Uri redirectUri = new Uri(ConfigurationManager.AppSettings["ida:RedirectUri"]);
 
-        static string authority = String.Format(CultureInfo.InvariantCulture, aadInstance, tenant);
+        private static string authority = String.Format(CultureInfo.InvariantCulture, aadInstance, tenant);
 
         //
         // To authenticate to the To Do list service, the client needs to know the service's App ID URI.
         // To contact the To Do list service we need it's URL as well.
         //
-        const string todoListResourceId = "https://skwantoso.com/TodoListService";
-        const string todoListBaseAddress = "https://localhost:44321";
+        private static string todoListResourceId = ConfigurationManager.AppSettings["todo:TodoListResourceId"];
+        private static string todoListBaseAddress = ConfigurationManager.AppSettings["todo:TodoListBaseAddress"];
 
         private HttpClient httpClient = new HttpClient();
         private AuthenticationContext authContext = null;
@@ -219,6 +235,8 @@ private void SignIn(object sender = null, RoutedEventArgs args = null)
             {
                 TodoList.ItemsSource = string.Empty;
                 authContext.TokenCacheStore.Clear();
+                // Also clear cookies from the browser control.
+                ClearCookies();
                 SignInButton.Content = "Sign In";
                 return;
             }
@@ -254,17 +272,12 @@ private void SignIn(object sender = null, RoutedEventArgs args = null)
                 return;
             }
 
-            // Uncomment this next line if you want to clear all of the state from the browser control used by ADAL.
-            // ClearCookies();
         }
 
-        //
         // This function clears cookies from the browser control used by ADAL.
-        // It is provided here for reference in case you want to reset the cookie state of the browser control.
-        // It is not used by default in this sample.
-        //
         private void ClearCookies()
         {
+            const int INTERNET_OPTION_END_BROWSER_SESSION = 42;
             InternetSetOption(IntPtr.Zero, INTERNET_OPTION_END_BROWSER_SESSION, IntPtr.Zero, 0);
         }
 

TodoListClient/TodoItem.cs

@@ -1,4 +1,20 @@
-using System;
+//----------------------------------------------------------------------------------------------
+//    Copyright 2014 Microsoft Corporation
+//
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//----------------------------------------------------------------------------------------------
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

TodoListClient/TodoListClient.csproj

@@ -41,6 +41,7 @@
       <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.1.0.3\lib\net40\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Web.Extensions" />

TodoListService/Controllers/TodoListController.cs

@@ -1,10 +1,27 @@
-using System;
+//----------------------------------------------------------------------------------------------
+//    Copyright 2014 Microsoft Corporation
+//
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//----------------------------------------------------------------------------------------------
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Web.Http;
 
+// The following using statements were added for this sample.
 using System.Collections.Concurrent;
 using TodoListService.Models;
 using System.Security.Claims;

TodoListService/Models/TodoItem.cs

@@ -1,4 +1,20 @@
-using System;
+//----------------------------------------------------------------------------------------------
+//    Copyright 2014 Microsoft Corporation
+//
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//----------------------------------------------------------------------------------------------
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;