merge

Author: mjohanss

src/Server/Coderr.Server.App/Core/Invitations/CommandHandlers/IAccountService.cs

@@ -1,8 +1,5 @@
-using System;
-using System.Configuration;
-using System.Linq;
+using System.Linq;
 using System.Security;
-using System.Security.Claims;
 using System.Threading.Tasks;
 using codeRR.Server.Api.Core.Applications.Events;
 using codeRR.Server.Api.Core.Invitations.Commands;
@@ -11,11 +8,9 @@
 using codeRR.Server.App.Configuration;
 using codeRR.Server.App.Core.Applications;
 using codeRR.Server.App.Core.Users;
-using codeRR.Server.Infrastructure.Configuration;
 using codeRR.Server.Infrastructure.Security;
 using Coderr.Server.PluginApi.Config;
 using DotNetCqs;
-using DotNetCqs.DependencyInjection;
 using Griffin.Container;
 using log4net;
 

src/Server/Coderr.Server.App/Core/Invitations/CommandHandlers/InviteUserHandler.cs

@@ -22,4 +22,8 @@
 	  <Reference Include="System.Configuration" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <Folder Include="Core\Invitations\" />
+	</ItemGroup>
+
 </Project>

src/Server/Coderr.Server.SqlServer.Tests/codeRR.Server.SqlServer.Tests.csproj

@@ -16,6 +16,7 @@ public void Should_not_be_able_to_create_application_without_name_specified()
                 var sut = new ConfigureApplicationPage(WebDriver)
                     .CreateApplication(string.Empty);
 
+                //TODO: Verify error message
                 sut.VerifyIsCurrentPage();
 
                 Logout();

src/Server/Coderr.Server.Web.Tests/Helpers/xUnit/EnsureTestEnvironmentAttribute.cs

@@ -14,12 +14,10 @@
 namespace codeRR.Server.Web.Tests
 {
     [TestCaseOrderer("codeRR.Server.Web.Tests.Helpers.xUnit.TestCaseOrderer", "codeRR.Server.Web.Tests")]
-    //[EnsureTestEnvironment]
     public abstract class WebTest
     {
         private static readonly IisExpressHelper _iisExpress;
         private static readonly DatabaseManager _databaseManager = new DatabaseManager();
-        private bool _disposed;
 
         static WebTest()
         {
@@ -37,7 +35,6 @@ static WebTest()
             };
 
             _iisExpress = new IisExpressHelper();
-            EnsureTestEnvironmentAttribute.helper = _iisExpress;
             _iisExpress = new IisExpressHelper
             {
                 ConfigPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "applicationhost.config"),
@@ -48,12 +45,12 @@ static WebTest()
             _iisExpress.Start("codeRR.Server.Web");
 
             TestData = new TestDataManager(_databaseManager.OpenConnection);
+            WebDriver = DriverFactory.Create(BrowserType.Chrome);
+            AppDomain.CurrentDomain.DomainUnload += (o, e) => { DisposeWebDriver(); };
         }
 
         protected WebTest()
         {
-            WebDriver = DriverFactory.Create(BrowserType.Chrome);
-            AppDomain.CurrentDomain.DomainUnload += (o, e) => { Dispose(); };
 
             TestData.ResetDatabase(_iisExpress.BaseUrl);
         }
@@ -62,13 +59,11 @@ protected WebTest()
 
         public static TestDataManager TestData { get; }
 
-        public IWebDriver WebDriver { get; private set; }
+        public static IWebDriver WebDriver { get; private set; }
 
-        public void Dispose()
+
+        private static void DisposeWebDriver()
         {
-            if (_disposed)
-                return;
-            _disposed = true;
             try
             {
                 WebDriver.Quit();
@@ -77,6 +72,7 @@ public void Dispose()
             catch
             {
             }
+
             WebDriver.Dispose();
         }
 

src/Server/Coderr.Server.Web.Tests/Tests/ConfigureApplicationPageTests.cs

@@ -186,7 +186,7 @@ private QueueListener CreateQueueListener(IServiceLocator locator, string inboun
             };
             listener.PoisonMessageDetected += (sender, args) =>
             {
-                Err.Report(args.Exception, new { args.Message });
+                //Err.Report(args.Exception, new { args.Message });
                 _log.Error(inboundQueueName + " Poison message: " + args.Message.Body, args.Exception);
             };
             listener.ScopeCreated += (sender, args) =>

src/Server/Coderr.Server.Web.Tests/WebTest.cs

@@ -14,8 +14,10 @@
 using codeRR.Server.Api.Core.Invitations.Queries;
 using codeRR.Server.App.Configuration;
 using codeRR.Server.App.Core.Accounts;
+using codeRR.Server.Infrastructure;
 using codeRR.Server.Infrastructure.Configuration;
 using codeRR.Server.Infrastructure.Security;
+using codeRR.Server.SqlServer.Core.Accounts;
 using codeRR.Server.Web.Models.Account;
 using Coderr.Server.PluginApi.Config;
 using DotNetCqs;
@@ -95,6 +97,16 @@ public async Task<ActionResult> Accept(AcceptViewModel model)
             };
 
             var identity = await _accountService.AcceptInvitation(this.ClaimsUser(), cmd);
+
+            //TODO: Remove hack.
+            // HERE since the message queue starts to process the events
+            // before we are done with them. We need some way to stack up the publishing
+            // until the current handler is done.
+            //
+            // can't use a message handler since we need a result from the invitation accept.
+            // so that we can construct a new identity
+            _uow.SaveChanges();
+
             if (identity == null)
             {
                 ModelState.AddModelError("",
@@ -103,9 +115,9 @@ public async Task<ActionResult> Accept(AcceptViewModel model)
                 return View(new AcceptViewModel());
             }
 
-          
+
             SignIn(identity);
-            return Redirect("~/#/account/accepted");
+            return RedirectToAction("UpdateSession", new { returnUrl = "/#/account/accepted" });
         }
 
         public async Task<ActionResult> Activate(string id)
@@ -169,7 +181,7 @@ public async Task<ActionResult> Login(LoginViewModel model)
                     return View(model);
                 }
 
-             
+
                 SignIn(principal);
 
                 if (model.ReturnUrl != null && model.ReturnUrl.StartsWith("/"))