Skip to content

E
emiMobile
Commit 7d5a024b by Mac Stephens
Options

Update exception handling and memory management

parent d17bf35c
Showing with 186 additions and 123 deletions
emiMobileServer/Source/Api.ServiceImpl.pas
...@@ -16,7 +16,6 @@ type ...@@ -16,7 +16,6 @@ type
private private
procedure AfterConstruction; override; procedure AfterConstruction; override;
procedure BeforeDestruction; override; procedure BeforeDestruction; override;
function GetComplaintMemos(const CfsId: string): TJSONObject;
public public
function GetBadgeCounts: TJSONObject; function GetBadgeCounts: TJSONObject;
function GetComplaintList: TJSONObject; function GetComplaintList: TJSONObject;
...@@ -30,6 +29,7 @@ type ...@@ -30,6 +29,7 @@ type
function GetComplaintWarnings(const ComplaintId: string): TJSONObject; function GetComplaintWarnings(const ComplaintId: string): TJSONObject;
function GetUnitDetails(const UnitId: string): TJSONObject; function GetUnitDetails(const UnitId: string): TJSONObject;
function GetUnitLogs(const UnitId: string): TJSONObject; function GetUnitLogs(const UnitId: string): TJSONObject;
function GetComplaintMemos(const CfsId: string): TJSONObject;
end; end;
implementation implementation
...@@ -73,7 +73,7 @@ begin ...@@ -73,7 +73,7 @@ begin
except except
on E: Exception do on E: Exception do
begin begin
Logger.Log(2, '---TApiService.GetBadgeCounts End (error): ' + E.Message); Logger.Log(2, '---TApiService.GetBadgeCounts error: ' + E.ClassName + ': ' + E.Message);
raise EXDataHttpException.Create(500, 'Failed to load badge counts'); raise EXDataHttpException.Create(500, 'Failed to load badge counts');
end; end;
end; end;
...@@ -86,109 +86,134 @@ var ...@@ -86,109 +86,134 @@ var
data: TJSONArray; data: TJSONArray;
emitted: Integer; emitted: Integer;
item: TJSONObject; item: TJSONObject;
UnitsByComplaintMap: TObjectDictionary<string,TJSONArray>; UnitsByComplaintMap: TObjectDictionary<string, TJSONArray>;
complaintId: string; complaintId: string;
unitArray: TJSONArray; unitArray: TJSONArray;
unitStatus: string; unitStatus: string;
latestUpdate: TDateTime; latestUpdate: TDateTime;
unitObj: TJSONObject; unitObj: TJSONObject;
begin begin
Logger.Log(3,'---TApiService.GetComplaintMap initiated'); Logger.Log(3, '---TApiService.GetComplaintMap initiated');
Result:=TJSONObject.Create; Result := TJSONObject.Create;
TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result); TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result);
data:=TJSONArray.Create; data := TJSONArray.Create;
UnitsByComplaintMap:=TObjectDictionary<string,TJSONArray>.Create([doOwnsValues]); Result.AddPair('data', data);
UnitsByComplaintMap := TObjectDictionary<string, TJSONArray>.Create([doOwnsValues]);
try try
ApiDB.uqMapComplaintUnitsList.Open; try
while not ApiDB.uqMapComplaintUnitsList.Eof do ApiDB.uqMapComplaintUnitsList.Close;
begin ApiDB.uqMapComplaintUnitsList.Open;
complaintId:=ApiDB.uqMapComplaintUnitsListCOMPLAINTID.AsString; try
if not UnitsByComplaintMap.TryGetValue(complaintId,unitArray) then while not ApiDB.uqMapComplaintUnitsList.Eof do
begin begin
unitArray:=TJSONArray.Create; complaintId := ApiDB.uqMapComplaintUnitsListCOMPLAINTID.AsString;
UnitsByComplaintMap.Add(complaintId,unitArray);
end;
unitStatus:='Dispatched'; if not UnitsByComplaintMap.TryGetValue(complaintId, unitArray) then
if not ApiDB.uqMapComplaintUnitsListDATECLEARED.IsNull then begin
unitStatus:='Cleared' unitArray := TJSONArray.Create;
else if not ApiDB.uqMapComplaintUnitsListDATEARRIVED.IsNull then UnitsByComplaintMap.Add(complaintId, unitArray);
unitStatus:='On Scene' end;
else if not ApiDB.uqMapComplaintUnitsListDATERESPONDED.IsNull then
unitStatus:='Enroute';
latestUpdate:=0;
if not ApiDB.uqMapComplaintUnitsListDATEDISPATCHED.IsNull then
latestUpdate:=ApiDB.uqMapComplaintUnitsListDATEDISPATCHED.AsDateTime;
if (not ApiDB.uqMapComplaintUnitsListDATERESPONDED.IsNull) and
(ApiDB.uqMapComplaintUnitsListDATERESPONDED.AsDateTime>latestUpdate) then
latestUpdate:=ApiDB.uqMapComplaintUnitsListDATERESPONDED.AsDateTime;
if (not ApiDB.uqMapComplaintUnitsListDATEARRIVED.IsNull) and
(ApiDB.uqMapComplaintUnitsListDATEARRIVED.AsDateTime>latestUpdate) then
latestUpdate:=ApiDB.uqMapComplaintUnitsListDATEARRIVED.AsDateTime;
if (not ApiDB.uqMapComplaintUnitsListDATECLEARED.IsNull) and
(ApiDB.uqMapComplaintUnitsListDATECLEARED.AsDateTime>latestUpdate) then
latestUpdate:=ApiDB.uqMapComplaintUnitsListDATECLEARED.AsDateTime;
unitObj:=TJSONObject.Create;
unitObj.AddPair('Unit',ApiDB.uqMapComplaintUnitsListUNITNAME.AsString);
unitObj.AddPair('Status',unitStatus);
if latestUpdate<>0 then
unitObj.AddPair('Updated',FormatDateTime('yyyy-mm-dd hh:nn:ss',latestUpdate))
else
unitObj.AddPair('Updated','');
unitArray.AddElement(unitObj); unitStatus := 'Dispatched';
ApiDB.uqMapComplaintUnitsList.Next;
end;
try if not ApiDB.uqMapComplaintUnitsListDATECLEARED.IsNull then
emitted:=0; unitStatus := 'Cleared'
else if not ApiDB.uqMapComplaintUnitsListDATEARRIVED.IsNull then
unitStatus := 'On Scene'
else if not ApiDB.uqMapComplaintUnitsListDATERESPONDED.IsNull then
unitStatus := 'Enroute';
latestUpdate := 0;
if not ApiDB.uqMapComplaintUnitsListDATEDISPATCHED.IsNull then
latestUpdate := ApiDB.uqMapComplaintUnitsListDATEDISPATCHED.AsDateTime;
if (not ApiDB.uqMapComplaintUnitsListDATERESPONDED.IsNull) and
(ApiDB.uqMapComplaintUnitsListDATERESPONDED.AsDateTime > latestUpdate) then
latestUpdate := ApiDB.uqMapComplaintUnitsListDATERESPONDED.AsDateTime;
if (not ApiDB.uqMapComplaintUnitsListDATEARRIVED.IsNull) and
(ApiDB.uqMapComplaintUnitsListDATEARRIVED.AsDateTime > latestUpdate) then
latestUpdate := ApiDB.uqMapComplaintUnitsListDATEARRIVED.AsDateTime;
if (not ApiDB.uqMapComplaintUnitsListDATECLEARED.IsNull) and
(ApiDB.uqMapComplaintUnitsListDATECLEARED.AsDateTime > latestUpdate) then
latestUpdate := ApiDB.uqMapComplaintUnitsListDATECLEARED.AsDateTime;
unitObj := TJSONObject.Create;
unitArray.AddElement(unitObj);
unitObj.AddPair('Unit', ApiDB.uqMapComplaintUnitsListUNITNAME.AsString);
unitObj.AddPair('Status', unitStatus);
if latestUpdate <> 0 then
unitObj.AddPair('Updated', FormatDateTime('yyyy-mm-dd hh:nn:ss', latestUpdate))
else
unitObj.AddPair('Updated', '');
ApiDB.uqMapComplaintUnitsList.Next;
end;
finally
ApiDB.uqMapComplaintUnitsList.Close;
end;
emitted := 0;
ApiDB.uqMapComplaints.Close;
ApiDB.uqMapComplaints.Open; ApiDB.uqMapComplaints.Open;
while not ApiDB.uqMapComplaints.Eof do try
begin while not ApiDB.uqMapComplaints.Eof do
item:=TJSONObject.Create; begin
item := TJSONObject.Create;
item.AddPair('ComplaintId',ApiDB.uqMapComplaintsCOMPLAINTID.AsString); data.AddElement(item);
item.AddPair('DispatchDistrict', ApiDB.uqMapComplaintsDISPATCHDISTRICT.AsString);
item.AddPair('Agency', ApiDB.uqMapComplaintsAGENCY.AsString);
item.AddPair('AgencyName', ApiDB.uqMapComplaintsAGENCY_NAME.AsString);
item.AddPair('DispatchCodeDesc',ApiDB.uqMapComplaintsDISPATCH_CODE_DESC.AsString);
item.AddPair('DispatchCodeCategory',ApiDB.uqMapComplaintsDISPATCHCODECATEGORY.AsString);
item.AddPair('Priority',ApiDB.uqMapComplaintsPRIORITY.AsString);
item.AddPair('PriorityBadge', ApiDB.uqMapComplaintspriorityBadge.AsString);
item.AddPair('ComplaintStatusKey', ApiDB.uqMapComplaintscomplaintStatusKey.AsString);
item.AddPair('pngName', ApiDB.uqMapComplaintspngName.AsString);
item.AddPair('Address',ApiDB.uqMapComplaintsADDRESS.AsString);
item.AddPair('Business',ApiDB.uqMapComplaintsBUSINESS.AsString);
complaintId:=ApiDB.uqMapComplaintsCOMPLAINTID.AsString;
if UnitsByComplaintMap.TryGetValue(complaintId,unitArray) then
item.AddPair('Units',TJSONArray(unitArray.Clone))
else
item.AddPair('Units',TJSONArray.Create);
item.AddPair('Lat',TJSONNumber.Create(ApiDB.uqMapComplaintsLAT.AsFloat)); item.AddPair('ComplaintId', ApiDB.uqMapComplaintsCOMPLAINTID.AsString);
item.AddPair('Lng',TJSONNumber.Create(ApiDB.uqMapComplaintsLNG.AsFloat)); item.AddPair('DispatchDistrict', ApiDB.uqMapComplaintsDISPATCHDISTRICT.AsString);
item.AddPair('Agency', ApiDB.uqMapComplaintsAGENCY.AsString);
item.AddPair('AgencyName', ApiDB.uqMapComplaintsAGENCY_NAME.AsString);
item.AddPair('DispatchCodeDesc', ApiDB.uqMapComplaintsDISPATCH_CODE_DESC.AsString);
item.AddPair('DispatchCodeCategory', ApiDB.uqMapComplaintsDISPATCHCODECATEGORY.AsString);
item.AddPair('Priority', ApiDB.uqMapComplaintsPRIORITY.AsString);
item.AddPair('PriorityBadge', ApiDB.uqMapComplaintspriorityBadge.AsString);
item.AddPair('ComplaintStatusKey', ApiDB.uqMapComplaintscomplaintStatusKey.AsString);
item.AddPair('pngName', ApiDB.uqMapComplaintspngName.AsString);
item.AddPair('Address', ApiDB.uqMapComplaintsADDRESS.AsString);
item.AddPair('Business', ApiDB.uqMapComplaintsBUSINESS.AsString);
complaintId := ApiDB.uqMapComplaintsCOMPLAINTID.AsString;
if UnitsByComplaintMap.TryGetValue(complaintId, unitArray) then
item.AddPair('Units', TJSONArray(unitArray.Clone))
else
item.AddPair('Units', TJSONArray.Create);
data.AddElement(item); item.AddPair('Lat', TJSONNumber.Create(ApiDB.uqMapComplaintsLAT.AsFloat));
Inc(emitted); item.AddPair('Lng', TJSONNumber.Create(ApiDB.uqMapComplaintsLNG.AsFloat));
ApiDB.uqMapComplaints.Next;
Inc(emitted);
ApiDB.uqMapComplaints.Next;
end;
finally
ApiDB.uqMapComplaints.Close;
end; end;
Result.AddPair('count',TJSONNumber.Create(data.Count)); Result.AddPair('count', TJSONNumber.Create(data.Count));
Result.AddPair('returned',TJSONNumber.Create(emitted)); Result.AddPair('returned', TJSONNumber.Create(emitted));
Result.AddPair('data',data);
Logger.Log(3,'---TApiService.GetComplaintMap End (returned='+emitted.ToString+')'); Logger.Log(3, '---TApiService.GetComplaintMap End (returned=' + IntToStr(emitted) + ')');
except except
on E: EXDataHttpException do
begin
Logger.Log(2, '---TApiService.GetComplaintMap http error: ' + E.ClassName + ': ' + E.Message);
raise;
end;
on E: Exception do on E: Exception do
begin begin
FreeAndNil(data); Logger.Log(2, '---TApiService.GetComplaintMap error: ' + E.ClassName + ': ' + E.Message);
Logger.Log(2,'GetComplaintMap error: '+E.Message); raise EXDataHttpException.Create(500, 'Failed to load complaint map');
raise EXDataHttpException.Create(500,'Failed to load complaint map');
end; end;
end; end;
finally finally
...@@ -206,17 +231,16 @@ var ...@@ -206,17 +231,16 @@ var
begin begin
Logger.Log(4, '---TApiService.GetUnitMap initiated'); Logger.Log(4, '---TApiService.GetUnitMap initiated');
// Note: GetUnitMap is AVL-anchored (shows all AVL units).
// Note: DIS_UNITID is null when the unit is not dispatch-active; client should disable/hide Details in that case.
// Note: To restrict map to dispatch-active only, change uqMapUnits join to DIS_UNIT_ACTIVE from LEFT JOIN to INNER JOIN.
Result := TJSONObject.Create; Result := TJSONObject.Create;
TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result); TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result);
data := TJSONArray.Create; data := TJSONArray.Create;
Result.AddPair('data', data);
try try
with ApiDB.uqMapUnits do with ApiDB.uqMapUnits do
begin begin
Close;
Open; Open;
try try
First; First;
...@@ -225,6 +249,7 @@ begin ...@@ -225,6 +249,7 @@ begin
if (not ApiDB.uqMapUnitsGPS_LATITUDE.IsNull) and (not ApiDB.uqMapUnitsGPS_LONGITUDE.IsNull) then if (not ApiDB.uqMapUnitsGPS_LATITUDE.IsNull) and (not ApiDB.uqMapUnitsGPS_LONGITUDE.IsNull) then
begin begin
item := TJSONObject.Create; item := TJSONObject.Create;
data.AddElement(item);
item.AddPair('UnitId', ApiDB.uqMapUnitsUNITID.AsString); item.AddPair('UnitId', ApiDB.uqMapUnitsUNITID.AsString);
item.AddPair('UnitName', ApiDB.uqMapUnitsUNITNAME.AsString); item.AddPair('UnitName', ApiDB.uqMapUnitsUNITNAME.AsString);
...@@ -259,7 +284,6 @@ begin ...@@ -259,7 +284,6 @@ begin
item.AddPair('CanShowDetails', TJSONBool.Create(not ApiDB.uqMapUnitsDIS_UNITID.IsNull)); item.AddPair('CanShowDetails', TJSONBool.Create(not ApiDB.uqMapUnitsDIS_UNITID.IsNull));
data.AddElement(item);
end; end;
Next; Next;
...@@ -271,13 +295,18 @@ begin ...@@ -271,13 +295,18 @@ begin
Result.AddPair('count', TJSONNumber.Create(data.Count)); Result.AddPair('count', TJSONNumber.Create(data.Count));
Result.AddPair('returned', TJSONNumber.Create(data.Count)); Result.AddPair('returned', TJSONNumber.Create(data.Count));
Result.AddPair('data', data);
except except
data.Free; on E: EXDataHttpException do
Logger.Log(2, '---TApiService.GetUnitMap error'); begin
raise EXDataHttpException.Create(500, 'Failed to load unit map'); Logger.Log(2, '---TApiService.GetUnitMap http error: ' + E.ClassName + ': ' + E.Message);
raise;
end;
on E: Exception do
begin
Logger.Log(2, '---TApiService.GetUnitMap error: ' + E.ClassName + ': ' + E.Message);
raise EXDataHttpException.Create(500, 'Failed to load unit map');
end;
end; end;
Logger.Log(4, '---TApiService.GetUnitMap End'); Logger.Log(4, '---TApiService.GetUnitMap End');
end; end;
...@@ -668,6 +697,8 @@ begin ...@@ -668,6 +697,8 @@ begin
TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result); TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result);
data := TJSONArray.Create; data := TJSONArray.Create;
Result.AddPair('data', data);
try try
with ApiDB.uqCFSMemos do with ApiDB.uqCFSMemos do
begin begin
...@@ -678,6 +709,7 @@ begin ...@@ -678,6 +709,7 @@ begin
while not Eof do while not Eof do
begin begin
item := TJSONObject.Create; item := TJSONObject.Create;
data.AddElement(item);
item.AddPair('MemoId', ApiDB.uqCFSMemosMEMO_ID.AsString); item.AddPair('MemoId', ApiDB.uqCFSMemosMEMO_ID.AsString);
item.AddPair('CFSId', ApiDB.uqCFSMemosCFSID.AsString); item.AddPair('CFSId', ApiDB.uqCFSMemosCFSID.AsString);
...@@ -692,7 +724,6 @@ begin ...@@ -692,7 +724,6 @@ begin
item.AddPair('BadgeNumber', ApiDB.uqCFSMemosBADGE_NUMBER.AsString); item.AddPair('BadgeNumber', ApiDB.uqCFSMemosBADGE_NUMBER.AsString);
item.AddPair('Remarks', ApiDB.uqCFSMemosREMARKS.AsString); item.AddPair('Remarks', ApiDB.uqCFSMemosREMARKS.AsString);
data.AddElement(item);
Next; Next;
end; end;
finally finally
...@@ -702,13 +733,18 @@ begin ...@@ -702,13 +733,18 @@ begin
Result.AddPair('count', TJSONNumber.Create(data.Count)); Result.AddPair('count', TJSONNumber.Create(data.Count));
Result.AddPair('returned', TJSONNumber.Create(data.Count)); Result.AddPair('returned', TJSONNumber.Create(data.Count));
Result.AddPair('data', data);
except except
data.Free; on E: EXDataHttpException do
Logger.Log(3, '---TApiService.GetComplaintMemos End (error)'); begin
raise EXDataHttpException.Create(500, 'Failed to load complaint memos'); Logger.Log(2, '---TApiService.GetComplaintMemos http error: ' + E.ClassName + ': ' + E.Message);
raise;
end;
on E: Exception do
begin
Logger.Log(2, '---TApiService.GetComplaintMemos error: ' + E.ClassName + ': ' + E.Message);
raise EXDataHttpException.Create(500, 'Failed to load complaint memos');
end;
end; end;
Logger.Log(3, '---TApiService.GetComplaintMemos End'); Logger.Log(3, '---TApiService.GetComplaintMemos End');
end; end;
...@@ -775,7 +811,7 @@ begin ...@@ -775,7 +811,7 @@ begin
end; end;
on E: Exception do on E: Exception do
begin begin
Logger.Log(2, '---TApiService.GetComplaintHistory error: ' + E.Message); Logger.Log(2, '---TApiService.GetComplaintHistory error: ' + E.ClassName + ': ' + E.Message);
raise EXDataHttpException.Create(500, 'Failed to load complaint history'); raise EXDataHttpException.Create(500, 'Failed to load complaint history');
end; end;
end; end;
...@@ -833,7 +869,7 @@ begin ...@@ -833,7 +869,7 @@ begin
end; end;
on E: Exception do on E: Exception do
begin begin
Logger.Log(2, '---TApiService.GetComplaintContacts error: ' + E.Message); Logger.Log(2, '---TApiService.GetComplaintContacts error: ' + E.ClassName + ': ' + E.Message);
raise EXDataHttpException.Create(500, 'Failed to load complaint contacts'); raise EXDataHttpException.Create(500, 'Failed to load complaint contacts');
end; end;
end; end;
...@@ -914,7 +950,7 @@ begin ...@@ -914,7 +950,7 @@ begin
end; end;
on E: Exception do on E: Exception do
begin begin
Logger.Log(2, '---TApiService.GetComplaintWarnings error: ' + E.Message); Logger.Log(2, '---TApiService.GetComplaintWarnings error: ' + E.ClassName + ': ' + E.Message);
raise EXDataHttpException.Create(500, 'Failed to load complaint warnings'); raise EXDataHttpException.Create(500, 'Failed to load complaint warnings');
end; end;
end; end;
...@@ -934,6 +970,8 @@ begin ...@@ -934,6 +970,8 @@ begin
TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result); TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result);
dataArr := TJSONArray.Create; dataArr := TJSONArray.Create;
Result.AddPair('data', dataArr);
returnedCount := 0; returnedCount := 0;
try try
...@@ -967,7 +1005,6 @@ begin ...@@ -967,7 +1005,6 @@ begin
Result.AddPair('count', TJSONNumber.Create(returnedCount)); Result.AddPair('count', TJSONNumber.Create(returnedCount));
Result.AddPair('returned', TJSONNumber.Create(returnedCount)); Result.AddPair('returned', TJSONNumber.Create(returnedCount));
Result.AddPair('data', dataArr);
Logger.Log(4, '---TApiService.GetUnitLogs End (returned=' + IntToStr(returnedCount) + ')'); Logger.Log(4, '---TApiService.GetUnitLogs End (returned=' + IntToStr(returnedCount) + ')');
except except
...@@ -978,7 +1015,7 @@ begin ...@@ -978,7 +1015,7 @@ begin
end; end;
on E: Exception do on E: Exception do
begin begin
Logger.Log(2, '---TApiService.GetUnitLogs error: ' + E.Message); Logger.Log(2, '---TApiService.GetUnitLogs error: ' + E.ClassName + ': ' + E.Message);
raise EXDataHttpException.Create(500, 'Failed to load unit logs'); raise EXDataHttpException.Create(500, 'Failed to load unit logs');
end; end;
end; end;
...@@ -1000,6 +1037,7 @@ begin ...@@ -1000,6 +1037,7 @@ begin
try try
with ApiDB.uqUnitDetails do with ApiDB.uqUnitDetails do
begin begin
Close;
ParamByName('UNITID').AsString := UnitId; ParamByName('UNITID').AsString := UnitId;
Open; Open;
try try
...@@ -1007,6 +1045,7 @@ begin ...@@ -1007,6 +1045,7 @@ begin
raise EXDataHttpException.Create(404, 'Unit not found'); raise EXDataHttpException.Create(404, 'Unit not found');
obj := TJSONObject.Create; obj := TJSONObject.Create;
Result.AddPair('data', obj);
obj.AddPair('UnitId', ApiDB.uqUnitDetailsUNITID.AsString); obj.AddPair('UnitId', ApiDB.uqUnitDetailsUNITID.AsString);
obj.AddPair('UnitName', ApiDB.uqUnitDetailsUNITNAME.AsString); obj.AddPair('UnitName', ApiDB.uqUnitDetailsUNITNAME.AsString);
...@@ -1032,7 +1071,6 @@ begin ...@@ -1032,7 +1071,6 @@ begin
updateTimeText := FormatDateTime('yyyy-mm-dd hh:nn:ss', ApiDB.uqUnitDetailsUPDATE_TIME.AsDateTime); updateTimeText := FormatDateTime('yyyy-mm-dd hh:nn:ss', ApiDB.uqUnitDetailsUPDATE_TIME.AsDateTime);
obj.AddPair('UpdateTime', updateTimeText); obj.AddPair('UpdateTime', updateTimeText);
Result.AddPair('data', obj);
finally finally
Close; Close;
end; end;
...@@ -1040,12 +1078,12 @@ begin ...@@ -1040,12 +1078,12 @@ begin
except except
on E: EXDataHttpException do on E: EXDataHttpException do
begin begin
Logger.Log(2, '---TApiService.GetUnitDetails http error: ' + E.Message); Logger.Log(2, '---TApiService.GetUnitDetails http error: ' + E.ClassName + ': ' + E.Message);
raise; raise;
end; end;
on E: Exception do on E: Exception do
begin begin
Logger.Log(2, '---TApiService.GetUnitDetails error: ' + E.Message); Logger.Log(2, '---TApiService.GetUnitDetails error: ' + E.ClassName + ': ' + E.Message);
raise EXDataHttpException.Create(500, 'Failed to load unit details'); raise EXDataHttpException.Create(500, 'Failed to load unit details');
end; end;
end; end;
......
emiMobileServer/Source/Auth.ServiceImpl.pas
...@@ -14,7 +14,6 @@ type ...@@ -14,7 +14,6 @@ type
TAuthService = class(TInterfacedObject, IAuthService) TAuthService = class(TInterfacedObject, IAuthService)
strict private strict private
authDB: TAuthDatabase; authDB: TAuthDatabase;
function GetQuery: TUniQuery;
private private
userName: string; userName: string;
userFullName: string; userFullName: string;
...@@ -25,7 +24,6 @@ type ...@@ -25,7 +24,6 @@ type
procedure AfterConstruction; override; procedure AfterConstruction; override;
procedure BeforeDestruction; override; procedure BeforeDestruction; override;
function VerifyVersion(ClientVersion: string): TJSONObject; function VerifyVersion(ClientVersion: string): TJSONObject;
property Query: TUniQuery read GetQuery;
function CheckUser(const User, Password, Agency: string): Integer; function CheckUser(const User, Password, Agency: string): Integer;
function Decrypt(inStr, keyStr: AnsiString): AnsiString; function Decrypt(inStr, keyStr: AnsiString): AnsiString;
public public
...@@ -52,17 +50,14 @@ procedure TAuthService.AfterConstruction; ...@@ -52,17 +50,14 @@ procedure TAuthService.AfterConstruction;
begin begin
inherited; inherited;
authDB := TAuthDatabase.Create(nil); authDB := TAuthDatabase.Create(nil);
Logger.Log(3, 'AuthDatabase created');
end; end;
procedure TAuthService.BeforeDestruction; procedure TAuthService.BeforeDestruction;
begin begin
authDB.Free; authDB.Free;
inherited; inherited;
end; Logger.Log(3, 'AuthDatabase destroyed');
function TAuthService.GetQuery: TUniQuery;
begin
Result := authDB.uqAuth;
end; end;
function TAuthService.GetAgenciesList: TAgenciesList; function TAuthService.GetAgenciesList: TAgenciesList;
...@@ -82,6 +77,8 @@ begin ...@@ -82,6 +77,8 @@ begin
authDB.uqAuth.Open; authDB.uqAuth.Open;
Result := TAgenciesList.Create; Result := TAgenciesList.Create;
TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result);
Result.data := TList<TAgencyItem>.Create; Result.data := TList<TAgencyItem>.Create;
TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result.data); TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result.data);
...@@ -104,7 +101,7 @@ begin ...@@ -104,7 +101,7 @@ begin
else else
begin begin
Logger.Log(2, 'TAuthService.GetAgenciesList - Error: connecting to auth database!'); 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;
end; end;
...@@ -126,6 +123,8 @@ begin ...@@ -126,6 +123,8 @@ begin
authDB.uqAuth.Open; authDB.uqAuth.Open;
Result := TAgencyConfigList.Create; Result := TAgencyConfigList.Create;
TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result);
Result.data := TList<TAgencyConfigItem>.Create; Result.data := TList<TAgencyConfigItem>.Create;
TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result.data); TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result.data);
...@@ -197,10 +196,27 @@ begin ...@@ -197,10 +196,27 @@ begin
Logger.Log(1, Format('AuthService.Login - User: "%s" Agency: "%s"', [User, Agency])); Logger.Log(1, Format('AuthService.Login - User: "%s" Agency: "%s"', [User, Agency]));
userState := CheckUser(User, Password, 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 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'); raise EXDataHttpUnauthorized.Create('Invalid user or password');
end;
if userState = 1 then 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; JWT := TJWT.Create;
try try
...@@ -222,19 +238,22 @@ end; ...@@ -222,19 +238,22 @@ end;
function TAuthService.CheckUser(const User, Password, Agency: string): Integer; function TAuthService.CheckUser(const User, Password, Agency: string): Integer;
var var
userStr: string; userStr: string;
sqlStr: string;
decryptedPassword: AnsiString; decryptedPassword: AnsiString;
passwordKey: AnsiString; passwordKey: AnsiString;
begin begin
Logger.Log(3, Format('LoginService.CheckUser - User: "%s" Agency: "%s"', [User, Agency])); Logger.Log(3, Format('LoginService.CheckUser - User: "%s" Agency: "%s"', [User, Agency]));
passwordKey := 'wx3cFo$kIf2jrk(gOmvi7uvPfk*iorE8@kfm+nvR6jfh=swDqalpokSjf'; 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.Close;
authDB.uqAuth.SQL.Text := sqlStr; authDB.uqAuth.SQL.Text :=
Logger.Log(4, Format('LoginService.CheckUser - Query: "%s"', [sqlStr])); '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; authDB.uqAuth.Open;
try try
if authDB.uqAuth.IsEmpty then if authDB.uqAuth.IsEmpty then
...@@ -279,6 +298,12 @@ var ...@@ -279,6 +298,12 @@ var
k, i: integer; k, i: integer;
tempKeyStr: AnsiString; tempKeyStr: AnsiString;
begin begin
if inStr = '' then
Exit('');
if keyStr = '' then
Exit('');
k := Integer(inStr[1]); k := Integer(inStr[1]);
tempKeyStr := keyStr; tempKeyStr := keyStr;
while Length(tempKeyStr) < 256 do while Length(tempKeyStr) < 256 do
......
emiMobileServer/bin/emiMobileServer.ini
[Settings] [Settings]
LogFileNum=722 LogFileNum=723
webClientVersion=0.1.0 webClientVersion=0.1.0
[Database] [Database]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment