omniauth-campus 1.7 → 1.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/omniauth-campus/version.rb +1 -1
- data/lib/omniauth/strategies/campus.rb +14 -51
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 4dc378cd97e24a30fe2e7b9375bfb80d7c07fa04
|
4
|
+
data.tar.gz: ff87d4012bc72a88fd34dd91877163fb654c8360
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: cb30cff6335b8a8313205707448dadf2d1dc5585368ee3d5cb7dd6ed079b31d33fe5481691d73d86c87d05b33663230e5e86a4837ad025423e41c11abeeaf205
|
7
|
+
data.tar.gz: d269e2dcc41df51ab20eb791b76e57f742e9573a9878517495992bc43bf9c9615a3dc70b1a6b1a3bf7d050dfb1d5799bc4fa875ff14ee89c660740338cc2ae10
|
@@ -25,63 +25,26 @@ module OmniAuth
|
|
25
25
|
|
26
26
|
option :name, "campus"
|
27
27
|
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
def consumer
|
34
|
-
consumer = ::OAuth::Consumer.new(options.consumer_key, options.consumer_secret, options.client_options)
|
35
|
-
consumer.http.open_timeout = options.open_timeout if options.open_timeout
|
36
|
-
consumer.http.read_timeout = options.read_timeout if options.read_timeout
|
37
|
-
consumer
|
38
|
-
end
|
39
|
-
|
40
|
-
def request_phase
|
41
|
-
request_token = consumer.get_request_token({:oauth_callback => callback_url}, options.request_params)
|
42
|
-
session['oauth'] ||= {}
|
43
|
-
session['oauth'][name.to_s] = {'callback_confirmed' => request_token.callback_confirmed?, 'request_token' => request_token.token, 'request_secret' => request_token.secret}
|
44
|
-
|
45
|
-
if request_token.callback_confirmed?
|
46
|
-
redirect request_token.authorize_url(options[:authorize_params])
|
47
|
-
else
|
48
|
-
redirect request_token.authorize_url(options[:authorize_params].merge(:oauth_callback => callback_url))
|
28
|
+
def request_phase
|
29
|
+
%w[force_login lang screen_name].each do |v|
|
30
|
+
if request.params[v]
|
31
|
+
options[:authorize_params][v.to_sym] = request.params[v]
|
32
|
+
end
|
49
33
|
end
|
50
34
|
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
def callback_phase
|
58
|
-
raise OmniAuth::NoSessionError.new("Session Expired") if session['oauth'].nil?
|
59
|
-
|
60
|
-
request_token = ::OAuth::RequestToken.new(consumer, session['oauth'][name.to_s].delete('request_token'), session['oauth'][name.to_s].delete('request_secret'))
|
35
|
+
%w[x_auth_access_type].each do |v|
|
36
|
+
if request.params[v]
|
37
|
+
options[:request_params][v.to_sym] = request.params[v]
|
38
|
+
end
|
39
|
+
end
|
61
40
|
|
62
|
-
|
63
|
-
|
64
|
-
opts[:oauth_verifier] = request['oauth_verifier']
|
41
|
+
if request.params['use_authorize'] == 'true'
|
42
|
+
options[:client_options][:authorize_path] = '/oauth/authorize'
|
65
43
|
else
|
66
|
-
|
44
|
+
options[:client_options][:authorize_path] = '/oauth/authenticate'
|
67
45
|
end
|
68
46
|
|
69
|
-
|
70
|
-
super
|
71
|
-
rescue ::Timeout::Error => e
|
72
|
-
fail!(:timeout, e)
|
73
|
-
rescue ::Net::HTTPFatalError, ::OpenSSL::SSL::SSLError => e
|
74
|
-
fail!(:service_unavailable, e)
|
75
|
-
rescue ::OAuth::Unauthorized => e
|
76
|
-
fail!(:invalid_credentials, e)
|
77
|
-
rescue ::MultiJson::DecodeError => e
|
78
|
-
fail!(:invalid_response, e)
|
79
|
-
rescue ::OmniAuth::NoSessionError => e
|
80
|
-
fail!(:session_expired, e)
|
81
|
-
end
|
82
|
-
|
83
|
-
credentials do
|
84
|
-
{'token' => access_token.token, 'secret' => access_token.secret}
|
47
|
+
old_request_phase
|
85
48
|
end
|
86
49
|
|
87
50
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: omniauth-campus
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: '1.
|
4
|
+
version: '1.8'
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- johnvehr
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-03-
|
11
|
+
date: 2014-03-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|