Cleaned up string to sign

Author: seanmcc-msft

sdk/storage/Azure.Storage.Queues/src/Sas/QueueSasBuilder.cs

@@ -93,15 +93,11 @@ public class QueueSasBuilder
         public string QueueName { get; set; }
 
         /// <summary>
-        /// Optional. Beginning in version 2020-02-10, this value will be used for
-        /// the AAD Object ID of a user authorized by the owner of the
-        /// User Delegation Key to perform the action granted by the SAS.
-        /// The Azure Storage service will ensure that the owner of the
-        /// user delegation key has the required permissions before granting access.
-        /// No additional permission check for the user specified in this value will be performed.
-        /// This is only used with generating User Delegation SAS.
+        /// Optional. Beginning in version 2025-07-05, this value  specifies the Entra ID of the user would is authorized to
+        /// use the resulting SAS URL.  The resulting SAS URL must be used in conjunction with an Entra ID token that has been
+        /// issued to the user specified in this value.
         /// </summary>
-        public string PreauthorizedAgentObjectId { get; set; }
+        public string DelegatedUserObjectId { get; set; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="QueueSasBuilder"/>
@@ -348,15 +344,8 @@ public QueueSasQueryParameters ToSasQueryParameters(UserDelegationKey userDelega
                 keyExpiry: userDelegationKey.SignedExpiresOn,
                 keyService: userDelegationKey.SignedService,
                 keyVersion: userDelegationKey.SignedVersion,
-                signature: signature,
-                cacheControl: null, // CacheControl,
-                contentDisposition: null, // ContentDisposition,
-                contentEncoding: null, // ContentEncoding,
-                contentLanguage: null, // ContentLanguage,
-                contentType: null, // ContentType,
-                authorizedAadObjectId: PreauthorizedAgentObjectId,
-                correlationId: null, //CorrelationId,
-                encryptionScope: null /*EncryptionScope*/);
+                delegatedUserObjectId: DelegatedUserObjectId,
+                signature: signature);
             return p;
         }
 
@@ -379,16 +368,10 @@ private string ToStringToSign(UserDelegationKey userDelegationKey, string accoun
                     signedExpiry,
                     userDelegationKey.SignedService,
                     userDelegationKey.SignedVersion,
-                    PreauthorizedAgentObjectId,
-                    null, // AgentObjectId - enabled only in HNS accounts
-                    null, // CorrelationId
                     null, // SignedKeyDelegatedUserTenantId, will be added in a future release.
-                    //null, // SignedDelegatedUserObjectId, will be added in future release.
-                    //IPRange.ToString(),
-                    //SasExtensions.ToProtocolString(Protocol),
-                    //null, // Unknown
-                    //null, // Unknown
-                    //null, // Unknown
+                    DelegatedUserObjectId,
+                    IPRange.ToString(),
+                    SasExtensions.ToProtocolString(Protocol),
                     Version);
         }
 

sdk/storage/Azure.Storage.Queues/src/Sas/QueueSasQueryParameters.cs

@@ -82,15 +82,7 @@ internal QueueSasQueryParameters(
             DateTimeOffset keyExpiry = default,
             string keyService = default,
             string keyVersion = default,
-            string cacheControl = default,
-            string contentDisposition = default,
-            string contentEncoding = default,
-            string contentLanguage = default,
-            string contentType = default,
-            string authorizedAadObjectId = default,
-            string unauthorizedAadObjectId = default,
-            string correlationId = default,
-            string encryptionScope = default)
+            string delegatedUserObjectId = default)
             : base(
                 version,
                 services,
@@ -103,16 +95,17 @@ internal QueueSasQueryParameters(
                 resource,
                 permissions,
                 signature,
-                cacheControl,
-                contentDisposition,
-                contentEncoding,
-                contentLanguage,
-                contentType,
-                authorizedAadObjectId,
-                unauthorizedAadObjectId,
-                correlationId,
+                cacheControl: null,
+                contentDisposition: null,
+                contentEncoding: null,
+                contentLanguage: null,
+                contentType: null,
+                authorizedAadObjectId: null,
+                unauthorizedAadObjectId: null,
+                correlationId: null,
                 directoryDepth: null,
-                encryptionScope)
+                encryptionScope: null,
+                delegatedUserObjectId)
         {
             KeyProperties = new UserDelegationKeyProperties
             {

sdk/storage/Azure.Storage.Queues/tests/QueueClientTestFixtureAttribute.cs

@@ -46,8 +46,8 @@ public QueueClientTestFixtureAttribute(params object[] additionalParameters)
                 },
                 additionalParameters: additionalParameters)
                 {
-                    RecordingServiceVersion = QueueClientOptions.ServiceVersion.V2025_05_05;
-                    LiveServiceVersions = new object[] { QueueClientOptions.ServiceVersion.V2025_07_05, };
+                    RecordingServiceVersion = StorageVersionExtensions.MaxVersion;
+                    LiveServiceVersions = new object[] { StorageVersionExtensions.MaxVersion };
                 }
     }
 }

sdk/storage/Azure.Storage.Queues/tests/QueueClientTests.cs

@@ -1287,7 +1287,7 @@ public async Task SendMessageAsync_SAS()
         }
 
         [RecordedTest]
-        //[ServiceVersion(Min = QueueClientOptions.ServiceVersion.V2026_02_06)]
+        [ServiceVersion(Min = QueueClientOptions.ServiceVersion.V2026_02_06)]
         public async Task SendMessageAsync_UserDelegationSAS()
         {
             // Arrange