Skip to content

Add Storage OAuth endpoint to public environment #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add Storage OAuth endpoint to public environment #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/Authentication.Abstractions/AzureEnvironment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@ private static void SetExtendedProperties(IDictionary<string, AzureEnvironment>
azureEnvironments[EnvironmentName.AzureCloud].SetProperty(ExtendedEndpoint.AzureSynapseAnalyticsEndpointResourceId, AzureEnvironmentConstants.AzureSynapseAnalyticsEndpointResourceId);
azureEnvironments[EnvironmentName.AzureCloud].SetProperty(ExtendedEndpoint.ManagedHsmServiceEndpointResourceId, AzureEnvironmentConstants.AzureManagedHsmServiceEndpointResourceId);
azureEnvironments[EnvironmentName.AzureCloud].SetProperty(ExtendedEndpoint.ManagedHsmServiceEndpointSuffix, AzureEnvironmentConstants.AzureManagedHsmDnsSuffix);
azureEnvironments[EnvironmentName.AzureCloud].SetProperty(ExtendedEndpoint.AzureStorageOAuthEndpointResourceId, AzureEnvironmentConstants.AzureStorageOAuthEndpointResourceId);
}

if (azureEnvironments.ContainsKey(EnvironmentName.AzureChinaCloud))
Expand All @@ -260,6 +261,7 @@ private static void SetExtendedProperties(IDictionary<string, AzureEnvironment>
azureEnvironments[EnvironmentName.AzureChinaCloud].SetProperty(ExtendedEndpoint.AzureSynapseAnalyticsEndpointResourceId, AzureEnvironmentConstants.ChinaSynapseAnalyticsEndpointResourceId);
azureEnvironments[EnvironmentName.AzureChinaCloud].SetProperty(ExtendedEndpoint.ManagedHsmServiceEndpointResourceId, AzureEnvironmentConstants.ChineManagedHsmServiceEndpointResourceId);
azureEnvironments[EnvironmentName.AzureChinaCloud].SetProperty(ExtendedEndpoint.ManagedHsmServiceEndpointSuffix, AzureEnvironmentConstants.ChinaManagedHsmDnsSuffix);
azureEnvironments[EnvironmentName.AzureChinaCloud].SetProperty(ExtendedEndpoint.AzureStorageOAuthEndpointResourceId, AzureEnvironmentConstants.AzureStorageOAuthEndpointResourceId);
}

if (azureEnvironments.ContainsKey(EnvironmentName.AzureUSGovernment))
Expand All @@ -272,6 +274,7 @@ private static void SetExtendedProperties(IDictionary<string, AzureEnvironment>
azureEnvironments[EnvironmentName.AzureUSGovernment].SetProperty(ExtendedEndpoint.AzureSynapseAnalyticsEndpointResourceId, AzureEnvironmentConstants.USGovernmentSynapseAnalyticsEndpointResourceId);
azureEnvironments[EnvironmentName.AzureUSGovernment].SetProperty(ExtendedEndpoint.ManagedHsmServiceEndpointResourceId, AzureEnvironmentConstants.USGovernmeneManagedHsmServiceEndpointResourceId);
azureEnvironments[EnvironmentName.AzureUSGovernment].SetProperty(ExtendedEndpoint.ManagedHsmServiceEndpointSuffix, AzureEnvironmentConstants.USGovernmentManagedHsmDnsSuffix);
azureEnvironments[EnvironmentName.AzureUSGovernment].SetProperty(ExtendedEndpoint.AzureStorageOAuthEndpointResourceId, AzureEnvironmentConstants.AzureStorageOAuthEndpointResourceId);
}

if (azureEnvironments.ContainsKey(EnvironmentName.AzureGermanCloud))
Expand All @@ -280,6 +283,7 @@ private static void SetExtendedProperties(IDictionary<string, AzureEnvironment>
azureEnvironments[EnvironmentName.AzureGermanCloud].SetProperty(ExtendedEndpoint.AnalysisServicesEndpointResourceId, AzureEnvironmentConstants.GermanAnalysisServicesEndpointResourceId);
azureEnvironments[EnvironmentName.AzureGermanCloud].SetProperty(ExtendedEndpoint.ManagedHsmServiceEndpointResourceId, AzureEnvironmentConstants.GermanAzureManagedHsmServiceEndpointResourceId);
azureEnvironments[EnvironmentName.AzureGermanCloud].SetProperty(ExtendedEndpoint.ManagedHsmServiceEndpointSuffix, AzureEnvironmentConstants.GermanManagedHsmDnsSuffix);
azureEnvironments[EnvironmentName.AzureGermanCloud].SetProperty(ExtendedEndpoint.AzureStorageOAuthEndpointResourceId, AzureEnvironmentConstants.AzureStorageOAuthEndpointResourceId);
}
}

Expand Down Expand Up @@ -660,7 +664,8 @@ public static class ExtendedEndpoint
AzureAttestationServiceEndpointSuffix = "AzureAttestationServiceEndpointSuffix",
AzureAttestationServiceEndpointResourceId = "AzureAttestationServiceEndpointResourceId",
AzureSynapseAnalyticsEndpointSuffix = "AzureSynapseAnalyticsEndpointSuffix",
AzureSynapseAnalyticsEndpointResourceId = "AzureSynapseAnalyticsEndpointResourceId";
AzureSynapseAnalyticsEndpointResourceId = "AzureSynapseAnalyticsEndpointResourceId",
AzureStorageOAuthEndpointResourceId = "AzureStorageOAuthEndpointResourceId";
}
}
}
5 changes: 5 additions & 0 deletions src/Authentication.Abstractions/AzureEnvironmentConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,5 +218,10 @@ public static class AzureEnvironmentConstants
public const string AzureContainerRegistryEndpointSuffix = "azurecr.io";
public const string ChinaContainerRegistryEndpointSuffix = "azurecr.cn";
public const string USGovernmentContainerRegistryEndpointSuffix = "azurecr.us";

/// <summary>
/// The OAuth endpoint for storage, global and governant clouds share same resource id
/// </summary>
public const string AzureStorageOAuthEndpointResourceId = "https://storage.azure.com";
}
}
6 changes: 6 additions & 0 deletions src/Authentication.Abstractions/Extensions/AzureEnvironmentExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,9 @@ public static void SetEndpoint(this IAzureEnvironment environment, string endpoi
case AzureEnvironment.ExtendedEndpoint.ManagedHsmServiceEndpointResourceId:
environment.SetProperty(AzureEnvironment.ExtendedEndpoint.ManagedHsmServiceEndpointResourceId, propertyValue);
break;
case AzureEnvironment.ExtendedEndpoint.AzureStorageOAuthEndpointResourceId:
environment.SetProperty(AzureEnvironment.ExtendedEndpoint.AzureStorageOAuthEndpointResourceId, propertyValue);
break;
}
}
}
Expand Down Expand Up @@ -351,6 +354,9 @@ public static string GetTokenAudience(this IAzureEnvironment environment, string
case AzureEnvironment.Endpoint.ContainerRegistryEndpointSuffix:
resource = AzureEnvironment.Endpoint.ContainerRegistryEndpointSuffix;
break;
case AzureEnvironment.ExtendedEndpoint.AzureStorageOAuthEndpointResourceId:
resource = AzureEnvironment.ExtendedEndpoint.AzureStorageOAuthEndpointResourceId;
break;
default:
resource = AzureEnvironment.Endpoint.ActiveDirectoryServiceEndpointResourceId;
break;
Expand Down