Changed the behavior of the JWT LiveValidityWindows

Added milligram.css to some samples
danieleteti · May 17, 2018 · a4381ec · a4381ec
1 parent 34bc5e0
commit a4381ec
Show file tree

Hide file tree

Showing 24 changed files with 827 additions and 232 deletions.
diff --git a/samples/apachemodule/Apache24/htdocs/css/milligram.css b/samples/apachemodule/Apache24/htdocs/css/milligram.css
diff --git a/samples/apachemodule/Apache24/htdocs/css/styles.css b/samples/apachemodule/Apache24/htdocs/css/styles.css
@@ -1,12 +1,13 @@
-* {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 18px;
-}
 
 .header {
 	padding-top: 5px;
 }
 
+#wineList {
+  overflow-y: scroll;
+  height: 80%;
+}
+
 .leftArea {
 	position: absolute;
 	left: 10px;

diff --git a/samples/apachemodule/Apache24/htdocs/index.html b/samples/apachemodule/Apache24/htdocs/index.html
@@ -1,63 +1,70 @@
 <!DOCTYPE HTML>
 <html>
+
 <head>
-<title>Cellar</title>
-<link rel="stylesheet" href="css/styles.css" />
+	<title>Cellar</title>
+	<link rel="stylesheet" href="css/milligram.css" />
+	<link rel="stylesheet" href="css/styles.css" />
 </head>
 
 <body>
 
-<div class="header">
-	<input type="text" id="searchKey"/>
-	<button id="btnSearch">Search</button>
-	<button id="btnAdd">New Wine</button>
-</div>
+	<div class="header">
+		<input type="text" id="searchKey" />
+		<button class="button" id="btnSearch">Search</button>
+		<button class="button" id="btnAdd">New Wine</button>
+	</div>
 
 
-<div class="leftArea">
-<ul id="wineList"></ul>
-</div>
+	<div class="leftArea">
+		<ul id="wineList"></ul>
+	</div>
 
-<form id="wineForm">
+	<form id="wineForm">
 
-<div class="mainArea">
+		<div class="mainArea">
 
-<label>Id:</label>
-<input id="wineId" name="id" type="text" style="width: 50px" disabled />
+			<label>Id:</label>
+			<input id="wineId" name="id" type="text" style="width: 50px" disabled />
 
-<label>Name:</label>
-<input type="text" id="name" name="name" required>
+			<label>Name:</label>
+			<input type="text" id="name" name="name" required>
 
-<label>Grapes:</label>
-<input type="text" id="grapes" name="grapes"/>
+			<label>Grapes:</label>
+			<input type="text" id="grapes" name="grapes" />
 
-<label>Country:</label>
-<input type="text" id="country" name="country"/>
+			<label>Country:</label>
+			<input type="text" id="country" name="country" />
 
-<label>Region:</label>
-<input type="text" id="region" name="region"/>
+			<label>Region:</label>
+			<input type="text" id="region" name="region" />
 
-<label>Year:</label>
-<select id="year" name="year"><option value=""></option></select>
-<div class="padding02">
-<button id="btnSave">Save</button>
-<button id="btnDelete">Delete</button>
-</div>
-</div>
+			<label>Year:</label>
+			<select id="year" name="year">
+				<option value=""></option>
+			</select>
+			<div class="padding02">
+				<button class="button" id="btnSave">Save</button>
+				<button class="button" id="btnDelete">Delete</button>
+			</div>
+		</div>
 
-<div class="rightArea">
+		<div class="rightArea">
 
-<img id="pic" height="300"/>
+			<img id="pic" height="300" />
 
-<label>Notes:</label>
-<textarea id="description" name="description"></textarea>
-</div>
+			<label>Notes:</label>
+			<textarea id="description" name="description"></textarea>
+		</div>
 
-</form>
+	</form>
 
-<script src="js/jquery-1.7.1.min.js"></script>
-<script src="js/main.js"></script>
+	<script src="js/jquery-1.7.1.min.js"></script>
+	<script src="js/main.js"></script>
 
-<div class="footer textcenter padding02">The client code of this demo is slightly based on <a target="_blank" href="http://coenraets.org/blog/2011/12/restful-services-with-jquery-php-and-the-slim-framework/">"RESTful services with jQuery, PHP and the Slim Framework"</a></div>
+	<div class="footer textcenter padding02">The client code of this demo is slightly based on
+		<a target="_blank" href="http://coenraets.org/blog/2011/12/restful-services-with-jquery-php-and-the-slim-framework/">"RESTful services with jQuery, PHP and the Slim Framework"</a>
+	</div>
 </body>
+
 </html>
diff --git a/samples/apachemodule/WineCellarAppControllerU.pas b/samples/apachemodule/WineCellarAppControllerU.pas
@@ -55,10 +55,11 @@ implementation
 
 uses
   System.SysUtils, System.Classes, System.IOUtils,
-  WinesBO, MVCFramework.Serializer.Commons;
+  WinesBO, MVCFramework.Serializer.Commons, MVCFramework.Logger;
 
 procedure TWineCellarApp.FindWines(ctx: TWebContext);
 begin
+  Log.Debug('','MYTAG');
   Render(dm.FindWines(ctx.Request.Params['value']));
 end;
 

diff --git a/samples/apachemodule/mod_dmvc.dproj b/samples/apachemodule/mod_dmvc.dproj
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{61ADE231-72F2-4E11-8EDD-62C5AFEF0463}</ProjectGuid>
-        <ProjectVersion>18.3</ProjectVersion>
+        <ProjectVersion>18.4</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <MainSource>mod_dmvc.dpr</MainSource>
         <Base>True</Base>

diff --git a/samples/articles_crud_server/MainDM.pas b/samples/articles_crud_server/MainDM.pas
@@ -3,11 +3,27 @@
 interface
 
 uses
-  System.SysUtils, System.Classes, FireDAC.Stan.Intf, FireDAC.Stan.Option,
-  FireDAC.Stan.Error, FireDAC.UI.Intf, FireDAC.Phys.Intf, FireDAC.Stan.Def,
-  FireDAC.Stan.Pool, FireDAC.Stan.Async, FireDAC.Phys, FireDAC.Phys.FB, Data.DB,
-  FireDAC.Comp.Client, FireDAC.Stan.Param, FireDAC.DatS, FireDAC.DApt.Intf,
-  FireDAC.DApt, FireDAC.Comp.DataSet, FireDAC.Phys.FBDef, FireDAC.VCLUI.Wait;
+  System.SysUtils,
+  System.Classes,
+  FireDAC.Stan.Intf,
+  FireDAC.Stan.Option,
+  FireDAC.Stan.Error,
+  FireDAC.UI.Intf,
+  FireDAC.Phys.Intf,
+  FireDAC.Stan.Def,
+  FireDAC.Stan.Pool,
+  FireDAC.Stan.Async,
+  FireDAC.Phys,
+  FireDAC.Phys.FB,
+  Data.DB,
+  FireDAC.Comp.Client,
+  FireDAC.Stan.Param,
+  FireDAC.DatS,
+  FireDAC.DApt.Intf,
+  FireDAC.DApt,
+  FireDAC.Comp.DataSet,
+  FireDAC.Phys.FBDef,
+  FireDAC.VCLUI.Wait;
 
 type
   TdmMain = class(TDataModule)
@@ -28,10 +44,13 @@ implementation
 
 procedure TdmMain.ConnectionBeforeConnect(Sender: TObject);
 begin
-  // currently, this demo uses firebird 2.5
+{$IFNDEF WINDOWSSERVICE}
   // if you want to use firebird 2.5, you can use the file ORDERSMANAGER_FB25.FDB
   Connection.Params.Values['Database'] := '..\..\data\ORDERSMANAGER_FB30.FDB';
   // Connection.Params.Values['Database'] := '..\..\data\ORDERSMANAGER_FB25.FDB';
+{$ELSE}
+  Connection.Params.Values['Database'] := 'C:\DEV\dmvcframework\samples\data\ORDERSMANAGER_FB30.FDB';
+{$ENDIF}
 end;
 
 end.
diff --git a/samples/articles_crud_server/WebModuleUnit1.dfm b/samples/articles_crud_server/WebModuleUnit1.dfm
@@ -6,7 +6,6 @@ object WebModule1: TWebModule1
       Default = True
       Name = 'DefaultHandler'
       PathInfo = '/'
-      OnAction = WebModule1DefaultHandlerAction
     end>
   Height = 230
   Width = 415

diff --git a/samples/articles_crud_server/WebModuleUnit1.pas b/samples/articles_crud_server/WebModuleUnit1.pas
@@ -6,8 +6,6 @@ interface
 
 type
   TWebModule1 = class(TWebModule)
-    procedure WebModule1DefaultHandlerAction(Sender: TObject;
-      Request: TWebRequest; Response: TWebResponse; var Handled: Boolean);
     procedure WebModuleCreate(Sender: TObject);
   private
     FEngine: TMVCEngine;
@@ -26,22 +24,12 @@ implementation
 
 {$R *.dfm}
 
-procedure TWebModule1.WebModule1DefaultHandlerAction(Sender: TObject;
-  Request: TWebRequest; Response: TWebResponse; var Handled: Boolean);
-begin
-  Response.Content :=
-    '<html>' +
-    '<head><title>Web Server Application</title></head>' +
-    '<body>Web Server Application</body>' +
-    '</html>';
-end;
-
 procedure TWebModule1.WebModuleCreate(Sender: TObject);
 begin
   FEngine := TMVCEngine.Create(self);
   FEngine.AddController(TArticlesController);
   FEngine.AddMiddleware(TCORSMiddleware.Create);
-  FEngine.AddMiddleware(TCompressionMiddleware.Create);
+  FEngine.AddMiddleware(TCompressionMiddleware.Create(256));
 
 end;
 

diff --git a/samples/jsonwebtoken/vclclient/MainClientFormU.dfm b/samples/jsonwebtoken/vclclient/MainClientFormU.dfm
@@ -82,7 +82,6 @@ object Form5: TForm5
       Caption = 'Get a protected resource'
       TabOrder = 0
       OnClick = btnGetClick
-      ExplicitTop = 2
     end
     object btnLOGIN: TButton
       AlignWithMargins = True

diff --git a/samples/jsonwebtoken_livevaliditywindow/JWTServer.dproj b/samples/jsonwebtoken_livevaliditywindow/JWTServer.dproj
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{7B54055A-5749-4136-9FE2-35FDBEEA874C}</ProjectGuid>
-        <ProjectVersion>18.2</ProjectVersion>
+        <ProjectVersion>18.4</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <MainSource>JWTServer.dpr</MainSource>
         <Base>True</Base>

diff --git a/samples/jsonwebtoken_livevaliditywindow/WebModuleUnit1.pas b/samples/jsonwebtoken_livevaliditywindow/WebModuleUnit1.pas
@@ -27,7 +27,6 @@ implementation
 
 {$R *.dfm}
 
-
 uses
   AppControllerU,
   System.Generics.Collections,
@@ -45,29 +44,22 @@ procedure TWebModule1.WebModuleCreate(Sender: TObject);
       JWT.Claims.Issuer := 'Delphi MVC Framework JWT Middleware Sample';
       JWT.Claims.NotBefore := Now - OneMinute * 5; // valid since 5 minutes ago
       JWT.Claims.IssuedAt := Now;
+      JWT.Claims.ExpirationTime := Now + OneSecond * 30;
       JWT.CustomClaims['mycustomvalue'] := 'hello there';
       // Here we dont use a fixed ExpirationTime but a LiveValidityWindowInSeconds
       // to make the ExpirationTime dynamic, incrementing the
       // ExpirationTime by LiveValidityWindowInSeconds seconds at each request
-      JWT.LiveValidityWindowInSeconds := 5; // 60 * 60; // 1 hour
+      JWT.LiveValidityWindowInSeconds := 10; // 60 * 60; // 1 hour
     end;
 
   MVC := TMVCEngine.Create(Self);
   MVC.Config[TMVCConfigKey.DocumentRoot] := '..\..\www';
   MVC.Config[TMVCConfigKey.SessionTimeout] := '30';
   MVC.Config[TMVCConfigKey.DefaultContentType] := 'text/html';
   MVC.AddController(TApp1MainController).AddController(TAdminController)
-    .AddMiddleware(TMVCJWTAuthenticationMiddleware.Create(
-    TAuthenticationSample.Create,
-    lClaimsSetup,
-    'mys3cr37',
-    '/login',
-    [
-    TJWTCheckableClaim.ExpirationTime,
-    TJWTCheckableClaim.NotBefore,
-    TJWTCheckableClaim.IssuedAt
-    ],
-    0 // just for test, Leeway seconds is zero.
+    .AddMiddleware(TMVCJWTAuthenticationMiddleware.Create(TAuthenticationSample.Create, lClaimsSetup, 'mys3cr37',
+    '/login', [TJWTCheckableClaim.ExpirationTime, TJWTCheckableClaim.NotBefore, TJWTCheckableClaim.IssuedAt], 0
+    // just for test, Leeway seconds is zero.
     ));
 end;
 

diff --git a/samples/jsonwebtoken_livevaliditywindow/vclclient/JWTClient.dproj b/samples/jsonwebtoken_livevaliditywindow/vclclient/JWTClient.dproj
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{E7317702-64D3-4A65-8734-030F3AE3DBBC}</ProjectGuid>
-        <ProjectVersion>18.2</ProjectVersion>
+        <ProjectVersion>18.4</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <MainSource>JWTClient.dpr</MainSource>
         <Base>True</Base>

diff --git a/samples/middleware/MiddlewareSamples.dproj b/samples/middleware/MiddlewareSamples.dproj
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{0388D146-2B8B-427B-AEDD-EFD5F51D3139}</ProjectGuid>
-        <ProjectVersion>18.2</ProjectVersion>
+        <ProjectVersion>18.4</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <MainSource>MiddlewareSamples.dpr</MainSource>
         <Base>True</Base>

diff --git a/samples/outputcachewithredis/OutputCacheWithRedis.dpr b/samples/outputcachewithredis/OutputCacheWithRedis.dpr
@@ -4,7 +4,6 @@ program OutputCacheWithRedis;
 
 uses
   System.SysUtils,
-  Winapi.Windows,
   IdHTTPWebBrokerBridge,
   Web.WebReq,
   Web.WebBroker,
@@ -20,9 +19,6 @@ uses
 
 procedure RunServer(APort: Integer);
 var
-  LInputRecord: TInputRecord;
-  LEvent: DWord;
-  LHandle: THandle;
   LServer: TIdHTTPWebBrokerBridge;
 begin
   Writeln(Format('Starting "OutputCacheWithRedis" HTTP Server or port %d', [APort]));
@@ -32,16 +28,8 @@ begin
     LServer.ListenQueue := 200;
     LServer.MaxConnections := 5000;
     LServer.Active := True;
-    Writeln('Press ESC to stop the server');
-    LHandle := GetStdHandle(STD_INPUT_HANDLE);
-    while True do
-    begin
-      Win32Check(ReadConsoleInput(LHandle, LInputRecord, 1, LEvent));
-      if (LInputRecord.EventType = KEY_EVENT) and
-        LInputRecord.Event.KeyEvent.bKeyDown and
-        (LInputRecord.Event.KeyEvent.wVirtualKeyCode = VK_ESCAPE) then
-        break;
-    end;
+    Writeln('Press RETURN to stop the server');
+    ReadLn;
   finally
     LServer.Free;
   end;

diff --git a/samples/outputcachewithredis/OutputCacheWithRedis.dproj b/samples/outputcachewithredis/OutputCacheWithRedis.dproj
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{BE3A3D14-17E0-45C1-BD21-4710DE4CBCC2}</ProjectGuid>
-        <ProjectVersion>18.2</ProjectVersion>
+        <ProjectVersion>18.4</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <MainSource>OutputCacheWithRedis.dpr</MainSource>
         <Base>True</Base>

diff --git a/samples/renders/MyDataModuleU.pas b/samples/renders/MyDataModuleU.pas
@@ -64,8 +64,6 @@   TMyDataModule = class(TDataModule)
     { Public declarations }
   end;
 
-var
-  MyDataModule: TMyDataModule;
 
 implementation
 

diff --git a/samples/renders/RenderSampleControllerU.pas b/samples/renders/RenderSampleControllerU.pas
@@ -229,7 +229,7 @@ procedure TRenderSampleController.GetCustomers_AsDataSet(CTX: TWebContext);
   lDM := TMyDataModule.Create(nil);
   try
     lDM.qryCustomers.Open;
-    Render(lDM.qryCustomers);
+    Render(lDM.qryCustomers, False);
   finally
     lDM.Free;
   end;
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,8 +64,6 @@ TMyDataModule = class(TDataModule) @@
         { Public declarations }
       end;
-    var
-      MyDataModule: TMyDataModule;
     implementation
@@ Expand Down @@