deploy ver 0.9.13 & server 0.9.13.2

kgOrdersClient/ConnectionModule.pas

@@ -19,7 +19,7 @@ type
     FUnauthorizedAccessProc: TUnauthorizedAccessProc;
 
   public
-    const clientVersion = '0.9.12';
+    const clientVersion = '0.9.13';
     procedure InitApp(SuccessProc: TSuccessProc;
       UnauthorizedAccessProc: TUnauthorizedAccessProc);
     procedure SetClientConfig(Callback: TVersionCheckCallback);
@@ -46,12 +46,14 @@ begin
   TFViewErrorPage.DisplayConnectionError(Error);
 end;
 
+
 procedure TDMConnection.ApiConnectionRequest(Args: TXDataWebConnectionRequest);
 begin
   if AuthService.Authenticated then
     Args.Request.Headers.SetValue('Authorization', 'Bearer ' + AuthService.GetToken);
 end;
 
+
 procedure TDMConnection.ApiConnectionResponse(
   Args: TXDataWebConnectionResponse);
 begin
@@ -59,11 +61,13 @@ begin
     FUnauthorizedAccessProc(Format('%d: %s',[Args.Response.StatusCode, Args.Response.ContentAsText]));
 end;
 
+
 procedure TDMConnection.AuthConnectionError(Error: TXDataWebConnectionError);
 begin
   TFViewErrorPage.DisplayConnectionError(Error);
 end;
 
+
 procedure TDMConnection.InitApp(SuccessProc: TSuccessProc;
   UnauthorizedAccessProc: TUnauthorizedAccessProc);
 
@@ -85,7 +89,6 @@ end;
 
 
 procedure TDMConnection.SetClientConfig(Callback: TVersionCheckCallback);
-
 begin
   XDataWebClient1.Connection := AuthConnection;
 

kgOrdersServer/Source/Auth.Service.pas

@@ -19,7 +19,7 @@ type
   IAuthService = interface(IInvokable)
   ['{9CFD59B2-A832-4F82-82BB-9A25FC93F305}']
     function Login(const user, password: string): string;
-    function VerifyVersion(ClientVersion: string): TJSONObject;
+    function VerifyVersion(clientVersion: string): TJSONObject;
   end;
 
 implementation

kgOrdersServer/Source/Auth.ServiceImpl.pas

@@ -62,11 +62,12 @@ begin
   inherited;
 end;
 
-function TAuthService.VerifyVersion(ClientVersion: string): TJSONObject;
+function TAuthService.VerifyVersion(clientVersion: string): TJSONObject;
 var
   iniFile: TIniFile;
   webClientVersion: string;
 begin
+  Logger.Log( 5, 'TAuthService.VerifyVersion(clientVersion: ' + clientVersion + ')' );
   Result := TJSONObject.Create;
   TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result);
 
@@ -82,11 +83,9 @@ begin
     end;
     if clientVersion <> webClientVersion then
     begin
-      //Result.AddPair('error',
-        //'Your browser is running version' + webClientVersion + ' when it should be running ' +
-        //clientVersion + sLineBreak + 'Please click below to reload.');
+      Logger.Log(1, 'webApp version mismatch client ver: ' + clientVersion + ' required ver: ' + webClientVersion);
       Result.AddPair('error',
-        'Version mismatch' + sLineBreak + '  Client version: ' + clientVersion  +
+        'webApp version mismatch' + sLineBreak + '  Client version: ' + clientVersion  +
          sLineBreak + '  Server version: ' + webClientVersion +
          sLineBreak + 'Please click button to clear cache and reload.');
     end;

kgOrdersServer/Source/Common.Config.pas

@@ -91,5 +91,10 @@ begin
   Logger.Log(1, '--TServerConfig.Create - end');
 end;
 
+initialization
+  ServerConfig := TServerConfig.Create;
+
+finalization
+  ServerConfig.Free;
 
 end.

kgOrdersServer/Source/Main.dfm

@@ -10,7 +10,6 @@ object FMain: TFMain
   Font.Height = -11
   Font.Name = 'Tahoma'
   Font.Style = []
-  OnClose = FormClose
   DesignSize = (
     773
     597)

kgOrdersServer/Source/Main.pas

@@ -26,7 +26,6 @@ type
     procedure btnDataClick(Sender: TObject);
     procedure btnExitClick(Sender: TObject);
     procedure ContactFormData(AText: String);
-    procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure initTimerTimer(Sender: TObject);
     procedure btnAuthSwaggerUIClick(Sender: TObject);
     procedure btnQBClick(Sender: TObject);
@@ -242,15 +241,6 @@ begin
 end;
 
 
-procedure TFMain.FormClose(Sender: TObject; var Action: TCloseAction);
-begin
-  ServerConfig.Free;
-  AuthServerModule.Free;
-  ApiServerModule.Free;
-  AppServerModule.Free;
-end;
-
-
 procedure TFMain.UpdateGUI;
 begin
   if AuthServerModule.SparkleHttpSysDispatcher.Active then

kgOrdersServer/kgOrdersServer.dproj

@@ -114,11 +114,11 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <DCC_ExeOutput>.\bin</DCC_ExeOutput>
         <DCC_UnitSearchPath>C:\RADTOOLS\FastMM4;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
-        <VerInfo_Keys>CompanyName=EM Systems;FileDescription=$(MSBuildProjectName);FileVersion=0.9.12.1;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=0.9.11;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=EM Systems;FileDescription=$(MSBuildProjectName);FileVersion=0.9.13.2;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=0.9.11;Comments=</VerInfo_Keys>
         <VerInfo_MajorVer>0</VerInfo_MajorVer>
         <VerInfo_MinorVer>9</VerInfo_MinorVer>
-        <VerInfo_Release>12</VerInfo_Release>
-        <VerInfo_Build>1</VerInfo_Build>
+        <VerInfo_Release>13</VerInfo_Release>
+        <VerInfo_Build>2</VerInfo_Build>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>