fix #1640 to resolve issue with server prerendering, upgrade Installer to Bootstrap5, add more defensive logic and logging to DatabaseManager, fix file logger issue, update Pager to use Bootstrap5 pagination, add expiry date support for commercial extensions

Oqtane.Client/App.razor

@@ -33,12 +33,8 @@
 
     private PageState PageState { get; set; }
 
-    protected override async Task OnAfterRenderAsync(bool firstRender)
+    protected override async Task OnParametersSetAsync()
     {
-        if (firstRender && !_initialized)
-        {
-            var interop = new Interop(JSRuntime);
-            SiteState.AntiForgeryToken = await interop.GetElementByName(Constants.RequestVerificationToken);
         _installation = await InstallationService.IsInstalled();
         if (_installation.Alias != null)
         {
@@ -49,7 +45,14 @@
             _installation.Message = "Site Not Configured Correctly - No Matching Alias Exists For Host Name";
         }
         _initialized = true;
-            StateHasChanged();
+    }
+
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (firstRender)
+        {
+            var interop = new Interop(JSRuntime);
+            SiteState.AntiForgeryToken = await interop.GetElementByName(Constants.RequestVerificationToken);
         }
     }
 

Oqtane.Client/Installer/Installer.razor

@@ -150,7 +150,8 @@
         if (firstRender)
         {
             var interop = new Interop(JSRuntime);
-            await interop.IncludeLink("app-stylesheet", "stylesheet", "https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css", "text/css", "sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T", "anonymous", "");
+            await interop.IncludeLink("", "stylesheet", "https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css", "text/css", "sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC", "anonymous", "");
+            await interop.IncludeScript("", "https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js", "sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM", "anonymous", "", "head", "");
         }
     }
 

Oqtane.Client/Modules/Admin/Languages/Index.razor

@@ -32,10 +32,6 @@ else
                 {
                     <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadLanguage(context.Code))>@SharedLocalizer["Upgrade"]</button>
                 }
-                else
-                {
-                    @((MarkupString)PurchaseLink(context.Code))
-                }
             </td>
         </Row>
     </Pager>
@@ -95,23 +91,6 @@ else
         return upgradeavailable;
     }
 
-    private string PurchaseLink(string code)
-    {
-        string link = "";
-        if (_packages != null)
-        {
-            var package = _packages.Where(item => item.PackageId == (Constants.PackageId + ".Client." + code)).FirstOrDefault();
-            if (package != null)
-            {
-                if (package.Price > 0 && !string.IsNullOrEmpty(package.PaymentUrl))
-                {
-                    link = "<a class=\"btn btn-primary\" style=\"text-decoration: none !important\" href=\"" + package.PaymentUrl + "\" target=\"_new\">" + package.Price.ToString("$#,##0.00") + "</a>";
-                }
-            }
-        }
-        return link;
-    }
-
     private async Task DownloadLanguage(string code)
     {
         try

Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor

@@ -22,6 +22,7 @@ else
             <th style="width: 1px;">&nbsp;</th>
             <th>@SharedLocalizer["Name"]</th>
             <th>@SharedLocalizer["Version"]</th>
+            <th>@SharedLocalizer["Expires"]</th>
             <th style="width: 1px;">&nbsp;</th>
         </Header>
         <Row>
@@ -34,15 +35,14 @@ else
             </td>
             <td>@context.Name</td>
             <td>@context.Version</td>
+            <td>
+                @((MarkupString)PurchaseLink(context.PackageName))
+            </td>
             <td>
                 @if (UpgradeAvailable(context.PackageName, context.Version))
                 {
                     <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadModule(context.PackageName, context.Version))>@SharedLocalizer["Upgrade"]</button>
                 }
-                else
-                {
-                    @((MarkupString)PurchaseLink(context.PackageName))
-                }
             </td>
         </Row>
     </Pager>
@@ -71,6 +71,27 @@ else
         }
     }
 
