Moved username/password to http client rather than request object.

not sure why I put it there in the first place!

Author: vincentparrett

Source/VSoft.HttpClient.Request.pas

@@ -35,10 +35,6 @@   TRequest = class(TInterfacedObject, IHttpRequest)
     FEncoding : TEncoding;
     FForceFormData : boolean;
 	  FFollowRedirects : boolean;
-    FUserName : string;
-    FPassword : string;
-    FProxyUserName : string;
-    FProxyPassword : string;
 
     FConnectionTimeout: Integer;
     FSendTimeout: Integer;
@@ -60,10 +56,6 @@   TRequest = class(TInterfacedObject, IHttpRequest)
     function GetSaveAsFile : string;
     function GetResource : string;
 
-    function GetUserName : string;
-    function GetPassword : string;
-    function GetProxyUserName : string;
-    function GetProxyPassword : string;
     function GetConnectionTimeout : integer;
     function GetSendTimeout : integer;
     function GetResponseTimeout : integer;
@@ -77,10 +69,6 @@   TRequest = class(TInterfacedObject, IHttpRequest)
     procedure SetHttpMethod(value : THttpMethod);
     procedure SetSaveAsFile(const value : string);
     procedure SetResource(const value : string);
-    procedure SetUserName(const value : string);
-    procedure SetPassword(const value : string);
-    procedure SetProxyUserName(const value : string);
-    procedure SetProxyPassword(const value : string);
 
     procedure SetConnectionTimeout(value : integer);
     procedure SetSendTimeout(value : integer);
@@ -147,10 +135,6 @@   TRequest = class(TInterfacedObject, IHttpRequest)
     property Resource    : string read GetResource write SetResource;
     property ContentLength : Int64 read GetContentLength;
     property SaveAsFile  : string read FSaveAsFile write FSaveAsFile;
-    property UserName  : string read FUserName write FUserName;
-    property Passsword : string read FPassword write FPassword;
-    property ProxyUserName : string read FProxyUserName write FProxyUserName;
-    property ProxyPassword : string read FProxyPassword write FProxyPassword;
 
     property ConnectionTimeout: Integer read FConnectionTimeout write FConnectionTimeout;
     property SendTimeout: Integer read FSendTimeout write FSendTimeout;
@@ -375,20 +359,6 @@ function TRequest.GetParameters: TStrings;
   result := FRequestParams;
 end;
 
-function TRequest.GetPassword: string;
-begin
-  result := FPassword;
-end;
-
-function TRequest.GetProxyPassword: string;
-begin
-  result := FProxyPassword;
-end;
-
-function TRequest.GetProxyUserName: string;
-begin
-  result := FProxyUserName;
-end;
 
 function TRequest.GetResource: string;
 begin
@@ -416,11 +386,6 @@ function TRequest.GetUrlSegments: TStrings;
   result := FUrlSegments;
 end;
 
-function TRequest.GetUserName: string;
-begin
-  result := FUserName;
-end;
-
 
 procedure TRequest.SetAccept(const value: string);
 begin
@@ -462,21 +427,6 @@ procedure TRequest.SetHttpMethod(value: THttpMethod);
   FHttpMethod := value;
 end;
 
-procedure TRequest.SetPassword(const value: string);
-begin
-  FPassword := value;
-end;
-
-procedure TRequest.SetProxyPassword(const value: string);
-begin
-  FProxyPassword := value;
-end;
-
-procedure TRequest.SetProxyUserName(const value: string);
-begin
-  FProxyUserName := value;
-end;
-
 procedure TRequest.SetResource(const value: string);
 begin
  FURI.Path := value;
@@ -497,10 +447,6 @@ procedure TRequest.SetSendTimeout(value: integer);
   FSendTimeout := value;
 end;
 
-procedure TRequest.SetUserName(const value: string);
-begin
-  FUserName := value;
-end;
 
 function TRequest.WillFollowRedirects: IHttpRequest;
 begin

Source/VSoft.HttpClient.WinHttpClient.pas

@@ -25,6 +25,9 @@   THttpClient = class(THttpClientBase, IHttpClient, IHttpClientInternal)
     FAuthTyp : THttpAuthType;
     FUserName : string;
     FPassword : string;
+    FProxyUserName : string;
+    FProxyPassword : string;
+
     FWaitEvent : TEvent;
     FCurrentRequest : IHttpRequest;
     FResponse : IHttpResponseInternal;
@@ -74,6 +77,13 @@   THttpClient = class(THttpClientBase, IHttpClient, IHttpClientInternal)
     function GetPassword : string;
     procedure SetUserName(const value : string);
     procedure SetPassword(const value : string);
+    function GetProxyUserName : string;
+    procedure SetProxyUserName(const value : string);
+
+    function GetProxyPassword : string;
+    procedure SetProxyPassword(const value : string);
+
+
 
     function GetUseHttp2 : boolean;
     procedure SetUseHttp2(const value : boolean);
@@ -92,6 +102,8 @@   THttpClient = class(THttpClientBase, IHttpClient, IHttpClientInternal)
 
 
 
+
+
     function CreateRequest(const resource : string) : IHttpRequest;overload;
     function CreateRequest(const uri : IUri) : IHttpRequest;overload;
 
@@ -301,6 +313,16 @@ function THttpClient.GetPassword: string;
   result := FPassword;
 end;
 
