Compare commits

..

3 Commits

Author SHA1 Message Date
Tommy Parnell
b2094b9c4f bump version 2016-07-03 14:13:04 -04:00
Jack Tench
e51b69cf8f Allow custom scopes for Salesforce (#168)
* Pass list of scopes to Saleforce authorization endpoint to allow for customisation of scopes via existing configuration option.

* SalesforceAuthenticationHandler ensure Options.Scope not null
2016-07-03 10:42:27 -07:00
Tommy Parnell
c083049ce3 revert changes to the build for now 2016-07-03 13:42:35 -04:00
3 changed files with 10 additions and 14 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 = ENV['APPVEYOR_REPO_TAG_NAME'] || '0.0.1-alpha1'
@version = "2.7.0"
PROJECTS = Dir.glob('src/*').select{|dir| File.directory? dir }
desc 'Retrieve things'
@@ -63,16 +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'
return nil
end
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}"
sh "#{NUGET_EXE} push #{FileList["*.nupkg"].first}"
end

View File

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

View File

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