From b26e486147afe9fdfbb0effcba6c1e582ead272c Mon Sep 17 00:00:00 2001
From: Hadi Khazaee Asl <hadi_khazaee_asl@yahoo.com>
Date: Thu, 17 Jul 2025 09:27:47 +0330
Subject: [PATCH] Last ...

---
 Partial/XIdentityProvider+Open.cs | 15 +++++++--------
 Providers/XIdentityProvider.cs    | 29 ++++++++++++++++++++++++-----
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/Partial/XIdentityProvider+Open.cs b/Partial/XIdentityProvider+Open.cs
index e3fdca2..f4697d9 100644
--- a/Partial/XIdentityProvider+Open.cs
+++ b/Partial/XIdentityProvider+Open.cs
@@ -10,7 +10,6 @@ using xHttpService.Constants;
 using xIdentityModels.Dtos;
 using xIdentityService.Constants;
 using xModels.Dtos;
-using xModels.Extensions;
 
 namespace xIdentityService.Providers
 {
@@ -33,7 +32,7 @@ namespace xIdentityService.Providers
                 Device = device,
                 Payload = userSelectByParam,
                 Action = XOpenActions.GetUserInfo,
-                Timestamp = DateTime.UtcNow.AddMinutes(5)
+                Timestamp = DateTime.UtcNow.AddMinutes(5).ToTimestamp()
             };
             if (!opaModel.Validate())
             {
@@ -84,13 +83,13 @@ namespace xIdentityService.Providers
             // Prepare Rest Request ...
             var requestU = GetRestRequet(
                 XApiAccountEndpoint.GetUserInfo,
-                @params: new Dictionary<string, string>
-                {
-                    { XParam.XRequest.GetStringValue(), request }
-                },
                 headers: new Dictionary<string, string>
                 {
                     { XAuthentication.TOKEN, token}
+                },
+                queryStrings: new Dictionary<string, string>
+                {
+                    { XParam.XRequest.GetStringValue(), request }
                 }
             );
 
@@ -125,10 +124,10 @@ namespace xIdentityService.Providers
             // Retrieve Model and Validate it ...
             var responseModel = responseJson.FromJSON<XOpenActionRequestDto>();
             if (responseModel.IsNull() ||
-                responseModel.Timestamp.IsExPired() ||
                 responseModel.Payload.IsNullOrEmpty() ||
                 // !responseModel.Device.IsSameAs(device) ||
-                responseToken != responseModel.Checksum)
+                responseToken != responseModel.Checksum ||
+                responseModel.Timestamp.FromTimestamp().IsExPired())
             {
                 XException.ActionFailed.Throw();
             }
diff --git a/Providers/XIdentityProvider.cs b/Providers/XIdentityProvider.cs
index 8dcbc12..83bfb35 100644
--- a/Providers/XIdentityProvider.cs
+++ b/Providers/XIdentityProvider.cs
@@ -154,14 +154,12 @@ namespace xIdentityService.Providers {
         /// <summary>
         /// Get an Instance of RestRequest 
         /// </summary>
-        /// <param name="endpoint"></param>
-        /// <param name="params"></param>
-        /// <returns></returns>
         public RestRequest GetRestRequet (
             XApiAccountEndpoint endpoint,
-            IDictionary<string, string> @params = null,
             bool addXPoweredValue = true,
-            IDictionary<string, string> headers = null
+            IDictionary<string, string> @params = null,
+            IDictionary<string, string> headers = null,
+            IDictionary<string, string> queryStrings = null
         ) {
             //
             var url = endpoint.GetStringValue ();
@@ -180,6 +178,27 @@ namespace xIdentityService.Providers {
                 }
             }
 
+            //
+            // Add Query Strings ...
+            if (!queryStrings.IsNull () && queryStrings.Count > 0) {
+                //
+                url = $"{url}?";
+                var enumerator = queryStrings.GetEnumerator ();
+                while (enumerator.MoveNext ()) {
+                    //
+                    var item = enumerator.Current;
+
+                    //
+                    url += $"{item.Key}={item.Value.ToUrlEncoded ()}&";
+                }
+
+                //
+                // remove lates & ...
+                if (url.EndsWith ("&")) {
+                    url = url.Substring (0, url.Length - 1);
+                }
+            }
+
             //
             // Create request ...
             var request = new RestRequest (url, DataFormat.Json);