devise-doorkeeper 1.1.1 → 1.1.2.ci.30.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +13 -5
  2. data/lib/devise/doorkeeper.rb +4 -4
  3. data/lib/devise/doorkeeper/doorkeeper_failure_app.rb +7 -4
  4. data/lib/devise/doorkeeper/version.rb +1 -1
  5. data/spec/dummy/app/services/custom_failure_app.rb +7 -0
  6. data/spec/dummy/config/initializers/devise.rb +3 -0
  7. data/spec/requests/oauth/bearer_tokens_spec.rb +2 -1
  8. metadata +40 -38
checksums.yaml CHANGED
@@ -1,7 +1,15 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: c716f6fe07604df7601700f23e7234552432ef9b
4
- data.tar.gz: 1e811c9bb792a950a5d628652ba74359ab738100
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ ZmUxMjdmNWEyNDRhMjA1N2VmOWRjZGZjMjUxNmVlZjYwZjhlNzA3MQ==
5
+ data.tar.gz: !binary |-
6
+ ZTkzOGNmM2Y0OTQzMmM5YzhkMzNkMWIwYzhiZDk2MGQ5OTkxYjhiMQ==
5
7
  SHA512:
6
- metadata.gz: 89b26391b24a799866b93f0a034d97440ff8cf8c8a822654b85db026c36d50eda33a96938e9dbfc561b6af4e3f8c2c7d4bdeb9e1e0f752b59d06bafba1105630
7
- data.tar.gz: 0c636b1c194f77fb0f5c32d0607a0849fb41901b7c3a03e82b9f1e39c150a40dc6b35c7312d8c220e8304efda3b16e3db176ec4c5681663de13754c5c590da07
8
+ metadata.gz: !binary |-
9
+ Mjc1NDI5NGIyNjIzNTQzNTA2NzAzZDFkMzI0OWJkM2QyY2MxY2U4MTRiNzFj
10
+ NjU0MjZkZGNkZmE4ZjhiMWNiZWZhNDY5OTBkM2RlNTk0YzM5NjM5MGVmNTUx
11
+ ODRmYzE1ZjlhYWU3MjQ0MjliODFhNTUyMDBkNjg2NjUyYjg4MmM=
12
+ data.tar.gz: !binary |-
13
+ ZGIwYzBmNDUwY2ZmZjk4OTI1YTBkNDIwMzZmOWE3Y2NhZGVhOTMxYjdiNDNh
14
+ ODg5OWFjZGZkYmZhZWM2NmEwNTdjZThlZWJlMzQwZjQzODE2NzgyMDBjMDM3
15
+ MDlhZDViYTYzYzcwMTYwNWU3Mjg3MDgxYjYzODUyYjhlYjlkODY=
data/lib/devise/doorkeeper.rb CHANGED
@@ -1,15 +1,15 @@
1
1
  require 'devise/doorkeeper/version'
2
2
  require 'devise/strategies/doorkeeper'
3
+ require 'devise/doorkeeper/doorkeeper_failure_app'
3
4
 
4
5
  module Devise
5
6
  module Doorkeeper
7
+ # configure devise to support doorkeeper error responses
6
8
  def self.configure_devise(config)
7
- config.warden do |manager|
8
- require 'devise/doorkeeper/doorkeeper_failure_app'
9
- manager.failure_app = Devise::Doorkeeper::DoorkeeperFailureApp
10
- end
9
+ Devise::FailureApp.prepend(Devise::Doorkeeper::DoorkeeperFailureApp)
11
10
  end
12
11
 
12
+ # configure doorkeeper to use devise authentication
13
13
  def self.configure_doorkeeper(base)
14
14
  base.instance_eval do
15
15
  resource_owner_authenticator do
data/lib/devise/doorkeeper/doorkeeper_failure_app.rb CHANGED
@@ -1,11 +1,10 @@
1
- require 'devise/failure_app'
2
1
  require 'devise/strategies/doorkeeper'
3
2
 
4
3
  module Devise
5
4
  module Doorkeeper
6
- class DoorkeeperFailureApp < ::Devise::FailureApp
5
+ module DoorkeeperFailureApp
7
6
  def respond
8
- if warden_message == Devise::Strategies::Doorkeeper::WARDEN_INVALID_TOKEN_MESSAGE
7
+ if oauth_error?
9
8
  invalid_oauth_token
10
9
  else
