Merge branch 'master' into server-api-client

Author: gauffininteractive

src/Server/OneTrueError.Api.Client.Tests/TryTheClient.cs

@@ -17,13 +17,13 @@ public class TryTheClient
         public async Task Test()
         {
             OneTrueApiClient client = new OneTrueApiClient();
-            client.Open(new Uri("http://localhost/onetrueerror/"), "o333", "kjsdklsdsdjkl");
+            client.Open(new Uri("http://localhost/onetrueerror/"), "", "");
             FindAccountByUserNameResult result = null;
             try
             {
                 result = await client.QueryAsync(new FindAccountByUserName("admin"));
             }
-            catch (WebException ex)
+            catch (WebException ex) 
             {
 
             }

src/Server/OneTrueError.Api/Core/ApiKeys/Commands/CreateApiKey.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel.Design;
 using DotNetCqs;
 
 namespace OneTrueError.Api.Core.ApiKeys.Commands
@@ -29,6 +30,32 @@ public CreateApiKey(string applicationName, string apiKey, string sharedSecret,
             ApplicationIds = applicationIds;
         }
 
+        /// <summary>
+        /// Creates a new instance of <see cref="CreateApiKey"/>.
+        /// </summary>
+        /// <param name="applicationName"><see cref="ApplicationName"/></param>
+        /// <param name="apiKey"><see cref="ApiKey"/></param>
+        /// <param name="sharedSecret"><see cref="SharedSecret"/></param>
+        public CreateApiKey(string applicationName, string apiKey, string sharedSecret)
+        {
+            if (applicationName == null) throw new ArgumentNullException("applicationName");
+            if (apiKey == null) throw new ArgumentNullException("apiKey");
+            if (sharedSecret == null) throw new ArgumentNullException("sharedSecret");
+
+            ApplicationName = applicationName;
+            ApiKey = apiKey;
+            SharedSecret = sharedSecret;
+            ApplicationIds = new int[0];
+        }
+
+        /// <summary>
+        /// Serialization constructor
+        /// </summary>
+        protected CreateApiKey()
+        {
+            
+        }
+
 
         /// <summary>
         /// Must always be the one that creates the key (will be assigned by the CommandBus per convention)

src/Server/OneTrueError.App/Core/Accounts/Requests/ActivateAccountHandler.cs

@@ -18,12 +18,14 @@ public class ActivateAccountHandler : IRequestHandler<ActivateAccount, ActivateA
     {
         private readonly IEventBus _eventBus;
         private readonly IAccountRepository _repository;
-        private IQueryBus _queryBus;
+        private readonly IQueryBus _queryBus;
+
         /// <summary>
         ///     Creates a new instance of <see cref="ActivateAccountHandler" />.
         /// </summary>
         /// <param name="repository">repos</param>
         /// <param name="eventBus">used to publish <see cref="AccountActivated" />.</param>
+        /// <param name="queryBus"> </param>
         public ActivateAccountHandler(IAccountRepository repository, IEventBus eventBus, IQueryBus queryBus)
         {
             _repository = repository;
@@ -51,7 +53,7 @@ public async Task<ActivateAccountReply> ExecuteAsync(ActivateAccount request)
             var query = new GetApplicationList();
             var apps = await _queryBus.QueryAsync(query);
             var roles = apps.Select(x => "Member_" + x.Id).ToArray();
-            
+
             Thread.CurrentPrincipal = new OneTruePrincipal(account.Id, account.UserName, roles);
             var evt = new AccountActivated(account.Id, account.UserName)
             {

src/Server/OneTrueError.SqlServer.Tests/Core/ApiKeys/Commands/CreateApiKeyHandlerTests.cs

@@ -52,6 +52,20 @@ public async Task should_be_able_to_Create_key()
             generated.AllowedApplications.Should().BeEquivalentTo(new[] {_applicationId});
         }
 
+        [Fact]
+        public async Task should_be_able_to_Create_a_key_without_applications_mapped()
+        {
+            var cmd = new CreateApiKey("Mofo", Guid.NewGuid().ToString("N"), Guid.NewGuid().ToString("N"));
+
+            var sut = new CreateApiKeyHandler(_uow);
+            await sut.ExecuteAsync(cmd);
+
+            var repos = new ApiKeyRepository(_uow);
+            var generated = await repos.GetByKeyAsync(cmd.ApiKey);
+            generated.Should().NotBeNull();
+            generated.AllowedApplications.Should().BeEmpty();
+        }
+
         public void Dispose()
         {
             _uow.Dispose();

src/Server/OneTrueError.SqlServer/Core/ApiKeys/Commands/CreateApiKeyHandler.cs

@@ -33,6 +33,7 @@ public async Task ExecuteAsync(CreateApiKey command)
                 id = (int) await cmd.ExecuteScalarAsync();
             }
 
+
             foreach (var applicationId in command.ApplicationIds)
             {
                 using (var cmd = _unitOfWork.CreateDbCommand())

src/Server/OneTrueError.SqlServer/Schema/Database.sql

@@ -119,7 +119,7 @@ BEGIN
         [CreatedAtUtc]       DATETIME       NOT NULL,
         [SolvedAtUtc]        DATETIME       NULL,
         [Title]						     NVARCHAR(100)  NULL,
-        [RemoteAddress]      VARCHAR (20)   NULL,
+        [RemoteAddress]      VARCHAR (45)   NULL, --SEE http://stackoverflow.com/questions/166132/maximum-length-of-the-textual-representation-of-an-ipv6-address
         [Exception]          NTEXT          NOT NULL,
         [ContextInfo]        NTEXT          NOT NULL
 	);

src/Server/OneTrueError.Web/Areas/Admin/Controllers/ApiKeysController.cs

@@ -26,10 +26,10 @@ public ApiKeysController(IQueryBus queryBus, ICommandBus commandBus)
 
         public async Task<ActionResult> Index()
         {
-            var query= new ListApiKeys();
+            var query = new ListApiKeys();
             var result = await _queryBus.QueryAsync(query);
-            var vms = result.Keys.Select(x => new ListViewModelItem {Id = x.Id, Name = x.ApplicationName}).ToArray();
-            var model = new ListViewModel {Keys = vms};
+            var vms = result.Keys.Select(x => new ListViewModelItem { Id = x.Id, Name = x.ApplicationName }).ToArray();
+            var model = new ListViewModel { Keys = vms };
             return View(model);
         }
 
@@ -81,11 +81,13 @@ public async Task<ActionResult> Create(CreateViewModel model)
 
             var apiKey = Guid.NewGuid().ToString("N");
             var sharedSecret = Guid.NewGuid().ToString("N");
-            var apps = model.SelectedApplications.Select(int.Parse).ToArray();
+            var apps = model.SelectedApplications == null
+                ? new int[0]
+                : model.SelectedApplications.Select(int.Parse).ToArray();
             var cmd = new CreateApiKey(model.ApplicationName, apiKey, sharedSecret, apps);
             await _commandBus.ExecuteAsync(cmd);
 
-            return RedirectToAction("Created", new {apiKey, sharedSecret});
+            return RedirectToAction("Created", new { apiKey, sharedSecret });
         }
 
         public ActionResult Created(string apiKey, string sharedSecret)