Microsoft.Identity.Web refactor #272

TiagoBrenck · 2020-01-27T22:37:12Z

Intro

This PR might look like a beast, but it is less scary than you think. A lot of files got changed because this branch also includes the renaming of the methods: AddMicrosoftIdentityPlatformAuthentication, AddMsal and GetAccessTokenOnBehalfOfUserAsync.

I will add a comment on each file that have been modified on the refactoring, explaining the "why's"

Purpose

The mainly 3 purpose of this change are:

Remove AzureAD.UI and AzureADB2C.UI packages
Unify B2C and AAD logic to acquire tokens, remove accounts, sign-in and all helpers provided by the extension library
Leverage OpenIdConnectOptions and JwtBearerOptions classes for configuration

The byproduct of this refactoring includes, but is not limited to:

Given more flexibility to developer customize their authN/authZ configurations using Microsoft.Identity.Web
Possibility to have more OIDC schemes configured without having shemes conflicts. Using AAD and Google for instance, or maybe multiple AAD configurarions
Taken control of configurations once blocked by AzureAD.UI packages, like the usage of all attributes of OpenIdConnectOptions

Does this introduce a breaking change?

[ ] Yes
[x] No (Although [Obsolete] attribute was used)

Pull Request Type

What kind of change does this Pull Request introduce?

[ ] Bugfix
[x] Feature
[ ] Code style update (formatting, local variables)
[x] Refactoring (no functional changes, no api changes)
[x] Documentation content changes
[ ] Other... Please describe:

Pending tasks

Include a B2C calling Web API
Investigate RemoveAccountAsync on B2C scenario
Update Readme s
Have a scenario with 2 different OIDC configurations

- AddMicrosoftIdentityPlatformAuthentication => AddSignIn - AddMsal => AddWebAppCallProtectedWebApi

…he comfort AzureAD layers) This code does not work yet ....

Added logic to check if authority has v2.0 before modifying it

… web project

* Renaming GetAccessTokenOnBehalfOfUserAsync into GetAccessTokenForUserAsync as the OnBehalfOfUser was telling too much about OBO, whereas in the case of a Web App this was not the OBO flow. * Addressing PR feedback

# Conflicts: # 1-WebApp-OIDC/1-2-AnyOrg/README-1-1-to-1-2.md # 1-WebApp-OIDC/1-5-B2C/Startup.cs # 1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.sln # 2-WebApp-graph-user/2-1-Call-MSGraph/Properties/launchSettings.json # 5-WebApp-AuthZ/5-1-Roles/README-incremental-instructions.md # Microsoft.Identity.Web/WebAppServiceCollectionExtensions.cs

…ns in the same class Add AuthorityHelpers Helper method to check if authority is V2 Helper method to build AAD or B2C AuthorityHelpers Refactored AddSignIn so parameters shows in a logical order

Added B2C exclusive OIDC event handlers Fixed 1-5 samples to use Microsoft.Identity.UI project

# Conflicts: # 1-WebApp-OIDC/1-2-AnyOrg/README-1-1-to-1-2.md # 2-WebApp-graph-user/2-1-Call-MSGraph/AspnetCoreWebApp-calls-Microsoft-Graph.sln # 5-WebApp-AuthZ/5-1-Roles/README-incremental-instructions.md # Microsoft.Identity.Web/ClaimsPrincipalExtensions.cs # Microsoft.Identity.Web/TokenAcquisition.cs # Microsoft.Identity.Web/TokenCacheProviders/Session/MsalSessionTokenCacheProvider.cs # Microsoft.Identity.Web/WebAppServiceCollectionExtensions.cs

jennyf19

Thanks for the quick updates, @TiagoBrenck

Microsoft.Identity.Web/AzureADB2COpenIDConnectEventHandlers.cs

jennyf19 · 2020-01-30T21:19:53Z

this comment is not valid anymore right? #Resolved

Refers to: Microsoft.Identity.Web/ClaimsPrincipalExtensions.cs:15 in 14dd663. [](commit_id = 14dd663, deletion_comment = False)

