Merge pull request #624 from hargata/Hargata/618

#618
2025-12-10 18:36:38 -06:00 · 2024-09-22 10:24:01 -06:00 · 2024-09-22 10:24:01 -06:00 · d0c19d0436
commit d0c19d0436
parent e6857331e2 3428abf358
10 changed files with 185 additions and 148 deletions
--- a/Controllers/APIController.cs
+++ b/Controllers/APIController.cs
@ -666,7 +666,7 @@ namespace CarCareTracker.Controllers
        {
            var vehicles = _dataAccess.GetVehicles();
            List<OperationResponse> operationResponses = new List<OperationResponse>();
-            var defaultEmailAddress = _config.GetDefaultReminderEmail();
+            var defaultEmailAddress = _config.GetUserConfig(User).DefaultReminderEmail;
            foreach(Vehicle vehicle in vehicles)
            {
                var vehicleId = vehicle.Id;
--- a/Controllers/LoginController.cs
+++ b/Controllers/LoginController.cs
@ -51,6 +51,10 @@ namespace CarCareTracker.Controllers
        }
        public IActionResult Registration()
        {
+            if (_config.GetServerDisabledRegistration())
+            {
+                return RedirectToAction("Index");
+            }
            return View();
        }
        public IActionResult ForgotPassword()
--- a/Helper/ConfigHelper.cs
+++ b/Helper/ConfigHelper.cs
@ -14,9 +14,9 @@ namespace CarCareTracker.Helper
        bool AuthenticateRootUser(string username, string password);
        string GetWebHookUrl();
        string GetMOTD();
-        string GetDefaultReminderEmail();
        string GetLogoUrl();
        string GetServerLanguage();
+        bool GetServerDisabledRegistration();
        bool GetServerEnableShopSupplies();
        string GetServerPostgresConnection();
        string GetAllowedFileUploadExtensions();
@ -53,15 +53,6 @@ namespace CarCareTracker.Helper
            }
            return motd;
        }
-        public string GetDefaultReminderEmail()
-        {
-            var defaultEmail = _config["DEFAULT_REMINDER_EMAIL"];
-            if (string.IsNullOrWhiteSpace(defaultEmail))
-            {
-                defaultEmail = "";
-            }
-            return defaultEmail;
-        }
        public OpenIDConfig GetOpenIDConfig()
        {
            OpenIDConfig openIdConfig = _config.GetSection("OpenIDConfig").Get<OpenIDConfig>() ?? new OpenIDConfig();
@ -104,6 +95,11 @@ namespace CarCareTracker.Helper
            var serverLanguage = _config[nameof(UserConfig.UserLanguage)] ?? "en_US";
            return serverLanguage;
        }
+        public bool GetServerDisabledRegistration()
+        {
+            var registrationDisabled = bool.Parse(_config[nameof(UserConfig.DisableRegistration)]);
+            return registrationDisabled;
+        }
        public string GetServerPostgresConnection()
        {
            if (!string.IsNullOrWhiteSpace(_config["POSTGRES_CONNECTION"]))
@ -190,7 +186,9 @@ namespace CarCareTracker.Helper
                VisibleTabs = _config.GetSection(nameof(UserConfig.VisibleTabs)).Get<List<ImportMode>>(),
                UserColumnPreferences = _config.GetSection(nameof(UserConfig.UserColumnPreferences)).Get<List<UserColumnPreference>>() ?? new List<UserColumnPreference>(),
                ReminderUrgencyConfig = _config.GetSection(nameof(UserConfig.ReminderUrgencyConfig)).Get<ReminderUrgencyConfig>() ?? new ReminderUrgencyConfig(),
-                DefaultTab = (ImportMode)int.Parse(_config[nameof(UserConfig.DefaultTab)])
+                DefaultTab = (ImportMode)int.Parse(_config[nameof(UserConfig.DefaultTab)]),
+                DefaultReminderEmail = _config[nameof(UserConfig.DefaultReminderEmail)],
+                DisableRegistration = bool.Parse(_config[nameof(UserConfig.DisableRegistration)])
            };
            int userId = 0;
            if (user != null)
