Merge branch 'fix-user-identities-api' into 'master'

Fix user identities API

Added ability to update or set the identity of an existing user, like the documentation said it was possible, but actually wasn't.

@DouweM or @stanhu could you please take a look at my code, and see if its sound?

/cc @JobV 

See merge request !1398

1 files changed, 11 insertions, 0 deletions

diff --git a/lib/api/users.rb b/lib/api/users.rb
index 813cc379e43..a98d668e02d 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -121,6 +121,17 @@ module API
             User.where(username: attrs[:username]).
                 where.not(id: user.id).count > 0
 
+        identity_attrs = attributes_for_keys [:provider, :extern_uid]
+        if identity_attrs.any?
+          identity = user.identities.find_by(provider: identity_attrs[:provider])
+          if identity
+            identity.update_attributes(identity_attrs)
+          else
+            identity = user.identities.build(identity_attrs)
+            identity.save
+          end
+        end
+
         if user.update_attributes(attrs)
           present user, with: Entities::UserFull
         else