+function THttpClient.GetProxyPassword: string;
+begin
+  result := FProxyPassword;
+end;
+
+function THttpClient.GetProxyUserName: string;
+begin
+  result := FProxyUserName;
+end;
+
 function THttpClient.GetResourceFromRequest(const request: IHttpRequest): string;
 var
   i : integer;
@@ -366,9 +388,9 @@ function THttpClient.DoAuthentication(hRequest : HINTERNET; dwAuthenticationSche
   case dwAuthTarget  of
     WINHTTP_AUTH_TARGET_SERVER :
     begin
-      if FCurrentRequest.UserName <> '' then
+      if FUserName <> '' then
       begin
-        if not WinHttpSetCredentials(hRequest, dwAuthTarget, dwAuthenticationScheme, PChar(FCurrentRequest.UserName), PChar(FCurrentRequest.Passsword),nil) then
+        if not WinHttpSetCredentials(hRequest, dwAuthTarget, dwAuthenticationScheme, PChar(FUserName), PChar(FPassword),nil) then
           result := S_OK
         else
           result := GetLastError;
@@ -377,9 +399,9 @@ function THttpClient.DoAuthentication(hRequest : HINTERNET; dwAuthenticationSche
     end;
     WINHTTP_AUTH_TARGET_PROXY :
     begin
-      if FCurrentRequest.ProxyUserName <> '' then
+      if FProxyUserName <> '' then
       begin
-        if WinHttpSetCredentials(hRequest, dwAuthTarget, dwAuthenticationScheme, PChar(FCurrentRequest.ProxyUserName), PChar(FCurrentRequest.ProxyPassword),nil) then
+        if WinHttpSetCredentials(hRequest, dwAuthTarget, dwAuthenticationScheme, PChar(FProxyUserName), PChar(FProxyPassword),nil) then
           result := S_OK
         else
           result := GetLastError;
@@ -892,6 +914,16 @@ procedure THttpClient.SetPassword(const value: string);
   FPassword := value;
 end;
 
+procedure THttpClient.SetProxyPassword(const value: string);
+begin
+  FProxyPassword := value;
+end;
+
+procedure THttpClient.SetProxyUserName(const value: string);
+begin
+  FProxyUserName := value;
+end;
+
 procedure THttpClient.SetResponseTimeout(const value: integer);
 begin
   FResponseTimeout := value;

Source/VSoft.HttpClient.pas

@@ -81,10 +81,6 @@ interface
     function GetSaveAsFile : string;
     function GetResource : string;
 
-    function GetUserName : string;
-    function GetPassword : string;
-    function GetProxyUserName : string;
-    function GetProxyPassword : string;
     function GetConnectionTimeout : integer;
     function GetSendTimeout : integer;
     function GetResponseTimeout : integer;
@@ -98,10 +94,6 @@ interface
     procedure SetHttpMethod(value : THttpMethod);
     procedure SetSaveAsFile(const value : string);
     procedure SetResource(const value : string);
-    procedure SetUserName(const value : string);
-    procedure SetPassword(const value : string);
-    procedure SetProxyUserName(const value : string);
-    procedure SetProxyPassword(const value : string);
 
     procedure SetConnectionTimeout(value : integer);
     procedure SetSendTimeout(value : integer);
@@ -163,10 +155,6 @@ interface
     property Resource    : string read GetResource write SetResource;
     property ContentLength : Int64 read GetContentLength;
     property SaveAsFile  : string read GetSaveAsFile write SetSaveAsFile;
-    property UserName  : string read GetUserName write SetUserName;
-    property Passsword : string read GetPassword write SetPassword;
-    property ProxyUserName : string read GetProxyUserName write SetProxyUserName;
-    property ProxyPassword : string read GetProxyPassword write SetProxyPassword;
 
     property ConnectionTimeout: Integer read GetConnectionTimeout write SetConnectionTimeout;
     property SendTimeout: Integer read GetSendTimeout write SetSendTimeout;
@@ -236,6 +224,13 @@   THttpClientBase = class(TInterfacedObject)
     function GetPassword : string;
     procedure SetPassword(const value : string);
 
+    function GetProxyUserName : string;
+    procedure SetProxyUserName(const value : string);
+
+    function GetProxyPassword : string;
+    procedure SetProxyPassword(const value : string);
+
+
     function GetConnectionTimeout : integer;
     procedure SetConnectionTimeout(const value : integer);
 
@@ -263,8 +258,10 @@   THttpClientBase = class(TInterfacedObject)
     property AuthType   : THttpAuthType read GetAuthType write SetAuthType;
     property BaseUri    : string read GetBaseUri write SetBaseUri;
     property UserAgent  : string read GetUserAgent write SetUserAgent;
-    property UserName   : string read GetUserName write SetUserName;
-    property Password   : string read GetPassword write SetPassword;
+    property UserName  : string read GetUserName write SetUserName;
+    property Passsword : string read GetPassword write SetPassword;
+    property ProxyUserName : string read GetProxyUserName write SetProxyUserName;
+    property ProxyPassword : string read GetProxyPassword write SetProxyPassword;
 
     property ConnectionTimeout: Integer read GetConnectionTimeout write SetConnectionTimeout;
     property SendTimeout: Integer read GetSendTimeout write SetSendTimeout;