Fix user lookup http calls (#1573)

* Fix user lookup http calls

* Changelog entry

* Fix PCL build

Author: nirinchev

CHANGELOG.md

@@ -19,6 +19,8 @@ to the new 2.x format. It can be thrown when using `Realm.GetInstance` or `Realm
 that allows you to open the old Realm file in a dynamic mode and migrate any required data. ([#1552](https://github.com/realm/realm-dotnet/pull/1552))
 - Enable encryption on Windows. ([#1570](https://github.com/realm/realm-dotnet/pull/1570))
 - Enable Realm compaction on Windows. ([#1571](https://github.com/realm/realm-dotnet/pull/1571))
+- `UserInfo` has been significantly enhanced. It now contains metadata about a user stored on the Realm Object Server, as well as a list of all user
+account data associated with that user. ([#1573](https://github.com/realm/realm-dotnet/pull/1573))
 
 ### Bug fixes
 - `Realm.GetInstance` will now advance the Realm to the latest version, so you no longer have to call `Refresh` manually after that. ([#1523](https://github.com/realm/realm-dotnet/pull/1523))

Platform.PCL/Realm.Sync.PCL/Realm.Sync.PCL.csproj

@@ -37,6 +37,9 @@
     <Compile Include="..\..\Realm\Realm.Sync\Dtos\UserInfo.cs">
       <Link>Dtos\UserInfo.cs</Link>
     </Compile>
+    <Compile Include="..\..\Realm\Realm.Sync\Dtos\AccountInfo.cs">
+      <Link>Dtos\AccountInfo.cs</Link>
+    </Compile>
     <Compile Include="..\..\Realm\Realm.Sync\Exceptions\IncompatibleSyncedFileException.cs">
       <Link>Exceptions\IncompatibleSyncedFileException.cs</Link>
     </Compile>

Realm/Realm.Sync/Dtos/AccountInfo.cs

@@ -0,0 +1,36 @@
+////////////////////////////////////////////////////////////////////////////
+//
+// Copyright 2017 Realm Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////
+
+namespace Realms.Sync
+{
+    /// <summary>
+    /// An object containing information about an account associated with a user.
+    /// </summary>
+    public class AccountInfo
+    {
+        /// <summary>
+        /// Gets the provider that manages this user account.
+        /// </summary>
+        public string Provider { get; internal set; }
+
+        /// <summary>
+        /// Gets the user account's identity in the provider's system.
+        /// </summary>
+        public string ProviderUserIdentity { get; internal set; }
+    }
+}

Realm/Realm.Sync/Dtos/UserInfo.cs

@@ -16,6 +16,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////
 
+using System.Collections.Generic;
+
 namespace Realms.Sync
 {
     /// <summary>
@@ -34,13 +36,13 @@ public class UserInfo
         public bool IsAdmin { get; internal set; }
 
         /// <summary>
-        /// Gets the provider that the user registered through.
+        /// Gets a collection of all the user accounts associated with the user.
         /// </summary>
-        public string Provider { get; internal set; }
+        public IEnumerable<AccountInfo> Accounts { get; internal set; }
 
         /// <summary>
-        /// Gets the user's identity in the provider's system.
+        /// Gets the metadata about this user stored on the Realm Object Server.
         /// </summary>
-        public string ProviderUserIdentity { get; internal set; }
+        public IDictionary<string, string> Metadata { get; internal set; }
     }
 }

Realm/Realm.Sync/Helpers/AuthenticationHelper.cs

@@ -19,6 +19,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
@@ -139,18 +140,29 @@ public static Task ChangePasswordAsync(User user, string password, string otherU
 
         public static async Task<UserInfo> RetrieveInfoForUserAsync(User user, string provider, string providerId)
         {
-            var uri = new Uri(user.ServerUri, $"/api/providers/{provider}/accounts/{providerId}");
+            var uri = new Uri(user.ServerUri, $"/auth/users/{provider}/{providerId}");
             try
             {
                 var response = await MakeAuthRequestAsync(HttpMethod.Get, uri, setupRequest: request =>
                         request.Headers.TryAddWithoutValidation("Authorization", user.RefreshToken));
 
+                var accounts = response["accounts"].Children<JObject>()
+                                                   .Select(j => new AccountInfo
+                                                   {
+                                                       Provider = j["provider"].Value<string>(),
+                                                       ProviderUserIdentity = j["provider_id"].Value<string>()
+                                                   })
+                                                   .ToArray();
+
+                var metadata = response["metadata"].Children<JObject>()
+                                                   .ToDictionary(j => j["key"].Value<string>(), j => j["value"].Value<string>());
+
                 return new UserInfo
                 {
-                    Identity = response["user"]["id"].Value<string>(),
-                    IsAdmin = response["user"]["isAdmin"].Value<bool>(),
-                    Provider = response["provider"].Value<string>(),
-                    ProviderUserIdentity = response["provider_id"].Value<string>(),
+                    Identity = response["user_id"].Value<string>(),
+                    IsAdmin = response["is_admin"].Value<bool>(),
+                    Accounts = accounts,
+                    Metadata = metadata
                 };
             }
             catch (HttpException ex) when (ex.StatusCode == HttpStatusCode.NotFound)

Realm/Realm.Sync/Realm.Sync.csproj

@@ -24,6 +24,7 @@
     <Compile Include="SessionState.cs" />
     <Compile Include="SyncConfiguration.cs" />
     <Compile Include="User.cs" />
+    <Compile Include="Dtos\AccountInfo.cs" />
     <Compile Include="Dtos\UserInfo.cs" />
     <Compile Include="UserPersistenceMode.cs" />
     <Compile Include="UserState.cs" />

Tests/Tests.Sync.Shared/CredentialsTests.cs

@@ -18,6 +18,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Nito.AsyncEx;
 using NUnit.Framework;
@@ -195,8 +196,12 @@ public void UserLookup_WhenTargetUserExists_ShouldReturnResponse()
 
                 Assert.That(lookupResponse.Identity, Is.EqualTo(alice.Identity));
                 Assert.That(lookupResponse.IsAdmin, Is.False);
-                Assert.That(lookupResponse.Provider, Is.EqualTo(Credentials.Provider.UsernamePassword));
-                Assert.That(lookupResponse.ProviderUserIdentity, Is.EqualTo(aliceUsername));
+
+                Assert.That(lookupResponse.Accounts, Is.Not.Empty);
+                var passwordAccount = lookupResponse.Accounts.SingleOrDefault(a => a.Provider == Credentials.Provider.UsernamePassword);
+
+                Assert.That(passwordAccount, Is.Not.Null);
+                Assert.That(passwordAccount.ProviderUserIdentity, Is.EqualTo(aliceUsername));
             });
         }
 
@@ -229,8 +234,11 @@ public void UserLookup_WhenTargetUserIsSelf_ShouldReturnResponse()
 
                 Assert.That(lookupResponse.Identity, Is.EqualTo(admin.Identity));
                 Assert.That(lookupResponse.IsAdmin, Is.True);
-                Assert.That(lookupResponse.Provider, Is.EqualTo(Credentials.Provider.UsernamePassword));
-                Assert.That(lookupResponse.ProviderUserIdentity, Is.EqualTo(Constants.AdminUsername));
+                Assert.That(lookupResponse.Accounts, Is.Not.Empty);
+                var passwordAccount = lookupResponse.Accounts.SingleOrDefault(a => a.Provider == Credentials.Provider.UsernamePassword);
+
+                Assert.That(passwordAccount, Is.Not.Null);
+                Assert.That(passwordAccount.ProviderUserIdentity, Is.EqualTo(Constants.AdminUsername));
             });
         }