+    private string PurchaseLink(string packagename)
+    {
+        string link = "";
+        if (!string.IsNullOrEmpty(packagename) && _packages != null)
+        {
+            var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
+            if (package != null)
+            {
+                if (package.ExpiryDate != null && package.ExpiryDate.Value.Date != DateTime.MaxValue.Date)
+                {
+                    link += "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span>";
+                    if (!string.IsNullOrEmpty(package.PaymentUrl))
+                    {
+                        link += "&nbsp;&nbsp;<a class=\"btn btn-primary\" style=\"text-decoration: none !important\" href=\"" + package.PaymentUrl + "\" target=\"_new\">" + SharedLocalizer["Extend"] + "</a>";
+                    }
+                }
+            }
+        }
+        return link;
+    }
+
     private bool UpgradeAvailable(string packagename, string version)
     {
         var upgradeavailable = false;
@@ -86,23 +107,6 @@ else
         return upgradeavailable;
     }
 
-    private string PurchaseLink(string packagename)
-    {
-        string link = "";
-        if (!string.IsNullOrEmpty(packagename) && _packages != null)
-        {
-            var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
-            if (package != null)
-            {
-                if (package.Price > 0 && !string.IsNullOrEmpty(package.PaymentUrl))
-                {
-                    link = "<a class=\"btn btn-primary\" style=\"text-decoration: none !important\" href=\"" + package.PaymentUrl + "\" target=\"_new\">" + package.Price.ToString("$#,##0.00") + "</a>";
-                }
-            }
-        }
-        return link;
-    }
-
     private async Task DownloadModule(string packagename, string version)
     {
         try

Oqtane.Client/Modules/Admin/SystemInfo/Index.razor

@@ -44,12 +44,6 @@
                     <input id="installationid" class="form-control" @bind="@_installationid" readonly />
                 </div>
             </div>
-            <div class="row mb-1 align-items-center">
-                <div class="col-sm-3"></div>
-                <div class="col-sm-9">
-                    <br /><input type="checkbox" @onchange="(e => RegisterChecked(e))" /> @Localizer["Register"]
-                </div>
-            </div>
         </div>
         <br /><br />
         <ActionDialog Header="Restart Application" Message="Are You Sure You Wish To Restart The Application?" Action="Restart Application" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await RestartApplication())" ResourceKey="RestartApplication" />
@@ -196,20 +190,4 @@
             await logger.LogError(ex, "Error Restarting Application");
         }
     }
-
-    private async Task RegisterChecked(ChangeEventArgs e)
-    {
-        try
-        {
-            if ((bool)e.Value)
-            {
-                await InstallationService.RegisterAsync(PageState.User.Email);
-                AddModuleMessage(Localizer["Success.Register"], MessageType.Success);
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error On Register");
-        }
-    }
 }

Oqtane.Client/Modules/Admin/Themes/Index.razor

@@ -21,8 +21,9 @@ else
         <Header>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
-            <th scope="col">@SharedLocalizer["Name"]</th>
+            <th>@SharedLocalizer["Name"]</th>
-            <th scope="col">@SharedLocalizer["Version"]</th>
+            <th>@SharedLocalizer["Version"]</th>
+            <th>@SharedLocalizer["Expires"]</th>
             <th>&nbsp;</th>
         </Header>
         <Row>
@@ -35,15 +36,14 @@ else
             </td>
             <td>@context.Name</td>
             <td>@context.Version</td>
+            <td>
+                @((MarkupString)PurchaseLink(context.PackageName))
+            </td>
             <td>
                 @if (UpgradeAvailable(context.PackageName, context.Version))
                 {
                     <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadTheme(context.PackageName, context.Version))>@SharedLocalizer["Upgrade"]</button>
                 }
-                else
-                {
-                    @((MarkupString)PurchaseLink(context.PackageName))
-                }
             </td>
             <td></td>
         </Row>
@@ -73,6 +73,27 @@ else
         }
     }
 
+    private string PurchaseLink(string packagename)
+    {
+        string link = "";
+        if (!string.IsNullOrEmpty(packagename) && _packages != null)
+        {
+            var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
+            if (package != null)
+            {
+                if (package.ExpiryDate != null && package.ExpiryDate.Value.Date != DateTime.MaxValue.Date)
+                {
+                    link += "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span>";
+                    if (!string.IsNullOrEmpty(package.PaymentUrl))
+                    {
+                        link += "&nbsp;&nbsp;<a class=\"btn btn-primary\" style=\"text-decoration: none !important\" href=\"" + package.PaymentUrl + "\" target=\"_new\">" + SharedLocalizer["Extend"] + "</a>";
+                    }
+                }
+            }
+        }
+        return link;
+    }
+
     private bool UpgradeAvailable(string packagename, string version)
     {
         var upgradeavailable = false;
@@ -103,23 +124,6 @@ else
         }
     }
 
