Merge

Author: gauffininteractive

src/Server/OneTrueError.Api/Core/Incidents/Queries/FindIncidents.cs

@@ -71,6 +71,11 @@ public FindIncidents()
         /// </summary>
         public bool ReOpened { get; set; }
 
+        /// <summary>
+        /// Will be searched in incident.message and report.stacktrace.
+        /// </summary>
+        public string FreeText { get; set; }
+
         /// <summary>
         ///     Sort order
         /// </summary>

src/Server/OneTrueError.App/Core/Support/SendSupportRequestHandler.cs

@@ -0,0 +1,53 @@
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading.Tasks;
+using DotNetCqs;
+using Griffin.Container;
+using OneTrueError.Api.Core.Support;
+using OneTrueError.App.Configuration;
+using OneTrueError.Infrastructure.Configuration;
+
+namespace OneTrueError.App.Core.Support
+{
+    /// <summary>
+    ///     Sends a support request to the OneTrueError Team.
+    /// </summary>
+    /// <remarks>
+    ///     <para>
+    ///         You must have bought commercial support or registered to get 30 days of free support.
+    ///     </para>
+    /// </remarks>
+    [Component]
+    public class SendSupportRequestHandler : ICommandHandler<SendSupportRequest>
+    {
+        /// <inheritdoc />
+        public async Task ExecuteAsync(SendSupportRequest command)
+        {
+            var baseConfig = ConfigurationStore.Instance.Load<BaseConfiguration>();
+            var errorConfig = ConfigurationStore.Instance.Load<OneTrueErrorConfigSection>();
+
+            string installationId = null;
+            var email = baseConfig.SupportEmail;
+            if (errorConfig != null)
+            {
+                email = errorConfig.ContactEmail;
+                installationId = errorConfig.InstallationId;
+            }
+
+
+            var items = new List<KeyValuePair<string, string>>();
+            if (installationId != null)
+                items.Add(new KeyValuePair<string, string>("InstallationId", installationId));
+            items.Add(new KeyValuePair<string, string>("ContactEmail", email));
+            items.Add(new KeyValuePair<string, string>("Subject", command.Subject));
+            items.Add(new KeyValuePair<string, string>("Message", command.Message));
+
+            //To know which page the user had trouble with
+            items.Add(new KeyValuePair<string, string>("PageUrl", command.Url));
+
+            var content = new FormUrlEncodedContent(items);
+            var client = new HttpClient();
+            await client.PostAsync("https://onetrueerror.com/support/request", content);
+        }
+    }
+}

src/Server/OneTrueError.App/OneTrueError.App.csproj

@@ -95,6 +95,7 @@
     <Compile Include="Core\Reports\Jobs\DeleteOldReports.cs" />
     <Compile Include="Core\Reports\Jobs\DeleteReportsBelowReportLimit.cs" />
     <Compile Include="Core\Reports\PagedReports.cs" />
+    <Compile Include="Core\Support\SendSupportRequestHandler.cs" />
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Modules\Geolocation\ErrorOrginResult.cs" />
     <Compile Include="Modules\Geolocation\QueryHandlers\GetOriginsForIncidentHandler.cs" />

src/Server/OneTrueError.SqlServer/Core/Incidents/Queries/FindIncidentsHandler.cs

@@ -32,16 +32,22 @@ FROM Incidents
                                     JOIN Applications ON (Applications.Id = Incidents.ApplicationId)
                                     JOIN ApplicationMembers atm ON (atm.ApplicationId = Applications.Id AND AccountId = @accountId)";
                 cmd.AddParameter("accountId", ClaimsPrincipal.Current.GetAccountId());
+
                 if (query.ApplicationId > 0)
                 {
-                    sqlQuery += " WHERE Applications.Id = @id AND (";
+                    sqlQuery += " WHERE Applications.Id = @id";
                     cmd.AddParameter("id", query.ApplicationId);
                 }
-                else
+                if (query.FreeText != null)
                 {
-                    sqlQuery += "AND (";
+                    sqlQuery += @" AND (
+                                    Incidents.Id IN (SELECT Distinct IncidentId FROM ErrorReports WHERE StackTrace LIKE @FreeText
+                                    Or Incidents.Description LIKE @FreeText)
+                                    )";
+                    cmd.AddParameter("FreeText", $"%{query.FreeText}%");
                 }
 
+                sqlQuery += " AND (";
                 if (query.Ignored)
                     sqlQuery += "IgnoreReports = 1 OR ";
                 if (query.Closed)

src/Server/OneTrueError.SqlServer/Modules/Geolocation/StoreErrorOriginHandler.cs renamed to src/Server/OneTrueError.SqlServer/Modules/Geolocation/ErrorOriginRepository.cs

@@ -125,7 +125,7 @@
     <Compile Include="Core\Users\ApplicationTeamMemberMapper.cs" />
     <Compile Include="Core\Users\UserMapper.cs" />
     <Compile Include="Core\Users\UserRepository.cs" />
