Changed EditUser form, fixed memory leak issues, and fixed issue with database…

Changed EditUser form, fixed memory leak issues, and fixed issue with database files crashing on create

kgOrdersClient/View.EditUser.dfm

@@ -3,8 +3,8 @@ object FViewEditUser: TFViewEditUser
   Height = 480
   OnShow = WebFormCreate
   object WebLabel2: TWebLabel
-    Left = 16
-    Top = 8
+    Left = 33
+    Top = 33
     Width = 57
     Height = 15
     Caption = 'Full Name:'
@@ -14,8 +14,8 @@ object FViewEditUser: TFViewEditUser
     WidthPercent = 100.000000000000000000
   end
   object WebLabel3: TWebLabel
-    Left = 14
-    Top = 37
+    Left = 283
+    Top = 8
     Width = 53
     Height = 15
     Caption = 'Password:'
@@ -25,7 +25,7 @@ object FViewEditUser: TFViewEditUser
     WidthPercent = 100.000000000000000000
   end
   object WebLabel5: TWebLabel
-    Left = 280
+    Left = 34
     Top = 8
     Width = 56
     Height = 15
@@ -35,19 +35,8 @@ object FViewEditUser: TFViewEditUser
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
   end
-  object WebLabel6: TWebLabel
-    Left = 236
-    Top = 37
-    Width = 100
-    Height = 15
-    Caption = 'Confirm Password:'
-    Color = clBtnFace
-    ElementID = 'lblconfirm'
-    HeightPercent = 100.000000000000000000
-    WidthPercent = 100.000000000000000000
-  end
   object WebLabel7: TWebLabel
-    Left = 35
+    Left = 58
     Top = 62
     Width = 32
     Height = 15
@@ -58,8 +47,8 @@ object FViewEditUser: TFViewEditUser
     WidthPercent = 100.000000000000000000
   end
   object lblactive: TWebLabel
-    Left = 45
-    Top = 163
+    Left = 298
+    Top = 36
     Width = 38
     Height = 15
     Caption = 'Active?'
@@ -99,17 +88,6 @@ object FViewEditUser: TFViewEditUser
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
   end
-  object edtConfirmPassword: TWebEdit
-    Left = 346
-    Top = 34
-    Width = 121
-    Height = 22
-    ChildOrder = 7
-    ElementID = 'edtconfirmpassword'
-    HeightPercent = 100.000000000000000000
-    WidthPercent = 100.000000000000000000
-    OnChange = edtConfirmPasswordChange
-  end
   object edtEmail: TWebEdit
     Left = 96
     Top = 62
@@ -129,7 +107,6 @@ object FViewEditUser: TFViewEditUser
     ElementID = 'edtpassword'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    OnChange = edtPasswordChange
   end
   object btnConfirm: TWebButton
     Left = 96
@@ -151,8 +128,8 @@ object FViewEditUser: TFViewEditUser
     OnClick = btnConfirmClick
   end
   object edtFullname: TWebEdit
-    Left = 96
-    Top = 4
+    Left = 346
+    Top = 5
     Width = 121
     Height = 22
     ChildOrder = 14
@@ -161,8 +138,8 @@ object FViewEditUser: TFViewEditUser
     WidthPercent = 100.000000000000000000
   end
   object edtUsername: TWebEdit
-    Left = 346
-    Top = 4
+    Left = 96
+    Top = 6
     Width = 121
     Height = 22
     ChildOrder = 14
@@ -190,8 +167,8 @@ object FViewEditUser: TFViewEditUser
     OnClick = btnCancelClick
   end
   object cbStatus: TWebCheckBox
-    Left = 96
-    Top = 162
+    Left = 346
+    Top = 33
     Width = 107
     Height = 20
     Caption = 'Active?'

kgOrdersClient/View.EditUser.html

@@ -6,12 +6,6 @@
       <form id="edituserform" class="row g-3 needs-validation" novalidate>
 
         <div class="col-md-6">
