Compare commits

...

4 Commits

Author SHA1 Message Date
Tommy Parnell
900c80a98f bump version 2018-04-01 02:25:35 -04:00
Wouter Van Speybroeck
f60e8b5ffa NameIDentifier should use Id from context instead of username (#232) 2018-04-01 02:25:11 -04:00
Tommy Parnell
c74cd15808 bump version 2018-03-06 21:24:46 -05:00
imaleksandr
26a690060a The "v" parameter with version number becomes obligatory for all API requests. An error will be returned if the parameter is not sent. (#228) 2018-03-06 21:24:17 -05:00
5 changed files with 19 additions and 9 deletions

View File

@@ -15,7 +15,7 @@ PACKAGES = File.expand_path("packages")
TOOLS = File.expand_path("tools")
NUGET = File.expand_path("#{TOOLS}/nuget")
NUGET_EXE = File.expand_path("#{TOOLS}/nuget/nuget.exe")
@version = "2.20.0"
@version = "2.22.0"
PROJECTS = Dir.glob('src/*').select{|dir| File.directory? dir }
desc 'Retrieve things'

View File

@@ -105,7 +105,7 @@ namespace Owin.Security.Providers.Discord
};
if (!string.IsNullOrEmpty(context.Id))
{
context.Identity.AddClaim(new Claim(ClaimTypes.NameIdentifier, context.UserName, XmlSchemaString, Options.AuthenticationType));
context.Identity.AddClaim(new Claim(ClaimTypes.NameIdentifier, context.Id, XmlSchemaString, Options.AuthenticationType));
}
if (!string.IsNullOrEmpty(context.UserName))
{

View File

@@ -25,7 +25,7 @@ namespace Owin.Security.Providers.VKontakte.Provider
User = user;
AccessToken = accessToken;
Id = TryGetValue(user, "uid");
Id = TryGetValue(user, "id");
var firstName = TryGetValue(user, "first_name");
var lastName = TryGetValue(user, "last_name");
UserName = firstName + " " + lastName;

View File

@@ -61,7 +61,7 @@ namespace Owin.Security.Providers.VKontakte
var state = Options.StateDataFormat.Protect(properties);
var authorizationEndpoint =
$"{Options.Endpoints.AuthorizationEndpoint}?client_id={Uri.EscapeDataString(Options.ClientId)}&redirect_uri={Uri.EscapeDataString(redirectUri)}&scope={Uri.EscapeDataString(scope)}&state={Uri.EscapeDataString(state)}&display={Uri.EscapeDataString(Options.Display)}";
$"{Options.Endpoints.AuthorizationEndpoint}?client_id={Uri.EscapeDataString(Options.ClientId)}&redirect_uri={Uri.EscapeDataString(redirectUri)}&scope={Uri.EscapeDataString(scope)}&state={Uri.EscapeDataString(state)}&display={Uri.EscapeDataString(Options.Display)}&v={Uri.EscapeDataString(Options.ApiVersion)}";
Response.Redirect(authorizationEndpoint);
@@ -156,7 +156,7 @@ namespace Owin.Security.Providers.VKontakte
// Get the VK user
var userRequestUri = new Uri(
$"{Options.Endpoints.UserInfoEndpoint}?access_token={Uri.EscapeDataString(accessToken)}&user_id{userId}");
$"{Options.Endpoints.UserInfoEndpoint}?access_token={Uri.EscapeDataString(accessToken)}&user_id{userId}&v={Uri.EscapeDataString(Options.ApiVersion)}");
var userResponse = await _httpClient.GetAsync(userRequestUri, Request.CallCancelled);
userResponse.EnsureSuccessStatusCode();

View File

@@ -14,6 +14,7 @@ namespace Owin.Security.Providers.VKontakte
private const string UserInfoEndpoint = "https://api.vk.com/method/users.get";
private const string DefaultCallbackPath = "/signin-vkontakte";
private const string DefaultDisplayMode = "page";
private const string DefaultApiVersion = "5.73";
/// <summary>
/// Gets or sets the a pinned certificate validator to use to validate the endpoints used
@@ -100,10 +101,18 @@ namespace Owin.Security.Providers.VKontakte
/// </summary>
public ISecureDataFormat<AuthenticationProperties> StateDataFormat { get; set; }
/// <summary>
/// Initializes a new <see cref="VKontakteAuthenticationOptions" />
/// </summary>
public VKontakteAuthenticationOptions()
/// <summary>
/// Default API version. Required.
/// </summary>
/// <remarks>
/// Defaults to 5.73
/// </remarks>
public string ApiVersion { get; set; }
/// <summary>
/// Initializes a new <see cref="VKontakteAuthenticationOptions" />
/// </summary>
public VKontakteAuthenticationOptions()
: base(Constants.DefaultAuthenticationType)
{
Caption = Constants.DefaultAuthenticationType;
@@ -118,6 +127,7 @@ namespace Owin.Security.Providers.VKontakte
TokenEndpoint = TokenEndpoint,
UserInfoEndpoint = UserInfoEndpoint
};
ApiVersion = DefaultApiVersion;
}
}
}