client fix

Author: landrix

Diff for: Samples/OpenMasterdata.dproj

@@ -1,14 +1,15 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{3972419D-CF6D-415D-BE30-6C8E7969A200}</ProjectGuid>
-        <ProjectVersion>20.1</ProjectVersion>
+        <ProjectVersion>20.2</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Application</AppType>
         <MainSource>OpenMasterdata.dpr</MainSource>
+        <ProjectName Condition="'$(ProjectName)'==''">OpenMasterdata</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -112,6 +113,7 @@ $(PostBuildEvent)]]></PostBuildEvent>
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
+        <DCC_DebugDCUs>true</DCC_DebugDCUs>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
@@ -161,22 +163,11 @@ $(PostBuildEvent)]]></PostBuildEvent>
                 <Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\dclofficexp290.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
-                    <Excluded_Packages Name="_C:\Program Files (x86)\madCollection\madExcept\BDS23\win32\madExceptWizard_.bpl">Datei _C:\Program Files (x86)\madCollection\madExcept\BDS23\win32\madExceptWizard_.bpl nicht gefunden</Excluded_Packages>
-                    <Excluded_Packages Name="_C:\Program Files (x86)\madCollection\madExcept\BDS23\win32\madExceptVcl_.bpl">Datei _C:\Program Files (x86)\madCollection\madExcept\BDS23\win32\madExceptVcl_.bpl nicht gefunden</Excluded_Packages>
-                    <Excluded_Packages Name="_C:\Program Files (x86)\madCollection\madExcept\BDS23\win32\madExcept_.bpl">Datei _C:\Program Files (x86)\madCollection\madExcept\BDS23\win32\madExcept_.bpl nicht gefunden</Excluded_Packages>
-                    <Excluded_Packages Name="_C:\Program Files (x86)\madCollection\madDisAsm\BDS23\win32\madDisAsm_.bpl">Datei _C:\Program Files (x86)\madCollection\madDisAsm\BDS23\win32\madDisAsm_.bpl nicht gefunden</Excluded_Packages>
-                    <Excluded_Packages Name="_C:\Program Files (x86)\madCollection\madBasic\BDS23\win32\madHelp_.bpl">Datei _C:\Program Files (x86)\madCollection\madBasic\BDS23\win32\madHelp_.bpl nicht gefunden</Excluded_Packages>
-                    <Excluded_Packages Name="_C:\Program Files (x86)\madCollection\madBasic\BDS23\win32\madBasic_.bpl">Datei _C:\Program Files (x86)\madCollection\madBasic\BDS23\win32\madBasic_.bpl nicht gefunden</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
-            <Deployment Version="4">
+            <Deployment Version="5">
+                <DeployFile LocalName="Win32\Debug\OpenMasterdata.exe" Configuration="Debug" Class="ProjectOutput"/>
                 <DeployFile LocalName="Win32\Debug\OpenMasterdata.exe" Configuration="Debug" Class="ProjectOutput"/>
-                <DeployFile LocalName="Win32\Debug\OpenMasterdata.exe" Configuration="Debug" Class="ProjectOutput">
-                    <Platform Name="Win32">
-                        <RemoteName>OpenMasterdata.exe</RemoteName>
-                        <Overwrite>true</Overwrite>
-                    </Platform>
-                </DeployFile>
                 <DeployClass Name="AdditionalDebugSymbols">
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
@@ -189,16 +180,6 @@ $(PostBuildEvent)]]></PostBuildEvent>
                         <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>
@@ -209,12 +190,6 @@ $(PostBuildEvent)]]></PostBuildEvent>
                         <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>
@@ -837,6 +812,9 @@ $(PostBuildEvent)]]></PostBuildEvent>
                     <Platform Name="Win64">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="Win64x">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSDeviceDebug">
                     <Platform Name="iOSDevice32">
@@ -1130,6 +1108,7 @@ $(PostBuildEvent)]]></PostBuildEvent>
                 <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win64x" Name="$(PROJECTNAME)"/>
             </Deployment>
             <Platforms>
                 <Platform value="Win32">True</Platform>

Diff for: Samples/OpenMasterdata.res

