vidibus-oauth2_server 0.0.6 → 0.0.7

Sign up to get free protection for your applications and to get access to all the features.
@@ -22,7 +22,11 @@ class Oauth2::AuthenticationController < Oauth2Controller
22
22
 
23
23
  def access_token
24
24
  token = Oauth2Token.find!(params)
25
- render :text => {:access_token => token.token}.to_uri, :type => :url_encoded_form, :status => :ok
25
+ render({
26
+ :text => {:access_token => token.token}.to_uri,
27
+ :content_type => 'application/x-www-form-urlencoded',
28
+ :status => :ok
29
+ })
26
30
  end
27
31
 
28
32
  protected
@@ -1,20 +1,30 @@
1
1
  class Oauth2::UsersController < Oauth2Controller
2
2
  before_filter :ensure_token!
3
- before_filter :find_user
3
+ before_filter :ensure_user
4
4
 
5
5
  def show
6
- attributes = @user.try!(:oauth_attributes) || @user.attributes.only(*%w[name email uuid])
6
+ attributes = user.try!(:oauth_attributes) || user.attributes.only(*%w[name email uuid])
7
7
  render :json => attributes
8
8
  end
9
9
 
10
10
  protected
11
11
 
12
- def find_user
13
- @user = User.where(:uuid => @access_token.user_id).first or render(:nothing => true, :status => :bad_request)
12
+ def user
13
+ @user ||= User.where(:uuid => @access_token.user_id).first
14
+ end
15
+
16
+ def ensure_user
17
+ unless user
18
+ render(:nothing => true, :status => :bad_request)
19
+ end
14
20
  end
15
21
 
16
22
  def ensure_token!
17
- unless token = params[:access_token] || params[:oauth_token]
23
+ if header = request.headers['Authorization']
24
+ token = header[/Bearer (.+)/, 1]
25
+ end
26
+ token ||= params[:access_token] || params[:oauth_token]
27
+ unless token
18
28
  raise Vidibus::Oauth2Server::MissingTokenError
19
29
  end
20
30
  @access_token = Oauth2Token.find!(:token => token)
data/config/routes.rb CHANGED
@@ -1,5 +1,6 @@
1
1
  Rails.application.routes.draw do
2
2
  get '/oauth/authorize' => 'oauth2/authentication#authorize'
3
+ match '/oauth/token' => 'oauth2/authentication#access_token', :via => [:get, :post]
3
4
  match '/oauth/access_token' => 'oauth2/authentication#access_token', :via => [:get, :post]
4
5
  match '/oauth/oauth_token' => 'oauth2/authentication#access_token', :via => [:get, :post]
5
6
  get '/oauth/user' => 'oauth2/users#show'
@@ -1,5 +1,5 @@
1
1
  module Vidibus
2
2
  module Oauth2Server
3
- VERSION = '0.0.6'
3
+ VERSION = '0.0.7'
4
4
  end
5
5
  end
@@ -19,6 +19,7 @@ module Vidibus
19
19
 
20
20
  class InvalidTokenError < Oauth2ServerError; end
21
21
  class ExpiredTokenError < Oauth2ServerError; end
22
+ class MissingTokenError < Oauth2ServerError; end
22
23
 
23
24
  FLOWS = %w[web_server code authorization_code]
24
25
  end
metadata CHANGED
@@ -1,174 +1,182 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: vidibus-oauth2_server
3
- version: !ruby/object:Gem::Version
4
- hash: 19
5
- prerelease: false
6
- segments:
7
- - 0
8
- - 0
9
- - 6
10
- version: 0.0.6
3
+ version: !ruby/object:Gem::Version
4
+ version: 0.0.7
5
+ prerelease:
11
6
  platform: ruby
12
- authors:
7
+ authors:
13
8
  - Andre Pankratz
14
9
  autorequire:
15
10
  bindir: bin
16
11
  cert_chain: []
17
-
18
- date: 2012-02-13 00:00:00 +01:00
19
- default_executable:
20
- dependencies:
21
- - !ruby/object:Gem::Dependency
12
+ date: 2016-01-03 00:00:00.000000000 Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
22
15
  name: rails
23
- prerelease: false
24
- requirement: &id001 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
25
17
  none: false
26
- requirements:
18
+ requirements:
27
19
  - - ~>
28
- - !ruby/object:Gem::Version
29
- hash: 5
30
- segments:
31
- - 3
32
- version: "3"
20
+ - !ruby/object:Gem::Version
21
+ version: '3'
33
22
  type: :runtime
34
- version_requirements: *id001
35
- - !ruby/object:Gem::Dependency
36
- name: mongoid
37
23
  prerelease: false
38
- requirement: &id002 !ruby/object:Gem::Requirement
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ~>
28
+ - !ruby/object:Gem::Version
29
+ version: '3'
30
+ - !ruby/object:Gem::Dependency
31
+ name: mongoid
32
+ requirement: !ruby/object:Gem::Requirement
39
33
  none: false
40
- requirements:
34
+ requirements:
41
35
  - - ~>