Microsoft.Identity.Web/ClaimsPrincipalExtensions.cs

Microsoft.Identity.Web/TokenAcquisition.cs

Added B2C Password Reset Policy ID to app settings.

Added B2C Password Reset Policy

# Conflicts: # Microsoft.Identity.Web/AuthorizeForScopesAttribute.cs

* Experiment for a B2C Web app calling a B2C Web API. Needs more work. * Test and fix B2C web app calls web api scenario Fix issue in AadIssuerValidator when certains claims are not present (ex. policy) in the token Fix bug w/scopes and scopeKeySection Send "client_info=1" to request to get client info back from AAD B2C Add ClientInfo class + methods to pull out the TenantId from the ClientInfo Add full value to UserFlow as it was not picking up on short version In TokenAcquisition, check first for b2c and then do null tenant and then tenant specific, was using the wrong authority for b2c previously Fix bug in determining audience validation * Fixing missing references * Uncommenting a needed line * Fixing a build break * Fixing the configuration and a problem brought bad a by merge by jmprieur * add uitid to the claims for b2c * moving Web app calling Web API with B2C in own folder * Reading the 4-1-MyOrg folder * Update README.md Co-authored-by: jennyf19 <jeferrie@microsoft.com>

- Removed DisallowsSameSiteNone from WebAppServiceCollectionExtensions because it got moved to another class - Added edit profile button on login bar - Fixed merge on AuthorizeForScopesAttribute - Added options.TokenValidationParameters.NameClaimType = "name" on web api Startup to fix todo list

Fixing merge

