Merge branch 'develop'

Author: Cesar4D

.gitignore

@@ -82,3 +82,6 @@ modules/
 Server/Win32/Debug/dataset.xml
 Server/Win32/Debug/push.ini
 /WebClient/TMSWeb
+/WebClient/Win32
+/WebClient/Win32
+Server/Bin/dataset.xml

PushNotificationsGroup.groupproj

@@ -3,10 +3,10 @@
         <ProjectGuid>{741820B1-2792-4089-9001-82F9EED6A43D}</ProjectGuid>
     </PropertyGroup>
     <ItemGroup>
-        <Projects Include="WebClient\WebClient.dproj">
+        <Projects Include="Server\Server.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="Server\Server.dproj">
+        <Projects Include="WebClient\WebPushClient.dproj">
             <Dependencies/>
         </Projects>
     </ItemGroup>
@@ -17,15 +17,6 @@
             <Default.Personality/>
         </BorlandProject>
     </ProjectExtensions>
-    <Target Name="WebClient">
-        <MSBuild Projects="WebClient\WebClient.dproj"/>
-    </Target>
-    <Target Name="WebClient:Clean">
-        <MSBuild Projects="WebClient\WebClient.dproj" Targets="Clean"/>
-    </Target>
-    <Target Name="WebClient:Make">
-        <MSBuild Projects="WebClient\WebClient.dproj" Targets="Make"/>
-    </Target>
     <Target Name="Server">
         <MSBuild Projects="Server\Server.dproj"/>
     </Target>
@@ -35,14 +26,23 @@
     <Target Name="Server:Make">
         <MSBuild Projects="Server\Server.dproj" Targets="Make"/>
     </Target>
+    <Target Name="WebPushClient">
+        <MSBuild Projects="WebClient\WebPushClient.dproj"/>
+    </Target>
+    <Target Name="WebPushClient:Clean">
+        <MSBuild Projects="WebClient\WebPushClient.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="WebPushClient:Make">
+        <MSBuild Projects="WebClient\WebPushClient.dproj" Targets="Make"/>
+    </Target>
     <Target Name="Build">
-        <CallTarget Targets="WebClient;Server"/>
+        <CallTarget Targets="Server;WebPushClient"/>
     </Target>
     <Target Name="Clean">
-        <CallTarget Targets="WebClient:Clean;Server:Clean"/>
+        <CallTarget Targets="Server:Clean;WebPushClient:Clean"/>
     </Target>
     <Target Name="Make">
-        <CallTarget Targets="WebClient:Make;Server:Make"/>
+        <CallTarget Targets="Server:Make;WebPushClient:Make"/>
     </Target>
     <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
 </Project>

Server/Win32/Debug/WebPush.dll Server/Bin/WebPush.dllServer/Win32/Debug/WebPush.dll renamed to Server/Bin/WebPush.dll

@@ -0,0 +1,4 @@
+[vapid]
+PublicKey=BDxsa4gZnS8WiuUzazfE27TCi4YLPdgiI_aPN3zRy85xYXfVruEJ2Q9v9UGVrDzVChR8M9hduu6BiTchKP8iP4k=
+PrivateKey=k_qGHoBJVZ8BaQ9yitmClT4dCevWMHIVo4Bj8dXM_iU=
+

Server/Win32/Debug/libeay32.dll Server/Bin/libeay32.dllServer/Win32/Debug/libeay32.dll renamed to Server/Bin/libeay32.dll

@@ -59,8 +59,8 @@
         <Base>true</Base>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base)'!=''">
-        <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
-        <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
+        <DCC_DcuOutput>.\Dcus</DCC_DcuOutput>
+        <DCC_ExeOutput>.\Bin</DCC_ExeOutput>
         <DCC_E>false</DCC_E>
         <DCC_N>false</DCC_N>
         <DCC_S>false</DCC_S>
@@ -71,6 +71,8 @@
         <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
         <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
         <SanitizedProjectName>Server</SanitizedProjectName>
