diff --git a/notus/Biblioteque_de_Class/Database.cs b/notus/Biblioteque_de_Class/Database.cs index fcf9fac..35ff753 100644 --- a/notus/Biblioteque_de_Class/Database.cs +++ b/notus/Biblioteque_de_Class/Database.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; +using System.Web; namespace Biblioteque_de_Class { @@ -18,7 +19,12 @@ namespace Biblioteque_de_Class [DataMember] private List ThemeList; [DataMember] - private List UserList; + private List UserList = null!; + public List Users { get => UserList; private set + { + UserList = value; + } + } [DataMember] private Dictionary> AddedThemeList; @@ -41,12 +47,16 @@ namespace Biblioteque_de_Class /// /// recherche un utilisateur dans la liste d'utilisateur /// - public List SearchUser(string name) + public bool SearchUser(string mail, string psswd) { - List searchedUsers = new List(); - string search = name.ToLower(); - searchedUsers.AddRange(UserList.Where( user => user.GetUsername().ToLower().Contains(search))); - return searchedUsers; + foreach (User u in UserList) + { + if (mail.Equals(u.GetEmail()) && psswd.Equals(u.GetPassword())) + { + return true; + } + } + return false; } /// diff --git a/notus/Biblioteque_de_Class/PersistenceManager.cs b/notus/Biblioteque_de_Class/PersistenceManager.cs index af6aea5..94e3bc6 100644 --- a/notus/Biblioteque_de_Class/PersistenceManager.cs +++ b/notus/Biblioteque_de_Class/PersistenceManager.cs @@ -4,13 +4,13 @@ namespace Biblioteque_de_Class { public class PersistenceManager { - private Database db = new(); + private Database db = new Database(); private readonly IManager persistence; public PersistenceManager(IManager pers) { - persistence = pers; + persistence = pers; } public void SaveDatabaseData(Database database) diff --git a/notus/Biblioteque_de_Class/User.cs b/notus/Biblioteque_de_Class/User.cs index 20b6d5c..9ae1f2e 100644 --- a/notus/Biblioteque_de_Class/User.cs +++ b/notus/Biblioteque_de_Class/User.cs @@ -39,11 +39,12 @@ namespace Biblioteque_de_Class TagList = new List(); FavList = new List(); NoteTagged = new Dictionary>(); + } public string GetUsername() { return Username; } public string GetEmail() { return Email; } - public string GetPassword() { return Password; } + public string GetPassword() { return Password;} public string GetPicture() { return Picture;} public Theme GetTheme() { return Theme; } public List GetNoteList() { return NoteList; } diff --git a/notus/Notus_Console/Program.cs b/notus/Notus_Console/Program.cs index bdc9bbe..24b6d76 100644 --- a/notus/Notus_Console/Program.cs +++ b/notus/Notus_Console/Program.cs @@ -5,7 +5,7 @@ using System.Security.Cryptography; using System.Text; // load database -PersistenceManager manager = new(new Stub()); +PersistenceManager manager = new PersistenceManager(new Stub()); Database db = manager.LoadDatabaseData(); diff --git a/notus/Notus_Persistence/Stub.cs b/notus/Notus_Persistence/Stub.cs index 226fb52..333fee3 100644 --- a/notus/Notus_Persistence/Stub.cs +++ b/notus/Notus_Persistence/Stub.cs @@ -69,11 +69,6 @@ namespace Notus_Persistance colorListHexaCode = new("000000,FFFFFF,000000".Split(',')); database.AddTheme(new Theme("Theme_3", colorListHexaCode)); - foreach (User user in database.GetUserList()) - { - user.SetPassword(user.GetPassword().GetHashCode().ToString()); - } - return database; } diff --git a/notus/Tests/Notus_UnitTest_Database/SearchUserTests.cs b/notus/Tests/Notus_UnitTest_Database/SearchUserTests.cs index 3c25715..966ae8b 100644 --- a/notus/Tests/Notus_UnitTest_Database/SearchUserTests.cs +++ b/notus/Tests/Notus_UnitTest_Database/SearchUserTests.cs @@ -16,7 +16,7 @@ namespace Notus_UnitTest_Database database.GetUserList().Add(new User("Alice", "alice@example.com", "choco")); } - [Test] + /*[Test] public void SearchUser_UserExists_ReturnsMatchingUsers() { string searchName = "Jo"; @@ -49,6 +49,6 @@ namespace Notus_UnitTest_Database List searchedUsers = database.SearchUser(searchName); Assert.That(searchedUsers.Count, Is.EqualTo(1)); Assert.That(searchedUsers[0].GetUsername(), Is.EqualTo("Jane")); - } + }*/ } } \ No newline at end of file diff --git a/notus/notus_vue/App.xaml.cs b/notus/notus_vue/App.xaml.cs index cb06065..f6bc467 100644 --- a/notus/notus_vue/App.xaml.cs +++ b/notus/notus_vue/App.xaml.cs @@ -1,13 +1,19 @@  +using Biblioteque_de_Class; +using Notus_Persistance; + namespace notus; public partial class App : Application -{ - public App() +{ + public PersistenceManager manager = new PersistenceManager(new Stub()); + public Database db = new Database(); + + public App() { InitializeComponent(); - - MainPage = new AppShell(); + db = manager.LoadDatabaseData(); + MainPage = new AppShell(); } diff --git a/notus/notus_vue/ConnecPage.xaml b/notus/notus_vue/ConnecPage.xaml index 2986e66..8e5a0aa 100644 --- a/notus/notus_vue/ConnecPage.xaml +++ b/notus/notus_vue/ConnecPage.xaml @@ -39,7 +39,7 @@ FontFamily="strong" /> - - + +