Skip to content

Commit 6c16d8f

Browse files
author
gauffininteractive
committed
Changes to the installation procedure and consequences of them
1 parent 882c0dc commit 6c16d8f

File tree

9 files changed

+17
-9
lines changed

9 files changed

+17
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public async Task<LoginReply> ExecuteAsync(Login request)
6060
catch (AuthenticationException ex)
6161
{
6262
_logger.Debug("Logging failed for " + request.UserName, ex);
63-
_eventBus.PublishAsync(new LoginFailed(request.UserName) {IsLocked = true}).Start();
63+
_eventBus.PublishAsync(new LoginFailed(request.UserName) {IsLocked = true}).Wait();
6464
return new LoginReply {Result = LoginResult.Locked};
6565
}
6666

src/Server/OneTrueError.Data.Common/Queueing/MessageQueueSettings.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ namespace OneTrueError.Infrastructure.Queueing
55
{
66
public sealed class MessageQueueSettings : IConfigurationSection
77
{
8+
public MessageQueueSettings()
9+
{
10+
UseSql = true;
11+
}
12+
813
public string ReportQueue { get; set; }
914

1015
public bool ReportAuthentication { get; set; }

src/Server/OneTrueError.Data.Common/Queueing/QueueProvider.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public class QueueProvider : IMessageQueueProvider
1919

2020
public IMessageQueue Open(string queueName)
2121
{
22-
var config = ConfigurationStore.Instance.Load<MessageQueueSettings>();
22+
var config = ConfigurationStore.Instance.Load<MessageQueueSettings>()
23+
?? new MessageQueueSettings(); //isn't added by the installation guide.
2324
var conString = ConfigurationManager.ConnectionStrings["Db"].ConnectionString;
2425
var provider = ConfigurationManager.ConnectionStrings["Db"].ProviderName;
2526
switch (queueName)

src/Server/OneTrueError.Web/App_Start/RouteConfig.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ public static void RegisterInstallationRoutes(RouteCollection routes)
3131
routes.MapRoute(
3232
name: "Default",
3333
url: "{controller}/{action}/{id}",
34-
defaults: new { controller = "Home", action = "ToInstall", id = UrlParameter.Optional });
34+
defaults: new { controller = "Home", action = "ToInstall", id = UrlParameter.Optional },
35+
namespaces: new[] { "OneTrueError.Web.Controllers" }
36+
);
3537
}
3638
}
3739
}

src/Server/OneTrueError.Web/Areas/Admin/InstallationAreaRegistration.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ public override void RegisterArea(AreaRegistrationContext context)
1717
context.MapRoute(
1818
"admin_default",
1919
"admin/{controller}/{action}/{id}",
20-
new { action = "Index", controller = "Home", id = UrlParameter.Optional }
20+
new { action = "Index", controller = "Home", id = UrlParameter.Optional },
21+
namespaces: new []{GetType().Namespace + ".Controllers"}
2122
);
2223
}
2324
}

src/Server/OneTrueError.Web/Controllers/AccountController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ public async Task<ActionResult> Login(LoginViewModel model)
211211
ModelState.AddModelError("", "Incorrect username or password.");
212212
else
213213
ModelState.AddModelError("",
214-
"Your account have not been activated (check your email account). Contact support@onetrueerror.com if you need assistance.");
214+
"Your account is locked or have not been activated (check your email account). Contact support@onetrueerror.com if you need assistance.");
215215

216216
model.Password = "";
217217
return View(model);

src/Server/OneTrueError.Web/Scripts/Promise.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Server/OneTrueError.Web/Views/Shared/_Layout.cshtml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@
133133
@Scripts.Render("~/bundles/bootstrap")
134134
<script src="@Url.Content("~/Scripts/Promise.js")"></script>
135135
<script src="@Url.Content("~/Scripts/CqsClient.js")"></script>
136-
<script src="@Url.Content("~/signalr/hubs")"></script>
137136
@Scripts.Render("~/bundles/app")
138137
@RenderSection("scripts", required: false)
139138
@RenderSection("ViewModelScripts", required: false)

src/Server/OneTrueError.Web/Web.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<appSettings>
4-
<add key="Configured" value="true" />
4+
<add key="Configured" value="false" />
55
<add key="ScanForNewErrorReportsBatcher.Enabled" value="true" />
66
<add key="ScanForNewFeedback.Enabled" value="true" />
77
</appSettings>

0 commit comments

Comments
 (0)