--- a/Models/UserConfig.cs
+++ b/Models/UserConfig.cs
@ -7,6 +7,7 @@
        public bool UseMPG { get; set; }
        public bool UseDescending { get; set; }
        public bool EnableAuth { get; set; }
+        public bool DisableRegistration { get; set; }
        public bool HideZero { get; set; }
        public bool UseUKMPG {get;set;}
        public bool UseThreeDecimalGasCost { get; set; }
@ -22,6 +23,7 @@
        public ReminderUrgencyConfig ReminderUrgencyConfig { get; set; } = new ReminderUrgencyConfig();
        public string UserNameHash { get; set; }
        public string UserPasswordHash { get; set;}
+        public string DefaultReminderEmail { get; set; } = string.Empty;
        public string UserLanguage { get; set; } = "en_US";
        public List<ImportMode> VisibleTabs { get; set; } = new List<ImportMode>() { 
            ImportMode.Dashboard,
--- a/Views/Home/Index.cshtml
+++ b/Views/Home/Index.cshtml
@ -13,6 +13,7 @@
 }
@section Scripts {
    <script src="~/js/garage.js?v=@StaticHelper.VersionNumber"></script>
+    <script src="~/js/settings.js?v=@StaticHelper.VersionNumber"></script>
    <script src="~/js/supplyrecord.js?v=@StaticHelper.VersionNumber"></script>
    <script src="~/lib/drawdown/drawdown.js"></script>
 }
--- a/Views/Home/_Settings.cshtml
+++ b/Views/Home/_Settings.cshtml
@ -71,6 +71,13 @@
                <input class="form-check-input" onChange="enableAuthCheckChanged()" type="checkbox" role="switch" id="enableAuth" checked="@Model.UserConfig.EnableAuth">
                <label class="form-check-label" for="enableAuth">@translator.Translate(userLanguage, "Enable Authentication")</label>
            </div>
+            @if (Model.UserConfig.EnableAuth)
+            {
+                <div class="form-check form-switch">
+                    <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="disableRegistration" checked="@Model.UserConfig.DisableRegistration">
+                    <label class="form-check-label" for="disableRegistration">@translator.Translate(userLanguage, "Disable Registration")</label>
+                </div>
+            }
        }
    </div>
    <div class="col-12 col-md-6">
@ -198,6 +205,19 @@
                        </div>
                    </div>
                </div>
+                <div class="col-12 col-md-6">
+                    <span class="lead">@translator.Translate(userLanguage, "Default Reminder Email")</span>
+                    <div class="row">
+                        <div class="col-12 d-grid">
+                            <div class="input-group">
+                                <input id="inputDefaultEmail" class="form-control" placeholder="@translator.Translate(userLanguage,"Default Email for Reminder")" value="@Model.UserConfig.DefaultReminderEmail">
+                                 <div class="input-group-text">
+                                    <button type="button" class="btn btn-sm btn-primary zero-y-padding" onclick="updateSettings()"><i class="bi bi-floppy"></i></button>
+                                 </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
            </div>
        }
    </div>
@ -306,137 +326,6 @@
            }
        });
    }