42
- - !ruby/object:Gem::Version
43
- hash: 7
44
- segments:
45
- - 2
46
- version: "2"
36
+ - !ruby/object:Gem::Version
37
+ version: '2'
47
38
  type: :runtime
48
- version_requirements: *id002
49
- - !ruby/object:Gem::Dependency
50
- name: vidibus-core_extensions
51
39
  prerelease: false
52
- requirement: &id003 !ruby/object:Gem::Requirement
53
- none: false
54
- requirements:
55
- - - ">="
56
- - !ruby/object:Gem::Version
57
- hash: 3
58
- segments:
59
- - 0
60
- version: "0"
40
+ version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
42
+ requirements:
43
+ - - ~>
44
+ - !ruby/object:Gem::Version
45
+ version: '2'
46
+ - !ruby/object:Gem::Dependency
47
+ name: vidibus-core_extensions
48
+ requirement: !ruby/object:Gem::Requirement
49
+ none: false
50
+ requirements:
51
+ - - ! '>='
52
+ - !ruby/object:Gem::Version
53
+ version: '0'
61
54
  type: :runtime
62
- version_requirements: *id003
63
- - !ruby/object:Gem::Dependency
64
- name: vidibus-uuid
65
55
  prerelease: false
66
- requirement: &id004 !ruby/object:Gem::Requirement
67
- none: false
68
- requirements:
69
- - - ">="
70
- - !ruby/object:Gem::Version
71
- hash: 3
72
- segments:
73
- - 0
74
- version: "0"
56
+ version_requirements: !ruby/object:Gem::Requirement
57
+ none: false
58
+ requirements:
59
+ - - ! '>='
60
+ - !ruby/object:Gem::Version
61
+ version: '0'
62
+ - !ruby/object:Gem::Dependency
63
+ name: vidibus-uuid
64
+ requirement: !ruby/object:Gem::Requirement
65
+ none: false
66
+ requirements:
67
+ - - ! '>='
68
+ - !ruby/object:Gem::Version
69
+ version: '0'
75
70
  type: :runtime
76
- version_requirements: *id004
77
- - !ruby/object:Gem::Dependency
78
- name: vidibus-validate_uri
79
71
  prerelease: false
80
- requirement: &id005 !ruby/object:Gem::Requirement
81
- none: false
82
- requirements:
83
- - - ">="
84
- - !ruby/object:Gem::Version
85
- hash: 3
86
- segments:
87
- - 0
88
- version: "0"
72
+ version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
74
+ requirements:
75
+ - - ! '>='
76
+ - !ruby/object:Gem::Version
77
+ version: '0'
78
+ - !ruby/object:Gem::Dependency
79
+ name: vidibus-validate_uri
80
+ requirement: !ruby/object:Gem::Requirement
81
+ none: false
82
+ requirements:
83
+ - - ! '>='
84
+ - !ruby/object:Gem::Version
85
+ version: '0'
89
86
  type: :runtime
90
- version_requirements: *id005
91
- - !ruby/object:Gem::Dependency
92
- name: bundler
93
87
  prerelease: false
94
- requirement: &id006 !ruby/object:Gem::Requirement
95
- none: false
96
- requirements:
97
- - - ">="
98
- - !ruby/object:Gem::Version
99
- hash: 23
100
- segments:
101
- - 1
102
- - 0
103
- - 0
88
+ version_requirements: !ruby/object:Gem::Requirement
89
+ none: false
90
+ requirements:
91
+ - - ! '>='
92
+ - !ruby/object:Gem::Version
93
+ version: '0'
94
+ - !ruby/object:Gem::Dependency
95
+ name: bundler
96
+ requirement: !ruby/object:Gem::Requirement
97
+ none: false
98
+ requirements:
99
+ - - ! '>='
100
+ - !ruby/object:Gem::Version
104
101
  version: 1.0.0
105
102
  type: :development
106
- version_requirements: *id006
107
- - !ruby/object:Gem::Dependency
108
- name: rake
109
103
  prerelease: false
110
- requirement: &id007 !ruby/object:Gem::Requirement
111
- none: false
112
- requirements:
113
- - - ">="
114
- - !ruby/object:Gem::Version
115
- hash: 3
116
- segments:
117
- - 0
118
- version: "0"
104
+ version_requirements: !ruby/object:Gem::Requirement
105
+ none: false
106
+ requirements:
107
+ - - ! '>='
108
+ - !ruby/object:Gem::Version
109
+ version: 1.0.0
110
+ - !ruby/object:Gem::Dependency
111
+ name: rake
112
+ requirement: !ruby/object:Gem::Requirement
113
+ none: false
114
+ requirements:
115
+ - - ! '>='
116
+ - !ruby/object:Gem::Version
117
+ version: '0'
119
118
  type: :development
120
- version_requirements: *id007
121
- - !ruby/object:Gem::Dependency
122
- name: rdoc
123
119
  prerelease: false