-    private string PurchaseLink(string packagename)
-    {
-        string link = "";
-        if (!string.IsNullOrEmpty(packagename) && _packages != null)
-        {
-            var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
-            if (package != null)
-            {
-                if (package.Price > 0 && !string.IsNullOrEmpty(package.PaymentUrl))
-                {
-                    link = "<a class=\"btn btn-primary\" style=\"text-decoration: none !important\" href=\"" + package.PaymentUrl + "\" target=\"_new\">" + package.Price.ToString("$#,##0.00") + "</a>";
-                }
-            }
-        }
-        return link;
-    }
-
     private async Task DeleteTheme(Theme Theme)
     {
         try

Oqtane.Client/Modules/Controls/Pager.razor

@@ -5,40 +5,63 @@
 <p>
     @if (Toolbar == "Top")
     {
-        <div class="mx-auto text-center">
+        <ul class="pagination justify-content-center my-2">
             @if (_endPage > 1)
             {
-                <button class="btn btn-secondary m-1" @onclick=@(async () => UpdateList(1))><span class="oi oi-media-step-backward" title="first" aria-hidden="true"></span></button>
+                <li class="page-item">
+                    <a class="page-link" @onclick=@(async () => UpdateList(1))><span class="oi oi-media-step-backward" title="first" aria-hidden="true"></span></a>
+                </li>
             }
             @if (_page > _maxPages)
             {
-                <button class="btn btn-secondary m-1" @onclick=@(async () => SetPagerSize("back"))><span class="oi oi-media-skip-backward" title="back" aria-hidden="true"></span></button>
+                <li class="page-item">
+                    <a class="page-link" @onclick=@(async () => SetPagerSize("back"))><span class="oi oi-media-skip-backward" title="back" aria-hidden="true"></span></a>
+                </li>
             }
             @if (_endPage > 1)
             {
-                <button class="btn btn-secondary m-1" @onclick=@(async () => NavigateToPage("previous"))><span class="oi oi-chevron-left" title="previous" aria-hidden="true"></span></button>
+                <li class="page-item">
+                    <a class="page-link" @onclick=@(async () => NavigateToPage("previous"))><span class="oi oi-chevron-left" title="previous" aria-hidden="true"></span></a>
+                </li>
                 @for (int i = _startPage; i <= _endPage; i++)
                 {
                     var pager = i;
-                    <button class="btn @((pager == _page) ? "btn-primary" : "btn-link")" @onclick=@(async () => UpdateList(pager))>
+                    if (pager == _page)
-                        @pager
+                    {
-                    </button>
+                        <li class="page-item active">
+                            <a class="page-link" @onclick=@(async () => UpdateList(pager))>@pager</a>
+                        </li>
                     }
-                <button class="btn btn-secondary m-1" @onclick=@(async () => NavigateToPage("next"))><span class="oi oi-chevron-right" title="next" aria-hidden="true"></span></button>
+                    else
+                    {
+                        <li class="page-item">
+                            <a class="page-link" @onclick=@(async () => UpdateList(pager))>@pager</a>
+                        </li>
+                    }
+                }
+                <li class="page-item">
+                    <a class="page-link" @onclick=@(async () => NavigateToPage("next"))><span class="oi oi-chevron-right" title="next" aria-hidden="true"></span></a>
+                </li>
             }
             @if (_endPage < _pages)
             {
-                <button class="btn btn-secondary m-1" @onclick=@(async () => SetPagerSize("forward"))><span class="oi oi-media-skip-forward" title="forward" aria-hidden="true"></span></button>
+                <li class="page-item">
+                    <a class="page-link" @onclick=@(async () => SetPagerSize("forward"))><span class="oi oi-media-skip-forward" title="forward" aria-hidden="true"></span></a>
+                </li>
             }
             @if (_endPage > 1)
             {
-                <button class="btn btn-secondary m-1" @onclick=@(async () => UpdateList(_pages))><span class="oi oi-media-step-forward" title="last" aria-hidden="true"></span></button>
+                <li class="page-item">
+                    <a class="page-link" @onclick=@(async () => UpdateList(_pages))><span class="oi oi-media-step-forward" title="last" aria-hidden="true"></span></a>
+                </li>
             }
             @if (_endPage > 1)
             {
-                <span class="btn btn-link disabled">Page @_page of @_pages</span>
+                <li class="page-item disabled">
+                    <a class="page-link">Page @_page of @_pages</a>
+                </li>
             }
-        </div>
+        </ul>
     }
     @if (Format == "Table")
     {
@@ -74,40 +97,63 @@
     }
     @if (Toolbar == "Bottom")
     {
-        <div class="mx-auto text-center">
+        <ul class="pagination justify-content-center my-2">
             @if (_endPage > 1)
             {
-                <button class="btn btn-secondary mr-1" @onclick=@(async () => UpdateList(1))><span class="oi oi-media-step-backward" title="first" aria-hidden="true"></span></button>
+                <li class="page-item">
+                    <a class="page-link" @onclick=@(async () => UpdateList(1))><span class="oi oi-media-step-backward" title="first" aria-hidden="true"></span></a>
+                </li>
             }
             @if (_page > _maxPages)
             {
-                <button class="btn btn-secondary mr-1" @onclick=@(async () => SetPagerSize("back"))><span class="oi oi-media-skip-backward" title="back" aria-hidden="true"></span></button>
+                <li class="page-item">
+                    <a class="page-link" @onclick=@(async () => SetPagerSize("back"))><span class="oi oi-media-skip-backward" title="back" aria-hidden="true"></span></a>
+                </li>
             }
             @if (_endPage > 1)
             {
-                <button class="btn btn-secondary mr-1" @onclick=@(async () => NavigateToPage("previous"))><span class="oi oi-chevron-left" title="previous" aria-hidden="true"></span></button>
+                <li class="page-item">
+                    <a class="page-link" @onclick=@(async () => NavigateToPage("previous"))><span class="oi oi-chevron-left" title="previous" aria-hidden="true"></span></a>
+                </li>
                 @for (int i = _startPage; i <= _endPage; i++)
                 {
                     var pager = i;
-                    <button class="btn @((pager == _page) ? "btn-primary" : "btn-link")" @onclick=@(async () => UpdateList(pager))>
+                    if (pager == _page)
-                        @pager
+                    {
-                    </button>
+                        <li class="page-item active">
+                            <a class="page-link" @onclick=@(async () => UpdateList(pager))>@pager</a>
+                        </li>
                     }
-                <button class="btn btn-secondary mr-1" @onclick=@(async () => NavigateToPage("next"))><span class="oi oi-chevron-right" title="next" aria-hidden="true"></span></button>
+                    else
+                    {
+                        <li class="page-item">
+                            <a class="page-link" @onclick=@(async () => UpdateList(pager))>@pager</a>
+                        </li>
+                    }
+                }
+                <li class="page-item">
+                    <a class="page-link" @onclick=@(async () => NavigateToPage("next"))><span class="oi oi-chevron-right" title="next" aria-hidden="true"></span></a>
+                </li>
             }
             @if (_endPage < _pages)
             {
-                <button class="btn btn-secondary mr-1" @onclick=@(async () => SetPagerSize("forward"))><span class="oi oi-media-skip-forward" title="forward" aria-hidden="true"></span></button>
+                <li class="page-item">
+                    <a class="page-link" @onclick=@(async () => SetPagerSize("forward"))><span class="oi oi-media-skip-forward" title="forward" aria-hidden="true"></span></a>
+                </li>
             }
             @if (_endPage > 1)
             {
-                <button class="btn btn-secondary mr-1" @onclick=@(async () => UpdateList(_pages))><span class="oi oi-media-step-forward" title="last" aria-hidden="true"></span></button>
+                <li class="page-item">
+                    <a class="page-link" @onclick=@(async () => UpdateList(_pages))><span class="oi oi-media-step-forward" title="last" aria-hidden="true"></span></a>
+                </li>
             }
             @if (_endPage > 1)
             {
-                <span class="btn btn-link disabled">Page @_page of @_pages</span>
+                <li class="page-item disabled">
+                    <a class="page-link">Page @_page of @_pages</a>
+                </li>
             }
-        </div>
+        </ul>
     }
 </p>
 

Oqtane.Client/Resources/SharedResources.resx

@@ -303,4 +303,10 @@
   <data name="Trial" xml:space="preserve">
     <value>Day Trial</value>
   </data>
+  <data name="Expires" xml:space="preserve">
+    <value>Expires</value>
+  </data>
+  <data name="Extend" xml:space="preserve">
+    <value>Extend</value>
+  </data>
 </root>

Oqtane.Server/Infrastructure/DatabaseManager.cs

@@ -250,6 +250,7 @@ namespace Oqtane.Infrastructure
             catch (Exception ex)
             {
                 result.Message = ex.Message;
+                _filelogger.LogError(Utilities.LogMessage(this, result.Message));
             }
 
             return result;
@@ -288,6 +289,7 @@ namespace Oqtane.Infrastructure
                 catch (Exception ex)
                 {
                     result.Message = ex.Message;
+                    _filelogger.LogError(Utilities.LogMessage(this, result.Message));
                 }
             }
             else
