From 8a38417a512e8dc658d9f4654295a3908981e270 Mon Sep 17 00:00:00 2001 From: amazing-username Date: Sun, 28 Apr 2019 01:22:51 +0000 Subject: [PATCH] Added EmailVerified to the User model and implmeneted Registration functionality #33 --- Controllers/RegisterController.cs | 1 + Models/Context/UserStoreContext.cs | 10 ++++++---- Models/User.cs | 2 ++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Controllers/RegisterController.cs b/Controllers/RegisterController.cs index 4678605..dfc7f58 100644 --- a/Controllers/RegisterController.cs +++ b/Controllers/RegisterController.cs @@ -43,6 +43,7 @@ namespace Icarus.Controllers PasswordEncryption pe = new PasswordEncryption(); user.Password = pe.HashPassword(user); + user.EmailVerified = false; Console.WriteLine($"Hashed Password: {user.Password}"); UserStoreContext context = HttpContext.RequestServices diff --git a/Models/Context/UserStoreContext.cs b/Models/Context/UserStoreContext.cs index 4f9f341..c3885c7 100644 --- a/Models/Context/UserStoreContext.cs +++ b/Models/Context/UserStoreContext.cs @@ -35,19 +35,20 @@ namespace Icarus.Models.Context conn.Open(); string query = "INSERT INTO Users(Username, Password, Nickname," + "Email, PhoneNumber, Firstname, Lastname, " + - "DateCreated, LastLogin) VALUES(@Username, " + - "@Password, @Nickname, @Email, @PhoneNumber, " + - "@Firstname, @Lastname, @DateCreated, @LastLogin)"; + "EmailVerified, DateCreated, LastLogin) " + + "VALUES(@Username, @Password, @Nickname, " + + "@Email, @PhoneNumber, @Firstname, @Lastname," + + " @EmailVerified, @DateCreated, @LastLogin)"; using (MySqlCommand cmd = new MySqlCommand(query, conn)) { cmd.Parameters.AddWithValue("@Username", user.Username); cmd.Parameters.AddWithValue("@Password", user.Password); - //cmd.Parameters.AddWithValue("@Salt", user.Salt); cmd.Parameters.AddWithValue("@Nickname", user.Nickname); cmd.Parameters.AddWithValue("@Email", user.Email); cmd.Parameters.AddWithValue("@PhoneNumber", user.PhoneNumber); cmd.Parameters.AddWithValue("@Firstname", user.Firstname); cmd.Parameters.AddWithValue("@Lastname", user.Lastname); + cmd.Parameters.AddWithValue("@EmailVerified", user.EmailVerified); cmd.Parameters.AddWithValue("@DateCreated", DateTime.Now); cmd.Parameters.AddWithValue("@LastLogin", DateTime.Now); @@ -84,6 +85,7 @@ namespace Icarus.Models.Context user.Nickname = reader["Nickname"].ToString(); user.Email = reader["Email"].ToString(); user.PhoneNumber = reader["PhoneNumber"].ToString(); + user.EmailVerified = Boolean.Parse(reader["EmailVerified"].ToString()); user.Firstname = reader["Firstname"].ToString(); user.Lastname = reader["Lastname"].ToString(); user.DateCreated = DateTime.ParseExact(reader["DateCreated"].ToString(), "yyyy-MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture); diff --git a/Models/User.cs b/Models/User.cs index ecdad66..568c0e4 100644 --- a/Models/User.cs +++ b/Models/User.cs @@ -22,6 +22,8 @@ namespace Icarus.Models public string Firstname { get; set; } [JsonProperty("last_name")] public string Lastname { get; set; } + [JsonProperty("email_verified")] + public bool EmailVerified { get; set; } [JsonProperty("date_created")] public DateTime DateCreated { get; set; } [JsonProperty("last_login")]