static helper for userconfig path.

This commit is contained in:
DESKTOP-GENO133\IvanPlex
2024-01-06 15:47:21 -07:00
parent 4abf7fbba2
commit 89345fd8eb
4 changed files with 11 additions and 9 deletions

View File

@@ -55,7 +55,7 @@ namespace CarCareTracker.Controllers
{ {
try try
{ {
var configFileContents = System.IO.File.ReadAllText("config/userConfig.json"); var configFileContents = System.IO.File.ReadAllText(StaticHelper.UserConfigPath);
var existingUserConfig = System.Text.Json.JsonSerializer.Deserialize<UserConfig>(configFileContents); var existingUserConfig = System.Text.Json.JsonSerializer.Deserialize<UserConfig>(configFileContents);
if (existingUserConfig is not null) if (existingUserConfig is not null)
{ {
@@ -69,7 +69,7 @@ namespace CarCareTracker.Controllers
userConfig.UserNameHash = string.Empty; userConfig.UserNameHash = string.Empty;
userConfig.UserPasswordHash = string.Empty; userConfig.UserPasswordHash = string.Empty;
} }
System.IO.File.WriteAllText("config/userConfig.json", System.Text.Json.JsonSerializer.Serialize(userConfig)); System.IO.File.WriteAllText(StaticHelper.UserConfigPath, System.Text.Json.JsonSerializer.Serialize(userConfig));
return Json(true); return Json(true);
} catch (Exception ex) } catch (Exception ex)
{ {

View File

@@ -1,4 +1,5 @@
using CarCareTracker.Models; using CarCareTracker.Helper;
using CarCareTracker.Models;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
@@ -36,7 +37,7 @@ namespace CarCareTracker.Controllers
//compare it against hashed credentials //compare it against hashed credentials
try try
{ {
var configFileContents = System.IO.File.ReadAllText("config/userConfig.json"); var configFileContents = System.IO.File.ReadAllText(StaticHelper.UserConfigPath);
var existingUserConfig = System.Text.Json.JsonSerializer.Deserialize<UserConfig>(configFileContents); var existingUserConfig = System.Text.Json.JsonSerializer.Deserialize<UserConfig>(configFileContents);
if (existingUserConfig is not null) if (existingUserConfig is not null)
{ {
@@ -74,7 +75,7 @@ namespace CarCareTracker.Controllers
{ {
try try
{ {
var configFileContents = System.IO.File.ReadAllText("config/userConfig.json"); var configFileContents = System.IO.File.ReadAllText(StaticHelper.UserConfigPath);
var existingUserConfig = JsonSerializer.Deserialize<UserConfig>(configFileContents); var existingUserConfig = JsonSerializer.Deserialize<UserConfig>(configFileContents);
if (existingUserConfig is not null) if (existingUserConfig is not null)
{ {
@@ -86,7 +87,7 @@ namespace CarCareTracker.Controllers
existingUserConfig.UserNameHash = hashedUserName; existingUserConfig.UserNameHash = hashedUserName;
existingUserConfig.UserPasswordHash = hashedPassword; existingUserConfig.UserPasswordHash = hashedPassword;
} }
System.IO.File.WriteAllText("config/userConfig.json", JsonSerializer.Serialize(existingUserConfig)); System.IO.File.WriteAllText(StaticHelper.UserConfigPath, JsonSerializer.Serialize(existingUserConfig));
return Json(true); return Json(true);
} }
catch (Exception ex) catch (Exception ex)
@@ -101,7 +102,7 @@ namespace CarCareTracker.Controllers
{ {
try try
{ {
var configFileContents = System.IO.File.ReadAllText("config/userConfig.json"); var configFileContents = System.IO.File.ReadAllText(StaticHelper.UserConfigPath);
var existingUserConfig = JsonSerializer.Deserialize<UserConfig>(configFileContents); var existingUserConfig = JsonSerializer.Deserialize<UserConfig>(configFileContents);
if (existingUserConfig is not null) if (existingUserConfig is not null)
{ {
@@ -110,7 +111,7 @@ namespace CarCareTracker.Controllers
existingUserConfig.UserNameHash = string.Empty; existingUserConfig.UserNameHash = string.Empty;
existingUserConfig.UserPasswordHash = string.Empty; existingUserConfig.UserPasswordHash = string.Empty;
} }
System.IO.File.WriteAllText("config/userConfig.json", JsonSerializer.Serialize(existingUserConfig)); System.IO.File.WriteAllText(StaticHelper.UserConfigPath, JsonSerializer.Serialize(existingUserConfig));
//destroy any login cookies. //destroy any login cookies.
Response.Cookies.Delete("ACCESS_TOKEN"); Response.Cookies.Delete("ACCESS_TOKEN");
return Json(true); return Json(true);

View File

@@ -6,5 +6,6 @@
public static class StaticHelper public static class StaticHelper
{ {
public static string DbName = "data/cartracker.db"; public static string DbName = "data/cartracker.db";
public static string UserConfigPath = "config/userConfig.json";
} }
} }

View File

@@ -24,7 +24,7 @@ if (!Directory.Exists("data"))
} }
//Additional JsonFile //Additional JsonFile
builder.Configuration.AddJsonFile("config/userConfig.json", optional: true, reloadOnChange: true); builder.Configuration.AddJsonFile(StaticHelper.UserConfigPath, optional: true, reloadOnChange: true);
//Configure Auth //Configure Auth
builder.Services.AddDataProtection(); builder.Services.AddDataProtection();