Merge pull request Azure#6244 from markcowl/oauth-preview

Remove need for profile changes in storage OAuth support

Author: praries880

src/ResourceManager/Storage/AzureRM.Storage.psd1

@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '5.0.2'
+ModuleVersion = '5.0.1'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -130,10 +130,8 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Support create Storage Context with OAuth.
-        - The PR pending change：
-        - Change to signed package
-        - Use AuthenticationFactory in Powershell to replace ADAL reference.'
+        ReleaseNotes = '* Query Storage Usage By Location
+  - Get-AzureRmStorageUsage'
 
         # Prerelease string of this module
         Prerelease = 'preview'

src/ResourceManager/Storage/Commands.Management.Storage/Properties/AssemblyInfo.cs

@@ -46,5 +46,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("5.0.2")]
-[assembly: AssemblyFileVersion("5.0.2")]
+[assembly: AssemblyVersion("5.0.1")]
+[assembly: AssemblyFileVersion("5.0.1")]

src/ServiceManagement/Azure.psd1

@@ -51,7 +51,7 @@ CLRVersion = '4.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Azure.Storage'; ModuleVersion = '4.3.0'; })
+#RequiredModules = ''
 
 # Assemblies that must be loaded prior to importing this module
 # RequiredAssemblies = @()

src/Storage/Azure.Storage.psd1

@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '4.3.0'
+ModuleVersion = '4.4.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -158,16 +158,10 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Set minimum dependency of module to PowerShell 5.0
-* Support  as Storage blob container name
-	- New-AzureStorageBlobContainer
-	- Remove-AzureStorageBlobContainer
-	- Set-AzureStorageBlobContent
-	- Get-AzureStorageBlobContent
-* Fix the issue that some Storage cmdlets failure output not contain detail failure information'
+        ReleaseNotes = '* Support creating Storage Context with OAuth credentials.'
 
         # Prerelease string of this module
-        # Prerelease = ''
+        Prerelease = 'preview'
 
         # Flag to indicate whether the module requires explicit user acceptance for install/update
         # RequireLicenseAcceptance = $false

src/Storage/Commands.Storage/Common/Cmdlet/NewAzureStorageContext.cs

@@ -37,6 +37,16 @@ namespace Microsoft.WindowsAzure.Commands.Storage.Common.Cmdlet
         OutputType(typeof(AzureStorageContext))]
     public class NewAzureStorageContext : AzureDataCmdlet
     {
+        /// <summary>
+        /// Default resourceId for storage OAuth tokens
+        /// </summary>
+        public const string StorageOAuthEndpointResourceValue = "https://storage.azure.com";
+
+        /// <summary>
+        /// The extension key to use for the storage token audience value
+        /// </summary>
+        public const string StorageOAuthEndpointResourceKey = "StorageOAuthEndpointResourceId";
+
         /// <summary>
         /// Account name and key parameter set name
         /// </summary>
@@ -356,6 +366,19 @@ private RenewTokenFuncAsync GetTokenRenewer(IAccessToken accessToken)
             return renewer;
         }
 
+        private IAzureEnvironment EnsureStorageOAuthAudienceSet(IAzureEnvironment environment)
+        {
+            if (environment != null)
+            {
+                if (!environment.IsPropertySet(StorageOAuthEndpointResourceKey))
+                {
+                    environment.SetProperty(StorageOAuthEndpointResourceKey, StorageOAuthEndpointResourceValue);
+                }
+            }
+
+            return environment;
+        }
+
         /// <summary>
         /// Create a OAuth Token
         /// </summary>
@@ -364,12 +387,12 @@ private IAccessToken CreateOAuthToken()
         {
             IAccessToken accessToken = AzureSession.Instance.AuthenticationFactory.Authenticate(
                DefaultContext.Account,
-               DefaultContext.Environment,
+               EnsureStorageOAuthAudienceSet(DefaultContext.Environment),
                DefaultContext.Tenant.Id,
                null,
                ShowDialog.Never,
                null,
-               AzureEnvironment.ExtendedEndpoint.StorageOAuthEndpointResourceId);
+               StorageOAuthEndpointResourceKey);
             return accessToken;
         }
 

src/Storage/Commands.Storage/Properties/AssemblyInfo.cs

@@ -44,8 +44,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.3.0")]
-[assembly: AssemblyFileVersion("4.3.0")]
+[assembly: AssemblyVersion("4.4.0")]
+[assembly: AssemblyFileVersion("4.4.0")]
 
 #if SIGN
 [assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.Storage.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]

tools/AzureRM/AzureRM.psd1

@@ -52,7 +52,6 @@ CLRVersion = '4.0'
 
 # Modules that must be imported into the global environment prior to importing this module
 RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; RequiredVersion = '5.0.0'; }, 
-               @{ModuleName = 'Azure.Storage'; RequiredVersion = '4.3.0'; }, 
                @{ModuleName = 'AzureRM.AnalysisServices'; RequiredVersion = '0.6.7'; }, 
                @{ModuleName = 'Azure.AnalysisServices'; RequiredVersion = '0.5.1'; }, 
                @{ModuleName = 'AzureRM.ApiManagement'; RequiredVersion = '6.0.0'; },