Async migration: Converted lots of stuff to async/await.

Removed locking from Server.cs in favor of concurrent collections.
(Probably unsafe! Needs testing and refactoring for data consistency.)

Author: taradinoc

Guncho.Core/Api/Controllers/ProfilesController.cs

@@ -86,7 +86,7 @@ public IHttpActionResult GetProfileByName(string name)
         }
 
         [Route("{name}", Name = "PutProfileByName")]
-        public IHttpActionResult PutProfileByName(string name, [FromBody] ProfileDto newProfile)
+        public async Task<IHttpActionResult> PutProfileByName(string name, [FromBody] ProfileDto newProfile)
         {
             var player = playersService.GetPlayerByName(name);
 
@@ -156,7 +156,7 @@ public IHttpActionResult PutProfileByName(string name, [FromBody] ProfileDto new
                 return BadRequest(ModelState);
             }
 
-            var result = playersService.TransactionalUpdate(
+            var result = await playersService.TransactionalUpdate(
                 player,
                 p =>
                 {
@@ -191,7 +191,7 @@ public IHttpActionResult GetMy()
         }
 
         [Route("my")]
-        public IHttpActionResult PutMy(ProfileDto newProfile)
+        public Task<IHttpActionResult> PutMy(ProfileDto newProfile)
         {
             return PutProfileByName(User.Identity.Name, newProfile);
         }

Guncho.Core/Api/Controllers/RealmsController.cs

@@ -7,6 +7,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Net.Http;
+using System.Threading.Tasks;
 using System.Web.Http;
 using System.Web.Http.Results;
 
@@ -147,7 +148,7 @@ public Check(Func<T, bool> checkFunc, string modelKey, string errorMsg)
         }
 
         [Route("{realmName}", Name = "PutRealmByName")]
-        public IHttpActionResult PutRealmByName(string realmName, RealmDto newSettings)
+        public async Task<IHttpActionResult> PutRealmByName(string realmName, RealmDto newSettings)
         {
             // TODO: use ETags for concurrency control
 
@@ -249,7 +250,7 @@ public IHttpActionResult PutRealmByName(string realmName, RealmDto newSettings)
                 return BadRequest(ModelState);
             }
 
-            var result = realmsService.TransactionalUpdate(
+            var result = await realmsService.TransactionalUpdate(
                 realm,
                 r =>
                 {
@@ -320,7 +321,7 @@ private bool CompilerEqualsFactory(CompilerOptionsDto dto, RealmFactory factory)
         }
 
         [Route("", Name = "PostNewRealm")]
-        public IHttpActionResult PostNewRealm(RealmDto newRealm)
+        public async Task<IHttpActionResult> PostNewRealm(RealmDto newRealm)
         {
             // verify permission
             if (!Request.CheckAccess(GunchoResources.RealmActions.Create, GunchoResources.Realm, newRealm.Name))
@@ -359,7 +360,7 @@ public IHttpActionResult PostNewRealm(RealmDto newRealm)
             }
 
             // create the realm
-            var realm = realmsService.CreateRealm(playersService.GetPlayerByName(User.Identity.Name), newRealm.Name, factory);
+            var realm = await realmsService.CreateRealm(playersService.GetPlayerByName(User.Identity.Name), newRealm.Name, factory);
 
             if (realm == null)
             {
@@ -375,7 +376,7 @@ public IHttpActionResult PostNewRealm(RealmDto newRealm)
             }
 
             // invoke the PUT handler to update any other settings
-            var innerResult = PutRealmByName(newRealm.Name, newRealm) as OkNegotiatedContentResult<RealmDto>;
+            var innerResult = (await PutRealmByName(newRealm.Name, newRealm)) as OkNegotiatedContentResult<RealmDto>;
 
             if (innerResult != null)
             {

Guncho.Core/Api/Hubs/PlayHub.cs

@@ -1,5 +1,6 @@
 using Guncho.Connections;
 using Microsoft.AspNet.SignalR;
+using Nito.AsyncEx;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -50,7 +51,7 @@ public Task SendCommand(string command)
             System.Diagnostics.Debug.WriteLine("SendCommand: id = {0}", new string[] { Context.ConnectionId });
             var connection = manager.GetConnectionById(Context.ConnectionId);
             connection.EnqueueCommand(command);
-            return Task.FromResult(0);
+            return TaskConstants.Completed;
         }
     }
 }

Guncho.Core/Api/Security/GunchoOAuthServerProvider.cs

@@ -6,6 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Security.Claims;
+using Nito.AsyncEx;
 
 namespace Guncho.Api.Security
 {
@@ -21,7 +22,7 @@ public GunchoOAuthServerProvider(UserManager<ApiUser, int> userManager)
         public override Task ValidateClientAuthentication(OAuthValidateClientAuthenticationContext context)
         {
             context.Validated();
-            return Task.FromResult(0);
+            return TaskConstants.Completed;
         }
 
         public override async Task GrantResourceOwnerCredentials(OAuthGrantResourceOwnerCredentialsContext context)
@@ -54,7 +55,7 @@ public override async Task GrantResourceOwnerCredentials(OAuthGrantResourceOwner
         public override Task TokenEndpoint(OAuthTokenEndpointContext context)
         {
             context.AdditionalResponseParameters.Add("username", context.Identity.Name);
-            return Task.FromResult(0);
+            return TaskConstants.Completed;
         }
     }
 }

Guncho.Core/Api/Security/OldTimeyUserStore.cs

@@ -1,4 +1,5 @@
 using Microsoft.AspNet.Identity;
+using Nito.AsyncEx;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -65,13 +66,13 @@ public Task<ApiUser> FindByNameAsync(string userName)
             return Task.FromResult(ToApiUser(player));
         }
 
-        public Task UpdateAsync(ApiUser user)
+        public async Task UpdateAsync(ApiUser user)
         {
             var player = server.GetPlayerById(user.Id);
 
             if (player != null)
             {
-                lock (player)
+                using (await player.Lock.WriterLockAsync())
                 {
                     player.Name = user.UserName;
 
@@ -80,10 +81,8 @@ public Task UpdateAsync(ApiUser user)
                     player.PasswordHash = parts[1];
                 }
 
-                server.SavePlayers();
+                await server.SavePlayers();
             }
-
-            return Task.FromResult(0);
         }
 
         #endregion
@@ -126,7 +125,7 @@ public Task SetPasswordHashAsync(ApiUser user, string passwordHash)
             }
             else
             {
-                return Task.FromResult(0);
+                return TaskConstants.Completed;
             }
         }