Merge pull request 'working' (#21) from working into main

Reviewed-on: #21

src/Server/Controllers/EmployeeController.cs

@@ -15,6 +15,9 @@ namespace BoredCareers.Controllers {
             if (isLoggedIn()) {
                 if (await isLoggedInUserEmployeeOf(CompanyID)) { 
                     Employee[] employees = await _databaseService.GetEmployeesFromCompany(CompanyID);
+                    foreach (Employee cur in employees) {
+                        cur.Company.EmailToken = "";
+                    }
                     return Ok(employees);
                 }
                 return NotFound("You are not an employee of company");
@@ -25,7 +28,10 @@ namespace BoredCareers.Controllers {
         [HttpGet]
         public async Task<IActionResult> GetEmployee() {
             if (isLoggedIn()) {
-                Employee[] employees = await _databaseService.GetEmployeesFromAccount(getLoggedInUserID());
+                Employee[] employees = await _databaseService.GetEmployeeOfCompanyByAccountID(getLoggedInUserID());
+                foreach (Employee cur in employees) {
+                    cur.Company.EmailToken = "";
+                }
                 return Ok(employees);
             }
             return NotFound("Not logged in");

src/Server/Program.cs

@@ -37,7 +37,7 @@ string dbPass = !string.IsNullOrEmpty(_dbpass) ? _dbpass : "oasv34$8gpv023dd";
 
 // Create the database serivice
 builder.Services.AddSingleton<DatabaseService>(sp =>
-    new DatabaseService("server=" + dbserver + ";user=" + dbUser + ";database=" + dbdatabase + ";password=" + dbPass + ";port=3306;")
+    new DatabaseService("server=" + dbserver + ";user=" + dbUser + ";database=" + dbdatabase + ";password=" + dbPass + ";port=3306;OldGuids=true;")
 );
 
 ////////////////////////////////

src/Server/Services/DatabaseService/Employee.cs

@@ -29,6 +29,7 @@ namespace BoredCareers.Services.DatabaseService {
                         string _name = reader.GetString("Name");
                         string _email = reader.GetString("Email");
                         bool _emailVerified = reader.GetBoolean("EmailVerified");
+                        string _emailtoken = reader.GetString("EmailToken");
                         string _websiteurl = reader.GetString("WebsiteURL");
                         string _logo = Encoding.UTF8.GetString((byte[])reader["Logo"]);
                         string _phone = reader.GetString( "Phone" );
@@ -46,6 +47,7 @@ namespace BoredCareers.Services.DatabaseService {
                                 Name = _name,
                                 Email = _email,
                                 EmailVerified = _emailVerified,
+                                EmailToken = _emailtoken,
                                 WebsiteURL = _websiteurl,
                                 Logo = _logo,
                                 Phone = _phone,
@@ -84,6 +86,7 @@ namespace BoredCareers.Services.DatabaseService {
                         string _name = reader.GetString("Name");
                         string _email = reader.GetString("Email");
                         bool _emailVerified = reader.GetBoolean("EmailVerified");
+                        string _emailtoken = reader.GetString("EmailToken");
                         string _websiteurl = reader.GetString("WebsiteURL");
                         string _logo = Encoding.UTF8.GetString((byte[])reader["Logo"]);
                         string _phone = reader.GetString( "Phone" );
@@ -101,6 +104,7 @@ namespace BoredCareers.Services.DatabaseService {
                                 Name = _name,
                                 Email = _email,
                                 EmailVerified = _emailVerified,
+                                EmailToken = _emailtoken,
                                 WebsiteURL = _websiteurl,
                                 Logo = _logo,
                                 Phone = _phone,
@@ -117,7 +121,7 @@ namespace BoredCareers.Services.DatabaseService {
             return employees.ToArray();
         }
         
-        public async Task<Employee[]> GetEmployeesFromAccount(int AccountID) {
+        public async Task<Employee[]> GetEmployeeOfCompanyByAccountID(int AccountID) {
             List<Employee> employees = new List<Employee>();
             using (MySqlConnection connection = GetConnection()) {
                 await connection.OpenAsync();
@@ -139,6 +143,7 @@ namespace BoredCareers.Services.DatabaseService {
                         string _name = reader.GetString("Name");
                         string _email = reader.GetString("Email");
                         bool _emailVerified = reader.GetBoolean("EmailVerified");
+                        string _emailtoken = reader.GetString("EmailToken");
                         string _websiteurl = reader.GetString("WebsiteURL");
                         string _logo = Encoding.UTF8.GetString((byte[])reader["Logo"]);
                         string _phone = reader.GetString( "Phone" );
@@ -156,6 +161,7 @@ namespace BoredCareers.Services.DatabaseService {
                                 Name = _name,
                                 Email = _email,
                                 EmailVerified = _emailVerified,
+                                EmailToken = _emailtoken,
                                 WebsiteURL = _websiteurl,
                                 Logo = _logo,
                                 Phone = _phone,