+        <VerInfo_Locale>1046</VerInfo_Locale>
+        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <DCC_UsePackage>vclwinx;DataSnapServer;ACBr_BPeDabpeESCPOS;ACBr_TCP;ACBr_ONE;ACBr_NFCom;fs29;fmx;vclie;DbxCommonDriver;bindengine;IndyIPCommon;VCLRESTComponents;DBXMSSQLDriver;FireDACCommonODBC;emsclient;bsfd103Rio;ACBr_OpenSSL;appanalytics;IndyProtocols;vclx;Skia.Package.RTL;aurelius;dbxcds;vcledge;FMX_FlexCel_Components;FmxTeeUI;VCLTMSFNCChartPkgDXE15;ACBr_BoletoRL;FlexCel_Pdf;DBXFirebirdDriver;ACBr_CTeDacteFR;FMXTMSFNCChartPkgDXE15;ACBr_NFCeECFVirtual;ACBr_DCeDACERL;FireDACSqliteDriver;DbxClientDriver;soapmidas;ACBr_NF3eDANF3eESCPOS;TeeUI;ACBr_PagFor;dbexpress;ACBr_Reinf;ACBr_NFSeXDanfseFPDF;inet;ACBr_BoletoFPDF;vcltouch;FMX_FlexCel_Core;FireDACDBXDriver;ACBr_NF3eDANF3eRL;fmxdae;tmsbcl;VCL_FlexCel_Core;CustomIPTransport;FireDACMSSQLDriver;C4DDateEdit;ZCore;ACBr_NFSeX;ZParseSql;C4DWizard;ACBr_NFe;frxPDF29;ACBr_CTeDacteRL;C4DMaskEdit;IndySystem;ACBr_Diversos;ACBr_GNREGuiaRL;BossExperts;frxe29;ZipMasterR;ACBr_NFSeXDanfseRL;ACBr_SAT;ACBr_CIOT;VirtualTreesR;ACBr_TEFD;fsDB29;VDOPrint;vclFireDAC;ACBr_SPED;ACBr_CTe;ACBr_SATWS;FireDACCommon;DataSnapServerMidas;FireDACODBCDriver;emsserverresource;DelphiAIDeveloper;ACBr_SEF2;ACBr_LCDPR;ACBr_SATExtratoFPDF;FlexCel_Render;ZComponent;bindcompdbx;rtl;FireDACMySQLDriver;ACBr_NFeDanfeFR;ACBr_DCe;VCL_FlexCel_Components;TMSFNCPushNotificationsPkgDXE15;frce;ACBr_BPe;DBXSqliteDriver;ACBr_Sintegra;DBXSybaseASEDriver;TMSWEBCorePkgDXE15;ACBr_Serial;ACBr_Comum;ACBr_MDFe;ACBr_NFeDanfeESCPOS;vclimg;DataSnapFireDAC;inetdbxpress;FireDAC;xmlrtl;dsnap;xdata;FireDACDb2Driver;DBXOracleDriver;DBXInformixDriver;ACBr_SATECFVirtual;fmxobj;bindcompvclsmp;DataSnapNativeClient;frx29;ACBr_SATExtratoFR;DatasnapConnectorsFreePascal;FMXTMSFNCUIPackPkgDXE15;frxIntIOIndy29;ACBr_NF3e;ACBr_PAF;ACBr_OpenDelivery;ACBr_NFeDanfeFPDF;ACBr_MDFeDamdfeFR;TMSFNCCorePkgDXE15;ACBr_SPEDImportar;FMXTMSFNCCorePkgDXE15;emshosting;sparkle;MSNPopUp_D104;frxDB29;FireDACCommonDriver;ACBr_ADRCST;ACBr_MTER;IndyIPClient;frxHTML29;bindcompvclwinx;ACBr_Convenio115;emsedge;bindcompfmx;inetdb;FireDACASADriver;ACBr_LFD;Tee;vclactnband;fmxFireDAC;FireDACInfxDriver;DBXMySQLDriver;fsADO29;VclSmp;ACBr_Ponto;DataSnapCommon;fmxase;DBXOdbcDriver;dbrtl;FireDACOracleDriver;Skia.Package.FMX;ACBre_Social;TeeDB;FlexCel_XlsAdapter;FireDACMSAccDriver;frxcs29;DataSnapIndy10ServerTransport;DataSnapConnectors;ACBr_ANe;ACBr_SATExtratoRL;vcldsnap;DBXInterBaseDriver;FireDACMongoDBDriver;ACBR_DeSTDA;PngComponentsD;ACBr_GNRE;ACBr_EDI;FireDACTDataDriver;Skia.Package.VCL;VCLTMSFNCUIPackPkgDXE15;vcldb;ACBr_Integrador;ACBr_PIXCD;FlexCel_Core;ACBr_BoletoFR;bindcomp;inetstn;IndyCore;RESTBackendComponents;ZPlain;frxIntIO29;FireDACADSDriver;RESTComponents;ACBr_NFSeXDANFSeFR;IndyIPServer;vcl;dsnapxml;adortl;dsnapcon;DataSnapClient;DataSnapProviderClient;ACBr_MDFeDamdfeRL;frxADO29;DBXDb2Driver;ACBr_Boleto;emsclientfiredac;FireDACPgDriver;FireDACDSDriver;ACBr_BlocoX;ACBrBaaS;tethering;ACBr_SATExtratoESCPOS;ZDbc;bindcompvcl;ACBr_GTIN;CloudService;DBXSybaseASADriver;ACBr_OFX;ACBr_PAFNFCe;FMXTee;ACBr_DebitoAutomatico;ACBr_NFeDanfeRL;TMSWEBCorePkgLibDXE15;DSPack_DXE2;ACBr_GNREGuiaFR;VCLTMSFNCCorePkgDXE15;soaprtl;soapserver;FireDACIBDriver;$(DCC_UsePackage)</DCC_UsePackage>
@@ -103,6 +105,8 @@
     <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
         <DCC_RemoteDebug>false</DCC_RemoteDebug>
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <VerInfo_Locale>1033</VerInfo_Locale>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
@@ -147,6 +151,10 @@
                 <Source>
                     <Source Name="MainSource">Server.dpr</Source>
                 </Source>
