Skip to content

Fix null ref in generated cmdlets when context is not set #10649

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

Merged
VeryEarly merged 3 commits into from
Dec 5, 2019
Merged

Fix null ref in generated cmdlets when context is not set #10649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f401e7
Fix null ref in generated cmdlets when context is not set
erich-wang Dec 3, 2019
dba983e
Merge branch 'master' into fix-null-context
erich-wang Dec 3, 2019
2511717
add missing namespace
erich-wang Dec 5, 2019
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
1 change: 1 addition & 0 deletions src/Accounts/Accounts/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
-->
## Upcoming Release
* Set correct UserAgent for client-side telemetry for Az 4.0 preview
* Display user friendly error message when context is null in Az 4.0

## Version 1.6.4
* Add a deprecation message for `Resolve-Error` alias.
Expand Down
6 changes: 6 additions & 0 deletions src/Accounts/Accounts/CommonModule/ContextAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
using System.Linq;
using System.Management.Automation;
using Microsoft.Azure.Commands.Profile.Properties;

namespace Microsoft.Azure.Commands.Common
{
Expand Down Expand Up @@ -170,6 +171,11 @@ internal Func<HttpRequestMessage, CancellationToken, Action, SignalDelegate, Nex
/// <returns></returns>
internal async Task AuthorizeRequest(IAzureContext context, string resourceId, HttpRequestMessage request, CancellationToken outerToken)
{
if (context == null || context.Account == null || context.Environment == null)
{
throw new InvalidOperationException(Resources.InvalidAzureContext);
}

await Task.Run(() =>
{
resourceId = context?.Environment?.GetAudienceFromRequestUri(request.RequestUri) ?? resourceId;
Expand Down
9 changes: 9 additions & 0 deletions src/Accounts/Accounts/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/Accounts/Accounts/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,4 +465,7 @@
<data name="SovereignProfileDescription" xml:space="preserve">
<value>A snapshot of the service API versiosn available in Azure Sovereign Clouds and the Azure Global Cloud.</value>
</data>
<data name="InvalidAzureContext" xml:space="preserve">
<value>The context is invalid. Please login using Connect-AzAccount.</value>
</data>
</root>