11
10
  super
@@ -14,11 +13,15 @@ module Devise
14
13
 
15
14
  private
16
15
 
16
+ def oauth_error?
17
+ warden_message == Devise::Strategies::Doorkeeper::WARDEN_INVALID_TOKEN_MESSAGE
18
+ end
19
+
17
20
  def invalid_oauth_token
18
21
  error = ::Doorkeeper::OAuth::InvalidTokenResponse.new
19
22
  headers.merge! error.headers
20
23
  self.response_body = error.body.to_json
21
- self.status = error.status
24
+ self.status = error.status
22
25
  end
23
26
  end
24
27
  end
data/lib/devise/doorkeeper/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Devise
2
2
  module Doorkeeper
3
- VERSION = '1.1.1'
3
+ VERSION = '1.1.2'
4
4
  end
5
5
  end
data/spec/dummy/app/services/custom_failure_app.rb ADDED
@@ -0,0 +1,7 @@
1
+ class CustomFailureApp < Devise::FailureApp
2
+ # test that sublclassing FailureApp works properly
3
+ def respond
4
+ super
5
+ Rails.logger.info('Testing error flow')
6
+ end
7
+ end
data/spec/dummy/config/initializers/devise.rb CHANGED
@@ -244,6 +244,9 @@ Devise.setup do |config|
244
244
  # manager.intercept_401 = false
245
245
  # manager.default_strategies(scope: :user).unshift :some_external_strategy
246
246
  # end
247
+ config.warden do |manager|
248
+ manager.failure_app = CustomFailureApp
249
+ end
247
250
 
248
251
  # ==> Mountable engine configurations
249
252
  # When using Devise inside an engine, let's call it `MyEngine`, and this engine
data/spec/requests/oauth/bearer_tokens_spec.rb CHANGED
@@ -35,7 +35,8 @@ RSpec.describe 'OAuth bearer token requests', type: :request do
35
35
  get request_path, params, headers
36
36
  end
37
37
  it { expect(response.status).to eq 401 }
38
- it { expect(response.headers).to include('WWW-Authenticate' => 'Bearer realm="DeviseDoorkeeperApp", error="invalid_token", error_description="The access token is invalid"') }
38
+ it { expect(response.headers['WWW-Authenticate']).to eq 'Bearer realm="DeviseDoorkeeperApp", error="invalid_token", error_description="The access token is invalid"' }
39
+ it { expect(response.body).to eq '{"error":"invalid_token","error_description":"The access token is invalid","state":"unauthorized"}' }
39
40
  end
40
41
  context 'with revoked access token' do
41
42
  with :access_token, revoked_at: 1.year.ago
metadata CHANGED
@@ -1,222 +1,222 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: devise-doorkeeper
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.1
4
+ version: 1.1.2.ci.30.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ryan Sonnek
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-07-06 00:00:00.000000000 Z
11
+ date: 2016-07-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ">="
17
+ - - ! '>='
18
18
  - !ruby/object:Gem::Version
19
19
  version: '0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ">="
24
+ - - ! '>='
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: devise
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ">="
31
+ - - ! '>='
32
32
  - !ruby/object:Gem::Version
33
33
  version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ">="
38
+ - - ! '>='
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: doorkeeper
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ">="
45
+ - - ! '>='
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ">="
52
+ - - ! '>='
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: bundler
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - "~>"
59
+ - - ~>
60
60
  - !ruby/object:Gem::Version
61
61
  version: '1.7'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - "~>"
66
+ - - ~>
67
67
  - !ruby/object:Gem::Version
68
68
  version: '1.7'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rspec-rails
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ">="
73
+ - - ! '>='
74
74
  - !ruby/object:Gem::Version
75
75
  version: '0'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ">="
80
+ - - ! '>='
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: factory_girl_rails
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ">="
87
+ - - ! '>='
88
88
  - !ruby/object:Gem::Version
89
89
  version: '0'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ">="
94
+ - - ! '>='
95
95
  - !ruby/object:Gem::Version
96
96
  version: '0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: factory_girl_rspec
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ">="
101
+ - - ! '>='
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0'
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - ">="
108
+ - - ! '>='
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: faker
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ">="
115
+ - - ! '>='
116
116
  - !ruby/object:Gem::Version
117
117
  version: '0'
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - ">="
122
+ - - ! '>='
123
123
  - !ruby/object:Gem::Version
