Skip to content

Require graph endpoint in authentication file #1107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jianghaolu merged 6 commits into from
Sep 26, 2016
Merged

Require graph endpoint in authentication file #1107

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
122f582
Squashed 'runtimes/' changes from 3010c5c..64c3003
jianghaolu Sep 23, 2016
29a87d1
Merge commit '122f5820ed650db7efb23681f3ae5299a5a4498e'
jianghaolu Sep 24, 2016
9f74fba
Merge branch 'master' of github.com:Azure/azure-sdk-for-java
jianghaolu Sep 25, 2016
1d9a3df
Require graph endpoint in authentication file
jianghaolu Sep 26, 2016
7997eaa
Squashed 'runtimes/' changes from 64c3003..553fa4c
jianghaolu Sep 26, 2016
0c73841
Merge commit '7997eaa0acff7c15a6954016e4ea7ffbe248bf33'
jianghaolu Sep 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ...entication/src/main/java/com/microsoft/azure/credentials/ApplicationTokenCredentials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ private enum CredentialSettings {
/** The base URL to the current Azure environment. */
BASE_URL("baseURL"),
/** The URL to Active Directory authentication. */
AUTH_URL("authURL");
AUTH_URL("authURL"),
/** The URL to Active Directory Graph. */
GRAPH_URL("graphURL");

/** The name of the key in the properties file. */
private final String name;
Expand Down Expand Up @@ -143,6 +145,7 @@ public static ApplicationTokenCredentials fromFile(File credentialsFile) throws
final String mgmtUri = authSettings.getProperty(CredentialSettings.MANAGEMENT_URI.toString());
final String authUrl = authSettings.getProperty(CredentialSettings.AUTH_URL.toString());
final String baseUrl = authSettings.getProperty(CredentialSettings.BASE_URL.toString());
final String graphUrl = authSettings.getProperty(CredentialSettings.GRAPH_URL.toString());
final String defaultSubscriptionId = authSettings.getProperty(CredentialSettings.SUBSCRIPTION_ID.toString());

return new ApplicationTokenCredentials(
Expand All @@ -153,7 +156,7 @@ public static ApplicationTokenCredentials fromFile(File credentialsFile) throws
authUrl,
mgmtUri,
baseUrl,
"https://graph.windows.net/") // TODO: cred file should contain GRAPH endpoint
graphUrl)
).withDefaultSubscriptionId(defaultSubscriptionId);
}

Expand Down