-    function showExtraFieldModal() {
-        $.get(`/Home/GetExtraFieldsModal?importMode=0`, function (data) {
-            $("#extraFieldModalContent").html(data);
-            $("#extraFieldModal").modal('show');
-        });
-    }
-    function hideExtraFieldModal() {
-        $("#extraFieldModal").modal('hide');
-    }
-    function getCheckedTabs() {
-        var visibleTabs = $("#visibleTabs :checked").map(function () {
-            return this.value;
-        });
-        return visibleTabs.toArray();
-    }
-    function deleteLanguage() {
-        var languageFileLocation = `/translations/${$("#defaultLanguage").val()}.json`;
-        $.post('/Files/DeleteFiles', { fileLocation: languageFileLocation }, function (data) {
-            //reset user language back to en_US
-            $("#defaultLanguage").val('en_US');
-            updateSettings();
-        });
-    }
-    function updateSettings() {
-        var visibleTabs = getCheckedTabs();
-        var defaultTab = $("#defaultTab").val();
-        if (!visibleTabs.includes(defaultTab)) {
-            defaultTab = "Dashboard"; //default to dashboard.
-        }
-        var userConfigObject = {
-            useDarkMode: $("#enableDarkMode").is(':checked'),
-            enableCsvImports: $("#enableCsvImports").is(':checked'),
-            useMPG: $("#useMPG").is(':checked'),
-            useDescending: $("#useDescending").is(':checked'),
-            hideZero: $("#hideZero").is(":checked"),
-            useUKMpg: $("#useUKMPG").is(":checked"),
-            useThreeDecimalGasCost: $("#useThreeDecimal").is(":checked"),
-            useMarkDownOnSavedNotes: $("#useMarkDownOnSavedNotes").is(":checked"),
-            enableAutoReminderRefresh: $("#enableAutoReminderRefresh").is(":checked"),
-            enableAutoOdometerInsert: $("#enableAutoOdometerInsert").is(":checked"),
-            enableShopSupplies: $("#enableShopSupplies").is(":checked"),
-            enableExtraFieldColumns: $("#enableExtraFieldColumns").is(":checked"),
-            hideSoldVehicles: $("#hideSoldVehicles").is(":checked"),
-            preferredGasUnit: $("#preferredGasUnit").val(),
-            preferredGasMileageUnit: $("#preferredFuelMileageUnit").val(),
-            userLanguage: $("#defaultLanguage").val(),
-            visibleTabs: visibleTabs,
-            defaultTab: defaultTab
-        }
-        sloader.show();
-        $.post('/Home/WriteToSettings', { userConfig: userConfigObject }, function (data) {
-            sloader.hide();
-            if (data) {
-                setTimeout(function () { window.location.href = '/Home/Index?tab=settings' }, 500);
-            } else {
-                errorToast(genericErrorMessage());
-            }
-        })
-    }
-    function makeBackup() {
-        $.get('/Files/MakeBackup', function (data) {
-            window.location.href = data;
-        });
-    }
-    function openUploadLanguage() {
-        $("#inputLanguage").click();
-    }
-    function openRestoreBackup() {
-        $("#inputBackup").click();
-    }
-    function uploadLanguage(event) {
-        let formData = new FormData();
-        formData.append("file", event.files[0]);
-        sloader.show();
-        $.ajax({
-            url: "/Files/HandleTranslationFileUpload",
-            data: formData,
-            cache: false,
-            processData: false,
-            contentType: false,
-            type: 'POST',
-            success: function (response) {
-                sloader.hide();
-                if (response.success) {
-                    setTimeout(function () { window.location.href = '/Home/Index?tab=settings' }, 500);
-                } else {
-                    errorToast(response.message);
-                }
-            },
-            error: function () {
-                sloader.hide();
-                errorToast("An error has occurred, please check the file size and try again later.");
-            }
-        });
-    }
-    function restoreBackup(event) {
-        let formData = new FormData();
-        formData.append("file", event.files[0]);
-        console.log('LubeLogger - DB Restoration Started');
-        sloader.show();
-        $.ajax({
-            url: "/Files/HandleFileUpload",
-            data: formData,
-            cache: false,
-            processData: false,
-            contentType: false,
-            type: 'POST',
-            success: function (response) {
-                if (response.trim() != '') {
-                    $.post('/Files/RestoreBackup', { fileName: response }, function (data) {
-                        sloader.hide();
-                        if (data) {
-                            console.log('LubeLogger - DB Restoration Completed');
-                            successToast("Backup Restored");
-                            setTimeout(function () { window.location.href = '/Home/Index' }, 500);
-                        } else {
-                            errorToast(genericErrorMessage());
-                            console.log('LubeLogger - DB Restoration Failed - Failed to process backup file.');
-                        }
-                    });
-                } else {
-                    console.log('LubeLogger - DB Restoration Failed - Failed to upload backup file.');
-                }
-            },
-            error: function () {
-                sloader.hide();
-                console.log('LubeLogger - DB Restoration Failed - Request failed to reach backend, please check file size.');
-                errorToast("An error has occurred, please check the file size and try again later.");
-            }
-        });
-    }
    function enableAuthCheckChanged() {
        var enableAuth = $("#enableAuth").is(":checked");
        if (enableAuth) {
--- a/Views/Login/Index.cshtml
+++ b/Views/Login/Index.cshtml
@ -5,6 +5,7 @@
@{
    var logoUrl = config.GetLogoUrl();
    var userLanguage = config.GetServerLanguage();
+    var registrationDisabled = config.GetServerDisabledRegistration();
    var openIdConfigName = config.GetOpenIDConfig().Name;
 }
@{
@ -46,9 +47,12 @@
            <div class="d-grid">
                <a href="/Login/ForgotPassword" class="btn btn-link mt-2">@translator.Translate(userLanguage, "Forgot Password")</a>
            </div>
-            <div class="d-grid">
-                <a href="/Login/Registration" class="btn btn-link mt-2">@translator.Translate(userLanguage, "Register")</a>
-            </div>
+            @if (!registrationDisabled)
+            {
+                <div class="d-grid">
+                    <a href="/Login/Registration" class="btn btn-link mt-2">@translator.Translate(userLanguage, "Register")</a>
+                </div>
+            }
        </div>
    </div>
 </div>
--- a/appsettings.json
+++ b/appsettings.json
@ -11,6 +11,7 @@
  "UseMPG": true,
  "UseDescending": false,
  "EnableAuth": false,
+  "DisableRegistration":  false,
  "HideZero": false,
  "EnableAutoReminderRefresh": false,
  "EnableAutoOdometerInsert": false,
@ -27,5 +28,6 @@
  "VisibleTabs": [ 0, 1, 4, 2, 3, 6, 5, 8 ],
  "DefaultTab": 8,
  "UserNameHash": "",
-  "UserPasswordHash": ""
+  "UserPasswordHash": "",
+  "DefaultReminderEmail":  ""
 }
--- a/wwwroot/defaults/en_US.json
+++ b/wwwroot/defaults/en_US.json
--- a/wwwroot/js/settings.js
+++ b/wwwroot/js/settings.js
@ -0,0 +1,137 @@
+function showExtraFieldModal() {
+    $.get(`/Home/GetExtraFieldsModal?importMode=0`, function (data) {
+        $("#extraFieldModalContent").html(data);
+        $("#extraFieldModal").modal('show');
+    });
+}
+function hideExtraFieldModal() {
+    $("#extraFieldModal").modal('hide');
+}
+function getCheckedTabs() {
+    var visibleTabs = $("#visibleTabs :checked").map(function () {
+        return this.value;
+    });
+    return visibleTabs.toArray();
+}
+function deleteLanguage() {
+    var languageFileLocation = `/translations/${$("#defaultLanguage").val()}.json`;
+    $.post('/Files/DeleteFiles', { fileLocation: languageFileLocation }, function (data) {
+        //reset user language back to en_US
+        $("#defaultLanguage").val('en_US');
+        updateSettings();
+    });
+}
+function updateSettings() {
+    var visibleTabs = getCheckedTabs();
+    var defaultTab = $("#defaultTab").val();
+    if (!visibleTabs.includes(defaultTab)) {
+        defaultTab = "Dashboard"; //default to dashboard.
+    }
+    //Root User Only Settings that aren't rendered:
+    var defaultReminderEmail = $("#inputDefaultEmail").length > 0 ? $("#inputDefaultEmail").val() : "";
+    var disableRegistration = $("#disableRegistration").length > 0 ? $("#disableRegistration").is(":checked") : false;
+
+    var userConfigObject = {
+        useDarkMode: $("#enableDarkMode").is(':checked'),
+        enableCsvImports: $("#enableCsvImports").is(':checked'),
+        useMPG: $("#useMPG").is(':checked'),
+        useDescending: $("#useDescending").is(':checked'),
+        hideZero: $("#hideZero").is(":checked"),
+        useUKMpg: $("#useUKMPG").is(":checked"),
+        useThreeDecimalGasCost: $("#useThreeDecimal").is(":checked"),
+        useMarkDownOnSavedNotes: $("#useMarkDownOnSavedNotes").is(":checked"),
+        enableAutoReminderRefresh: $("#enableAutoReminderRefresh").is(":checked"),
+        enableAutoOdometerInsert: $("#enableAutoOdometerInsert").is(":checked"),
+        enableShopSupplies: $("#enableShopSupplies").is(":checked"),
+        enableExtraFieldColumns: $("#enableExtraFieldColumns").is(":checked"),
+        hideSoldVehicles: $("#hideSoldVehicles").is(":checked"),
+        preferredGasUnit: $("#preferredGasUnit").val(),
+        preferredGasMileageUnit: $("#preferredFuelMileageUnit").val(),
+        userLanguage: $("#defaultLanguage").val(),
+        visibleTabs: visibleTabs,
+        defaultTab: defaultTab,
+        disableRegistration: disableRegistration,
+        defaultReminderEmail: defaultReminderEmail 
+    }
+    sloader.show();
+    $.post('/Home/WriteToSettings', { userConfig: userConfigObject }, function (data) {
+        sloader.hide();
+        if (data) {
+            setTimeout(function () { window.location.href = '/Home/Index?tab=settings' }, 500);
+        } else {
+            errorToast(genericErrorMessage());
+        }
+    })
+}
+function makeBackup() {
+    $.get('/Files/MakeBackup', function (data) {
+        window.location.href = data;
+    });
+}
+function openUploadLanguage() {
+    $("#inputLanguage").click();
+}
+function openRestoreBackup() {
+    $("#inputBackup").click();
+}
+function uploadLanguage(event) {
+    let formData = new FormData();
+    formData.append("file", event.files[0]);
+    sloader.show();
+    $.ajax({
+        url: "/Files/HandleTranslationFileUpload",
+        data: formData,
+        cache: false,
+        processData: false,
+        contentType: false,
+        type: 'POST',
+        success: function (response) {
+            sloader.hide();
+            if (response.success) {
+                setTimeout(function () { window.location.href = '/Home/Index?tab=settings' }, 500);
+            } else {
+                errorToast(response.message);
+            }
+        },
+        error: function () {
+            sloader.hide();
+            errorToast("An error has occurred, please check the file size and try again later.");
+        }
+    });
+}
+function restoreBackup(event) {
+    let formData = new FormData();
+    formData.append("file", event.files[0]);
+    console.log('LubeLogger - DB Restoration Started');
+    sloader.show();
+    $.ajax({
+        url: "/Files/HandleFileUpload",
+        data: formData,
+        cache: false,
+        processData: false,
+        contentType: false,
+        type: 'POST',
+        success: function (response) {
+            if (response.trim() != '') {
+                $.post('/Files/RestoreBackup', { fileName: response }, function (data) {
+                    sloader.hide();
+                    if (data) {
+                        console.log('LubeLogger - DB Restoration Completed');
+                        successToast("Backup Restored");
+                        setTimeout(function () { window.location.href = '/Home/Index' }, 500);
+                    } else {
+                        errorToast(genericErrorMessage());
+                        console.log('LubeLogger - DB Restoration Failed - Failed to process backup file.');
+                    }
+                });
+            } else {
+                console.log('LubeLogger - DB Restoration Failed - Failed to upload backup file.');
+            }
+        },
+        error: function () {
+            sloader.hide();
+            console.log('LubeLogger - DB Restoration Failed - Request failed to reach backend, please check file size.');
+            errorToast("An error has occurred, please check the file size and try again later.");
+        }
+    });
+}