From a29bbf15774dad97d0d7f156cb64cbc615617aed Mon Sep 17 00:00:00 2001
From: Daniele Teti <d.teti@bittime.it>
Date: Tue, 24 Dec 2024 10:40:10 +0100
Subject: [PATCH] Improved FileBased session sample

---
 samples/session_file_based/AppControllerU.pas |  41 +++--
 .../FileBasedSessionSample.dpr                |  11 +-
 .../FileBasedSessionSample.dproj              | 162 +++++++++++++++---
 samples/session_file_based/WebModuleUnit1.pas |   3 +-
 4 files changed, 166 insertions(+), 51 deletions(-)

diff --git a/samples/session_file_based/AppControllerU.pas b/samples/session_file_based/AppControllerU.pas
index bdac9165..de53c8d8 100644
--- a/samples/session_file_based/AppControllerU.pas
+++ b/samples/session_file_based/AppControllerU.pas
@@ -13,15 +13,15 @@   TApp1MainController = class(TMVCController)
   public
     [MVCPath('/name')]
     [MVCHTTPMethod([httpGET])]
-    procedure Index;
+    function Index: String;
 
     [MVCPath('/list')]
     [MVCHTTPMethod([httpGET])]
-    procedure GetCustomSessionData;
+    function GetCustomSessionData: String;
 
     [MVCPath('/login/($username)')]
     [MVCHTTPMethod([httpGET])]
-    procedure DoLogin(username: String);
+    function DoLogin(username: String): String;
 
     [MVCPath('/fruit/($nameOfFruit)')]
     [MVCHTTPMethod([httpGET])]
@@ -41,19 +41,18 @@ implementation
 
 { TApp1MainController }
 
-procedure TApp1MainController.DoLogin(username: String);
+function TApp1MainController.DoLogin(username: String): String;
 begin
   Session['username'] := username;
-  ResponseStream
-    .AppendLine('Logged as ' + username)
-    .AppendLine
-    .AppendLine('in address of browser type: ')
-    .AppendLine('http://localhost:8080/list             to check the current values in session ')
-    .AppendLine('http://localhost:8080/fruit/apple      to register apple ')
-    .AppendLine('http://localhost:8080/fruit/banana     to register banana ')
-    .AppendLine('http://localhost:8080/logout           to end session ')
-    .AppendLine('http://localhost:8080/login/johndoe    to login as johndoe');
-  RenderResponseStream;
+  Result :=
+    'Logged as ' + username + sLineBreak +
+     sLineBreak +
+    'In the browser address bar, you can write: ' + sLineBreak +
+    'http://localhost:8080/list             to check the current values in session ' + sLineBreak +
+    'http://localhost:8080/fruit/apple      to register apple ' + sLineBreak +
+    'http://localhost:8080/fruit/banana     to register banana ' + sLineBreak +
+    'http://localhost:8080/logout           to end session ' + sLineBreak +
+    'http://localhost:8080/login/johndoe    to login as johndoe';
 end;
 
 procedure TApp1MainController.RegisterFruit(nameOfFruit: String);
@@ -68,21 +67,20 @@ procedure TApp1MainController.DoLogout;
   Render('Logout');
 end;
 
-procedure TApp1MainController.GetCustomSessionData;
+function TApp1MainController.GetCustomSessionData: String;
 var
   I: Integer;
   lList: TArray<String>;
 begin
   lList := Session.Keys;
-  ResponseStream.AppendLine('List of fruits:');
+  Result := 'List of fruits:' + sLineBreak;
   for I := 0 to Length(lList) - 1 do
   begin
-    ResponseStream.AppendLine(IntToStr(I + 1) + '-' + Session[lList[I]]);
+    Result := Result + sLineBreak + IntToStr(I + 1) + '-' + Session[lList[I]] + sLineBreak;
   end;
-  RenderResponseStream;
 end;
 
-procedure TApp1MainController.Index;
+function TApp1MainController.Index: String;
 begin
   ContentType := TMVCMediaType.TEXT_PLAIN;
 