@@ -328,6 +330,7 @@ namespace Oqtane.Infrastructure
                     catch (Exception ex)
                     {
                         result.Message = ex.Message;
+                        _filelogger.LogError(Utilities.LogMessage(this, result.Message));
                     }
                 }
             }
@@ -432,6 +435,7 @@ namespace Oqtane.Infrastructure
                         catch (Exception ex)
                         {
                             result.Message = ex.Message;
+                            _filelogger.LogError(Utilities.LogMessage(this, result.Message));
                         }
 
                         // execute any version specific upgrade logic
@@ -539,6 +543,10 @@ namespace Oqtane.Infrastructure
             {
                 result.Success = true;
             }
+            else
+            {
+                _filelogger.LogError(Utilities.LogMessage(this, result.Message));
+            }
 
             return result;
         }
@@ -548,6 +556,8 @@ namespace Oqtane.Infrastructure
             var result = new Installation { Success = false, Message = string.Empty };
 
             if (!string.IsNullOrEmpty(install.TenantName) && !string.IsNullOrEmpty(install.Aliases) && !string.IsNullOrEmpty(install.SiteName))
+            {
+                try
                 {
                     using (var scope = _serviceScopeFactory.CreateScope())
                     {
@@ -651,8 +661,20 @@ namespace Oqtane.Infrastructure
                         }
                     }
                 }
