updating api called for JS sample

Author: peakyy

AdalJsSample/README.md

@@ -4,7 +4,7 @@ The [Azure Active Directory Authentication Library (ADAL)](https://docs.microsof
 
 ## 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 all VSTS known information associated with the signed in identity.
+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.
 
 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.
@@ -35,10 +35,10 @@ git clone https://github.com/Microsoft/vsts-auth-samples.git
 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` - (optional) update this if you would like to the sample to run a different VSTS API
+    * `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
     * `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`.
-4. Navigate to `http://localhost:8080`. Sign in with a user account from your AAD tenant which has access to at least 1 VSTS account. Displayed should be all VSTS known identity infromation about the signed in user account.
+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.
 
 
 

AdalJsSample/index.html

@@ -18,16 +18,24 @@
         <pre id="api_response"></pre>
 
         <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 vstsResourceId = '499b84ac-1321-427f-aa17-267ca6975798'; //Do not change
+            //=====================================================
+            
             // Set up ADAL
             var authContext = new AuthenticationContext({
-                clientId: '57c5c51c-2036-433a-befa-ebefc7f10689',//Update with your app regirstion's Application ID
-                postLogoutRedirectUri: 'http://localhost:8080' //Where you return upon signout
+                clientId: clientId,
+                postLogoutRedirectUri: replyUri //Where you return upon signout
             });
             // Make an AJAX request to the VSTS REST API and print the response as JSON.
-            var getCurrentUser = function (access_token) {
+            var getCurrentUserInfo = function (access_token) {
                 document.getElementById('api_response').textContent = 'Calling API...';
                 var xhr = new XMLHttpRequest();
-                xhr.open('GET', 'https://app.vssps.visualstudio.com/_apis/profile/profiles/me?api-version=1.0', true); //API called with ADAL token
+                //API called with ADAL token
+                xhr.open('GET', vstsApi, true);
                 xhr.setRequestHeader('Authorization', 'Bearer ' + access_token);
                 xhr.onreadystatechange = function () {
                     if (xhr.readyState === 4 && xhr.status === 200) {
@@ -47,7 +55,7 @@
                 authContext.handleWindowCallback();
                 var err = authContext.getLoginError();
                 if (err) {
-                    // TODO: Handle errors signing in and getting tokens
+                    // Handle error
                     document.getElementById('api_response').textContent =
                         'ERROR:\n\n' + err;
                 }
@@ -58,18 +66,17 @@
                     document.getElementById('username').textContent = 'Signed in as: ' + user.userName;
                     document.getElementById('api_response').textContent = 'Getting access token...';
 
-                    // Get an access token to the Microsoft Graph API
+                    // Get an access token to VSTS
                     authContext.acquireToken(
-                        '499b84ac-1321-427f-aa17-267ca6975798',
+                        vstsResourceId,
                         function (error, token) {
                             if (error || !token) {
-                                // TODO: Handle error obtaining access token
                                 document.getElementById('api_response').textContent =
                                     'ERROR:\n\n' + error;
                                 return;
                             }
                             // Use the access token
-                            getCurrentUser(token);
+                            getCurrentUserInfo(token);
                         }
                     );
                 } else {

ManagedClientConsoleAppSample/README.md

@@ -4,7 +4,7 @@ The [Azure Active Directory Authentication Library (ADAL)](https://docs.microsof
 
 ## 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.
+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