Fix issues

Author: blueww

src/Storage/Storage/Blob/Cmdlet/GetAzureStorageBlobContent.cs

@@ -281,9 +281,9 @@ internal void GetBlobContent(CloudBlobContainer container, string blobName, stri
 
         private bool IsSasTokenWithOAuth(CloudBlobContainer container)
         {   
-            if (container.ServiceClient.Credentials.IsSAS) //SAS
+            if (container != null && container.ServiceClient != null && container.ServiceClient.Credentials != null && container.ServiceClient.Credentials.IsSAS) //SAS
             {
-                if (Channel.StorageContext.Track2OauthToken != null)
+                if (Channel.StorageContext != null && Channel.StorageContext.Track2OauthToken != null)
                 {
                     return true;
                 }

src/Storage/Storage/DatalakeGen2/Cmdlet/GetAzDataLakeGen2FileContent.cs

@@ -323,7 +323,7 @@ public override void ExecuteCmdlet()
                     throw new ArgumentException(String.Format("The input FileSystem '{0}', path '{1}' point to a Directory, can't download it.", this.FileSystem, this.Path));
                 }
 
-                if (Channel.StorageContext.Track2OauthToken != null)
+                if (Channel != null && Channel.StorageContext != null &&Channel.StorageContext.Track2OauthToken != null)
                 {
                     var blobServiceClient = Channel.GetBlobServiceClient();
                     track2Blob = blobServiceClient.GetBlobContainerClient(this.FileSystem).GetBlockBlobClient(this.Path);
@@ -342,7 +342,7 @@ public override void ExecuteCmdlet()
                         Channel.StorageContext.StorageAccount.Credentials != null && Channel.StorageContext.StorageAccount.Credentials.IsSAS)
                     {
                         // For SAS, the Uri already contains the sas token, so can't repeatedly inout the credential
-                        if (Channel.StorageContext.Track2OauthToken != null)
+                        if (Channel != null && Channel.StorageContext != null && Channel.StorageContext.Track2OauthToken != null)
                         {
                             track2Blob = new BlockBlobClient(InputObject.File.Uri, Channel.StorageContext.Track2OauthToken);
                         }

src/Storage/Storage/File/Cmdlet/SetAzureStorageFileContent.cs

@@ -136,8 +136,6 @@ public override void ExecuteCmdlet()
             bool isDirectory;
             string[] path = NamingUtil.ValidatePath(this.Path, out isDirectory);
 
-            var cloudFileToBeUploaded =
-                        BuildCloudFileInstanceFromPathAsync(localFile.Name, path, isDirectory).ConfigureAwait(false).GetAwaiter().GetResult();
             var fileClientToBeUploaded = BuildShareFileClientInstanceFromPathAsync(localFile.Name, path, isDirectory).ConfigureAwait(false).GetAwaiter().GetResult();
 
 
@@ -147,7 +145,9 @@ public override void ExecuteCmdlet()
                     && !WithOauthCredential() 
                     && (this.DisAllowTrailingDot.IsPresent || !Util.PathContainsTrailingDot(fileClientToBeUploaded.Path))
                     && this.FileMode == null && this.Owner == null && this.Group == null)
-                {                    
+                {
+                    var cloudFileToBeUploaded =
+                                BuildCloudFileInstanceFromPathAsync(localFile.Name, path, isDirectory).ConfigureAwait(false).GetAwaiter().GetResult();
                     if (ShouldProcess(cloudFileToBeUploaded.Name, "Set file content"))
                     {
                         var progressRecord = new ProgressRecord(
@@ -179,7 +179,6 @@ await DataMovementTransferHelper.DoTransfer(() =>
                 }
                 else // use Track2 SDK
                 {
-                   
                     if (ShouldProcess(fileClientToBeUploaded.Path, "Set file content"))
                     {
                         var progressRecord = new ProgressRecord(

src/Storage/Storage/Model/Contract/StorageBlobManagement.cs

@@ -14,23 +14,24 @@
 
 namespace Microsoft.WindowsAzure.Commands.Storage.Model.Contract
 {
-    using Microsoft.WindowsAzure.Commands.Common.Storage;
-    using Microsoft.WindowsAzure.Commands.Storage.Common;
+    using global::Azure.Storage;
+    using global::Azure.Storage.Blobs;
+    using Microsoft.Azure.Cosmos.Table;
     using Microsoft.Azure.Storage;
-    using XSCL = Microsoft.Azure.Storage;
     using Microsoft.Azure.Storage.Blob;
     using Microsoft.Azure.Storage.File;
     using Microsoft.Azure.Storage.File.Protocol;
     using Microsoft.Azure.Storage.Queue;
-    using XSCLProtocol = Microsoft.Azure.Storage.Shared.Protocol;
-    using XTable = Microsoft.Azure.Cosmos.Table;
-    using Microsoft.Azure.Cosmos.Table;
+    using Microsoft.OData.UriParser;
+    using Microsoft.WindowsAzure.Commands.Common.Storage;
+    using Microsoft.WindowsAzure.Commands.Storage.Common;
     using System;
     using System.Collections.Generic;
     using System.Threading;
     using System.Threading.Tasks;
-    using global::Azure.Storage.Blobs;
-    using global::Azure.Storage;
+    using XSCL = Microsoft.Azure.Storage;
+    using XSCLProtocol = Microsoft.Azure.Storage.Shared.Protocol;
+    using XTable = Microsoft.Azure.Cosmos.Table;
 
     /// <summary>
     /// Blob management
@@ -183,13 +184,24 @@ public BlobServiceClient GetBlobServiceClient(BlobClientOptions options = null)
                 }
                 else //sas, Anonymous
                 {
+                    string blobEndpointWithSas = this.StorageContext.StorageAccount.BlobEndpoint.ToString();
+                    if (this.StorageContext.StorageAccount.Credentials.SASToken != null)
+                    {
+                        string sasToken = this.StorageContext.StorageAccount.Credentials.SASToken;
+                        if (!string.IsNullOrEmpty(sasToken) && !sasToken.StartsWith("?"))
+                        {
+                            sasToken = "?" + sasToken;
+                        }
+                        blobEndpointWithSas += sasToken;
+                    }
+
                     if (this.StorageContext != null && this.StorageContext.Track2OauthToken != null)
                     {
-                        blobServiceClient = new BlobServiceClient(this.StorageContext.StorageAccount.BlobEndpoint, this.StorageContext.Track2OauthToken, options);
+                        blobServiceClient = new BlobServiceClient(new Uri(blobEndpointWithSas), this.StorageContext.Track2OauthToken, options);
                     }
                     else
                     {
-                        blobServiceClient = new BlobServiceClient(this.StorageContext.StorageAccount.BlobEndpoint, options);
+                        blobServiceClient = new BlobServiceClient(new Uri(blobEndpointWithSas), options);
                     }
                 }
             }