Merge branch 'beta' of https://github.com/genexuslabs/DotNetClasses i…

…nto beta
genexuslabs · Sep 20, 2023 · 4703030 · 4703030
2 parents fcea39d + a872811
commit 4703030
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/dotnet/src/dotnetframework/GxClasses/Domain/GxLocations.cs b/dotnet/src/dotnetframework/GxClasses/Domain/GxLocations.cs
@@ -16,6 +16,7 @@ public class GxLocation
 		string _resourceName = "";
 		short _authentication;
 		short _authenticationMethod;
+		string _accessToken = "";
 		string _authenticationUser = "";
 		string _authenticationRealm = "";
 		string _authenticationPassword = "";
@@ -76,6 +77,11 @@ public short AuthenticationMethod
 			get {return _authenticationMethod;}
 			set {_authenticationMethod = value;}
 		}
+		public string AccessToken
+		{
+			get { return _accessToken; }
+			set { _accessToken = value; }
+		}
 		public string AuthenticationUser
 		{
 			get {return _authenticationUser;}

diff --git a/dotnet/src/dotnetframework/GxClasses/Helpers/GXRestAPIClient.cs b/dotnet/src/dotnetframework/GxClasses/Helpers/GXRestAPIClient.cs
@@ -371,6 +371,10 @@ public void RestExecute()
 					httpClient.AddHeader("Content-Type", _contentType);
 				}
 			}
+			if (this.Location.AuthenticationMethod == 4 && !String.IsNullOrEmpty(this.Location.AccessToken))
+			{
+				httpClient.AddHeader("Authorization", this.Location.AccessToken);
+			}
 			string serviceuri = ((this.Location.Secure > 0) ? "https" : "http") + "://" + this.Location.Host;
 			serviceuri += (this.Location.Port != 80) ? ":" + this.Location.Port.ToString() : String.Empty;
 			serviceuri += "/" + this.Location.BaseUrl.TrimEnd('/').TrimStart('/') + "/" + this.Location.ResourceName;