Update exception handling and memory management

emiMobileServer/Source/Auth.ServiceImpl.pas

@@ -14,7 +14,6 @@ type
   TAuthService = class(TInterfacedObject, IAuthService)
   strict private
     authDB: TAuthDatabase;
-    function GetQuery: TUniQuery;
   private
     userName: string;
     userFullName: string;
@@ -25,7 +24,6 @@ type
     procedure AfterConstruction; override;
     procedure BeforeDestruction; override;
     function VerifyVersion(ClientVersion: string): TJSONObject;
-    property Query: TUniQuery read GetQuery;
     function CheckUser(const User, Password, Agency: string): Integer;
     function Decrypt(inStr, keyStr: AnsiString): AnsiString;
   public
@@ -52,17 +50,14 @@ procedure TAuthService.AfterConstruction;
 begin
   inherited;
   authDB := TAuthDatabase.Create(nil);
+  Logger.Log(3, 'AuthDatabase created');
 end;
 
 procedure TAuthService.BeforeDestruction;
 begin
   authDB.Free;
   inherited;
-end;
-
-function TAuthService.GetQuery: TUniQuery;
-begin
-  Result := authDB.uqAuth;
+  Logger.Log(3, 'AuthDatabase destroyed');
 end;
 
 function TAuthService.GetAgenciesList: TAgenciesList;
@@ -82,6 +77,8 @@ begin
     authDB.uqAuth.Open;
 
     Result := TAgenciesList.Create;
+    TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result);
+
     Result.data := TList<TAgencyItem>.Create;
     TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result.data);
 
@@ -104,7 +101,7 @@ begin
   else
   begin
     Logger.Log(2, 'TAuthService.GetAgenciesList - Error: connecting to auth database!');
-    raise EXDataHttpException.Create('Error connecting to auth database!');
+    raise EXDataHttpException.Create(500, 'Failed to load agencies');
   end;
 end;
 
@@ -126,6 +123,8 @@ begin
   authDB.uqAuth.Open;
 
   Result := TAgencyConfigList.Create;
+  TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result);
+
   Result.data := TList<TAgencyConfigItem>.Create;
   TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result.data);
 
@@ -197,10 +196,27 @@ begin
   Logger.Log(1, Format('AuthService.Login - User: "%s" Agency: "%s"', [User, Agency]));
   userState := CheckUser(User, Password, Agency);
 
+  try
+    userState := CheckUser(User, Password, Agency);
+  except
+    on E: Exception do
+    begin
+      Logger.Log(2, 'AuthService.Login - CheckUser error: ' + E.ClassName + ': ' + E.Message);
+      raise EXDataHttpException.Create(500, 'Login failed');
+    end;
+  end;
+
   if userState = 0 then
+  begin
+    Logger.Log(2, Format('AuthService.Login - invalid login for User: "%s" Agency: "%s"', [User, Agency]));
     raise EXDataHttpUnauthorized.Create('Invalid user or password');
+  end;
+
   if userState = 1 then
-    raise EXDataHttpUnauthorized.Create('User not active!');
+  begin
+    Logger.Log(2, Format('AuthService.Login - inactive user: "%s" Agency: "%s"', [User, Agency]));
+    raise EXDataHttpUnauthorized.Create('User not active');
+  end;
 
   JWT := TJWT.Create;
   try
@@ -222,19 +238,22 @@ end;
 function TAuthService.CheckUser(const User, Password, Agency: string): Integer;
 var
   userStr: string;
-  sqlStr: string;
   decryptedPassword: AnsiString;
   passwordKey: AnsiString;
 begin
   Logger.Log(3, Format('LoginService.CheckUser - User: "%s" Agency: "%s"', [User, Agency]));
   passwordKey := 'wx3cFo$kIf2jrk(gOmvi7uvPfk*iorE8@kfm+nvR6jfh=swDqalpokSjf';
 
-  sqlStr := 'select u.* from lems.users u ';
-  sqlStr := sqlStr + 'where upper(user_name) = ' + QuotedStr(UpperCase(Trim(User))) + ' ';
-  sqlStr := sqlStr + 'and u.dept = ' + QuotedStr(UpperCase(Trim(Agency)));
   authDB.uqAuth.Close;
-  authDB.uqAuth.SQL.Text := sqlStr;
-  Logger.Log(4, Format('LoginService.CheckUser - Query: "%s"', [sqlStr]));
+  authDB.uqAuth.SQL.Text :=
+    'select u.* from lems.users u ' +
+    'where upper(user_name) = :USER_NAME ' +
+    'and u.dept = :AGENCY';
+
+  authDB.uqAuth.ParamByName('USER_NAME').AsString := UpperCase(Trim(User));
+  authDB.uqAuth.ParamByName('AGENCY').AsString := UpperCase(Trim(Agency));
+
+  Logger.Log(4, 'LoginService.CheckUser - opening user lookup query');
   authDB.uqAuth.Open;
   try
     if authDB.uqAuth.IsEmpty then
@@ -279,6 +298,12 @@ var
   k, i: integer;
   tempKeyStr: AnsiString;
 begin
+  if inStr = '' then
+    Exit('');
+
+  if keyStr = '' then
+    Exit('');
+
   k := Integer(inStr[1]);
   tempKeyStr := keyStr;
   while Length(tempKeyStr) < 256 do

emiMobileServer/bin/emiMobileServer.ini

 [Settings]
-LogFileNum=722
+LogFileNum=723
 webClientVersion=0.1.0
 
 [Database]