updated the device profile sample to remove bloat code

peakyy · peakyy · commit 20119cf8f8b2 · 2017-06-30T04:06:40.000-07:00
diff --git a/Device_Profile_Sample/Device Profile Sample.sln b/Device_Profile_Sample/Device Profile Sample.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26228.9
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Device Profile Get Identity Data", "Device Profile Get Identity Data.csproj", "{3221E66C-4C5B-4EAD-A5BE-DA88A9AC3A34}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Device Profile sample", "Device Profile sample.csproj", "{3221E66C-4C5B-4EAD-A5BE-DA88A9AC3A34}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Device_Profile_Sample/Device Profile sample.csproj b/Device_Profile_Sample/Device Profile sample.csproj
diff --git a/Device_Profile_Sample/Program.cs b/Device_Profile_Sample/Program.cs
@@ -9,49 +9,26 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DeviceProfileGetIdentityData
+namespace DeviceProfileSample
 {
     public class Program
     {
         public const string resource_vsts = "499b84ac-1321-427f-aa17-267ca6975798";
         public const string clientId_vs = "872cd9fa-d31f-45e0-9eab-6e460a02d1f1";
         public static void Main(string[] args)
         {
-            string commandString = string.Empty;
-            Console.ForegroundColor = ConsoleColor.Blue;
-            Console.WriteLine("***********************************************************");
-            Console.WriteLine("*                Get User Identity Data                   *");
-            Console.WriteLine("*                                                         *");
-            Console.WriteLine("*                                                         *");
-            Console.WriteLine("*                                                         *");
-            Console.WriteLine("***********************************************************");
-            Console.WriteLine("");
+            //============= Config [Edit these with your settings] =====================
+            var vstsAccountUri = "https://mseng.VisualStudio.com";
+            var restEndpoint = "_apis/projects?api-version=2.0";
+            //==========================================================================
 
-            // main command cycle
-            while (!commandString.Equals("Exit"))
-            {
-                Console.ResetColor();
-                Console.WriteLine("Enter command (userdata | exit) >");
-                commandString = Console.ReadLine();
+            UserData(vstsAccountUri,restEndpoint);
 
-                switch (commandString.ToUpper())
-                {
-                    case "USERDATA":
-                        UserData();
-                        break;
-                    case "EXIT":
-                        Console.WriteLine("Bye!");
-                        return;
-                        break;
-                    default:
-                        Console.ForegroundColor = ConsoleColor.Red;
-                        Console.WriteLine("Invalid command.");
-                        break;
-                }
-            }
+            //prevents console from closing immediately at the end of output
+            Console.ReadLine();
         }
 
-        static void UserData()
+        static void UserData(string vstsAccountUri, string restEndpoint)
         {
             //get auth token
             AuthenticationResult result = GetToken(null);
@@ -60,15 +37,15 @@ static void UserData()
             //call VSTS REST API
             using (var client = new HttpClient())
             {
-                client.BaseAddress = new Uri("https://app.vssps.visualstudio.com");
+                client.BaseAddress = new Uri(vstsAccountUri);
                 client.DefaultRequestHeaders.Accept.Clear();
                 client.DefaultRequestHeaders.Accept.Add(new System.Net.Http.Headers.MediaTypeWithQualityHeaderValue("application/json"));
                 client.DefaultRequestHeaders.Add("User-Agent", "VstsRestApiSamples");
                 client.DefaultRequestHeaders.Add("X-TFS-FedAuthRedirect", "Suppress");
                 client.DefaultRequestHeaders.Authorization = authHeader;
 
                 //connect to REST endpoint
-                HttpResponseMessage response = client.GetAsync("_apis/connectiondata").Result;
+                HttpResponseMessage response = client.GetAsync(restEndpoint).Result;
 
                 if (response.IsSuccessStatusCode)
                 {
diff --git a/Device_Profile_Sample/Properties/AssemblyInfo.cs b/Device_Profile_Sample/Properties/AssemblyInfo.cs
diff --git a/Device_Profile_Sample/README.md b/Device_Profile_Sample/README.md
@@ -4,7 +4,7 @@ For a headless text output client application, it is not possible authenticate t
 
 ## Sample Application
 
-This buildable sample will walk you through the steps to create a client-side console application which uses ADAL to authenticate a user via the [Device Profile flow](https://azure.microsoft.com/en-us/resources/samples/active-directory-dotnet-deviceprofile/?v=17.23h) and returns a JSON string containing all VSTS identity data for the authenticated user.
+This buildable sample will walk you through the steps to create a client-side console application which uses ADAL to authenticate a user via the [Device Profile flow](https://azure.microsoft.com/en-us/resources/samples/active-directory-dotnet-deviceprofile/?v=17.23h) and returns a JSON string containing all account team project data viewable by the authenticated user.
 
 ## Step 1: Clone or download vsts-auth-samples repository
 
@@ -19,11 +19,12 @@ Package: `Microsoft.Identity.Model.Clients.ActiveDirectory` has already been ins
 
 ## Step 3: Run the sample
 
-1. Navigate to the sample in cloned repo `vsts-auth-samples/Device_Profile_Sample/Device_Profile_Get_Identity_Data/`
+1. Navigate to the sample in cloned repo `vsts-auth-samples/Device_Profile_Sample/`
 2. Use [Nuget package restore](https://docs.microsoft.com/en-us/nuget/consume-packages/package-restore) to ensure you have all dependencies installed
-3. Open the solution file `Device Profile - Get Identity Data.sln` in [Visual Studio IDE 2017](https://www.visualstudio.com/downloads/)
+3. Open the solution file `Device Profile Sample.sln` in [Visual Studio IDE 2017](https://www.visualstudio.com/downloads/)
 4. Open CS file `Program.cs` and there are 2 important fields to be aware of:
     * `VSTSResourceId` - Immutable value. Denotes that we need a VSTS access token.
     * `clientId` - Immutable value*. *Normally your app's registered AAD clientId, but for VSTS is must be the VS client ID provided
-    These fields are how we configure ADAL to aquire a VSTS access token for the authenticated user.
-5. Build and run solution. You should see a console window waiting for text input. Input `userdata` to start the Device Profile auth flow. After authenticating you should see VSTS identity information displayed in the console window.
+    * `vstsAccountUri` - Mutable value. Denotes your vsts account URL (i.e. https://myaccount.visualstudio.com). Please update this with your account URL
+    * `restEndpoint` - Mutable value. Denotes which REST API endpoint we want to hit. We have configured it to return team project information.
+5. Build and run solution. You should see a console window with instruction on how to authenticate via the Device Profile flow. After authenticating you should see all team project information viewable by the authenticated identity displayed in the console window.
diff --git a/README.md b/README.md
@@ -9,6 +9,6 @@ Learn more about [integrating with Team Services](https://www.visualstudio.com/d
 ## Samples
 
 * [Managed Client ADAL Sample](./Managed_Client_ADAL_Sample/README.md)
-* [Device Profile Sample](./Device_Profile_Sample/Device_Profile_Get_Identity_Data/README.md)
+* [Device Profile Sample](./Device_Profile_Sample/README.md)
 * [ASP.NET Web App OAuth Sample](./ASP.NET_Web_App_OAuth_Sample/aspnet/README.md)
 * [Client Libraries Sample](./Client_Libraries_Sample/README.md)