@@ -90,11 +88,12 @@ procedure TApp1MainController.Index;
   if Context.SessionStarted then
   begin
     // automaticaly create the session
-    Render('Session[''username''] = ' + Session['username']);
+    Result := 'Session[''username''] = ' + Session['username']
   end
   else
   begin
-    Render(400, 'Session not created. Do login first');
+    StatusCode := HTTP_STATUS.BadRequest;
+    Result := 'Session not created. Do login first';
   end;
 end;
 
diff --git a/samples/session_file_based/FileBasedSessionSample.dpr b/samples/session_file_based/FileBasedSessionSample.dpr
index bf342dbd..679706ab 100644
--- a/samples/session_file_based/FileBasedSessionSample.dpr
+++ b/samples/session_file_based/FileBasedSessionSample.dpr
@@ -15,7 +15,7 @@ uses
   Web.WebBroker,
   IdHTTPWebBrokerBridge,
   WebModuleUnit1 in 'WebModuleUnit1.pas' {WebModule1: TWebModule},
-  AppControllerU in 'AppControllerU.pas';
+  AppControllerU in 'AppControllerU.pas', MVCFramework.Logger;
 
 {$R *.res}
 
@@ -24,15 +24,14 @@ procedure RunServer(APort: Integer);
 var
   LServer: TIdHTTPWebBrokerBridge;
 begin
-  Writeln(Format('Starting HTTP Server or port %d', [APort]));
+  LogI(Format('Starting HTTP Server or http://localhost:%d', [APort]));
   LServer := TIdHTTPWebBrokerBridge.Create(nil);
   try
     LServer.DefaultPort := APort;
     LServer.Active := True;
     {$IFDEF MSWINDOWS}
-    //ShellExecute(0, 'open', PChar('http://localhost:' + IntToStr(APort) + '/login/john'), nil, nil, SW_SHOW);
+    ShellExecute(0, 'open', PChar('http://localhost:' + IntToStr(APort) + '/login/john'), nil, nil, SW_SHOW);
     {$ENDIF}
-    Writeln('CTRL+C to stop the server');
     WaitForTerminationSignal;
     EnterInShutdownState;
   finally
@@ -42,6 +41,8 @@ end;
 
 begin
   ReportMemoryLeaksOnShutdown := True;
+  UseConsoleLogger := True;
+  UseLoggerVerbosityLevel := TLogLevel.levDebug;
   try
     if WebRequestHandler <> nil then
       WebRequestHandler.WebModuleClass := WebModuleClass;
@@ -49,7 +50,7 @@ begin
     RunServer(8080);
   except
     on E: Exception do
-      Writeln(E.ClassName, ': ', E.Message);
+      LogF(E.ClassName + ': ' + E.Message);
   end
 
 end.
diff --git a/samples/session_file_based/FileBasedSessionSample.dproj b/samples/session_file_based/FileBasedSessionSample.dproj
index 4e9c4a3c..c3b0b9f1 100644
--- a/samples/session_file_based/FileBasedSessionSample.dproj
+++ b/samples/session_file_based/FileBasedSessionSample.dproj
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{F9CBCE21-869A-478F-992C-88FCAC97BC8B}</ProjectGuid>
-        <ProjectVersion>19.5</ProjectVersion>
+        <ProjectVersion>20.2</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <MainSource>FileBasedSessionSample.dpr</MainSource>
         <Base>True</Base>
@@ -9,6 +9,7 @@
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Console</AppType>
+        <ProjectName Condition="'$(ProjectName)'==''">FileBasedSessionSample</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -153,13 +154,8 @@
                     <Excluded_Packages Name="$(BDSBIN)\dclofficexp170.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
