Merge pull request #1 from pakwfoley/pfoley/IAM-1697

Remove changes from doorkeeper PR doorkeeper-gem#1003
pakwfoley · Apr 5, 2018 · 50d81d2 · 50d81d2
2 parents 7a44f73 + bd74ee0
commit 50d81d2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/lib/doorkeeper/rails/routes.rb b/lib/doorkeeper/rails/routes.rb
@@ -51,7 +51,7 @@ def authorization_routes(mapping)
  as: mapping[:as],
  controller: mapping[:controllers]
  ) do
- routes.get '/native', action: :show, on: :member
+ routes.get '/:code', action: :show, on: :member
  routes.get '/', action: :new, on: :member
  end
  end

diff --git a/spec/controllers/authorizations_controller_spec.rb b/spec/controllers/authorizations_controller_spec.rb
@@ -229,7 +229,7 @@ def translated_error_message(key)
 
  it 'should redirect immediately' do
  expect(response).to be_redirect
- expect(response.location).to match(/oauth\/authorize\/native\?code=#{Doorkeeper::AccessGrant.first.token}/)
+ expect(response.location).to match(/oauth\/authorize\//)
  end
 
  it 'should issue a grant' do

diff --git a/spec/requests/flows/authorization_code_spec.rb b/spec/requests/flows/authorization_code_spec.rb
@@ -29,7 +29,6 @@
 
  access_grant_should_exist_for(@client, @resource_owner)
 
- url_should_have_param('code', Doorkeeper::AccessGrant.first.token)
  i_should_see 'Authorization code:'
  i_should_see Doorkeeper::AccessGrant.first.token
  end