derek/boredcareers
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

working #21

Merged
derek merged 3 commits from working into main 2025-08-05 21:56:00 -07:00
Conversation 0 Commits 3 Files Changed 3
+15 -3
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Server/Controllers/EmployeeController.cs
+7 -1
View File
@@ -15,6 +15,9 @@ namespace BoredCareers.Controllers {
if (isLoggedIn()) { if (isLoggedIn()) {
if (await isLoggedInUserEmployeeOf(CompanyID)) { if (await isLoggedInUserEmployeeOf(CompanyID)) {
Employee[] employees = await _databaseService.GetEmployeesFromCompany(CompanyID); Employee[] employees = await _databaseService.GetEmployeesFromCompany(CompanyID);
foreach (Employee cur in employees) {
cur.Company.EmailToken = "";
}
return Ok(employees); return Ok(employees);
} }
return NotFound("You are not an employee of company"); return NotFound("You are not an employee of company");
@@ -25,7 +28,10 @@ namespace BoredCareers.Controllers {
[HttpGet] [HttpGet]
public async Task<IActionResult> GetEmployee() { public async Task<IActionResult> GetEmployee() {
if (isLoggedIn()) { 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 Ok(employees);
} }
return NotFound("Not logged in"); return NotFound("Not logged in");
src/Server/Program.cs
+1 -1
View File
@@ -37,7 +37,7 @@ string dbPass = !string.IsNullOrEmpty(_dbpass) ? _dbpass : "oasv34$8gpv023dd";
// Create the database serivice // Create the database serivice
builder.Services.AddSingleton<DatabaseService>(sp => 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
+7 -1
View File
@@ -29,6 +29,7 @@ namespace BoredCareers.Services.DatabaseService {
string _name = reader.GetString("Name"); string _name = reader.GetString("Name");
string _email = reader.GetString("Email"); string _email = reader.GetString("Email");
bool _emailVerified = reader.GetBoolean("EmailVerified"); bool _emailVerified = reader.GetBoolean("EmailVerified");
string _emailtoken = reader.GetString("EmailToken");
string _websiteurl = reader.GetString("WebsiteURL"); string _websiteurl = reader.GetString("WebsiteURL");
string _logo = Encoding.UTF8.GetString((byte[])reader["Logo"]); string _logo = Encoding.UTF8.GetString((byte[])reader["Logo"]);
string _phone = reader.GetString( "Phone" ); string _phone = reader.GetString( "Phone" );
@@ -46,6 +47,7 @@ namespace BoredCareers.Services.DatabaseService {
Name = _name, Name = _name,
Email = _email, Email = _email,
EmailVerified = _emailVerified, EmailVerified = _emailVerified,
EmailToken = _emailtoken,
WebsiteURL = _websiteurl, WebsiteURL = _websiteurl,
Logo = _logo, Logo = _logo,
Phone = _phone, Phone = _phone,
@@ -84,6 +86,7 @@ namespace BoredCareers.Services.DatabaseService {
string _name = reader.GetString("Name"); string _name = reader.GetString("Name");
string _email = reader.GetString("Email"); string _email = reader.GetString("Email");
bool _emailVerified = reader.GetBoolean("EmailVerified"); bool _emailVerified = reader.GetBoolean("EmailVerified");
string _emailtoken = reader.GetString("EmailToken");
string _websiteurl = reader.GetString("WebsiteURL"); string _websiteurl = reader.GetString("WebsiteURL");
string _logo = Encoding.UTF8.GetString((byte[])reader["Logo"]); string _logo = Encoding.UTF8.GetString((byte[])reader["Logo"]);
string _phone = reader.GetString( "Phone" ); string _phone = reader.GetString( "Phone" );
@@ -101,6 +104,7 @@ namespace BoredCareers.Services.DatabaseService {
Name = _name, Name = _name,
Email = _email, Email = _email,
EmailVerified = _emailVerified, EmailVerified = _emailVerified,
EmailToken = _emailtoken,
WebsiteURL = _websiteurl, WebsiteURL = _websiteurl,
Logo = _logo, Logo = _logo,
Phone = _phone, Phone = _phone,
@@ -117,7 +121,7 @@ namespace BoredCareers.Services.DatabaseService {
return employees.ToArray(); return employees.ToArray();
} }
public async Task<Employee[]> GetEmployeesFromAccount(int AccountID) { public async Task<Employee[]> GetEmployeeOfCompanyByAccountID(int AccountID) {
List<Employee> employees = new List<Employee>(); List<Employee> employees = new List<Employee>();
using (MySqlConnection connection = GetConnection()) { using (MySqlConnection connection = GetConnection()) {
await connection.OpenAsync(); await connection.OpenAsync();
@@ -139,6 +143,7 @@ namespace BoredCareers.Services.DatabaseService {
string _name = reader.GetString("Name"); string _name = reader.GetString("Name");
string _email = reader.GetString("Email"); string _email = reader.GetString("Email");
bool _emailVerified = reader.GetBoolean("EmailVerified"); bool _emailVerified = reader.GetBoolean("EmailVerified");
string _emailtoken = reader.GetString("EmailToken");
string _websiteurl = reader.GetString("WebsiteURL"); string _websiteurl = reader.GetString("WebsiteURL");
string _logo = Encoding.UTF8.GetString((byte[])reader["Logo"]); string _logo = Encoding.UTF8.GetString((byte[])reader["Logo"]);
string _phone = reader.GetString( "Phone" ); string _phone = reader.GetString( "Phone" );
@@ -156,6 +161,7 @@ namespace BoredCareers.Services.DatabaseService {
Name = _name, Name = _name,
Email = _email, Email = _email,
EmailVerified = _emailVerified, EmailVerified = _emailVerified,
EmailToken = _emailtoken,
WebsiteURL = _websiteurl, WebsiteURL = _websiteurl,
Logo = _logo, Logo = _logo,
Phone = _phone, Phone = _phone,