…from the issuer) (#302)

jmprieur · 2020-02-19T18:47:08Z

Thanks @TiagoBrenck @jennyf19 @kalyankrishna1 for this big achievement!

jmprieur and others added 27 commits December 5, 2019 14:15

Renamings:

3ef8aab

- AddMicrosoftIdentityPlatformAuthentication => AddSignIn - AddMsal => AddWebAppCallProtectedWebApi

More renaming for consistency

ec18b4d

Updating the README.md with a breaking changes section

81126a6

Attempt to move to pure OIDC and JwtBearer implementation (dropping t…

2086d17

…he comfort AzureAD layers) This code does not work yet ....

Raw OIDC configuration suggestion

6f32783

missing commit

ff0cca9

Using AzureAD appsettings section

6988e56

Experimenting UI as external RazorLibrary project

09ef790

fix some comments and namings (#244)

794daae

Removing AzureADOptions class

60aa290

Added missing OpenIdConnectOptions binding

e347406

Added logic to check if authority has v2.0 before modifying it

removed Microsoft.AspNetCore.Authentication.AzureAD.UI reference from…

cc31b76

… web project

reversing testing method

7962851

Commented non-working method

2ed5158

Partial changes for B2C login

d7de325

Fixes for B2C sign-in

5dfebbc

Fixed B2C NameClaimType to "name"

dd95f87

Renaming2 (#269)

8c373f6

* Renaming GetAccessTokenOnBehalfOfUserAsync into GetAccessTokenForUserAsync as the OnBehalfOfUser was telling too much about OBO, whereas in the case of a Web App this was not the OBO flow. * Addressing PR feedback

New class MicrosoftIdentityOptions, so we can merge AAD and B2C optio…

bda9d3e

…ns in the same class Add AuthorityHelpers Helper method to check if authority is V2 Helper method to build AAD or B2C AuthorityHelpers Refactored AddSignIn so parameters shows in a logical order

Attempt to merge B2C and AAD acquireToken logic

c379423

Allowing multiple OIDC schemes to be configured

1242c3d

Merge branch 'master' into renaming

c3852b3

Added B2C ResetPassword and EditProfile in UI project

7d69b73

Added B2C exclusive OIDC event handlers Fixed 1-5 samples to use Microsoft.Identity.UI project

Added comments and preparation for PR

079aae7

Preparation for PR

ed9b55c

TiagoBrenck added the do not merge PR not ready to merge yet label Jan 27, 2020

TiagoBrenck requested review from kalyankrishna1 and bgavrilMS January 27, 2020 22:37

jennyf19 approved these changes Jan 30, 2020

View reviewed changes

jennyf19 reviewed Jan 30, 2020

View reviewed changes

Microsoft.Identity.Web/AzureADB2COpenIDConnectEventHandlers.cs Outdated Show resolved Hide resolved

jennyf19 reviewed Jan 30, 2020

View reviewed changes

Microsoft.Identity.Web/AzureADB2COpenIDConnectEventHandlers.cs Outdated Show resolved Hide resolved

jennyf19 reviewed Jan 30, 2020

View reviewed changes

Microsoft.Identity.Web/ClaimsPrincipalExtensions.cs Outdated Show resolved Hide resolved

jennyf19 reviewed Jan 30, 2020

View reviewed changes

Microsoft.Identity.Web/TokenAcquisition.cs Outdated Show resolved Hide resolved

Tiago Brenck added 3 commits January 30, 2020 13:52

Fixed all samples in folder 1 to use refactored code

cabe8d2

Updated all samples to use new code

2de14ce

Renaming policy to user flow

80b05ce

TiagoBrenck mentioned this pull request Jan 31, 2020

container issue for Authentication in web APIs with Azure Active Directory B2C in ASP.NET Core dotnet/AspNetCore.Docs#16186

Closed

8 tasks

pmaytak and others added 3 commits January 31, 2020 16:52

Added B2C Password Reset Policy

190780f

Added B2C Password Reset Policy ID to app settings.

Merge pull request #275 from Azure-Samples/B2C-reset-policy

16141bc

Added B2C Password Reset Policy

Merge branch 'master' into jmprieur/removingUis

f161eb3

# Conflicts: # Microsoft.Identity.Web/AuthorizeForScopesAttribute.cs

jmprieur added the enhancement New feature or request label Feb 9, 2020

jmprieur mentioned this pull request Feb 10, 2020

Handle signout in Blazor (dot net core 3.1), going to an allow anonymous page containing sign in link. #270

Closed

14 tasks

jmprieur and others added 11 commits February 9, 2020 17:46

Merging from master and resolving the conflicts

686751e

Moving Web app calling Web API to its own sub folder

075bfc8

Merge branch 'master' into jmprieur/removingUis

00e7c8c

Added older role claim const

c2929ff

Added policy on APIs to check for scope 'read'

5a0e144

Refactored scopes policy

5132107

Renamings and PR comments

5c86721

Merge pull request #300 from Azure-Samples/tibre/mergeCleanup

cc36d77

Fixing merge

Fixing the failing unit test (because the tenant ID is now retrieved …

ed250ae

…from the issuer) (#302)

TiagoBrenck removed the do not merge PR not ready to merge yet label Feb 19, 2020

jmprieur merged commit b1b0b4b into master Feb 19, 2020

jmprieur deleted the jmprieur/removingUis branch February 21, 2020 18:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Microsoft.Identity.Web refactor #272

Microsoft.Identity.Web refactor #272

Uh oh!

TiagoBrenck commented Jan 27, 2020 •

edited

Loading

Uh oh!

jennyf19 left a comment

Uh oh!

Uh oh!

Uh oh!

jennyf19 commented Jan 30, 2020 •

edited by TiagoBrenck

Loading

Uh oh!

Uh oh!

Uh oh!

jmprieur commented Feb 19, 2020

Uh oh!

Uh oh!

Microsoft.Identity.Web refactor #272

Microsoft.Identity.Web refactor #272

Uh oh!

Conversation

TiagoBrenck commented Jan 27, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Intro

Purpose

Does this introduce a breaking change?

Pull Request Type

Pending tasks

Uh oh!

jennyf19 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

jennyf19 commented Jan 30, 2020 • edited by TiagoBrenck Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jmprieur commented Feb 19, 2020

Uh oh!

Uh oh!

TiagoBrenck commented Jan 27, 2020 •

edited

Loading

jennyf19 commented Jan 30, 2020 •

edited by TiagoBrenck

Loading