124
124
  version: '0'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: json_spec
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - ">="
129
+ - - ! '>='
130
130
  - !ruby/object:Gem::Version
131
131
  version: '0'
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - ">="
136
+ - - ! '>='
137
137
  - !ruby/object:Gem::Version
138
138
  version: '0'
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: sqlite3
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - ">="
143
+ - - ! '>='
144
144
  - !ruby/object:Gem::Version
145
145
  version: '0'
146
146
  type: :development
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - ">="
150
+ - - ! '>='
151
151
  - !ruby/object:Gem::Version
152
152
  version: '0'
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: coveralls
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - ">="
157
+ - - ! '>='
158
158
  - !ruby/object:Gem::Version
159
159
  version: '0'
160
160
  type: :development
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - ">="
164
+ - - ! '>='
165
165
  - !ruby/object:Gem::Version
166
166
  version: '0'
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: pry
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
- - - ">="
171
+ - - ! '>='
172
172
  - !ruby/object:Gem::Version
173
173
  version: '0'
174
174
  type: :development
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
- - - ">="
178
+ - - ! '>='
179
179
  - !ruby/object:Gem::Version
180
180
  version: '0'
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: rake
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
- - - "~>"
185
+ - - ~>
186
186
  - !ruby/object:Gem::Version
187
187
  version: '10.0'
188
188
  type: :development
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - "~>"
192
+ - - ~>
193
193
  - !ruby/object:Gem::Version
194
194
  version: '10.0'
195
195
  - !ruby/object:Gem::Dependency
196
196
  name: travis
197
197
  requirement: !ruby/object:Gem::Requirement
198
198
  requirements:
199
- - - ">="
199
+ - - ! '>='
200
200
  - !ruby/object:Gem::Version
201
201
  version: '0'
202
202
  type: :development
203
203
  prerelease: false
204
204
  version_requirements: !ruby/object:Gem::Requirement
205
205
  requirements:
206
- - - ">="
206
+ - - ! '>='
207
207
  - !ruby/object:Gem::Version
208
208
  version: '0'
209
- description: " Support authentication via OAuth2 tokens dispensed from the Doorkeeper
210
- authorization flow "
209
+ description: ! ' Support authentication via OAuth2 tokens dispensed from the Doorkeeper
210
+ authorization flow '
211
211
  email:
212
212
  - ryan@codecrate.com
213
213
  executables: []
214
214
  extensions: []
215
215
  extra_rdoc_files: []
216
216
  files:
217
- - ".gitignore"
218
- - ".ruby-version"
219
- - ".travis.yml"
217
+ - .gitignore
218
+ - .ruby-version
219
+ - .travis.yml
220
220
  - Gemfile
221
221
  - LICENSE.txt
222
222
  - README.md
@@ -241,6 +241,7 @@ files:
241
241
  - spec/dummy/app/models/.keep
242
242
  - spec/dummy/app/models/concerns/.keep
243
243
  - spec/dummy/app/models/user.rb
244
+ - spec/dummy/app/services/custom_failure_app.rb
244
245
  - spec/dummy/app/views/layouts/application.html.erb
245
246
  - spec/dummy/app/views/welcome/index.html.erb
246
247
  - spec/dummy/bin/bundle
@@ -300,14 +301,14 @@ require_paths:
300
301
  - lib
301
302
  required_ruby_version: !ruby/object:Gem::Requirement
302
303
  requirements:
303
- - - ">="
304
+ - - ! '>='
304
305
  - !ruby/object:Gem::Version
305
306
  version: '0'
306
307
  required_rubygems_version: !ruby/object:Gem::Requirement
307
308
  requirements:
308
- - - ">="
309
+ - - ! '>'
309
310
  - !ruby/object:Gem::Version
310
- version: '0'
311
+ version: 1.3.1
311
312
  requirements: []
312
313
  rubyforge_project:
313
314
  rubygems_version: 2.4.5
@@ -330,6 +331,7 @@ test_files:
330
331
  - spec/dummy/app/models/.keep
331
332
  - spec/dummy/app/models/concerns/.keep
332
333
  - spec/dummy/app/models/user.rb
334
+ - spec/dummy/app/services/custom_failure_app.rb
333
335
  - spec/dummy/app/views/layouts/application.html.erb
334
336
  - spec/dummy/app/views/welcome/index.html.erb
335
337
  - spec/dummy/bin/bundle