@@ -1,4 +1,4 @@
-{
+{
 License OpenMasterdata-for-Delphi
 
 Copyright (C) 2024 Landrix Software GmbH & Co. KG
@@ -78,6 +78,9 @@     TValidateCertificatHelper = class(TObject)
     FAccessTokenValidTo : TDateTime;
     //FCookie : String;
 
+    FOAuthUrl : String;
+    FBySupplierPIDUrl : String;
+
     FRESTClientOAuth: TRESTClient;
     FRESTClientBySupplierPID: TRESTClient;
 
@@ -261,7 +264,10 @@ function TOpenMasterdataApiClient.Login: Boolean;
     RESTRequest.Name := 'RESTRequest';
     RESTRequest.AssignedValues := [TCustomRESTRequest.TAssignedValue.rvConnectTimeout, TCustomRESTRequest.TAssignedValue.rvReadTimeout];
     RESTRequest.Client := FRESTClientOAuth;
+    RESTRequest.Resource := FOAuthUrl;
     RESTRequest.Method := rmPOST;
+    RESTRequest.Accept := '*/*';
+
     case FGrantType of
       omdgt_Password:          RESTRequest.Params.AddItem('grant_type','password');
       omdgt_ClientCredentials: RESTRequest.Params.AddItem('grant_type','client_credentials');
@@ -270,7 +276,8 @@ function TOpenMasterdataApiClient.Login: Boolean;
       RESTRequest.Params.AddItem('client_secret',FClientSecret);
     if not FClientScope.IsEmpty then
       RESTRequest.Params.AddItem('scope',FClientScope);
-    RESTRequest.Params.AddItem('client_id',FClientID);
+    if FClientID <> '' then
+      RESTRequest.Params.AddItem('client_id',FClientID);
 
     if (FUsername <> '') and (FCustomerNumber <> '') then
       RESTRequest.Params.AddItem('username',FUsername+#9+FCustomerNumber)
@@ -287,7 +294,7 @@ function TOpenMasterdataApiClient.Login: Boolean;
 
     if not RESTResponse.Status.SuccessOK_200 then
     begin
-      FLastErrorMessage := RESTResponse.StatusText;
+      FLastErrorMessage := RESTResponse.StatusText+' '+RESTResponse.Content;
       FLastErrorCode := RESTResponse.StatusCode;
       exit;
     end;
@@ -298,7 +305,7 @@ function TOpenMasterdataApiClient.Login: Boolean;
     FAccessTokenValidTo := now;
     try
     try
-      itm.LoadFromJson(RESTResponse.Content);
+      itm.LoadFromJson(FLastOAuthResponseContent);
 
       if itm.access_token.IsEmpty then
         exit;
@@ -352,8 +359,10 @@ function TOpenMasterdataApiClient.RefreshLogin: Boolean;
     RESTRequest.Name := 'RESTRequest';
     RESTRequest.AssignedValues := [TCustomRESTRequest.TAssignedValue.rvConnectTimeout, TCustomRESTRequest.TAssignedValue.rvReadTimeout];
     RESTRequest.Client := FRESTClientOAuth;
+    RESTRequest.Resource := FOAuthUrl;
     RESTRequest.Params.AddItem('grant_type','refresh_token');
-    RESTRequest.Params.AddItem('client_id',FClientID);
+    if FClientID <> '' then
+      RESTRequest.Params.AddItem('client_id',FClientID);
     RESTRequest.Params.AddItem('refresh_token',FRefreshToken);
     RESTRequest.Response := RESTResponse;
 
@@ -431,6 +440,7 @@ function TOpenMasterdataApiClient.GetBySupplierPid(_SupplierPid: String;
     RESTRequest.Name := 'RESTRequest';
     RESTRequest.AssignedValues := [TCustomRESTRequest.TAssignedValue.rvConnectTimeout, TCustomRESTRequest.TAssignedValue.rvReadTimeout];
     RESTRequest.Client := FRESTClientBySupplierPID;
+    RESTRequest.Resource := FBySupplierPIDUrl;
     RESTRequest.AddAuthParameter('Authorization','Bearer ' + FAccessToken,TRESTRequestParameterKind.pkHTTPHEADER, [TRESTRequestParameterOption.poDoNotEncode]);
     //if FCookie <> '' then
     //  RESTRequest.AddAuthParameter('Cookie',FCookie,TRESTRequestParameterKind.pkCOOKIE, [TRESTRequestParameterOption.poDoNotEncode]);
@@ -549,17 +559,25 @@ class function TOpenMasterdataApiClient.GetGrantTypeFromString(
 
 procedure TOpenMasterdataApiClient.SetBySupplierPIDURL(
   const _URL : String);
+var
+  lUrl : TURI;
 begin
-  FRESTClientBySupplierPID.BaseURL := _URL;
+  lUrl := TURI.Create(_URL);
+  FBySupplierPIDUrl := lUrl.Path;
+  FRESTClientBySupplierPID.BaseURL := lUrl.Scheme+'://'+lUrl.Host+':'+lUrl.Port.ToString;
   FRESTClientBySupplierPID.Accept  := 'application/json';
   FRESTClientBySupplierPID.AcceptCharSet := 'UTF-8';
   FRESTClientBySupplierPID.ContentType   := 'application/json';
   FRESTClientBySupplierPID.HandleRedirects := true;
 end;
 
 procedure TOpenMasterdataApiClient.SetOAuthURL(const _URL : String);
+var
+  lUrl : TURI;
 begin
-  FRESTClientOAuth.BaseURL := _URL;
+  lUrl := TURI.Create(_URL);
+  FOAuthUrl := lUrl.Path;
+  FRESTClientOAuth.BaseURL := lUrl.Scheme+'://'+lUrl.Host+':'+lUrl.Port.ToString;
 end;
 
 { TOpenMasterdataApiClient.TValidateCertificatHelper }