omniauth-naranya_id 0.0.13 → 0.0.14
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/naranya_id/models/user.rb +15 -15
- data/lib/naranya_id.rb +4 -0
- data/lib/omniauth-naranya_id/version.rb +1 -1
- data/omniauth-naranya_id.gemspec +5 -6
- metadata +17 -31
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 4ab77dd796cb90c54ae17ddd42bfbf3dc1f4c224
|
4
|
+
data.tar.gz: d27ffe0b83aa9e6374d989183f37d668bfeda80a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 04fd44fdc8e2439e1bdd7bf22e38a94d30e8c78f677d2262c879ccc74027bacb8d8dd884b0f59fbc784ffe4a4fceda0bbddd5191467b52f7fb775e9cb827386f
|
7
|
+
data.tar.gz: 26ff14117d6eda1d2668d455c5f35d6bd3229355c649c6b06cea4395845743cd7edf1b1d3cad749626f146cecc856beb1b92313c686ee157073edce80c3ccf23
|
@@ -33,13 +33,13 @@ module NaranyaId
|
|
33
33
|
|
34
34
|
def save
|
35
35
|
return false unless self.valid?
|
36
|
-
|
36
|
+
|
37
37
|
api_token = OAuth::AccessToken.new NaranyaId.consumer, @access_token, @access_secret
|
38
|
-
|
38
|
+
|
39
39
|
nid_hash = {}.with_indifferent_access
|
40
40
|
nid_hash[:name] = @first_name unless @first_name.nil?
|
41
41
|
nid_hash[:lastname] = @last_name unless @last_name.nil?
|
42
|
-
|
42
|
+
|
43
43
|
nid_hash[:gender] = case @gender
|
44
44
|
when :male then 1
|
45
45
|
when :female then 0
|
@@ -47,10 +47,10 @@ module NaranyaId
|
|
47
47
|
|
48
48
|
nid_hash[:birthday] = @date_of_birth.to_s unless @date_of_birth.nil?
|
49
49
|
nid_hash[:screenname] = @screen_name unless @screen_name.nil?
|
50
|
-
|
50
|
+
|
51
51
|
response = api_token.put "/crmcapi/user", nid_hash
|
52
52
|
response_data = ActiveSupport::JSON.decode(response.body).with_indifferent_access if response.body =~ /\A{.*}/i
|
53
|
-
|
53
|
+
|
54
54
|
if Net::HTTPSuccess
|
55
55
|
elsif Net::HTTPClientError === response
|
56
56
|
|
@@ -64,10 +64,10 @@ module NaranyaId
|
|
64
64
|
else
|
65
65
|
self.errors.add :base, "Naranya ID responded with a client error (#{response_data[:message]})"
|
66
66
|
end
|
67
|
-
|
67
|
+
|
68
68
|
elsif Net::HTTPServerError === response
|
69
69
|
self.errors.add :base, "An error ocurred at Naranya ID server"
|
70
|
-
|
70
|
+
|
71
71
|
else
|
72
72
|
self.errors.add :base, "Naranya ID Server responded with an unexpected HTTP status code"
|
73
73
|
end
|
@@ -103,14 +103,14 @@ module NaranyaId
|
|
103
103
|
|
104
104
|
NaranyaId.logger.info "Consumer key: '#{NaranyaId.consumer.key}', Consumer secret: '#{NaranyaId.consumer.secret}'"
|
105
105
|
NaranyaId.logger.info "Access token key: '#{options[:token]}', Access token secret: '#{options[:secret]}'"
|
106
|
-
|
106
|
+
|
107
107
|
api_access_token = ::OAuth::AccessToken.new NaranyaId.consumer, options[:token], options[:secret]
|
108
|
-
|
109
|
-
user_info_response = api_access_token.get('/crmcapi/
|
110
|
-
|
108
|
+
|
109
|
+
user_info_response = api_access_token.get('/crmcapi/user')
|
110
|
+
|
111
111
|
if Net::HTTPSuccess === user_info_response
|
112
112
|
response_data = ActiveSupport::JSON.decode(user_info_response.body).with_indifferent_access
|
113
|
-
|
113
|
+
|
114
114
|
translated_data = {}.with_indifferent_access
|
115
115
|
translated_data[:first_name] = response_data[:vc_name] unless response_data[:vc_name].nil?
|
116
116
|
translated_data[:last_name] = response_data[:vc_lastname] unless response_data[:vc_lastname].nil?
|
@@ -118,7 +118,7 @@ module NaranyaId
|
|
118
118
|
translated_data[:date_of_birth] = response_data[:dt_birthday] unless response_data[:dt_birthday].nil?
|
119
119
|
translated_data[:email] = response_data[:vc_email] unless response_data[:vc_email].nil?
|
120
120
|
translated_data[:screen_name] = response_data[:vc_screenname] unless response_data[:vc_screenname].nil?
|
121
|
-
|
121
|
+
|
122
122
|
user = self.new translated_data
|
123
123
|
|
124
124
|
user.instance_variable_set :@id, response_data[:uuid]
|
@@ -128,8 +128,8 @@ module NaranyaId
|
|
128
128
|
else
|
129
129
|
nil
|
130
130
|
end
|
131
|
-
|
131
|
+
|
132
132
|
end
|
133
133
|
|
134
134
|
end
|
135
|
-
end
|
135
|
+
end
|
data/lib/naranya_id.rb
CHANGED
@@ -49,6 +49,10 @@ module NaranyaId
|
|
49
49
|
logger.warn "Current Naranya ID config: #{config.inspect}"
|
50
50
|
end
|
51
51
|
|
52
|
+
# TODO: WTF??? Porqué no carga la config default?????
|
53
|
+
config.client_options[:site] = ENV["NARANYA_ID_WEB_URL"] || "http://id.naranya.net"
|
54
|
+
config.client_options[:api_site] = ENV["NARANYA_ID_API_URL"] || "http://id.naranya.net:89"
|
55
|
+
|
52
56
|
consumer_key = config.consumer_key || ENV['NARANYA_ID_API_KEY']
|
53
57
|
consumer_secret = config.consumer_secret || ENV['NARANYA_ID_API_SECRET']
|
54
58
|
|
data/omniauth-naranya_id.gemspec
CHANGED
@@ -22,10 +22,9 @@ Gem::Specification.new do |spec|
|
|
22
22
|
spec.add_runtime_dependency "activemodel", "~> 4"
|
23
23
|
spec.add_runtime_dependency 'omniauth-oauth', '~> 1.0'
|
24
24
|
|
25
|
-
spec.add_development_dependency 'bundler',
|
26
|
-
spec.add_development_dependency '
|
27
|
-
spec.add_development_dependency '
|
28
|
-
spec.add_development_dependency '
|
29
|
-
spec.add_development_dependency '
|
30
|
-
spec.add_development_dependency 'webmock'
|
25
|
+
spec.add_development_dependency 'bundler', "~> 1.6"
|
26
|
+
spec.add_development_dependency 'rspec', "~> 3.1"
|
27
|
+
spec.add_development_dependency 'rack-test', "~> 0.6"
|
28
|
+
spec.add_development_dependency 'simplecov', "~> 0.8"
|
29
|
+
spec.add_development_dependency 'webmock', "~> 1"
|
31
30
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: omniauth-naranya_id
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.14
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Roberto Quintanilla
|
@@ -66,76 +66,62 @@ dependencies:
|
|
66
66
|
- - "~>"
|
67
67
|
- !ruby/object:Gem::Version
|
68
68
|
version: '1.6'
|
69
|
-
- !ruby/object:Gem::Dependency
|
70
|
-
name: rake
|
71
|
-
requirement: !ruby/object:Gem::Requirement
|
72
|
-
requirements:
|
73
|
-
- - ">="
|
74
|
-
- !ruby/object:Gem::Version
|
75
|
-
version: '0'
|
76
|
-
type: :development
|
77
|
-
prerelease: false
|
78
|
-
version_requirements: !ruby/object:Gem::Requirement
|
79
|
-
requirements:
|
80
|
-
- - ">="
|
81
|
-
- !ruby/object:Gem::Version
|
82
|
-
version: '0'
|
83
69
|
- !ruby/object:Gem::Dependency
|
84
70
|
name: rspec
|
85
71
|
requirement: !ruby/object:Gem::Requirement
|
86
72
|
requirements:
|
87
|
-
- - "
|
73
|
+
- - "~>"
|
88
74
|
- !ruby/object:Gem::Version
|
89
|
-
version: '
|
75
|
+
version: '3.1'
|
90
76
|
type: :development
|
91
77
|
prerelease: false
|
92
78
|
version_requirements: !ruby/object:Gem::Requirement
|
93
79
|
requirements:
|
94
|
-
- - "
|
80
|
+
- - "~>"
|
95
81
|
- !ruby/object:Gem::Version
|
96
|
-
version: '
|
82
|
+
version: '3.1'
|
97
83
|
- !ruby/object:Gem::Dependency
|
98
84
|
name: rack-test
|
99
85
|
requirement: !ruby/object:Gem::Requirement
|
100
86
|
requirements:
|
101
|
-
- - "
|
87
|
+
- - "~>"
|
102
88
|
- !ruby/object:Gem::Version
|
103
|
-
version: '0'
|
89
|
+
version: '0.6'
|
104
90
|
type: :development
|
105
91
|
prerelease: false
|
106
92
|
version_requirements: !ruby/object:Gem::Requirement
|
107
93
|
requirements:
|
108
|
-
- - "
|
94
|
+
- - "~>"
|
109
95
|
- !ruby/object:Gem::Version
|
110
|
-
version: '0'
|
96
|
+
version: '0.6'
|
111
97
|
- !ruby/object:Gem::Dependency
|
112
98
|
name: simplecov
|
113
99
|
requirement: !ruby/object:Gem::Requirement
|
114
100
|
requirements:
|
115
|
-
- - "
|
101
|
+
- - "~>"
|
116
102
|
- !ruby/object:Gem::Version
|
117
|
-
version: '0'
|
103
|
+
version: '0.8'
|
118
104
|
type: :development
|
119
105
|
prerelease: false
|
120
106
|
version_requirements: !ruby/object:Gem::Requirement
|
121
107
|
requirements:
|
122
|
-
- - "
|
108
|
+
- - "~>"
|
123
109
|
- !ruby/object:Gem::Version
|
124
|
-
version: '0'
|
110
|
+
version: '0.8'
|
125
111
|
- !ruby/object:Gem::Dependency
|
126
112
|
name: webmock
|
127
113
|
requirement: !ruby/object:Gem::Requirement
|
128
114
|
requirements:
|
129
|
-
- - "
|
115
|
+
- - "~>"
|
130
116
|
- !ruby/object:Gem::Version
|
131
|
-
version: '
|
117
|
+
version: '1'
|
132
118
|
type: :development
|
133
119
|
prerelease: false
|
134
120
|
version_requirements: !ruby/object:Gem::Requirement
|
135
121
|
requirements:
|
136
|
-
- - "
|
122
|
+
- - "~>"
|
137
123
|
- !ruby/object:Gem::Version
|
138
|
-
version: '
|
124
|
+
version: '1'
|
139
125
|
description: Omniauth provider for NaranyaID.
|
140
126
|
email:
|
141
127
|
- roberto.quintanilla@naranya.com
|