-            <Deployment Version="4">
-                <DeployFile LocalName="Win32\Debug\FileBasedSessionSample.exe" Configuration="Debug" Class="ProjectOutput">
-                    <Platform Name="Win32">
-                        <RemoteName>FileBasedSessionSample.exe</RemoteName>
-                        <Overwrite>true</Overwrite>
-                    </Platform>
-                </DeployFile>
+            <Deployment Version="5">
+                <DeployFile LocalName="Win32\Debug\FileBasedSessionSample.exe" Configuration="Debug" Class="ProjectOutput"/>
                 <DeployFile LocalName="Win32\Debug\SessionSample.exe" Configuration="Debug" Class="ProjectOutput"/>
                 <DeployClass Name="AdditionalDebugSymbols">
                     <Platform Name="OSX32">
@@ -169,16 +165,6 @@
                         <Operation>0</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="AndroidClasses">
-                    <Platform Name="Android">
-                        <RemoteDir>classes</RemoteDir>
-                        <Operation>64</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>classes</RemoteDir>
-                        <Operation>64</Operation>
-                    </Platform>
-                </DeployClass>
                 <DeployClass Name="AndroidFileProvider">
                     <Platform Name="Android">
                         <RemoteDir>res\xml</RemoteDir>
@@ -189,12 +175,6 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="AndroidGDBServer">
-                    <Platform Name="Android">
-                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
                 <DeployClass Name="AndroidLibnativeArmeabiFile">
                     <Platform Name="Android">
                         <RemoteDir>library\lib\armeabi</RemoteDir>
@@ -247,6 +227,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashImageDefV21">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-anydpi-v21</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-anydpi-v21</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="AndroidSplashStyles">
                     <Platform Name="Android">
                         <RemoteDir>res\values</RemoteDir>
@@ -267,6 +257,66 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV31">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v31</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v31</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_AdaptiveIcon">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-anydpi-v26</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-anydpi-v26</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_AdaptiveIconBackground">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_AdaptiveIconForeground">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_AdaptiveIconMonochrome">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_AdaptiveIconV33">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-anydpi-v33</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-anydpi-v33</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_Colors">
                     <Platform Name="Android">
                         <RemoteDir>res\values</RemoteDir>
@@ -277,6 +327,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="Android_ColorsDark">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-night-v21</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-night-v21</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_DefaultAppIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable</RemoteDir>
@@ -447,6 +507,56 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="Android_VectorizedNotificationIcon">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-anydpi-v24</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-anydpi-v24</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_VectorizedSplash">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_VectorizedSplashDark">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-night-anydpi-v21</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-night-anydpi-v21</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_VectorizedSplashV31">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-anydpi-v31</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-anydpi-v31</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_VectorizedSplashV31Dark">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-night-anydpi-v31</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-night-anydpi-v31</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="DebugSymbols">
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
@@ -624,6 +734,9 @@
                     <Platform Name="Win64">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="Win64x">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSDeviceDebug">
                     <Platform Name="iOSDevice32">
@@ -885,6 +998,7 @@
                 <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win64x" Name="$(PROJECTNAME)"/>
             </Deployment>
             <Platforms>
                 <Platform value="Win32">True</Platform>
diff --git a/samples/session_file_based/WebModuleUnit1.pas b/samples/session_file_based/WebModuleUnit1.pas
index b7d8a556..818d383d 100644
--- a/samples/session_file_based/WebModuleUnit1.pas
+++ b/samples/session_file_based/WebModuleUnit1.pas
@@ -27,7 +27,7 @@ implementation
 {$R *.dfm}
 
 
-uses AppControllerU, MVCFramework.Commons;
+uses AppControllerU, MVCFramework.Commons, MVCFramework.Middleware.Redirect;
 
 procedure TWebModule1.WebModuleCreate(Sender: TObject);
 begin
@@ -39,6 +39,7 @@ procedure TWebModule1.WebModuleCreate(Sender: TObject);
       Config[TMVCConfigKey.SessionType] := 'file';
     end);
   MVC.AddController(TApp1MainController);
+  MVC.AddMiddleware(TMVCRedirectMiddleware.Create(['/'], '/name'));
 end;
 
 end.