bump version

* Get incoming webhook object infomation from reponse.

* Null check for incoming webhook object

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 = ENV['APPVEYOR_REPO_TAG_NAME'] || '0.0.1-alpha1'
+@version = "2.8.0"
 PROJECTS = Dir.glob('src/*').select{|dir| File.directory? dir }
 
 desc 'Retrieve things'
@@ -63,17 +63,10 @@ end
 
 desc 'publish nugets'
 task :nuspec_publish do
- if ENV['APPVEYOR_REPO_TAG'] != 'true'
-  puts 'not publishing since APPVEYOR_REPO_TAG has not been set. Please add a github tag'
-  else
   PROJECTS.each{|dir|
     Dir.chdir(dir) do
-      sh "#{NUGET_EXE} push #{FileList["*.nupkg"].first} -ApiKey #{NUGET_KEY}"
+      sh "#{NUGET_EXE} push #{FileList["*.nupkg"].first}"
     end
   }
-  sh "#{NUGET_EXE} push #{FileList["*.nupkg"].first} -ApiKey #{NUGET_KEY}"
- end
-
-
-  
+  sh "#{NUGET_EXE} push #{FileList["*.nupkg"].first}"
 end

appveyor.yml

@@ -5,9 +5,6 @@ install:
   - set PATH=C:\Ruby22\bin;%PATH%
   - bundle install
 build_script:
-  - rake publish
+  - rake preflight
 artifacts:
 - path: src\**\*.nupkg
-environment:
-  NUGET_KEY:
-    secure: 5m1zupizmNvVwCg2MDUkRGQbbVfNypLo9yCstTAXQ5KHDypBe5RrGKi1HnEAhAy8

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

@@ -187,7 +187,12 @@ namespace Owin.Security.Providers.Salesforce
             var state = Options.StateDataFormat.Protect(properties);
 
             var authorizationEndpoint =
-                $"{Options.Endpoints.AuthorizationEndpoint}?response_type={"code"}&client_id={Options.ClientId}&redirect_uri={HttpUtility.UrlEncode(redirectUri)}&display={"page"}&immediate={false}&state={Uri.EscapeDataString(state)}&scope={""}";
+                $"{Options.Endpoints.AuthorizationEndpoint}?response_type={"code"}&client_id={Options.ClientId}&redirect_uri={HttpUtility.UrlEncode(redirectUri)}&display={"page"}&immediate={false}&state={Uri.EscapeDataString(state)}";
+
+            if (Options.Scope != null && Options.Scope.Count > 0)
+            {
+                authorizationEndpoint += $"&scope={string.Join(" ", Options.Scope)}";
+            }
 
             if (Options.Prompt != null)
             {

src/Owin.Security.Providers.SlackProvider/Provider/SlackAuthenticatedContext.cs

@@ -16,7 +16,8 @@ namespace Owin.Security.Providers.Slack.Provider
         /// <param name="user">The JSON-serialized user</param>
         /// <param name="accessToken">Slack Access token</param>
         /// <param name="scope">Indicates access level of application</param>
-        public SlackAuthenticatedContext(IOwinContext context, JObject user, string accessToken, string scope)
+        /// <param name="incomingWebhook">Contains channel infomation about the choosen default channel</param>
+        public SlackAuthenticatedContext(IOwinContext context, JObject user, string accessToken, string scope, JObject incomingWebhook)
             : base(context)
         {
             User = user;
@@ -28,6 +29,14 @@ namespace Owin.Security.Providers.Slack.Provider
             TeamId = TryGetValue(user, "team_id");
             TeamName = TryGetValue(user, "team");
             TeamUrl = TryGetValue(user, "url");
+            if (incomingWebhook != null)
+            {
+                ChannelId = TryGetValue(incomingWebhook, "channel_id");
+                ChannelName = TryGetValue(incomingWebhook, "channel");
+                ConfigurationUrl = TryGetValue(incomingWebhook, "configuration_url");
+                HooksUrl = TryGetValue(incomingWebhook, "url");
+            }
+
         }
 
         /// <summary>
@@ -73,6 +82,27 @@ namespace Owin.Security.Providers.Slack.Provider
         /// </summary>
         public string UserName { get; private set; }
 
+
+        /// <summary>
+        /// Gets the name of the channel choose at oauth time
+        /// </summary>
+        public string ChannelName { get; private set; }
+
+        /// <summary>
+        /// Gets the channel ID of the channel choosen at oauth time
+        /// </summary>
+        public string ChannelId { get; private set; }
+
+        /// <summary>
+        /// Gets the confiquration url
+        /// </summary>
+        public string ConfigurationUrl { get; private set; }
+
+        /// <summary>
+        /// Gets the hook url
+        /// </summary>
+        public string HooksUrl { get; private set; }
+
         /// <summary>
         /// Gets the <see cref="ClaimsIdentity"/> representing the user
         /// </summary>

src/Owin.Security.Providers.SlackProvider/SlackAuthenticationHandler.cs

@@ -95,7 +95,7 @@ namespace Owin.Security.Providers.Slack
                 dynamic response = JsonConvert.DeserializeObject<dynamic>(text);
                 var accessToken = (string)response.access_token;
                 var scope = (string)response.scope;
-
+                var incomingWebhookChannelInfo = response.incoming_webhook;
                 // Get the Slack user
                 var userRequest = new HttpRequestMessage(HttpMethod.Get, UserInfoEndpoint + "?token=" + Uri.EscapeDataString(accessToken));
 
@@ -104,7 +104,7 @@ namespace Owin.Security.Providers.Slack
                 text = await userResponse.Content.ReadAsStringAsync();
                 var user = JObject.Parse(text);
 
-                var context = new SlackAuthenticatedContext(Context, user, accessToken, scope)
+                var context = new SlackAuthenticatedContext(Context, user, accessToken, scope, incomingWebhookChannelInfo)
                 {
                     Identity = new ClaimsIdentity(
                         Options.AuthenticationType,
@@ -131,6 +131,10 @@ namespace Owin.Security.Providers.Slack
                 {
                     context.Identity.AddClaim(new Claim(ClaimTypes.Webpage, context.TeamUrl, XmlSchemaString, Options.AuthenticationType));
                 }
+                if (!string.IsNullOrEmpty(context.ChannelId))
+                {
+                    context.Identity.AddClaim(new Claim("urn:slack:channel_id", context.ChannelId, XmlSchemaString, Options.AuthenticationType));
+                }
                 context.Properties = properties;
 
                 await Options.Provider.Authenticated(context);