Fixes bug where the updated federated display_name is not returned
When shadowing a federated user, if the display name is changed, it
should get updated and returned in the user name attribute. This patch
fixes a bug where the display_name was getting updated, but not the old
display_name was being returned.
Closes-Bug: #1566494
Change-Id: I155d3a9e4c90a3d22d0b30e35276c9ddbb65ae6d
(cherry picked from commit 562b81dd4a
)
This commit is contained in:
parent
831e899572
commit
e818b2ee61
@ -1237,10 +1237,10 @@ class Manager(manager.Manager):
|
||||
"""
|
||||
user_dict = {}
|
||||
try:
|
||||
user_dict = self.shadow_users_api.get_federated_user(
|
||||
idp_id, protocol_id, unique_id)
|
||||
self.shadow_users_api.update_federated_user_display_name(
|
||||
idp_id, protocol_id, unique_id, display_name)
|
||||
user_dict = self.shadow_users_api.get_federated_user(
|
||||
idp_id, protocol_id, unique_id)
|
||||
except exception.UserNotFound:
|
||||
federated_dict = {
|
||||
'idp_id': idp_id,
|
||||
|
@ -519,10 +519,8 @@ class IdentityTestCase(test_v3.RestfulTestCase):
|
||||
fed_user["protocol_id"],
|
||||
fed_user["unique_id"],
|
||||
fed_user["display_name"])
|
||||
# FIXME(dolph): These assertEqual / assertNotEqual should be reversed,
|
||||
# to illustrate that the display name has been updated as expected.
|
||||
self.assertNotEqual(fed_user['display_name'], shadow_user2['name'])
|
||||
self.assertEqual(shadow_user1['name'], shadow_user2['name'])
|
||||
self.assertEqual(fed_user['display_name'], shadow_user2['name'])
|
||||
self.assertNotEqual(shadow_user1['name'], shadow_user2['name'])
|
||||
|
||||
# The shadowed users still share the same unique ID.
|
||||
self.assertEqual(shadow_user1['id'], shadow_user2['id'])
|
||||
|
Loading…
Reference in New Issue
Block a user