Merge remote-tracking branch 'origin/master' into dev

93fe35a6 · Elias Sarraf · 9ca47a7c · cdb35e6e · 93fe35a6 · 93fe35a6
Commit 93fe35a6 authored Apr 15, 2026 by Elias Sarraf
9 changed files
--- a/emT3XDataServer/Source/Api.Database.dfm
+++ b/emT3XDataServer/Source/Api.Database.dfm
@@ -9,6 +9,7 @@ object ApiDatabase: TApiDatabase
    LoginPrompt = False
    Left = 267
    Top = 395
+    EncryptedPassword = '9AFF92FF8CFF86FF8CFFCFFFCEFF'
  end
  object MySQLUniProvider1: TMySQLUniProvider
    Left = 416

--- a/emT3XDataServer/Source/Auth.Database.dfm
+++ b/emT3XDataServer/Source/Auth.Database.dfm
 object AuthDatabase: TAuthDatabase
  OnCreate = DataModuleCreate
  OnDestroy = DataModuleDestroy
-  Height = 249
+  Height = 202
-  Width = 433
+  Width = 578
  object uqWebTasksUrl: TUniQuery
    Connection = ucETaskAuth
    SQL.Strings = (
@@ -30,8 +30,8 @@ object AuthDatabase: TAuthDatabase
      'order by w.URL_TIME desc'
      'limit 1')
    FetchRows = 100
-    Left = 162
+    Left = 78
-    Top = 45
+    Top = 43
    ParamData = <
      item
        DataType = ftUnknown
@@ -103,7 +103,8 @@ object AuthDatabase: TAuthDatabase
    ProviderName = 'MySQL'
    Database = 'eTask'
    Username = 'root'
-    Server = '192.168.102.129'
+    Server = '192.168.102.131'
+    Connected = True
    LoginPrompt = False
    Left = 69
    Top = 133
@@ -113,4 +114,90 @@ object AuthDatabase: TAuthDatabase
    Left = 194
    Top = 132
  end
+  object uqWebLogin: TUniQuery
+    Connection = ucETaskAuth
+    SQL.Strings = (
+      'select'
+      '  u.USER_ID,'
+      '  u.USER_NAME,'
+      '  u.NAME,'
+      '  u.STATUS,'
+      '  u.EMAIL,'
+      '  u.ACCESS_LEVEL,'
+      '  u.TASK_RIGHTS,'
+      '  u.PERSPECTIVE_ID,'
+      '  u.LAST_NAME,'
+      '  u.FIRST_NAME,'
+      '  w.WEB_LOGIN'
+      'from web_tasks_url w'
+      'join users u on u.USER_ID = w.USER_ID'
+      'where w.USER_ID = :USER_ID'
+      '  and w.TASK_ID = :TASK_ID'
+      '  and u.PASSWORD = :PASSWORD')
+    Left = 192
+    Top = 44
+    ParamData = <
+      item
+        DataType = ftUnknown
+        Name = 'USER_ID'
+        Value = nil
+      end
+      item
+        DataType = ftUnknown
+        Name = 'TASK_ID'
+        Value = nil
+      end
+      item
+        DataType = ftUnknown
+        Name = 'PASSWORD'
+        Value = nil
+      end>
+    object uqWebLoginUSER_ID: TStringField
+      FieldName = 'USER_ID'
+      Required = True
+      Size = 7
+    end
+    object uqWebLoginUSER_NAME: TStringField
+      FieldName = 'USER_NAME'
+      Required = True
+      Size = 12
+    end
+    object uqWebLoginNAME: TStringField
+      FieldName = 'NAME'
+      Size = 40
+    end
+    object uqWebLoginSTATUS: TStringField
+      FieldName = 'STATUS'
+      Size = 7
+    end
+    object uqWebLoginEMAIL: TStringField
+      FieldName = 'EMAIL'
+      Size = 50
+    end
+    object uqWebLoginACCESS_LEVEL: TIntegerField
+      FieldName = 'ACCESS_LEVEL'
+    end
+    object uqWebLoginTASK_RIGHTS: TIntegerField
+      FieldName = 'TASK_RIGHTS'
+    end
+    object uqWebLoginPERSPECTIVE_ID: TStringField
+      FieldName = 'PERSPECTIVE_ID'
+      Size = 45
+    end
+    object uqWebLoginLAST_NAME: TStringField
+      FieldName = 'LAST_NAME'
+      Size = 35
+    end
+    object uqWebLoginFIRST_NAME: TStringField
+      FieldName = 'FIRST_NAME'
+      Size = 25
+    end
+    object uqWebLoginWEB_LOGIN: TStringField
+      FieldName = 'WEB_LOGIN'
+      ReadOnly = True
+      Required = True
+      FixedChar = True
+      Size = 1
+    end
+  end
 end
