Small orgs/AAD bug bash fixes #5482
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
scottbommarito
requested review from
joelverhagen,
agr,
loic-sharma,
xavierdecoster,
shishirx34,
nugetlurker,
ryuyu,
chenriksson,
cristinamanum and
skofman1
scottbommarito
commented
Feb 15, 2018
| @@ -75,7 +75,7 @@ public override SecurityPolicyResult Evaluate(UserSecurityPolicyEvaluationContex | |||
| var targetCredential = targetAccount.Credentials.GetAzureActiveDirectoryCredential(); | |||
|
|
|||
| if (targetCredential == null | |||
| || !targetCredential.TenantId.Equals(state.Tenant, StringComparison.OrdinalIgnoreCase)) | |||
| || !state.Tenant.Equals(targetCredential.TenantId, StringComparison.OrdinalIgnoreCase)) | |||
There was a problem hiding this comment.
Sometimes, for old AAD, targetCredential.TenantId is null. state.Tenant is guaranteed to be non-null, so we should use that to perform this comparison.
There was a problem hiding this comment.
Ideally we should populate the tenant ID values, but it would only be the case for admins that is missing.
chenriksson
approved these changes
Feb 15, 2018
shishirx34
approved these changes
Feb 15, 2018
| @@ -66,7 +66,7 @@ | |||
| else | |||
| { | |||
| <p class="text-center"> | |||
| Looks like we don't have an account with this email address (@Model.SignIn.UserNameOrEmail) in our records. | |||
| Looks like we don't have an account with this email address (@Model.Register.EmailAddress) in our records. | |||
There was a problem hiding this comment.
were you able to find out why the SignIn.UserNameOrEmail was empty even though the controller set its value in the model?
There was a problem hiding this comment.
When you submit the form and the submission fails, SignIn.UserNameOrEmail is not set.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#5441
#5436
And also fixed a NPE for when the user has an old AAD credential without a tenant ID.