+                <Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp290.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                </Excluded_Packages>
             </Delphi.Personality>
             <Deployment Version="5">
                 <DeployFile LocalName="Win32\Debug\Server.exe" Configuration="Debug" Class="ProjectOutput">

Server/Bin/push.ini

@@ -1,8 +1,8 @@
 object MainForm: TMainForm
   Left = 0
   Top = 0
-  Caption = 'Push Notifications Delphi - Server'
-  ClientHeight = 661
+  Caption = 'Push Notifications Delphi - TMS FNC'
+  ClientHeight = 617
   ClientWidth = 534
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
@@ -18,7 +18,7 @@ object MainForm: TMainForm
     Left = 0
     Top = 0
     Width = 534
-    Height = 661
+    Height = 617
     Cursor = crHandPoint
     Align = alClient
     BevelOuter = bvNone
@@ -27,6 +27,7 @@ object MainForm: TMainForm
     Padding.Right = 12
     Padding.Bottom = 12
     TabOrder = 0
+    ExplicitHeight = 661
     object lbTitle: TLabel
       AlignWithMargins = True
       Left = 12
@@ -39,8 +40,6 @@ object MainForm: TMainForm
       Margins.Bottom = 2
       Align = alTop
       Caption = 'Notification title'
-      ExplicitLeft = 5
-      ExplicitTop = 61
       ExplicitWidth = 86
     end
     object lbBody: TLabel
@@ -55,8 +54,6 @@ object MainForm: TMainForm
       Margins.Bottom = 2
       Align = alTop
       Caption = 'Notification body'
-      ExplicitLeft = 8
-      ExplicitTop = 87
       ExplicitWidth = 93
     end
     object edtTitle: TEdit
@@ -148,12 +145,24 @@ object MainForm: TMainForm
     end
     object GroupBox1: TGroupBox
       Left = 12
-      Top = 496
+      Top = 452
       Width = 510
       Height = 153
       Align = alBottom
       Caption = ' Log '
       TabOrder = 5
