Skip to content

Commit cf02b43

Browse files
committed
responding to Justin's comments
1 parent 7f53c5a commit cf02b43

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

DualSupportClientSample/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace DualSupportClientSample
1010
class Program
1111
{
1212
//============= Config [Edit these with your settings] =====================
13-
internal const string vstsOrTfsCollectionUrl = "VSTS: https://*.visualstudio.com or TFS: https://*:8080/tfs/defaultcollection"; //change to the URL of your VSTS or TFS account
13+
internal const string vstsOrTfsCollectionUrl = "https://myaccount.visualstudio.com" //change to the URL of your VSTS or TFS account; VSTS: https://*.visualstudio.com TFS: https://*:8080/tfs/defaultcollection"
1414
//==========================================================================
1515

1616
public static void Main(string[] args)

DualSupportClientSample/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
// General Information about an assembly is controlled through the following
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
8-
[assembly: AssemblyTitle("SimpleAdalConsoleApp")]
8+
[assembly: AssemblyTitle("DualSupportClientSample")]
99
[assembly: AssemblyDescription("")]
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
12-
[assembly: AssemblyProduct("SimpleAdalConsoleApp")]
12+
[assembly: AssemblyProduct("DualSupportClientSample")]
1313
[assembly: AssemblyCopyright("Copyright © 2017")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]

JavascriptWebAppSample/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ git clone https://github.com/Microsoft/vsts-auth-samples.git
2525
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.
2626
3. On the left hand navigation menu, select `Azure Active Directory`.
2727
4. Click on `App registrations` and select `New application registration` from the top bar.
28-
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.
28+
5. Enter a `name` for you application, ex. "Adal JS sample", choose `Web app/API` for `application type`, and enter `http://localhost:8081` for the `Redirect URI`. Finally click `create` at the bottom of the screen.
2929
6. Save the `Application ID` from your new application registration. You will need it later in this sample.
3030
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 `Delegated Permissions` -> click `Select` -> click `Done` -> click `Grant Permissions` -> click `Yes`.
3131

@@ -34,12 +34,12 @@ git clone https://github.com/Microsoft/vsts-auth-samples.git
3434
1. Open `index.html` in [Visual Studio Code](https://code.visualstudio.com/download) or another text editor or IDE.
3535
2. Inside `index.html` there is a section called `Input Vars` you will need to update to run the sample:
3636
* `clientId` - (Required) update this with the `application id` you saved from step 2.6 above
37-
* `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`
38-
* `logoutredirectUri` - (optional) update if you are hosting your app at a location other than `http://localhost:8080`
37+
* `replyUri` - (optional) In single page apps this should be the app URL itself. We have set this to `http://localhost:8081`(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`
38+
* `logoutredirectUri` - (optional) update if you are hosting your app at a location other than `http://localhost:8081`
3939
* `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)
4040
* `vstsResourceId` - Do not change this value. It is used to receive VSTS ADAL authentication tokens
41-
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.html` at `http://localhost:8080`.
42-
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.
41+
3. Navigate to the ADAL JS sample in cloned repo `vsts-auth-samples/JavascriptWebAppSample/` and start your http-server and set it to serve pages at `localhost:8081` which will by default serve `index.html` at `http://localhost:8081`.
42+
4. Navigate to `http://localhost:8081`. 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.
4343

4444

4545

JavascriptWebAppSample/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<script type="text/javascript">
2525
//========= Input Vars ================================
2626
var clientId = 'xxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'; //Update with your app registration's Application ID (step 2.6)
27-
var replyUri = 'http://localhost:8080'; //Where you will receive the token. (step 2.5)
28-
var logoutRedirectUri = 'http://localhost:8080'; //Where you return upon signout. Update if you are hosting your webpage somewhere else
27+
var replyUri = 'http://localhost:8081'; //Where you will receive the token. (step 2.5)
28+
var logoutRedirectUri = 'http://localhost:8081'; //Where you return upon signout. Update if you are hosting your webpage somewhere else
2929
var vstsApi = 'https://myaccount.visualstudio.com/_apis/projects?api-version=2.0'; //Update if want to access a different vsts API
3030
var vstsResourceId = '499b84ac-1321-427f-aa17-267ca6975798'; //Do not change. Needed to get a VSTS ADAL access token.
3131
//=====================================================

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ Learn more about [integrating with Team Services](https://www.visualstudio.com/d
1313
* [ASP.NET Web app OAuth sample](./OAuthWebSample/README.md)
1414
* [Client library sample (using VSSConnection)](./ClientLibraryConsoleAppSample/README.md)
1515
* [Javascript web app sample (using Azure Active Directory JS Library)](./JavascriptWebAppSample/README.md)
16-
* [Dual Support (VSTS/TFS) Client Sample (using Azure Active Directory Library and Windows Authentication)](./VstsTfsSample/README.md)
16+
* [Dual Support (VSTS/TFS) Client Sample (using Azure Active Directory Library and Windows Authentication)](./DualSupportClientSample/README.md)

0 commit comments

Comments
 (0)