From f78c6eb530c504959345f4818cafa9e36bb7ea1b Mon Sep 17 00:00:00 2001 From: "Jade.VAN.BRABANDT" Date: Mon, 8 Jan 2024 11:44:07 +0100 Subject: [PATCH] Refactor : more token hidding --- Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs | 2 +- Blazor/Blazor/Pages/Admins/Administrators.razor.cs | 4 ++-- Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs | 2 +- Blazor/Blazor/Pages/Chapters/Chapters.razor.cs | 4 ++-- Blazor/Blazor/Pages/Players/AddPlayer.razor.cs | 2 +- Blazor/Blazor/Pages/Players/Players.razor.cs | 4 ++-- Blazor/Blazor/Pages/Questions/AddQuestion.razor.cs | 2 +- Blazor/Blazor/Pages/Questions/Questions.razor.cs | 6 +++--- Blazor/Blazor/Services/DataLocalService.cs | 11 ++++++----- 9 files changed, 19 insertions(+), 18 deletions(-) diff --git a/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs b/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs index 258e8f7..c27833d 100644 --- a/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs +++ b/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs @@ -32,7 +32,7 @@ namespace Blazor.Pages.Admins var formContent = new FormUrlEncodedContent(formData); - string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/add/administrator/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO"; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/add/administrator"+"/"+Token.TOKEN_ID; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Admins/Administrators.razor.cs b/Blazor/Blazor/Pages/Admins/Administrators.razor.cs index b744dce..6a92534 100644 --- a/Blazor/Blazor/Pages/Admins/Administrators.razor.cs +++ b/Blazor/Blazor/Pages/Admins/Administrators.razor.cs @@ -45,7 +45,7 @@ public partial class Administrators // When you use a real API, we use this follow code //var response = await Http.GetFromJsonAsync( $"https://trusting-panini.87-106-126-109.plesk.page/api/administrators?page={e.Page}&pageSize={e.PageSize}" ); - var response = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/administrators/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var response = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/administrators"+"/"+Token.TOKEN_ID).Result; if (!e.CancellationToken.IsCancellationRequested) { @@ -54,7 +54,7 @@ public partial class Administrators var currentData = await LocalStorage.GetItemAsync("data"); if (currentData == null || currentData.Length != administrators.Count) { - var originalData = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/administrators/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var originalData = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/administrators"+"/"+Token.TOKEN_ID).Result; await LocalStorage.SetItemAsync("data", originalData); } } diff --git a/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs b/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs index 70a91f9..d8e6420 100644 --- a/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs +++ b/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs @@ -29,7 +29,7 @@ public partial class AddChapter var formContent = new FormUrlEncodedContent(formData); - string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/add/chapter/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO"; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/add/chapter"+"/"+Token.TOKEN_ID; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs b/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs index d541152..c9f7e66 100644 --- a/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs +++ b/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs @@ -92,7 +92,7 @@ public partial class Chapters return; } - var response = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var response = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters"+"/"+Token.TOKEN_ID).Result; if (!e.CancellationToken.IsCancellationRequested) { @@ -101,7 +101,7 @@ public partial class Chapters var currentData = await LocalStorage.GetItemAsync("data"); if (currentData == null || currentData.Length != chapters.Count) { - var originalData = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var originalData = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters"+"/"+Token.TOKEN_ID).Result; await LocalStorage.SetItemAsync("data", originalData); } } diff --git a/Blazor/Blazor/Pages/Players/AddPlayer.razor.cs b/Blazor/Blazor/Pages/Players/AddPlayer.razor.cs index 45d4ca0..0b519c9 100644 --- a/Blazor/Blazor/Pages/Players/AddPlayer.razor.cs +++ b/Blazor/Blazor/Pages/Players/AddPlayer.razor.cs @@ -27,7 +27,7 @@ namespace Blazor.Pages.Players var formContent = new FormUrlEncodedContent(formData); - string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/add/player/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO"; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/add/player"+"/"+Token.TOKEN_ID; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Players/Players.razor.cs b/Blazor/Blazor/Pages/Players/Players.razor.cs index fbdb5dc..c0777a0 100644 --- a/Blazor/Blazor/Pages/Players/Players.razor.cs +++ b/Blazor/Blazor/Pages/Players/Players.razor.cs @@ -87,7 +87,7 @@ public partial class Players return; } - var response = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/players/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var response = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/players"+"/"+Token.TOKEN_ID).Result; if (!e.CancellationToken.IsCancellationRequested) { @@ -96,7 +96,7 @@ public partial class Players var currentData = await LocalStorage.GetItemAsync("data"); if (currentData == null || currentData.Length != players.Count) { - var originalData = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/players/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var originalData = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/players"+"/"+Token.TOKEN_ID).Result; await LocalStorage.SetItemAsync("data", originalData); } } diff --git a/Blazor/Blazor/Pages/Questions/AddQuestion.razor.cs b/Blazor/Blazor/Pages/Questions/AddQuestion.razor.cs index 9ffd8a3..57ed18f 100644 --- a/Blazor/Blazor/Pages/Questions/AddQuestion.razor.cs +++ b/Blazor/Blazor/Pages/Questions/AddQuestion.razor.cs @@ -31,7 +31,7 @@ namespace Blazor.Pages.Questions var formContent = new FormUrlEncodedContent(formData); - string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/add/administrator/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO"; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/add/administrator"+"/"+Token.TOKEN_ID; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Questions/Questions.razor.cs b/Blazor/Blazor/Pages/Questions/Questions.razor.cs index a6411a4..37b5d6e 100644 --- a/Blazor/Blazor/Pages/Questions/Questions.razor.cs +++ b/Blazor/Blazor/Pages/Questions/Questions.razor.cs @@ -106,7 +106,7 @@ public partial class Questions if (currentData == null) { // this code add in the local storage the fake data (we load the data sync for initialize the data before load the OnReadData method) - var originalData = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var originalData = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters"+"/"+Token.TOKEN_ID).Result; await LocalStorage.SetItemAsync("data", originalData); } } @@ -115,7 +115,7 @@ public partial class Questions private async Task Export() { StringBuilder sb = new StringBuilder(); - HttpResponseMessage response = await Http.GetAsync("https://trusting-panini.87-106-126-109.plesk.page/api/questionsExport/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO"); + HttpResponseMessage response = await Http.GetAsync("https://trusting-panini.87-106-126-109.plesk.page/api/questionsExport"+"/"+Token.TOKEN_ID); var json = await response.Content.ReadAsStringAsync(); using (var jsonFile = ChoJSONReader.LoadText(json)) { @@ -175,7 +175,7 @@ public partial class Questions } var formContent = new FormUrlEncodedContent(formData); - apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/add/questions/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO"; + apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/add/questions"+"/"+Token.TOKEN_ID; response = await Http.PostAsync(apiUri, formContent); diff --git a/Blazor/Blazor/Services/DataLocalService.cs b/Blazor/Blazor/Services/DataLocalService.cs index d2a9062..5102323 100644 --- a/Blazor/Blazor/Services/DataLocalService.cs +++ b/Blazor/Blazor/Services/DataLocalService.cs @@ -1,4 +1,5 @@ using Blazor.Models; +using Blazor.Pages; using Blazor.ViewClasses; using Blazored.LocalStorage; using Microsoft.AspNetCore.Components; @@ -26,7 +27,7 @@ namespace Blazor.Services public async Task GetById(int id) { // Get the current data - var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters"+"/"+Token.TOKEN_ID).Result; // Get the chapter int the list var chapter = currentData.FirstOrDefault(w => w.Id == id); @@ -86,7 +87,7 @@ namespace Blazor.Services { // Get the current data //var currentData = await _localStorage.GetItemAsync>("data"); - var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters"+"/"+Token.TOKEN_ID).Result; // Get the chapter int the list var chapter = currentData.FirstOrDefault(w => w.Id == id); @@ -133,7 +134,7 @@ namespace Blazor.Services public async Task GetAdminById(int id) { // Get the current data - var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/administrators/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/administrators"+"/"+Token.TOKEN_ID).Result; // Get the admin int the list var admin = currentData.FirstOrDefault(w => w.Id == id); @@ -226,7 +227,7 @@ namespace Blazor.Services public async Task GetQuestionById(int id) { // Get the current data - var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/questions/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/questions"+"/"+Token.TOKEN_ID).Result; // Get the question int the list var question = currentData.FirstOrDefault(w => w.Id == id); @@ -318,7 +319,7 @@ namespace Blazor.Services public async Task GetPlayerById(int id) { // Get the current data - var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/players/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/players"+"/"+Token.TOKEN_ID).Result; // Get the player in the list var player = currentData.FirstOrDefault(w => w.Id == id);