+      ExplicitTop = 496
+      object lbClearLog: TLabel
+        Left = 464
+        Top = 0
+        Width = 33
+        Height = 15
+        Cursor = crHandPoint
+        Hint = 'Clear Log'
+        Caption = ' Clear '
+        Transparent = False
+        OnClick = lbClearLogClick
+      end
       object mmLog: TMemo
         Left = 2
         Top = 17
@@ -237,7 +246,7 @@ object MainForm: TMainForm
       Left = 12
       Top = 294
       Width = 510
-      Height = 136
+      Height = 119
       Margins.Left = 0
       Margins.Top = 7
       Margins.Right = 0
@@ -252,60 +261,52 @@ object MainForm: TMainForm
         Left = 4
         Top = 17
         Width = 502
-        Height = 86
+        Height = 69
         Align = alClient
         Columns = 3
         ItemHeight = 15
         TabOrder = 0
-        ExplicitLeft = 5
-        ExplicitTop = 13
+        ExplicitHeight = 86
       end
       object Panel2: TPanel
         Left = 4
-        Top = 103
+        Top = 86
         Width = 502
         Height = 29
         Align = alBottom
         BevelOuter = bvNone
         Padding.Top = 2
         Padding.Bottom = 2
         TabOrder = 1
+        ExplicitTop = 103
         object btnSendToSelectedUserId: TBitBtn
           Left = 0
           Top = 2
-          Width = 105
+          Width = 145
           Height = 25
           Align = alLeft
-          Caption = 'Send to selected'
+          Caption = 'Send to UserID selected'
           TabOrder = 0
           OnClick = btnSendToSelectedUserIdClick
         end
-        object BitBtn1: TBitBtn
-          Left = 105
+        object btnDeleteUserIDSelected: TBitBtn
+          Left = 145
           Top = 2
-          Width = 144
+          Width = 145
           Height = 25
           Align = alLeft
-          Caption = 'Disable send to selected'
+          Caption = 'Delete UserID selected'
           TabOrder = 1
-          OnClick = BitBtn1Click
-        end
-        object BitBtn2: TBitBtn
-          Left = 249
-          Top = 2
-          Width = 144
-          Height = 25
-          Align = alLeft
-          Caption = 'Enable send to selected'
-          TabOrder = 2
-          OnClick = BitBtn2Click
+          OnClick = btnDeleteUserIDSelectedClick
+          ExplicitLeft = 151
+          ExplicitTop = 5
         end
       end
     end
     object btnSendToAll: TBitBtn
       AlignWithMargins = True
       Left = 12
-      Top = 440
+      Top = 423
       Width = 510
       Height = 25
       Margins.Left = 0
@@ -316,6 +317,7 @@ object MainForm: TMainForm
       Caption = 'Send to all'
       TabOrder = 10
       OnClick = btnSendToAllClick
+      ExplicitTop = 440
     end
   end
   object TMSFNCWebPushSender1: TTMSFNCWebPushSender

Server/Win32/Debug/ssleay32.dll Server/Bin/ssleay32.dllServer/Win32/Debug/ssleay32.dll renamed to Server/Bin/ssleay32.dll

@@ -18,6 +18,7 @@ interface
   TMS.TMSFNCWebPushSender,
   TMS.TMSFNCWebPushServer,
   TMS.TMSFNCWebPushDB,
+  TMS.TMSFNCWebPushCommon,
   IdContext,
   IdCustomHTTPServer,
   System.JSON;
@@ -45,8 +46,8 @@   TMainForm = class(TForm)
     Panel2: TPanel;
     btnSendToSelectedUserId: TBitBtn;
     btnSendToAll: TBitBtn;
-    BitBtn1: TBitBtn;
-    BitBtn2: TBitBtn;
+    btnDeleteUserIDSelected: TBitBtn;
+    lbClearLog: TLabel;
     procedure FormCreate(Sender: TObject);
     procedure TMSFNCWebPushSender1NotificationError(Sender: TObject; AResponseCode: Integer; AResponse, AEndpoint,
       APayload, AUserID, ABrowserID: string; var ADelete: Boolean);