+                catch (Exception ex)
+                {
+                    result.Message = "An Error Occurred Creating Site - " + ex.Message;
+                }
+            }
 
+            if (string.IsNullOrEmpty(result.Message))
+            {
                 result.Success = true;
+            }
+            else
+            {
+                _filelogger.LogError(Utilities.LogMessage(this, result.Message));
+            }
 
             return result;
         }

Oqtane.Server/Infrastructure/Logging/FileLogger.cs

@@ -55,7 +55,7 @@ namespace Oqtane.Infrastructure
             var filepath = Path.Combine(folder, "error.log");
 
             // only retain an error log for the current day as it is intended for development purposes
-            if (File.GetCreationTime(filepath).ToUniversalTime().Date < DateTime.UtcNow.Date && File.Exists(filepath))
+            if (File.Exists(filepath) && File.GetLastWriteTimeUtc(filepath).Date < DateTime.UtcNow.Date)
             {
                 File.Delete(filepath);
             }

Oqtane.Shared/Models/Package.cs

@@ -68,7 +68,7 @@ namespace Oqtane.Models
         public int Vulnerabilities { get; set; }
 
         /// <summary>
-        /// The price of the package 
+        /// The price of the package  ( if commercial )
         /// </summary>
         public decimal Price { get; set; }
 
@@ -81,5 +81,10 @@ namespace Oqtane.Models
         /// The trial period in days ( if commercial )
         /// </summary>
         public int TrialPeriod { get; set; }
+
+        /// <summary>
+        /// The expiry date of the package ( if commercial )
+        /// </summary>
+        public DateTime? ExpiryDate { get; set; }
     }
 }