124
- requirement: &id008 !ruby/object:Gem::Requirement
125
- none: false
126
- requirements:
127
- - - ">="
128
- - !ruby/object:Gem::Version
129
- hash: 3
130
- segments:
131
- - 0
132
- version: "0"
120
+ version_requirements: !ruby/object:Gem::Requirement
121
+ none: false
122
+ requirements:
123
+ - - ! '>='
124
+ - !ruby/object:Gem::Version
125
+ version: '0'
126
+ - !ruby/object:Gem::Dependency
127
+ name: rdoc
128
+ requirement: !ruby/object:Gem::Requirement
129
+ none: false
130
+ requirements:
131
+ - - ! '>='
132
+ - !ruby/object:Gem::Version
133
+ version: '0'
133
134
  type: :development
134
- version_requirements: *id008
135
- - !ruby/object:Gem::Dependency
136
- name: rspec
137
135
  prerelease: false
138
- requirement: &id009 !ruby/object:Gem::Requirement
139
- none: false
140
- requirements:
141
- - - ">="
142
- - !ruby/object:Gem::Version
143
- hash: 3
144
- segments:
145
- - 0
146
- version: "0"
136
+ version_requirements: !ruby/object:Gem::Requirement
137
+ none: false
138
+ requirements:
139
+ - - ! '>='
140
+ - !ruby/object:Gem::Version
141
+ version: '0'
142
+ - !ruby/object:Gem::Dependency
143
+ name: rspec
144
+ requirement: !ruby/object:Gem::Requirement
145
+ none: false
146
+ requirements:
147
+ - - ! '>='
148
+ - !ruby/object:Gem::Version
149
+ version: '0'
147
150
  type: :development
148
- version_requirements: *id009
149
- - !ruby/object:Gem::Dependency
150
- name: rr
151
151
  prerelease: false
152
- requirement: &id010 !ruby/object:Gem::Requirement
153
- none: false
154
- requirements:
155
- - - ">="
156
- - !ruby/object:Gem::Version
157
- hash: 3
158
- segments:
159
- - 0
160
- version: "0"
152
+ version_requirements: !ruby/object:Gem::Requirement
153
+ none: false
154
+ requirements:
155
+ - - ! '>='
156
+ - !ruby/object:Gem::Version
157
+ version: '0'
158
+ - !ruby/object:Gem::Dependency
159
+ name: rr
160
+ requirement: !ruby/object:Gem::Requirement
161
+ none: false
162
+ requirements:
163
+ - - ! '>='
164
+ - !ruby/object:Gem::Version
165
+ version: '0'
161
166
  type: :development
162
- version_requirements: *id010
163
- description: OAuth2 server for Rails 3 with Mongoid.
167
+ prerelease: false
168
+ version_requirements: !ruby/object:Gem::Requirement
169
+ none: false
170
+ requirements:
171
+ - - ! '>='
172
+ - !ruby/object:Gem::Version
173
+ version: '0'
174
+ description: OAuth2 server for Vidibus user services
164
175
  email: andre@vidibus.com
165
176
  executables: []
166
-
167
177
  extensions: []
168
-
169
178
  extra_rdoc_files: []
170
-
171
- files:
179
+ files:
172
180
  - lib/vidibus/oauth2_server/extensions/controller.rb
173
181
  - lib/vidibus/oauth2_server/extensions.rb
174
182
  - lib/vidibus/oauth2_server/version.rb
@@ -184,41 +192,32 @@ files:
184
192
  - LICENSE
185
193
  - README.rdoc
186
194
  - Rakefile
187
- has_rdoc: true
188
195
  homepage: https://github.com/vidibus/vidibus-oauth2_server
189
- licenses: []
190
-
196
+ licenses:
197
+ - MIT
191
198
  post_install_message:
192
199
  rdoc_options: []
193
-
194
- require_paths:
200
+ require_paths:
195
201
  - lib
196
- required_ruby_version: !ruby/object:Gem::Requirement
202
+ required_ruby_version: !ruby/object:Gem::Requirement
197
203
  none: false
198
- requirements:
199
- - - ">="
200
- - !ruby/object:Gem::Version
201
- hash: 3
202
- segments:
204
+ requirements:
205
+ - - ! '>='
206
+ - !ruby/object:Gem::Version
207
+ version: '0'
208
+ segments:
203
209
  - 0
204
- version: "0"
205
- required_rubygems_version: !ruby/object:Gem::Requirement
210
+ hash: -1476866828250182914
211
+ required_rubygems_version: !ruby/object:Gem::Requirement
206
212
  none: false
207
- requirements:
208
- - - ">="
209
- - !ruby/object:Gem::Version
210
- hash: 23
211
- segments:
212
- - 1
213
- - 3
214
- - 6
213
+ requirements:
214
+ - - ! '>='
215
+ - !ruby/object:Gem::Version
215
216
  version: 1.3.6
216
217
  requirements: []
217
-
218
218
  rubyforge_project: vidibus-oauth2_server
219
- rubygems_version: 1.3.7
219
+ rubygems_version: 1.8.24
220
220
  signing_key:
221
221
  specification_version: 3
222
- summary: OAuth2 server for Rails 3 with Mongoid.
222
+ summary: OAuth2 server for Vidibus user services
223
223
  test_files: []
224
-