Skip to content

Commit

Permalink
Merge pull request Azure#42 from Azure/sdk_1008
Browse files Browse the repository at this point in the history
[Automatic PR] SDK changes from pull request Azure#1008
  • Loading branch information
jianghaolu authored Sep 13, 2016
2 parents 3010c5c + 65a9fd6 commit 524db4a
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
* Token based credentials for use with a REST Service Client.
*/
public class ApplicationTokenCredentials extends TokenCredentials {
/** The endpoint of the target resource. */
private String resourceEndpoint;
/** The active directory application client id. */
private String clientId;
/** The tenant or domain the containing the application. */
Expand Down Expand Up @@ -56,6 +58,30 @@ public ApplicationTokenCredentials(String clientId, String domain, String secret
} else {
this.environment = environment;
}
this.resourceEndpoint = this.environment.getTokenAudience();
}

/**
* Initializes a new instance of the UserTokenCredentials.
*
* @param clientId the active directory application client id.
* @param domain the domain or tenant id containing this application.
* @param secret the authentication secret for the application.
* @param resourceEndpoint the endpoint of the target resource.
* @param environment the Azure environment to authenticate with.
* If null is provided, AzureEnvironment.AZURE will be used.
*/
public ApplicationTokenCredentials(String clientId, String domain, String secret, String resourceEndpoint, AzureEnvironment environment) {
super(null, null); // defer token acquisition
this.clientId = clientId;
this.domain = domain;
this.secret = secret;
this.resourceEndpoint = resourceEndpoint;
if (environment == null) {
this.environment = AzureEnvironment.AZURE;
} else {
this.environment = environment;
}
}

/**
Expand Down Expand Up @@ -212,7 +238,7 @@ private void acquireAccessToken() throws IOException {
AuthenticationContext context = new AuthenticationContext(authorityUrl, this.getEnvironment().isValidateAuthority(), executor);
try {
authenticationResult = context.acquireToken(
this.getEnvironment().getTokenAudience(),
this.resourceEndpoint,
new ClientCredential(this.getClientId(), this.getSecret()),
null).get();
} catch (Exception e) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
* Token based credentials for use with a REST Service Client.
*/
public class UserTokenCredentials extends TokenCredentials {
/** The endpoint of the target resource. */
private String resourceEndpoint;
/** The Active Directory application client id. */
private String clientId;
/** The domain or tenant id containing this application. */
Expand Down Expand Up @@ -59,6 +61,34 @@ public UserTokenCredentials(String clientId, String domain, String username, Str
} else {
this.environment = environment;
}
this.resourceEndpoint = this.environment.getTokenAudience();
}

/**
* Initializes a new instance of the UserTokenCredentials.
*
* @param clientId the active directory application client id.
* @param domain the domain or tenant id containing this application.
* @param username the user name for the Organization Id account.
* @param password the password for the Organization Id account.
* @param clientRedirectUri the Uri where the user will be redirected after authenticating with AD.
* @param resourceEndpoint the endpoint of the target resource.
* @param environment the Azure environment to authenticate with.
* If null is provided, AzureEnvironment.AZURE will be used.
*/
public UserTokenCredentials(String clientId, String domain, String username, String password, String clientRedirectUri, String resourceEndpoint, AzureEnvironment environment) {
super(null, null); // defer token acquisition
this.clientId = clientId;
this.domain = domain;
this.username = username;
this.password = password;
this.clientRedirectUri = clientRedirectUri;
this.resourceEndpoint = resourceEndpoint;
if (environment == null) {
this.environment = AzureEnvironment.AZURE;
} else {
this.environment = environment;
}
}

/**
Expand Down Expand Up @@ -136,7 +166,7 @@ private void acquireAccessToken() throws IOException {
AuthenticationContext context = new AuthenticationContext(authorityUrl, this.getEnvironment().isValidateAuthority(), Executors.newSingleThreadExecutor());
try {
authenticationResult = context.acquireToken(
this.getEnvironment().getTokenAudience(),
this.resourceEndpoint,
this.getClientId(),
this.getUsername(),
this.getPassword(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public AzureEnvironment(
* Provides the settings for authentication with Azure.
*/
public static final AzureEnvironment AZURE = new AzureEnvironment(
"https://login.windows.net/",
"https://login.microsoftonline.com/",
"https://management.core.windows.net/",
true,
"https://management.azure.com/");
Expand Down

0 comments on commit 524db4a

Please sign in to comment.