bump version

Adding Configurable Display type to Salesforce Auth Request

README.md

@@ -1,6 +1,6 @@
 [![Build status](https://ci.appveyor.com/api/projects/status/gjlkpp86t8dw164f?svg=true)](https://ci.appveyor.com/project/tparnell8/owinoauthproviders)
 
-#OWIN OAuth Providers
+# OWIN OAuth Providers
 
 Provides a set of extra authentication providers for OWIN ([Project Katana](http://katanaproject.codeplex.com/)).  This project includes providers for:
 - OAuth

Rakefile.rb

@@ -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.25.0"
 PROJECTS = Dir.glob('src/*').select{|dir| File.directory? dir }
 
 desc 'Retrieve things'

src/Owin.Security.Providers.Discord/DiscordAuthenticationHandler.cs

@@ -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))
                 {

src/Owin.Security.Providers.Discord/Provider/DiscordAuthenticatedContext.cs

@@ -39,7 +39,7 @@ namespace Owin.Security.Providers.Discord.Provider
             Discriminator = TryGetValue(user, "discriminator");
             Avatar = TryGetValue(user, "avatar");
             Email = TryGetValue(user, "email");
-            Verified = TryGetValue(user, "verified") == "true";
+            Verified = TryGetValue(user, "verified").ToLowerInvariant() == "true";
         }
 
         public string RefreshToken { get; set; }

src/Owin.Security.Providers.Salesforce/SalesforceAuthenticationHandler.cs

@@ -195,7 +195,7 @@ namespace Owin.Security.Providers.Salesforce
             var authorizationEndpoint = ComposeAuthorizationEndpoint(properties);
 
             authorizationEndpoint =
-                $"{authorizationEndpoint}?response_type={"code"}&client_id={Options.ClientId}&redirect_uri={HttpUtility.UrlEncode(redirectUri)}&display={"page"}&immediate={false}&state={Uri.EscapeDataString(state)}";
+                $"{authorizationEndpoint}?response_type={"code"}&client_id={Options.ClientId}&redirect_uri={HttpUtility.UrlEncode(redirectUri)}&display={Options.DisplayMode}&immediate={false}&state={Uri.EscapeDataString(state)}";
 
             if (Options.Scope != null && Options.Scope.Count > 0)
             {

src/Owin.Security.Providers.Salesforce/SalesforceAuthenticationOptions.cs

@@ -26,6 +26,21 @@ namespace Owin.Security.Providers.Salesforce
             public string Environment { get; set; }
         }
 
+        /// <summary>
+        /// Options for Display Mode
+        ///     Changes the login and authorization pages’ display type. Salesforce supports these values.
+        ///     page—Full-page authorization screen(default)
+        ///     popup—Compact dialog optimized for modern web browser popup windows
+        ///     touch—Mobile-optimized dialog designed for modern smartphones, such as Android and iPhone
+        ///     mobile—Mobile-optimized dialog designed for less capable smartphones, such as BlackBerry OS 5
+        /// </summary>
+        public enum Display{
+            page,
+            popup,
+            touch,
+            mobile
+        }
+        
         /// <summary>
         ///     Gets or sets the a pinned certificate validator to use to validate the endpoints used
         ///     in back channel communications belong to Salesforce.
@@ -110,6 +125,10 @@ namespace Owin.Security.Providers.Salesforce
         ///     <see cref="System.Security.Claims.ClaimsIdentity" />.
         /// </summary>
         public string SignInAsAuthenticationType { get; set; }
+        /// <summary>
+        ///     Gets or sets the display—(Optional) 
+        /// </summary>
+        public Display DisplayMode { get; set; }
 
         /// <summary>
         ///     Gets or sets the type used to secure data handled by the middleware.

src/Owin.Security.Providers.Steam/SteamAuthenticationHandler.cs

@@ -10,7 +10,7 @@ namespace Owin.Security.Providers.Steam
 {
     internal sealed class SteamAuthenticationHandler : OpenIDAuthenticationHandlerBase<SteamAuthenticationOptions>
     {
-        private readonly Regex _accountIDRegex = new Regex(@"^http://steamcommunity\.com/openid/id/(7[0-9]{15,25})$", RegexOptions.Compiled);
+        private readonly Regex _accountIDRegex = new Regex(@"^https?://steamcommunity\.com/openid/id/(7[0-9]{15,25})$", RegexOptions.Compiled);
 
         private const string UserInfoUri = "http://api.steampowered.com/ISteamUser/GetPlayerSummaries/v0002/?key={0}&steamids={1}";
 

src/Owin.Security.Providers.Twitch/TwitchAuthenticationHandler.cs

@@ -60,8 +60,7 @@ namespace Owin.Security.Providers.Twitch
                     return new AuthenticationTicket(null, properties);
                 }
 
-                var requestPrefix = Request.Scheme + "://" + Request.Host;
-                var redirectUri = requestPrefix + Request.PathBase + Options.CallbackPath;
+                var redirectUri = GetRequestPrefix() + Request.PathBase + Options.CallbackPath;
 
                 // Build up the body for the token request
                 var body = new List<KeyValuePair<string, string>>
@@ -146,9 +145,7 @@ namespace Owin.Security.Providers.Twitch
 
             if (challenge == null) return Task.FromResult<object>(null);
             var baseUri =
-                Request.Scheme +
-                Uri.SchemeDelimiter +
-                Request.Host +
+                GetRequestPrefix() +
                 Request.PathBase;
 
             var currentUri =
@@ -237,5 +234,12 @@ namespace Owin.Security.Providers.Twitch
 
             return context.IsRequestCompleted;
         }
+
+        private string GetRequestPrefix()
+        {
+            return !String.IsNullOrEmpty(Options.RequestPrefix)
+                       ? Options.RequestPrefix
+                       : Request.Scheme + Uri.SchemeDelimiter + Request.Host;
+        }
     }
 }

src/Owin.Security.Providers.Twitch/TwitchAuthenticationOptions.cs

@@ -125,6 +125,11 @@ namespace Owin.Security.Providers.Twitch
         /// </summary>
         public bool ForceVerify { get; set; }
 
+        /// <summary>
+        ///     Gets or sets the Request prefix
+        /// </summary>
+        public string RequestPrefix { get; set; }
+
         /// <summary>
         ///     Initializes a new <see cref="TwitchAuthenticationOptions" />
         /// </summary>

src/Owin.Security.Providers.VKontakte/Provider/VKontakteAuthenticatedContext.cs

@@ -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;

src/Owin.Security.Providers.VKontakte/VKontakteAuthenticationHandler.cs

@@ -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();
 

src/Owin.Security.Providers.VKontakte/VKontakteAuthenticationOptions.cs

@@ -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;
         }
     }
 }