cfoundry 3.0.0 → 3.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/cfoundry/uaaclient.rb +1 -1
- data/lib/cfoundry/v2/user.rb +5 -5
- data/lib/cfoundry/version.rb +1 -1
- data/spec/cfoundry/uaaclient_spec.rb +3 -3
- metadata +4 -4
data/lib/cfoundry/uaaclient.rb
CHANGED
@@ -98,7 +98,7 @@ module CFoundry
|
|
98
98
|
|
99
99
|
def scim
|
100
100
|
auth_header = token && token.auth_header
|
101
|
-
scim = CF::UAA::Scim.new(uaa_url, auth_header)
|
101
|
+
scim = CF::UAA::Scim.new(uaa_url, auth_header, :symbolize_keys => true)
|
102
102
|
scim.logger.level = @trace ? Logger::Severity::TRACE : 1
|
103
103
|
scim
|
104
104
|
end
|
data/lib/cfoundry/v2/user.rb
CHANGED
@@ -44,7 +44,7 @@ module CFoundry
|
|
44
44
|
get_meta_from_uaa if @emails.nil?
|
45
45
|
|
46
46
|
return unless @emails && @emails.first
|
47
|
-
@emails.first[
|
47
|
+
@emails.first[:value]
|
48
48
|
end
|
49
49
|
|
50
50
|
def given_name
|
@@ -80,12 +80,12 @@ module CFoundry
|
|
80
80
|
def get_meta_from_uaa
|
81
81
|
user = @client.base.uaa.user(guid)
|
82
82
|
return if user.nil?
|
83
|
-
return if not user[
|
83
|
+
return if not user[:error].nil?
|
84
84
|
|
85
|
-
@emails = user[
|
85
|
+
@emails = user[:emails]
|
86
86
|
@name ||= {}
|
87
|
-
@name[:familyName] = user[
|
88
|
-
@name[:givenName] = user[
|
87
|
+
@name[:familyName] = user[:name][:familyname]
|
88
|
+
@name[:givenName] = user[:name][:givenname]
|
89
89
|
end
|
90
90
|
|
91
91
|
end
|
data/lib/cfoundry/version.rb
CHANGED
@@ -138,7 +138,7 @@ EOF
|
|
138
138
|
:headers => {'Content-Type' => 'application/json'},
|
139
139
|
:body => '{ "resources": [] }'
|
140
140
|
)
|
141
|
-
expect(subject).to eq({
|
141
|
+
expect(subject).to eq({:resources => []})
|
142
142
|
end
|
143
143
|
|
144
144
|
context "when there is no token" do
|
@@ -149,7 +149,7 @@ EOF
|
|
149
149
|
:headers => {'Content-Type' => 'application/json'},
|
150
150
|
:body => '{ "resources": [] }'
|
151
151
|
)
|
152
|
-
expect(subject).to eq({
|
152
|
+
expect(subject).to eq({:resources => []})
|
153
153
|
end
|
154
154
|
end
|
155
155
|
end
|
@@ -262,7 +262,7 @@ EOF
|
|
262
262
|
:headers => { "Content-Type" => 'application/json' }
|
263
263
|
)
|
264
264
|
|
265
|
-
expect(subject).to eq({
|
265
|
+
expect(subject).to eq({:id => "id"})
|
266
266
|
expect(req).to have_been_requested
|
267
267
|
end
|
268
268
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cfoundry
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.0.
|
4
|
+
version: 3.0.1
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2013-07-
|
13
|
+
date: 2013-07-22 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: activemodel
|
@@ -419,7 +419,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
419
419
|
version: '0'
|
420
420
|
segments:
|
421
421
|
- 0
|
422
|
-
hash:
|
422
|
+
hash: 3662156757126524907
|
423
423
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
424
424
|
none: false
|
425
425
|
requirements:
|
@@ -428,7 +428,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
428
428
|
version: '0'
|
429
429
|
segments:
|
430
430
|
- 0
|
431
|
-
hash:
|
431
|
+
hash: 3662156757126524907
|
432
432
|
requirements: []
|
433
433
|
rubyforge_project: cfoundry
|
434
434
|
rubygems_version: 1.8.25
|