Skip to content

new provoder for Daemon type apps. #25

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

Open
lockelost wants to merge 7 commits into
base: master
Choose a base branch
from
Open

new provoder for Daemon type apps. #25

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d45f189
new provoder for Daemon type apps.
lockelost Oct 20, 2016
8c8a164
Project change. Added AdalDaemonAuthenticationProvider.cs
lockelost Oct 21, 2016
0c9ddbb
- Use AuthenticationContextWrapper
lockelost Oct 27, 2016
b88d157
Changed 'SilentlyAuthenticateUserAsync()'
lockelost Oct 27, 2016
9a27511
changed 'AcquireDaemonTokenSilentAsync' to 'AcquireTokenSilentAsync'
lockelost Nov 1, 2016
3db43c1
changed AcquireDaemonTokenSilentAsync to AcquireTokenSilentAsync
lockelost Nov 1, 2016
51fa3a5
typo changes
lockelost Nov 1, 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
14 changes: 7 additions & 7 deletions src/OneDrive.Sdk.Authentication.Desktop/Business/AdalDaemonAuthenticationProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ public class AdalDaemonAuthenticationProvider : AdalAuthenticationProviderBase
{
private const int _retryCount = 3;
private const int _retrySleepDuration = 3000;
string _clientId;
string _clientKey;
protected string _clientId;
protected string _clientKey;

public IAuthenticationContextWrapper authContextWrapper;
ClientCredential clientCredential;
protected ClientCredential clientCredential;

protected override AuthenticateUserDelegate AuthenticateUser { get; set; }
protected override AuthenticateUserSilentlyDelegate AuthenticateUserSilently { get; set; }
Expand All @@ -44,8 +44,8 @@ public AdalDaemonAuthenticationProvider(
_clientKey = clientSecret;

string authority = String.Format(CultureInfo.InvariantCulture, "https://login.microsoftonline.com/{0}", tenant);
authContextWrapper = authenticationContextWrapper;
clientCredential = new ClientCredential(_clientId, _clientKey);
this.authContextWrapper = authenticationContextWrapper;
this.clientCredential = new ClientCredential(_clientId, _clientKey);
Copy link
Contributor

@cdmayer cdmayer Nov 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this.clientCredential = new ClientCredential(this._clientId, this._clientKey);

Please look for this everywhere in the file. Instance members and methods should always have this.


Copy link
Contributor

@cdmayer cdmayer Oct 26, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only 1 extra line

this.AuthenticateUser = this.PromptUserForAuthenticationAsync;
this.AuthenticateUserSilently = this.SilentlyAuthenticateUserAsync;
Expand All @@ -63,7 +63,7 @@ public async Task AuthenticateUserAsync(string serviceResourceId)
retry = false;
try
{
result = await this.authContextWrapper.AcquireDaemonTokenSilentAsync(
result = await this.authContextWrapper.AcquireTokenSilentAsync(
serviceResourceId,
clientCredential);
}
Expand Down Expand Up @@ -99,7 +99,7 @@ private async Task<IAuthenticationResult> SilentlyAuthenticateUserAsync(
string userId,
bool throwOnError)
{
var result = await this.authContextWrapper.AcquireDaemonTokenSilentAsync(
var result = await this.authContextWrapper.AcquireTokenSilentAsync(
serviceResourceId,
clientCredential);
return result;
Expand Down
2 changes: 1 addition & 1 deletion src/OneDrive.Sdk.Authentication.Desktop/Business/AuthenticationContextWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public ITokenCache TokenCache
/// <param name="resource">The resource to authenticate against.</param>
/// <param name="clientCredential">The client credential of the application.</param>
/// <returns>The <see cref="IAuthenticationResult"/>.</returns>
public async Task<IAuthenticationResult> AcquireDaemonTokenSilentAsync(string resource, ClientCredential clientCredential)
public async Task<IAuthenticationResult> AcquireTokenSilentAsync(string resource, ClientCredential clientCredential)
Copy link
Contributor

@cdmayer cdmayer Nov 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yikes sorry, this should actually be AcquireTokenAsync. It should match the call to AuthenticationContext to make it a little easier for the client to figure out what's happening under the covers. Sorry if I gave you the wrong name before :(

{
var result = await this.authenticationContext.AcquireTokenAsync(resource, clientCredential).ConfigureAwait(false);
return result == null ? null : new AuthenticationResultWrapper(result);
Expand Down
2 changes: 1 addition & 1 deletion src/OneDrive.Sdk.Authentication.Desktop/Business/IAuthenticationContextWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public interface IAuthenticationContextWrapper
/// <param name="resource">The resource to authenticate against.</param>
/// <param name="clientCredential">The client credential of the application.</param>
/// <returns>The <see cref="IAuthenticationResult"/>.</returns>
Task<IAuthenticationResult> AcquireDaemonTokenSilentAsync(string resource, ClientCredential clientCredential);
Task<IAuthenticationResult> AcquireTokenSilentAsync(string resource, ClientCredential clientCredential);

/// <summary>
/// Authenticates the user silently using <see cref="AuthenticationContext.AcquireTokenSilentAsync(string, string, UserIdentifier)"/>.
Expand Down