-          <label id="lblfullname" for="edtfullname" class="form-label">Full&nbsp;Name</label>
-          <input id="edtfullname" class="form-control" required>
-          <div class="invalid-feedback">Full Name is required.</div>
-        </div>
-
-        <div class="col-md-6">
           <label id="lblusername" for="edtusername" class="form-label">Username</label>
           <input id="edtusername" class="form-control" required>
           <div class="invalid-feedback">Username is required.</div>
@@ -20,19 +14,26 @@
         <div class="col-md-6">
           <label id="lblpassword" for="edtpassword" class="form-label">Password</label>
           <input id="edtpassword" type="password" class="form-control" required>
-          <div class="invalid-feedback">Passwords must match.</div>
+          <div class="invalid-feedback">Passwords is required.</div>
+        </div>
+
+        <div class="col-md-6">
+          <label id="lblfullname" for="edtfullname" class="form-label">Full&nbsp;Name</label>
+          <input id="edtfullname" class="form-control" required>
+          <div class="invalid-feedback">Full Name is required.</div>
         </div>
 
+
         <div class="col-md-6">
-          <label id="lblconfirm" for="edtconfirmpassword" class="form-label">Confirm&nbsp;Password</label>
-          <input id="edtconfirmpassword" type="password" class="form-control" required disabled>
-          <div class="invalid-feedback">Passwords must match.</div>
+          <label id="lblactive" for="cbstatus" class="form-label">Active</label>
+          <div class="form-check mt-1">
+            <input id="cbstatus" class="form-check-input" type="checkbox" style="width: 1.5em; height: 1.5em;">
+          </div>
         </div>
 
         <div class="col-md-6">
           <label id="lblemail" for="edtemail" class="form-label">Email&nbsp;Address</label>
-          <input id="edtemail" type="email" class="form-control" required>
-          <div class="invalid-feedback">Valid email is required.</div>
+          <input id="edtemail" type="email" class="form-control">
         </div>
 
         <div class="col-md-6">
@@ -47,19 +48,8 @@
 
         <div class="col-md-6">
           <label id="lblaccess" for="cbaccess" class="form-label">Access&nbsp;Type</label>
-          <select id="cbaccess" class="form-select" required>
-            <option selected disabled value="">Choose...</option>
-            <option value="ALL">All</option>
-            <option value="LIMITED">Limited</option>
+          <select id="cbaccess" class="form-select">
           </select>
-          <div class="invalid-feedback">Please select an access type.</div>
-        </div>
-
-        <div class="col-md-6">
-          <div class="form-check pt-2">
-            <input id="cbstatus" class="form-check-input" type="checkbox">
-            <label id="lblactive" for="cbstatus" class="form-check-label">Active</label>
-          </div>
         </div>
 
         <div class="d-flex gap-2 mt-4">

kgOrdersClient/View.EditUser.pas

@@ -15,9 +15,7 @@ type
     WebLabel2: TWebLabel;
     WebLabel3: TWebLabel;
     WebLabel5: TWebLabel;
-    WebLabel6: TWebLabel;
     WebLabel7: TWebLabel;
-    edtConfirmPassword: TWebEdit;
     edtEmail: TWebEdit;
     edtPassword: TWebEdit;
     btnConfirm: TWebButton;
@@ -38,8 +36,6 @@ type
     procedure btnConfirmClick(Sender: TObject);
     procedure btnCancelClick(Sender: TObject);
     procedure WebTimer1Timer(Sender: TObject);
-    procedure edtPasswordChange(Sender: TObject);
-    procedure edtConfirmPasswordChange(Sender: TObject);
   private
     { Private declarations }
     FMessage: string;
@@ -54,7 +50,6 @@ type
     QB: string;
     [async] procedure EditUser();
     [async] function AddUser(): string;
-    procedure ValidatePasswords;
   public
     { Public declarations }
     Info: string;
@@ -138,16 +133,6 @@ begin
 
 end;
 