@@ -60,14 +61,15 @@   TMainForm = class(TForm)
     procedure TMSFNCWebPushServer1UnregisterSubscription(Sender: TObject; AData: TJSONObject; var AHandled: Boolean);
     procedure btnSendToAllClick(Sender: TObject);
     procedure btnSendToSelectedUserIdClick(Sender: TObject);
-    procedure BitBtn1Click(Sender: TObject);
-    procedure BitBtn2Click(Sender: TObject);
+    procedure btnDeleteUserIDSelectedClick(Sender: TObject);
+    procedure lbClearLogClick(Sender: TObject);
   private
     procedure ConfScreen;
     function GetPortsText: string;
     function GetUrlToClick: string;
     function GetIconURL: string;
     function GetUserIDSelected: string;
+    procedure DeleteUserIdList(const AUserID: string);
   public
 
   end;
@@ -81,6 +83,8 @@ implementation
 
 procedure TMainForm.FormCreate(Sender: TObject);
 begin
+  SetWindowPos(Handle, HWND_TOPMOST, Left, Top, Width, Height, SWP_NOACTIVATE or SWP_NOMOVE or SWP_NOSIZE);
+
   //AO NAO E OBRIGATORIO, MAS O FIREFOX E O SAFARI NAO ACEITARAO SE NAO ESTIVEREM PRESENTES
   TMSFNCWebPushSender1.Claims.Subject := 'mailto:admin@example.com';
 
@@ -112,6 +116,11 @@ procedure TMainForm.ConfScreen;
   btnStop.Enabled := not btnStart.Enabled;
 end;
 
+procedure TMainForm.lbClearLogClick(Sender: TObject);
+begin
+  mmLog.Lines.Clear;
+end;
+
 procedure TMainForm.TMSFNCWebPushSender1NotificationError(Sender: TObject; AResponseCode: Integer; AResponse, AEndpoint,
   APayload, AUserID, ABrowserID: string; var ADelete: Boolean);
 begin
@@ -143,7 +152,12 @@ procedure TMainForm.TMSFNCWebPushServer1UnregisterSubscription(Sender: TObject;
 begin
   var LUserID := AData.GetValue<string>('userID');
   mmLog.Lines.Add('Unregister Subscription: ' + LUserID);
-  ListBox1.Items.Delete(ListBox1.Items.IndexOf(LUserID));
+  Self.DeleteUserIdList(LUserID);
+end;
+
+procedure TMainForm.DeleteUserIdList(const AUserID: string);
+begin
+  ListBox1.Items.Delete(ListBox1.Items.IndexOf(AUserID));
 end;
 
 function TMainForm.GetPortsText: string;
@@ -173,23 +187,16 @@ function TMainForm.GetUserIDSelected: string;
   Result := ListBox1.Items[ListBox1.ItemIndex];
 end;
 
-procedure TMainForm.BitBtn1Click(Sender: TObject);
+procedure TMainForm.btnDeleteUserIDSelectedClick(Sender: TObject);
+var
+  LUserID: string;
+  LSubscription: TTMSFNCWebPushSubscription;
 begin
-  TMSFNCWebPushDB1.SetUserActiveState(Self.GetUserIDSelected, False);
-end;
+  LUserID := Self.GetUserIDSelected;
+  TMSFNCWebPushDB1.DeleteSubscription(LUserID);
 
-procedure TMainForm.BitBtn2Click(Sender: TObject);
-begin
-//  if TMSFNCWebPushDB1.DataSource.DataSet.IsEmpty then
-//    Exit;
-//
-//  ListBox1.Clear;
-//
-//  TMSFNCWebPushDB1.DataSource.DataSet.First;
-//  while not TMSFNCWebPushDB1.DataSource.DataSet.Eof do
-//  begin
-//    ListBox1.Items.Add(TMSFNCWebPushDB1.DataSource.DataSet.FieldByName('UserID').AsString);
-//  end;
+  if not TMSFNCWebPushDB1.TryFindSubscriptionByID(LUserID, LSubscription) then
+    Self.DeleteUserIdList(LUserID);
 end;
 
 procedure TMainForm.btnSendToAllClick(Sender: TObject);