Updated sample to be compatible with the new middleware based session

danieleteti · Jan 23, 2025 · 2742960 · 2742960
1 parent 47420a7
commit 2742960
Show file tree

Hide file tree

Showing 22 changed files with 17 additions and 1,309 deletions.
diff --git a/samples/ado/WebModuleU.pas b/samples/ado/WebModuleU.pas
@@ -42,8 +42,6 @@ procedure TMyWebModule.WebModuleCreate(Sender: TObject);
     procedure(Config: TMVCConfig)
     begin
       Config.dotEnv := dotEnv; 
-      // session timeout (0 means session cookie)
-      Config[TMVCConfigKey.SessionTimeout] := dotEnv.Env('dmvc.session_timeout', '0');
       //default content-type
       Config[TMVCConfigKey.DefaultContentType] := dotEnv.Env('dmvc.default.content_type', TMVCConstants.DEFAULT_CONTENT_TYPE);
       //default content charset

diff --git a/samples/concurrency_speed_test/WebModuleU.pas b/samples/concurrency_speed_test/WebModuleU.pas
@@ -38,8 +38,6 @@ procedure TMyWebModule.WebModuleCreate(Sender: TObject);
     procedure(Config: TMVCConfig)
     begin
       Config.dotEnv := dotEnv;
-      // session timeout (0 means session cookie)
-      Config[TMVCConfigKey.SessionTimeout] := Config.dotEnv.Env('dmvc.session_timeout', '0');
       //default content-type
       Config[TMVCConfigKey.DefaultContentType] := Config.dotEnv.Env('dmvc.default.content_type', TMVCConstants.DEFAULT_CONTENT_TYPE);
       //default content charset

diff --git a/samples/functional_actions_showcase/WebModuleU.pas b/samples/functional_actions_showcase/WebModuleU.pas
@@ -36,8 +36,6 @@ procedure TMyWebModule.WebModuleCreate(Sender: TObject);
     procedure(Config: TMVCConfig)
     begin
       Config.dotEnv := dotEnv; 
-      // session timeout (0 means session cookie)
-      Config[TMVCConfigKey.SessionTimeout] := dotEnv.Env('dmvc.session_timeout', '0');
       //default content-type
       Config[TMVCConfigKey.DefaultContentType] := dotEnv.Env('dmvc.default.content_type', TMVCConstants.DEFAULT_CONTENT_TYPE);
       //default content charset

diff --git a/samples/htmx_mustache/WebModuleU.pas b/samples/htmx_mustache/WebModuleU.pas
@@ -39,8 +39,6 @@ procedure TWebModule1.WebModuleCreate(Sender: TObject);
     procedure(Config: TMVCConfig)
     begin
       Config.dotEnv := dotEnv;
-      // session timeout (0 means session cookie)
-      Config[TMVCConfigKey.SessionTimeout] := dotEnv.Env('dmvc.session_timeout', '0');
       //default content-type
       Config[TMVCConfigKey.DefaultContentType] := dotEnv.Env('dmvc.default.content_type', TMVCMediaType.TEXT_HTML);
       //default content charset

diff --git a/samples/htmx_templatepro/WebModuleU.pas b/samples/htmx_templatepro/WebModuleU.pas
@@ -39,8 +39,6 @@ procedure TWebModule1.WebModuleCreate(Sender: TObject);
     procedure(Config: TMVCConfig)
     begin
       Config.dotEnv := dotEnv;
-      // session timeout (0 means session cookie)
-      Config[TMVCConfigKey.SessionTimeout] := dotEnv.Env('dmvc.session_timeout', '0');
       //default content-type
       Config[TMVCConfigKey.DefaultContentType] := dotEnv.Env('dmvc.default.content_type', TMVCMediaType.TEXT_HTML);
       //default content charset

