summaryrefslogtreecommitdiff
path: root/lib/chef_zero/data_normalizer.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/chef_zero/data_normalizer.rb')
-rw-r--r--lib/chef_zero/data_normalizer.rb14
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/chef_zero/data_normalizer.rb b/lib/chef_zero/data_normalizer.rb
index 011606a..8492656 100644
--- a/lib/chef_zero/data_normalizer.rb
+++ b/lib/chef_zero/data_normalizer.rb
@@ -32,12 +32,22 @@ module ChefZero
container
end
- def self.normalize_user(user, name, identity_keys)
+ def self.normalize_user(user, name, identity_keys, osc_compat, method=nil)
user[identity_keys.first] ||= name
+ user['public_key'] ||= PUBLIC_KEY
user['admin'] ||= false
user['admin'] = !!user['admin']
user['openid'] ||= nil
- user['public_key'] ||= PUBLIC_KEY
+ if !osc_compat
+ if method == 'GET'
+ user.delete('admin')
+ user.delete('password')
+ user.delete('openid')
+ end
+ user['email'] ||= nil
+ user['first_name'] ||= nil
+ user['last_name'] ||= nil
+ end
user
end