derek/auth-mistox
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed database crashing on NULL returns
Docker Build and Release Upload / build (push) Successful in 1m22s
Details

Browse Source
This commit is contained in:
Derek Holloway
2025-07-26 10:21:27 -07:00
parent b6d6a15893
commit 72a500405a
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Server/Services/DatabaseService/Account.cs
+28 -28
View File
@@ -22,20 +22,20 @@ namespace Auth.Services.DatabaseService {
using( DbDataReader reader = await cmd.ExecuteReaderAsync() ) { using( DbDataReader reader = await cmd.ExecuteReaderAsync() ) {
while( await reader.ReadAsync() ) { while( await reader.ReadAsync() ) {
if( reader == null ) { break; } if( reader == null ) { break; }
int _id = reader.GetInt32("ID"); int _id = !reader.IsDBNull("ID") ? reader.GetInt32("ID") : -1;
string _username = reader.GetString("UserName"); string _username = !reader.IsDBNull("UserName") ? reader.GetString("UserName") : "";
string _email = reader.GetString("Email"); string _email = !reader.IsDBNull("Email") ? reader.GetString("Email") : "";
bool _emailVerified = reader.GetBoolean("EmailVerified"); bool _emailVerified = !reader.IsDBNull("EmailVerified") ? reader.GetBoolean("EmailVerified") : false;
string _passwordhash = reader.GetString("PasswordHash"); string _passwordhash = !reader.IsDBNull("PasswordHash") ? reader.GetString("PasswordHash") : "";
bool _failedpasswordlock = reader.GetBoolean( "FailedPasswordLock" ); bool _failedpasswordlock = !reader.IsDBNull("FailedPasswordLock") ? reader.GetBoolean("FailedPasswordLock") : false;
int _passwordattempts = reader.GetInt32( "PasswordAttempts" ); int _passwordattempts = !reader.IsDBNull("PasswordAttempts") ? reader.GetInt32("PasswordAttempts") : -1;
int _curpasswordattempts = reader.GetInt32( "CurrentPasswordAttempts" ); int _curpasswordattempts = !reader.IsDBNull("CurrentPasswordAttempts") ? reader.GetInt32("CurrentPasswordAttempts") : -1;
string _role = reader.GetString( "Role" ); string _role = !reader.IsDBNull("Role") ? reader.GetString("Role") : "";
string _emailtoken = reader.GetString( "EmailToken" ); string _emailtoken = !reader.IsDBNull("EmailToken") ? reader.GetString("EmailToken") : "";
DateTime _emailtokencreated = reader.GetDateTime( "EmailTokenCreation" ); DateTime _emailtokencreated = !reader.IsDBNull("EmailTokenCreation") ? reader.GetDateTime("EmailTokenCreation") : DateTime.MinValue;
string _passwordtoken = reader.GetString( "PasswordToken" ); string _passwordtoken = !reader.IsDBNull("PasswordToken") ? reader.GetString("PasswordToken") : "";
DateTime _passwordtokencreated = reader.GetDateTime( "PasswordTokenCreation" ); DateTime _passwordtokencreated = !reader.IsDBNull("PasswordTokenCreation") ? reader.GetDateTime("PasswordTokenCreation") : DateTime.MinValue;
string _dataserver = reader.GetString( "DataServer" ); string _dataserver = !reader.IsDBNull("DataServer") ? reader.GetString("DataServer") : "";
account = new Account() { account = new Account() {
ID = _id, ID = _id,
@@ -77,20 +77,20 @@ namespace Auth.Services.DatabaseService {
if( reader == null ) { if( reader == null ) {
break; break;
} }
int _id = reader.GetInt32("ID"); int _id = !reader.IsDBNull("ID") ? reader.GetInt32("ID") : -1;
string _username = reader.GetString("UserName"); string _username = !reader.IsDBNull("UserName") ? reader.GetString("UserName") : "";
string _email = reader.GetString("Email"); string _email = !reader.IsDBNull("Email") ? reader.GetString("Email") : "";
bool _emailVerified = reader.GetBoolean("EmailVerified"); bool _emailVerified = !reader.IsDBNull("EmailVerified") ? reader.GetBoolean("EmailVerified") : false;
string _passwordhash = reader.GetString("PasswordHash"); string _passwordhash = !reader.IsDBNull("PasswordHash") ? reader.GetString("PasswordHash") : "";
bool _failedpasswordlock = reader.GetBoolean( "FailedPasswordLock" ); bool _failedpasswordlock = !reader.IsDBNull("FailedPasswordLock") ? reader.GetBoolean("FailedPasswordLock") : false;
int _passwordattempts = reader.GetInt32( "PasswordAttempts" ); int _passwordattempts = !reader.IsDBNull("PasswordAttempts") ? reader.GetInt32("PasswordAttempts") : -1;
int _curpasswordattempts = reader.GetInt32( "CurrentPasswordAttempts" ); int _curpasswordattempts = !reader.IsDBNull("CurrentPasswordAttempts") ? reader.GetInt32("CurrentPasswordAttempts") : -1;
string _role = reader.GetString( "Role" ); string _role = !reader.IsDBNull("Role") ? reader.GetString("Role") : "";
string _emailtoken = reader.GetString( "EmailToken" ); string _emailtoken = !reader.IsDBNull("EmailToken") ? reader.GetString("EmailToken") : "";
DateTime _emailtokencreated = reader.GetDateTime( "EmailTokenCreation" ); DateTime _emailtokencreated = !reader.IsDBNull("EmailTokenCreation") ? reader.GetDateTime("EmailTokenCreation") : DateTime.MinValue;
string _passwordtoken = reader.GetString( "PasswordToken" ); string _passwordtoken = !reader.IsDBNull("PasswordToken") ? reader.GetString("PasswordToken") : "";
DateTime _passwordtokencreated = reader.GetDateTime( "PasswordTokenCreation" ); DateTime _passwordtokencreated = !reader.IsDBNull("PasswordTokenCreation") ? reader.GetDateTime("PasswordTokenCreation") : DateTime.MinValue;
string _dataserver = reader.GetString("DataServer"); string _dataserver = !reader.IsDBNull("DataServer") ? reader.GetString("DataServer") : "";
account = new Account() { account = new Account() {
ID = _id, ID = _id,