addressing Justin's comments

Author: peakyy

ClientLibraryConsoleAppSample/README.md

@@ -1,6 +1,6 @@
 # Client Libraries Sample
 
-The [Client Libraries](https://www.visualstudio.com/en-us/docs/integrate/get-started/client-libraries/dotnet) are .NET libraries made to simplify integration with Visual Studio Team Services and Team Foundation Server (2015 and later). They allow access to both the Traditional Client Object Model and [new REST APIs](https://www.visualstudio.com/en-us/docs/integrate/api/overview).
+For native applications the best way to authenticate and access VSTS resources is using the [Client Libraries](https://www.visualstudio.com/en-us/docs/integrate/get-started/client-libraries/dotnet). They are .NET libraries made to simplify integration with Visual Studio Team Services and Team Foundation Server (2015 and later). They allow access to both the Traditional Client Object Model and [new REST APIs](https://www.visualstudio.com/en-us/docs/integrate/api/overview).
 
 ## Sample Application
 

JavascriptWebAppSample/README.md

@@ -1,10 +1,10 @@
-# Javascirpt Web App Sample
+# Javascript Web App Sample
 
-The [Azure Active Directory Authentication Library (ADAL)](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-authentication-libraries) enables client application developers to authenticate cloud users and obtain access tokens for API usage.
+For javascript web applications that want access to resources like VSTS REST API's, they will have to support an authentication flow for their users. The [Azure Active Directory Authentication Library (ADAL) for JS](https://github.com/AzureAD/azure-activedirectory-library-for-js) enables javascript application developers to setup inerative authentication flows and obtain access tokens for API usage.
 
 ## Sample Application
 
-This buildable sample will walk you through the steps to create single page javascript application which uses ADAL to authenticate a user via an interactive prompt and display all project contained in a VSTS account/TFS collection.
+This buildable sample will walk you through the steps to create a single page javascript application which uses ADAL to authenticate a user via an interactive prompt and display all projects contained in a VSTS account/TFS collection.
 
 To run this sample you will need:
 * Http-server. You can download [NPM http server](https://www.npmjs.com/package/http-server) if you need one.
@@ -24,20 +24,21 @@ git clone https://github.com/Microsoft/vsts-auth-samples.git
 1. Sign in to the [Azure Portal](https://portal.azure.com).
 2. On the top bar, click on your account and under the Directory list, choose the Active Directory tenant where you wish to register your application.
 3. On the left hand navigation menu, select `Azure Active Directory`.
-4. Click on `App registrations` and select `New application regirstation` from the top bar.
+4. Click on `App registrations` and select `New application registration` from the top bar.
 5. Enter a `name` for you application, ex. "Adal JS sample", choose `Web app/API` for `application type`, and enter `http://localhost:8080` for the `Redirect URI`. Finally click `create` at the bottom of the screen.
 6. Save the `Application ID` from your new application registration. You will need it later in this sample.
 7. Grant Permissions for VSTS. Click `Required permissions` -> `add` -> `1 Select an API` -> type in and select `Microsoft Visual Studio Team Services` -> check the box for `Have full access to...` -> click `Save` -> click `Grant Permissions` -> click `Yes`.
 
 ## Step 3: Run the sample
 
 1. Open `index.html` in [Visual Studio Code](https://code.visualstudio.com/download?wt.mc_id=adw-brandcore-editor-slink-downloads&gclid=EAIaIQobChMItJndsOXH1QIVFJR-Ch3uTgMREAAYASABEgLb2vD_BwE) or another text editor or IDE.
-2. Inside `index.html` there is a section of `Input Vars` you can update to run the sample:
-    * `clientId` - (Required) update this with the `application id` you saved from `portal.azure.com`
-    * `replyUri` - (optional) update this if you are hosting `index.html` at an address other than `hottp://localhost:8080`
-    * `vstsApi` - (Required) update this with your VSTS/TFS collection, e.g. http://myaccount.visualstudio.com/DefaultCollection/_apis/projects?api-version=2.0 for VSTS or http://myserver:8080/tfs/DefaultCollection/_apis/projects?api-version=2.0 for TFS. If you would like to the sample to run a different VSTS API please change the entire string
+2. Inside `index.html` there is a section called `Input Vars` you will need to update to run the sample:
+    * `clientId` - (Required) update this with the `application id` you saved from step 2.6 above
+    * `replyUri` - (optional)  In single page apps this should be the app URL itself. We have set this to `http://localhost:8080`(where we will host our app), but if you are hosting your app at another URL please change this value and the reply URI in `portal.azure.com`
+    * `logoutredirectUri` - (optional) update if you are hosting your app at a location other than `http://localhost:8080`
+    * `vstsApi` - (Required) update this with your VSTS/TFS collection, e.g. http://myaccount.visualstudio.com/DefaultCollection/_apis/projects?api-version=2.0 for VSTS or http://myserver:8080/tfs/DefaultCollection/_apis/projects?api-version=2.0 for TFS. If you would like to the sample to run a different VSTS API please change the entire string. [Learn more about other VSTS REST API's](https://www.visualstudio.com/en-us/docs/integrate/get-started/rest/basics)
     * `vstsResourceId` - Do not change this value. It is used to receive VSTS ADAL authentication tokens
-3. Navigate to the ADAL JS sample in cloned repo `vsts-auth-samples/AdalJsSample/` and start your http-server which will serve `index.hmtl` at `http://localhost:8080`.
+3. Navigate to the ADAL JS sample in cloned repo `vsts-auth-samples/JavascriptWebAppSample/` and start your http-server which will by default serve `index.hmtl` at `http://localhost:8080`.
 4. Navigate to `http://localhost:8080`. Sign in with a user account from your AAD tenant which has access to the VSTS account specified in the `vstsApi`. All projects contained in the account should be displayed.
 
 

JavascriptWebAppSample/index.html

@@ -20,15 +20,17 @@
         <script type="text/javascript">
             //========= Input Vars ================================
             var clientId = '57c5c51c-2036-433a-befa-ebefc7f10689'; //Update with your app regirstion's Application ID
-            var replyUri = 'http://localhost:8080'; //Update if hosting webpage non-locally
-            var vstsApi = 'https://myaccount.visualstudio.com/DefaultCollection/_apis/projects?api-version=2.0';//'https://app.vssps.visualstudio.com/_apis/profile/profiles/me?api-version=1.0';//Update if want to access a different vsts API
+            var replyUri = 'http://localhost:8080'; //Where you will receive the token. 
+            var logoutRedirectUri = 'http://localhost:8080'; //Update if you are hosting your webpage somewhere else
+            var vstsApi = 'https://myaccount.visualstudio.com/_apis/projects?api-version=2.0';//'https://app.vssps.visualstudio.com/_apis/profile/profiles/me?api-version=1.0';//Update if want to access a different vsts API
             var vstsResourceId = '499b84ac-1321-427f-aa17-267ca6975798'; //Do not change
             //=====================================================
 
             // Set up ADAL
             var authContext = new AuthenticationContext({
                 clientId: clientId,
-                postLogoutRedirectUri: replyUri //Where you return upon signout
+                redirectUri:replyUri,
+                postLogoutRedirectUri: logoutRedirectUri //Where you return upon signout
             });
             // Make an AJAX request to the VSTS REST API and print the response as JSON.
             var getCurrentUserInfo = function (access_token) {

ManagedClientConsoleAppSample/Program.cs

@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
-using System.Threading;
 
 namespace ManagedClientConsoleAppSample
 {
@@ -13,7 +12,7 @@ class Program
         internal const string vstsCollectionUrl = "https://myaccount.visualstudio.com"; //change to the URL of your VSTS account; NOTE: This must use HTTPS
         // internal const string vstsCollectioUrl = "http://myserver:8080/tfs/DefaultCollection" alternate URL for a TFS collection
         internal const string clientId = "0fa17cf4-f75c-4185-ab9a-7c5ea47ca073"; //change to your app registration's Application ID
-        internal const string replyUri = "http://localhost:8080"; //change to your app registration's reply URI.
+        internal const string replyUri = "http://adaljssample"; //change to your app registration's reply URI.
         //==========================================================================
 
         internal const string VSTSResourceId = "499b84ac-1321-427f-aa17-267ca6975798"; //Constant value to target VSTS. Do not change  
@@ -80,7 +79,6 @@ private static void ListProjects(AuthenticationHeaderValue authHeader)
                 {
                     Console.WriteLine("\tSuccesful REST call");
                     Console.WriteLine(response.Content.ReadAsStringAsync().Result);
-                    Thread.Sleep(10000);
                 }
                 else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized)
                 {

ManagedClientConsoleAppSample/README.md

@@ -1,13 +1,15 @@
 # Managed Client ADAL Sample
 
-The [Azure Active Directory Authentication Library (ADAL)](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-authentication-libraries) enables client application developers to authenticate cloud users and obtain access tokens for API usage.
+For native applications which can support interative authentication prompts, the [Azure Active Directory Authentication Library (ADAL)](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-authentication-libraries) makes it easy to setup authentication flows for users.
+
+For native applications which cannot support interactive authentication prompts, please check out our [Device Profile Sample](./../DeviceProfileSample/README.md).
 
 ## 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 an interactive prompt and return a list of all projects inside a selected VSTS account/TFS collection.
 
 To run this sample you will need:
-* Visual Studio 2017
+* [Visual Studio IDE](https://www.visualstudio.com/vs/)
 * An Azure Active Directory (AAD) tenant. If you do not have one, follow these [steps to set up an AAD](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-howto-tenant)
 * A user account in your AAD tenant
 * A VSTS account backed by your AAD tenant where your user account has access. If you have an existing VSTS account not connected to your AAD tenant follow these [steps to connect you AAD tenant to your VSTS account](https://www.visualstudio.com/en-us/docs/setup-admin/team-services/manage-organization-access-for-your-account-vs)
@@ -25,7 +27,7 @@ git clone https://github.com/Microsoft/vsts-auth-samples.git
 2. On the top bar, click on your account and under the Directory list, choose the Active Directory tenant where you wish to register your application.
 3. On the left hand navigation menu, select `Azure Active Directory`.
 4. Click on `App registrations` and select `New application regirstation` from the top bar.
-5. Enter a `name` for you application, ex. "Adal native app sample", choose `Native` for `application type`, and enter `http://localhost:8080` for the `Redirect URI`. Finally click `create` at the bottom of the screen.
+5. Enter a `name` for you application, ex. "Adal native app sample", choose `Native` for `application type`, and enter `http://adaljssample` for the `Redirect URI`. Finally click `create` at the bottom of the screen.
 6. Save the `Application ID` from your new application registration. You will need it later in this sample.
 7. Grant Permissions for VSTS. Click `Required permissions` -> `add` -> `1 Select an API` -> type in and select `Microsoft Visual Studio Team Services` -> check the box for `Have full access to...` -> click `Save` -> click `Grant Permissions` -> click `Yes`.
 
@@ -41,9 +43,6 @@ Package: `Microsoft.Identity.Model.Clients.ActiveDirectory` has already been ins
 4. Open CS file `Program.cs` and there is a section with input values to change at the top of the class:
     * `vstsCollectionUrl` - update this with the url to your VSTS/TFS collection, e.g. http://myaccount.visualstudio.com for VSTS or http://myserver:8080/tfs/DefaultCollection for TFS.
     * `clientId` - update this with the `application id` you saved from `portal.azure.com`
-    * `replyUri` - we have set this to `http://localhost:8080`, but please update it as necessary for your own app.
+    * `replyUri` - we have set this to `http://adaljssample`, but please update it as necessary for your own app.
 5. Build and run solution. After running you should see an interactive login prompt. Then after authentication and authorization, a list of all projects inside of your account.
 
-
-
-