diff --git a/samples/htmx_website_with_templatepro/WebModuleU.pas b/samples/htmx_website_with_templatepro/WebModuleU.pas
@@ -41,8 +41,6 @@ procedure TMyWebModule.WebModuleCreate(Sender: TObject);
   FMVC := TMVCEngine.Create(Self,
     procedure(Config: TMVCConfig)
     begin
-      // session timeout (0 means session cookie)
-      Config[TMVCConfigKey.SessionTimeout] := dotEnv.Env('dmvc.session_timeout', '0');
       //default content-type
       Config[TMVCConfigKey.DefaultContentType] := dotEnv.Env('dmvc.default.content_type', TMVCMediaType.TEXT_HTML);
       //default content charset

diff --git a/samples/htmx_website_with_webstencils/WebModuleU.pas b/samples/htmx_website_with_webstencils/WebModuleU.pas
@@ -40,8 +40,6 @@ procedure TMyWebModule.WebModuleCreate(Sender: TObject);
   FMVC := TMVCEngine.Create(Self,
     procedure(Config: TMVCConfig)
     begin
-      // session timeout (0 means session cookie)
-      Config[TMVCConfigKey.SessionTimeout] := dotEnv.Env('dmvc.session_timeout', '0');
       //default content-type
       Config[TMVCConfigKey.DefaultContentType] := dotEnv.Env('dmvc.default.content_type', TMVCMediaType.TEXT_HTML);
       //default content charset

diff --git a/samples/instant_search_with_htmx_and_templatepro/WebModuleU.pas b/samples/instant_search_with_htmx_and_templatepro/WebModuleU.pas
@@ -44,8 +44,6 @@ procedure TMyWebModule.WebModuleCreate(Sender: TObject);
   FMVC := TMVCEngine.Create(Self,
     procedure(Config: TMVCConfig)
     begin
-      // session timeout (0 means session cookie)
-      Config[TMVCConfigKey.SessionTimeout] := dotEnv.Env('dmvc.session_timeout', '0');
       //default content-type
       Config[TMVCConfigKey.DefaultContentType] := dotEnv.Env('dmvc.default.content_type', TMVCMediaType.TEXT_HTML);
       //default content charset

diff --git a/samples/middleware_cors/SimpleWebServer/WebModuleU.pas b/samples/middleware_cors/SimpleWebServer/WebModuleU.pas
@@ -43,8 +43,6 @@ procedure TMyWebModule.WebModuleCreate(Sender: TObject);
     procedure(Config: TMVCConfig)
     begin
       Config.dotEnv := dotEnv; 
-      // session timeout (0 means session cookie)
-      Config[TMVCConfigKey.SessionTimeout] := dotEnv.Env('dmvc.session_timeout', '0');
       //default content-type
       Config[TMVCConfigKey.DefaultContentType] := dotEnv.Env('dmvc.default.content_type', TMVCConstants.DEFAULT_CONTENT_TYPE);
       //default content charset

diff --git a/samples/render_binary_contents/WebModuleU.pas b/samples/render_binary_contents/WebModuleU.pas
@@ -39,8 +39,6 @@ procedure TMyWebModule.WebModuleCreate(Sender: TObject);
   FMVC := TMVCEngine.Create(Self,
     procedure(Config: TMVCConfig)
     begin
-      // session timeout (0 means session cookie)
-      Config[TMVCConfigKey.SessionTimeout] := dotEnv.Env('dmvc.session_timeout', '0');
       //default content-type
       Config[TMVCConfigKey.DefaultContentType] := dotEnv.Env('dmvc.default.content_type', TMVCConstants.DEFAULT_CONTENT_TYPE);
       //default content charset

diff --git a/samples/services_injection/WebModuleU.pas b/samples/services_injection/WebModuleU.pas
@@ -44,8 +44,6 @@ procedure TMyWebModule.WebModuleCreate(Sender: TObject);
     procedure(Config: TMVCConfig)
     begin
       Config.dotEnv := dotEnv; 
-      // session timeout (0 means session cookie)
-      Config[TMVCConfigKey.SessionTimeout] := dotEnv.Env('dmvc.session_timeout', '0');
       //default content-type
       Config[TMVCConfigKey.DefaultContentType] := dotEnv.Env('dmvc.default.content_type', TMVCConstants.DEFAULT_CONTENT_TYPE);
       //default content charset

diff --git a/samples/session_file_based/WebModuleUnit1.pas b/samples/session_file_based/WebModuleUnit1.pas
@@ -27,18 +27,17 @@ implementation
 {$R *.dfm}
 
 
-uses AppControllerU, MVCFramework.Commons, MVCFramework.Middleware.Redirect;
+uses AppControllerU, MVCFramework.Commons, MVCFramework.Middleware.Redirect, MVCFramework.Middleware.Session;
 
 procedure TWebModule1.WebModuleCreate(Sender: TObject);
 begin
   MVC := TMVCEngine.Create(Self,
     procedure(Config: TMVCConfig)
     begin
-      Config[TMVCConfigKey.SessionTimeout] := '10'; // 10minutes
       Config[TMVCConfigKey.DefaultContentType] := 'text/plain';
-      Config[TMVCConfigKey.SessionType] := 'file';
     end);
   MVC.AddController(TApp1MainController);
+  MVC.AddMiddleware(UseFileSessionMiddleware(0));
   MVC.AddMiddleware(TMVCRedirectMiddleware.Create(['/'], '/name'));
 end;
 

diff --git a/samples/sessioncustom/AppControllerU.pas b/samples/sessioncustom/AppControllerU.pas
diff --git a/samples/sessioncustom/CustomSessionSample.dpr b/samples/sessioncustom/CustomSessionSample.dpr