-    <Compile Include="Modules\Geolocation\StoreErrorOriginHandler.cs" />
+    <Compile Include="Modules\Geolocation\ErrorOriginRepository.cs" />
     <Compile Include="Modules\ReportSpikes\ReportSpikesRepository.cs" />
     <Compile Include="Modules\Similarities\Mappers\SimilarityCollectionMapper.cs" />
     <Compile Include="Modules\Similarities\Mappers\SimilarityMapper.cs" />

src/Server/OneTrueError.SqlServer/OneTrueError.SqlServer.csproj

@@ -1,5 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.Configuration;
+using System.Net.Http;
+using System.Threading.Tasks;
 using System.Web.Mvc;
 using OneTrueError.App.Configuration;
 using OneTrueError.Infrastructure;
@@ -24,6 +27,36 @@ public ActionResult Activate()
             return Redirect("~/?#/welcome");
         }
 
+        public ActionResult Support()
+        {
+            return View(new SupportViewModel());
+        }
+
+        [HttpPost]
+        public async Task<ActionResult> Support(SupportViewModel model)
+        {
+            if (!ModelState.IsValid)
+                return View(model);
+
+            try
+            {
+                var client = new HttpClient();
+                var content =
+                    new FormUrlEncodedContent(new []
+                    {
+                        new KeyValuePair<string, string>("EmailAddress", model.Email),
+                        new KeyValuePair<string, string>("CompanyName", model.CompanyName)
+                    });
+                await client.PostAsync("https://onetrueerror.com/support/register/", content);
+                return Redirect(Url.GetNextWizardStep());
+            }
+            catch (Exception ex)
+            {
+                ModelState.AddModelError("", ex.Message);
+                return View(model);
+            }
+        }
+
         public ActionResult Basics()
         {
             var model = new BasicsViewModel();
@@ -35,7 +68,7 @@ public ActionResult Basics()
             }
             else
             {
-                model.BaseUrl = Request.Url.ToString().Replace("installation/setup/basics/", "");
+                model.BaseUrl = Request.Url.ToString().Replace("installation/setup/basics/", "").Replace("localhost", "yourServerName");
                 ViewBag.NextLink = "";
             }
 
@@ -50,6 +83,11 @@ public ActionResult Basics(BasicsViewModel model)
             if (!model.BaseUrl.EndsWith("/"))
                 model.BaseUrl += "/";
 
+            if (model.BaseUrl.IndexOf("localhost", StringComparison.OrdinalIgnoreCase) != -1)
+            {
+                ModelState.AddModelError("BaseUrl", "Use the servers real DNS name instead of 'localhost'. If you don't the Ajax request wont work as CORS would be enforced by IIS.");
+                return View(model);
+            }
             settings.BaseUrl = new Uri(model.BaseUrl);
             settings.SupportEmail = model.SupportEmail;
             ConfigurationStore.Instance.Store(settings);

src/Server/OneTrueError.Web/Areas/Installation/Controllers/SetupController.cs

@@ -0,0 +1,12 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace OneTrueError.Web.Areas.Installation.Models
+{
+    public class SupportViewModel
+    {
+        [EmailAddress]
+        public string Email { get; set; }
+
+        public string CompanyName { get; set; }
+    }
+}

src/Server/OneTrueError.Web/Areas/Installation/Models/SupportViewModel.cs

@@ -0,0 +1,28 @@
+@model OneTrueError.Web.Areas.Installation.Models.SupportViewModel
+@{
+    ViewBag.Title = "Installation - Support";
+}
+<div class="container">
+    <div class="col-lg-6">
+
+        <h2>Free Support</h2>
+        <p>Do you want to get 30 days of free email support?</p>
+        <p>No obligations attached, but you can purchase commercial support after that if you would like to support the project.</p>
+        <form method="post" action="@Url.Action("Support")" style="width: 100%" class="form">
+            @Html.ValidationSummary(false)
+            <div>
+                <input type="text" 
+                       name="CompanyName" class="form-control" value="@Model.CompanyName" placeholder="Company name" />
+
+                <input type="email"
+                       name="Email" class="form-control" value="@Model.Email" placeholder="Your email address" />
+            </div>
+            <div><em>(Leave fields empty if you do not want to sign up)</em></div>
+            <div>&nbsp;</div>
+            <br />
+            @Html.Raw(ViewBag.PrevLink)
+            <input type="submit" class="btn btn-primary" value="Signup" />
+            @Html.Raw(ViewBag.NextLink)
+        </form>
+    </div>
+</div>

src/Server/OneTrueError.Web/Areas/Installation/Views/Setup/Support.cshtml

@@ -13,6 +13,7 @@ public static class WizardSteps
             new WizardStepInfo("Error tracking", "~/installation/setup/errors/"),
             new WizardStepInfo("Create admin account", "~/installation/account/admin/"),
             new WizardStepInfo("Mail settings", "~/installation/messaging/email/"),
+            new WizardStepInfo("Support", "~/installation/setup/support"),
             new WizardStepInfo("Completed", "~/installation/setup/completed/")
         };