--- a/emT3XDataServer/Source/Auth.Database.pas
+++ b/emT3XDataServer/Source/Auth.Database.pas
@@ -25,6 +25,18 @@ type
    uqWebTasksUrlFIRST_NAME: TStringField;
    uqWebTasksUrlURL_TIME: TDateTimeField;
    uqWebTasksUrlURL_TIME_EXP: TIntegerField;
+    uqWebLogin: TUniQuery;
+    uqWebLoginUSER_ID: TStringField;
+    uqWebLoginUSER_NAME: TStringField;
+    uqWebLoginNAME: TStringField;
+    uqWebLoginSTATUS: TStringField;
+    uqWebLoginEMAIL: TStringField;
+    uqWebLoginACCESS_LEVEL: TIntegerField;
+    uqWebLoginTASK_RIGHTS: TIntegerField;
+    uqWebLoginPERSPECTIVE_ID: TStringField;
+    uqWebLoginLAST_NAME: TStringField;
+    uqWebLoginFIRST_NAME: TStringField;
+    uqWebLoginWEB_LOGIN: TStringField;
    procedure DataModuleCreate(Sender: TObject);
    procedure DataModuleDestroy(Sender: TObject);
  private

--- a/emT3XDataServer/Source/Auth.Service.pas
+++ b/emT3XDataServer/Source/Auth.Service.pas
@@ -20,6 +20,7 @@ type
  ['{9CFD59B2-A832-4F82-82BB-9A25FC93F305}']
    function Login(const userId, taskId, urlCode: string): string;
    function VerifyVersion(ClientVersion: string): TJSONObject;
+    function WebLogin(const userId, taskId, password: string): string;
  end;
 implementation

--- a/emT3XDataServer/Source/Auth.ServiceImpl.pas
+++ b/emT3XDataServer/Source/Auth.ServiceImpl.pas
@@ -34,6 +34,7 @@ type
  public
    function Login(const userId, taskId, urlCode: string): string;
    function VerifyVersion(ClientVersion: string): TJSONObject;
+    function WebLogin(const userId, taskId, password: string): string;
  end;
 implementation