-procedure TFViewEditUser.edtConfirmPasswordChange(Sender: TObject);
-begin
-  ValidatePasswords;
-end;
-
-procedure TFViewEditUser.edtPasswordChange(Sender: TObject);
-begin
-  ValidatePasswords;
-end;
-
 class function TFViewEditUser.CreateForm(AElementID, Mode, Username, Password, Name, Status, Email,
                                Access, Rights, QB: string): TWebForm;
 // Autofills known information about a user on create
@@ -180,7 +165,6 @@ begin
   if Mode = 'Edit' then
   begin
     edtPassword.Text := 'hidden';
-    edtConfirmPassword.Text := 'hidden';
   end;
   edtEmail.Text := Email;
   cbAccess.Text := Access;
@@ -226,52 +210,4 @@ begin
   WebTimer1.Enabled := True;
 end;
 
-
-procedure TFViewEditUser.ValidatePasswords;
-var
-  Pwd, Confirm: string;
-  PwdInput, ConfirmInput: TJSHTMLInputElement;
-begin
-  PwdInput := TJSHTMLInputElement(edtPassword.ElementHandle);
-  ConfirmInput := TJSHTMLInputElement(edtConfirmPassword.ElementHandle);
-
-  Pwd := PwdInput.value.Trim;
-  Confirm := ConfirmInput.value.Trim;
-
-  // Disable confirm until password exists
-  if Pwd = '' then
-  begin
-    ConfirmInput.disabled := True;
-    ConfirmInput.value := '';
-    ConfirmInput.setCustomValidity('');
-    ConfirmInput.classList.remove('is-invalid');
-    ConfirmInput.classList.remove('is-valid');
-  end
-  else
-  begin
-    ConfirmInput.disabled := False;
-
-    // Live match check
-    if Confirm = '' then
-    begin
-      ConfirmInput.setCustomValidity('');
-      ConfirmInput.classList.remove('is-invalid');
-      ConfirmInput.classList.remove('is-valid');
-    end
-    else if Confirm = Pwd then
-    begin
-      ConfirmInput.setCustomValidity('');
-      ConfirmInput.classList.add('is-valid');
-      ConfirmInput.classList.remove('is-invalid');
-    end
-    else
-    begin
-      ConfirmInput.setCustomValidity('Passwords must match');
-      ConfirmInput.classList.add('is-invalid');
-      ConfirmInput.classList.remove('is-valid');
-    end;
-  end;
-end;
-
-
 end.

kgOrdersServer/Source/Api.Database.dfm

@@ -6,8 +6,6 @@ object ApiDatabase: TApiDatabase
     ProviderName = 'MySQL'
     Database = 'kg_order_entry'
     Username = 'root'
-    Server = '192.168.159.10'
-    Connected = True
     LoginPrompt = False
     Left = 75
     Top = 65

kgOrdersServer/Source/Auth.ServiceImpl.pas

@@ -55,7 +55,15 @@ uses
 procedure TAuthService.AfterConstruction;
 begin
   inherited;
-  authDB := TAuthDatabase.Create(nil);
+  try
+    authDB := TAuthDatabase.Create(nil);
+  except
+    on E: Exception do
+    begin
+      Logger.Log(1, 'Error when creating the Auth database: ' + E.Message);
+      raise EXDataHttpException.Create(500, 'Unable to create Auth database: A KGOrders Server Error has occured!');
+    end;
+  end;
 end;
 
 procedure TAuthService.BeforeDestruction;
@@ -130,8 +138,10 @@ begin
     logger.Log(2, 'Login Error: User does not exist!');
   end
   else if userState = 2 then
+  begin
     raise EXDataHttpUnauthorized.Create('User not active!');
     logger.Log(2, 'Login Error: User not active!');
+  end;
 
 
   iniFile := TIniFile.Create(ChangeFileExt(ParamStr(0), '.ini'));

kgOrdersServer/bin/kgOrdersServer.ini

@@ -2,7 +2,7 @@
 MemoLogLevel=4
 FileLogLevel=4
 webClientVersion=1.0.0
-LogFileNum=141
+LogFileNum=157
 
 [Database]
 --Server=192.168.116.138