1 files changed, 12 insertions, 1 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb
index ee29f952246..a98d668e02d 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -3,7 +3,7 @@ module API
   class Users < Grape::API
     before { authenticate! }
 
-    resource :users do
+    resource :users, requirements: { uid: /[0-9]*/, id: /[0-9]*/ } do
       # Get a users list
       #
       # Example Request:
@@ -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