--- a/emT3XDataServer/Source/__recovery/Auth.Database.dfm
+++ b/emT3XDataServer/Source/__recovery/Auth.Database.dfm
+object AuthDatabase: TAuthDatabase
+  OnCreate = DataModuleCreate
+  OnDestroy = DataModuleDestroy
+  Height = 207
+  Width = 303
+  object uqWebTasksUrl: TUniQuery
+    Connection = ucETaskAuth
+    SQL.Strings = (
+      'select'
+      '  u.USER_ID,'
+      '  u.USER_NAME,'
+      '  u.NAME,'
+      '  u.STATUS,'
+      '  u.EMAIL,'
+      '  u.ACCESS_LEVEL,'
+      '  u.TASK_RIGHTS,'
+      '  u.PERSPECTIVE_ID,'
+      '  u.LAST_NAME,'
+      '  u.FIRST_NAME,'
+      '  w.URL_TIME,'
+      '  w.URL_TIME_EXP'
+      'from web_tasks_url w'
+      'join users u on u.USER_ID = w.USER_ID'
+      'where w.USER_ID = :USER_ID'
+      '  and w.TASK_ID = :TASK_ID'
+      '  and w.URL_CODE = :URL_CODE'
+        '  and TIMESTAMPDIFF(SECOND, w.URL_TIME, NOW()) between 0 and w.U' +
+        'RL_TIME_EXP'
+      'order by w.URL_TIME desc'
+      'limit 1')
+    FetchRows = 100
+    Left = 78
+    Top = 43
+    ParamData = <
+      item
+        DataType = ftUnknown
+        Name = 'USER_ID'
+        Value = nil
+      end
+      item
+        DataType = ftUnknown
+        Name = 'TASK_ID'
+        Value = nil
+      end
+      item
+        DataType = ftUnknown
+        Name = 'URL_CODE'
+        Value = nil
+      end>
+    object uqWebTasksUrlUSER_ID: TStringField
+      FieldName = 'USER_ID'
+      Required = True
+      Size = 7
+    end
+    object uqWebTasksUrlUSER_NAME: TStringField
+      FieldName = 'USER_NAME'
+      Required = True
+      Size = 12
+    end
+    object uqWebTasksUrlNAME: TStringField
+      FieldName = 'NAME'
+      Size = 40
+    end
+    object uqWebTasksUrlSTATUS: TStringField
+      FieldName = 'STATUS'
+      Size = 7
+    end
+    object uqWebTasksUrlEMAIL: TStringField
+      FieldName = 'EMAIL'
+      Size = 50
+    end
+    object uqWebTasksUrlACCESS_LEVEL: TIntegerField
+      FieldName = 'ACCESS_LEVEL'
+    end
+    object uqWebTasksUrlTASK_RIGHTS: TIntegerField
+      FieldName = 'TASK_RIGHTS'
+    end
+    object uqWebTasksUrlPERSPECTIVE_ID: TStringField
+      FieldName = 'PERSPECTIVE_ID'
+      Size = 45
+    end
+    object uqWebTasksUrlLAST_NAME: TStringField
+      FieldName = 'LAST_NAME'
+      Size = 35
+    end
+    object uqWebTasksUrlFIRST_NAME: TStringField
+      FieldName = 'FIRST_NAME'
+      Size = 25
+    end
+    object uqWebTasksUrlURL_TIME: TDateTimeField
+      FieldName = 'URL_TIME'
+      ReadOnly = True
+      Required = True
+    end
+    object uqWebTasksUrlURL_TIME_EXP: TIntegerField
+      FieldName = 'URL_TIME_EXP'
+      ReadOnly = True
+      Required = True
+    end
+  end
+  object ucETaskAuth: TUniConnection
+    ProviderName = 'MySQL'
+    Database = 'eTask'
+    Username = 'root'
+    Server = '192.168.102.131'
+    Connected = True
+    LoginPrompt = False
+    Left = 69
+    Top = 133
+    EncryptedPassword = '9AFF92FF8CFF86FF8CFFCFFFCEFF'
+  end
+  object MySQLUniProvider1: TMySQLUniProvider
+    Left = 194
+    Top = 132
+  end
+  object uqWebLogin: TUniQuery
+    Connection = ucETaskAuth
+    SQL.Strings = (
+      'select'
+      '  u.USER_ID,'
+      '  u.USER_NAME,'
+      '  u.NAME,'
+      '  u.STATUS,'
+      '  u.EMAIL,'
+      '  u.ACCESS_LEVEL,'
+      '  u.TASK_RIGHTS,'
+      '  u.PERSPECTIVE_ID,'
+      '  u.LAST_NAME,'
+      '  u.FIRST_NAME,'
+      '  w.WEB_LOGIN'
+      'from web_tasks_url w'
+      'join users u on u.USER_ID = w.USER_ID'
+      'where w.USER_ID = :USER_ID'
+      '  and w.TASK_ID = :TASK_ID'
+      '  and u.PASSWORD = :PASSWORD')
+    Left = 192
+    Top = 44
+    ParamData = <
+      item
+        DataType = ftUnknown
+        Name = 'USER_ID'
+        Value = nil
+      end
+      item
+        DataType = ftUnknown
+        Name = 'TASK_ID'
+        Value = nil
+      end
+      item
+        DataType = ftUnknown
+        Name = 'PASSWORD'
+        Value = nil
+      end>
+    object uqWebLoginUSER_ID: TStringField
+      FieldName = 'USER_ID'
+      Required = True
+      Size = 7
+    end
+    object uqWebLoginUSER_NAME: TStringField
+      FieldName = 'USER_NAME'
+      Required = True
+      Size = 12
+    end
+    object uqWebLoginNAME: TStringField
+      FieldName = 'NAME'
+      Size = 40
+    end
+    object uqWebLoginSTATUS: TStringField
+      FieldName = 'STATUS'
+      Size = 7
+    end
+    object uqWebLoginEMAIL: TStringField
+      FieldName = 'EMAIL'
+      Size = 50
+    end
+    object uqWebLoginACCESS_LEVEL: TIntegerField
+      FieldName = 'ACCESS_LEVEL'
+    end
+    object uqWebLoginTASK_RIGHTS: TIntegerField
+      FieldName = 'TASK_RIGHTS'
+    end
+    object uqWebLoginPERSPECTIVE_ID: TStringField
+      FieldName = 'PERSPECTIVE_ID'
+      Size = 45
+    end
+    object uqWebLoginLAST_NAME: TStringField
+      FieldName = 'LAST_NAME'
+      Size = 35
+    end
+    object uqWebLoginFIRST_NAME: TStringField
+      FieldName = 'FIRST_NAME'
+      Size = 25
+    end
+    object uqWebLoginWEB_LOGIN: TStringField
+      FieldName = 'WEB_LOGIN'
+      ReadOnly = True
+      Required = True
+      FixedChar = True
+      Size = 1
+    end
+  end
+end
--- a/emT3XDataServer/Source/__recovery/Auth.Database.pas
+++ b/emT3XDataServer/Source/__recovery/Auth.Database.pas
+// Auth Database to verify logins
+unit Auth.Database;
+interface
+uses
+  System.SysUtils, System.Classes, IniFiles, Vcl.Forms, MemDS,
+  Data.DB, DBAccess, Uni, UniProvider, PostgreSQLUniProvider, MySQLUniProvider;
+type
+  TAuthDatabase = class(TDataModule)
+    uqWebTasksUrl: TUniQuery;
+    ucETaskAuth: TUniConnection;
+    MySQLUniProvider1: TMySQLUniProvider;
+    uqWebTasksUrlUSER_ID: TStringField;
+    uqWebTasksUrlUSER_NAME: TStringField;
+    uqWebTasksUrlNAME: TStringField;
+    uqWebTasksUrlSTATUS: TStringField;
+    uqWebTasksUrlEMAIL: TStringField;
+    uqWebTasksUrlACCESS_LEVEL: TIntegerField;
+    uqWebTasksUrlTASK_RIGHTS: TIntegerField;
+    uqWebTasksUrlPERSPECTIVE_ID: TStringField;
+    uqWebTasksUrlLAST_NAME: TStringField;
+    uqWebTasksUrlFIRST_NAME: TStringField;
+    uqWebTasksUrlURL_TIME: TDateTimeField;
+    uqWebTasksUrlURL_TIME_EXP: TIntegerField;
+    uqWebLogin: TUniQuery;
+    uqWebLoginUSER_ID: TStringField;
+    uqWebLoginUSER_NAME: TStringField;
+    uqWebLoginNAME: TStringField;
+    uqWebLoginSTATUS: TStringField;
+    uqWebLoginEMAIL: TStringField;
+    uqWebLoginACCESS_LEVEL: TIntegerField;
+    uqWebLoginTASK_RIGHTS: TIntegerField;
+    uqWebLoginPERSPECTIVE_ID: TStringField;
+    uqWebLoginLAST_NAME: TStringField;
+    uqWebLoginFIRST_NAME: TStringField;
+    uqWebLoginWEB_LOGIN: TStringField;
+    procedure DataModuleCreate(Sender: TObject);
+    procedure DataModuleDestroy(Sender: TObject);
+  private
+    { Private declarations }
+  public
+    { Public declarations }
+  end;
+var
+  AuthDatabase: TAuthDatabase;
+implementation
+uses
+  System.JSON,
+  Common.Config,
+  Common.Logging,
+  uLibrary;
+{%CLASSGROUP 'Vcl.Controls.TControl'}
+{$R *.dfm}
+procedure TAuthDatabase.DataModuleCreate(Sender: TObject);
+begin
+  Logger.Log( 5, 'TAuthDatabase.DataModuleCreate' );
+  LoadDatabaseSettings( ucETaskAuth, 'emT3XDataServer.ini' );
+  try
+    ucETaskAuth.Connect;
+  except
+    on E: Exception do
+    begin
+      Logger.Log(2, '--TAuthDatabase.DataModuleCreate -Error connecting to database: ' + E.Message);
+    end;
+  end;
+end;
+procedure TAuthDatabase.DataModuleDestroy(Sender: TObject);
+begin
+  ucETaskAuth.Connected := false;
+end;
+end.
--- a/emT3XDataServer/Source/__recovery/Auth.ServiceImpl.pas
+++ b/emT3XDataServer/Source/__recovery/Auth.ServiceImpl.pas
--- a/emT3XDataServer/Source/__recovery/__recovery.ini
+++ b/emT3XDataServer/Source/__recovery/__recovery.ini
+[Auth.ServiceImpl.pas]
+SaveTime=4/15/2026 6:21:59 PM
+FileCount=1
+File0=C:\Projects\emT3web\emT3XDataServer\Source\Auth.ServiceImpl.pas
+[Auth.Database.pas]
+SaveTime=4/15/2026 6:21:59 PM
+FileCount=2
+File0=C:\Projects\emT3web\emT3XDataServer\Source\Auth.Database.pas
+File1=C:\Projects\emT3web\emT3XDataServer\Source\Auth.Database.dfm