Updating Web project templates to ms.id.web 0.3.0-preview #25309

jmprieur · 2020-08-27T12:19:46Z

Summary of the changes

Updates AddMicrosoftIdentityWeb* names based on what
Identity and ASP.NET Core team agreed
Fixes issue with the MultiTenant case (tenantId = common)
Uses the new reusable interfaces (AddMicrosoftGraph, and AddDownstreamApi)

This removes several files which are now part of Microsoft.Identity.Web
The projects will need to reference Microsoft.Identity.Web 0.3.0-preview

Addresses #bugnumber (in this specific format)

and quick fix to the Blasorwasm default values for the Web api so that customers have a better experience

JunTaoLuo

Some minor style feedback.

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Startup.cs

...mplates/content/ComponentsWebAssembly-CSharp/Server/Controllers/WeatherForecastController.cs

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Startup.cs

...emplates/Web.ProjectTemplates/content/WebApi-CSharp/Controllers/WeatherForecastController.cs

...ectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/dotnetcli.host.json

src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Startup.cs

JunTaoLuo · 2020-08-27T19:32:50Z

Some rough notes on how to test the new templates from a PR build. I'm omitting some small details but let me know if any of the steps are confusing.

Get the latest RC1 SDK (this step might be optional) and add it to the path, alternatively run all dotnet commands from that directory:
https://dotnetcli.azureedge.net/dotnet/Sdk/5.0.100-rc.1.20379.10/dotnet-sdk-5.0.100-rc.1.20379.10-win-x64.zip
Download the templates nupkg
The package can be found under the published artifacts of the azdo build under Windows_Packages/Release/Shipping/Microsoft.DotNet.Web.ProjectTemplates.5.0.5.0.0-ci.nupkg. For example: https://dev.azure.com/dnceng/public/_build/results?buildId=790308&view=artifacts&type=publishedArtifacts. This is an unrelated build for illustration purposes since this PR's build hasn't finished yet so don't actually use those templates.
Uninstall the existing project template
dotnet new -u Microsoft.DotNet.Web.ProjectTemplates.5.0
Install new project template
dotnet new -i C:\Users\johluo\Downloads\Microsoft.DotNet.Web.ProjectTemplates.5.0.5.0.0-ci.nupkg
Run your verification script/tool with the new templates

JunTaoLuo

Minor spacing fixes. I'm approving this now but @Tratcher @blowdart @javiercn @captainsafia should also take a look at the new API and template changes.

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Startup.cs

JunTaoLuo · 2020-08-27T20:39:41Z

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Startup.cs

@@ -116,7 +119,7 @@ public void ConfigureServices(IServiceCollection services)
            services.AddRazorPages();
 #if (OrganizationalAuth || IndividualB2CAuth)
            services.AddServerSideBlazor()
-                .AddMicrosoftIdentityConsentHandler();
+                        .AddMicrosoftIdentityConsentHandler();


JunTaoLuo · 2020-08-27T20:40:27Z

...ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Startup.cs

+#endif
+                        .AddInMemoryTokenCaches();
+#else
+                    .AddMicrosoftIdentityWebApi(Configuration.GetSection("AzureAd"));


Extra indent

src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Index.cshtml.cs

JunTaoLuo · 2020-08-27T20:41:52Z

src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Startup.cs

 using Microsoft.Identity.Web;
 using Microsoft.Identity.Web.UI;
-using Microsoft.Identity.Web.TokenCacheProviders.InMemory;
+using Microsoft.AspNetCore.Authorization;


Hmm seems like it isn't sorted, move this line to line 8

src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Startup.cs

JunTaoLuo · 2020-08-27T20:42:19Z

src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Startup.cs

@@ -112,7 +111,7 @@ public void ConfigureServices(IServiceCollection services)
 #endif
 #if (OrganizationalAuth || IndividualB2CAuth)
           services.AddRazorPages()
-                .AddMicrosoftIdentityUI();
+                   .AddMicrosoftIdentityUI();


Ditto, revert indentation.

src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Startup.cs

Tratcher

It looks in line with the agreed design.

...emplates/Web.ProjectTemplates/content/WebApi-CSharp/Controllers/WeatherForecastController.cs

JunTaoLuo · 2020-08-28T17:14:22Z

I'll clean up the templates's indenting and react to feedback to get this merged today.

jmprieur · 2020-08-28T17:31:12Z

I'm updating the PR right now (after testing)

javiercn · 2020-08-28T18:09:05Z

Hey folks, seems like the changes that we did originally broke the Blazor server individual auth template. Any chance we can get that addressed as part of this? #25353

JunTaoLuo · 2020-08-28T18:12:41Z

Sure, can you push a commit to this branch @javiercn

jmprieur · 2020-08-28T18:16:32Z

Hey folks, seems like the changes that we did originally broke the Blazor server individual auth template. Any chance we can get that addressed as part of this? #25353

@javiercn: I was not aware of this issue. Let's fix it.

JunTaoLuo · 2020-08-28T18:31:59Z

Ah we don't have permission to push to your branch since it's in your fork. @javiercn I think there's no benefit to piggy-backing off of this PR. Care to send a separate one?

javiercn · 2020-08-28T18:36:17Z

@jmprieur thanks for taking care of it.

Ah we don't have permission to push to your branch since it's in your fork. @javiercn I think there's no benefit to piggy-backing off of this PR. Care to send a separate one?

I'm fine having it as a separate PR as long as we fix it, hopefully before Tuesday to avoid going through full ask-mode.

JunTaoLuo

I realized my previous comment was misleading.

JunTaoLuo · 2020-08-28T18:34:48Z

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Startup.cs

 #endif
 #endif
 #if (OrganizationalAuth || IndividualB2CAuth)
            services.AddControllersWithViews()
-                .AddMicrosoftIdentityUI();
+                        .AddMicrosoftIdentityUI();


Suggested change

.AddMicrosoftIdentityUI();

.AddMicrosoftIdentityUI();

Sorry I mean that these extra indentations should be removed. As in revert the change to this line.

Oh, I see :). Will do.

JunTaoLuo · 2020-08-28T18:35:03Z

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Startup.cs

@@ -116,7 +119,7 @@ public void ConfigureServices(IServiceCollection services)
            services.AddRazorPages();
 #if (OrganizationalAuth || IndividualB2CAuth)
            services.AddServerSideBlazor()
-                .AddMicrosoftIdentityConsentHandler();
+                        .AddMicrosoftIdentityConsentHandler();


JunTaoLuo · 2020-08-28T18:35:55Z

src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Startup.cs

@@ -105,11 +103,11 @@ public void ConfigureServices(IServiceCollection services)
                options.FallbackPolicy = options.DefaultPolicy;
            });
            services.AddRazorPages()
-                .AddMvcOptions(options => {})
-                .AddMicrosoftIdentityUI();
+                    .AddMvcOptions(options => {})


Ditto, revert the extra indentations here and on lines 107 and 110

JunTaoLuo · 2020-08-28T18:36:15Z

src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Startup.cs

 using Microsoft.Identity.Web;
 using Microsoft.Identity.Web.UI;
-using Microsoft.Identity.Web.TokenCacheProviders.InMemory;
+using Microsoft.AspNetCore.Authorization;


Hmm seems like it isn't sorted, move this line to line 8

JunTaoLuo · 2020-08-28T18:36:27Z

src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Startup.cs

@@ -112,7 +111,7 @@ public void ConfigureServices(IServiceCollection services)
 #endif
 #if (OrganizationalAuth || IndividualB2CAuth)
           services.AddRazorPages()
-                .AddMicrosoftIdentityUI();
+                   .AddMicrosoftIdentityUI();


Ditto, revert indentation.

jmprieur · 2020-08-28T19:19:47Z

Ah we don't have permission to push to your branch since it's in your fork. @javiercn I think there's no benefit to piggy-backing off of this PR. Care to send a separate one?

@JunTaoLuo @javiercn : I just gave you permissions to my fork.
If anybody needs access, don't hesitate to ask (or give them. I'll make you admin when you have accepted the invite)

Updating Web project templates to ms.id.web 0.3.0-preview

7f7bf98

jmprieur requested a review from a team as a code owner August 27, 2020 12:19

ghost added the area-mvc Includes: MVC, Actions and Controllers, Localization, CORS, most templates label Aug 27, 2020

version bump

c1869f5

and quick fix to the Blasorwasm default values for the Web api so that customers have a better experience

jmprieur requested a review from dougbu as a code owner August 27, 2020 16:32

JunTaoLuo reviewed Aug 27, 2020

View reviewed changes

jmprieur mentioned this pull request Aug 27, 2020

Adressing PR feedback from John on templates AzureAD/microsoft-identity-web#512

Merged

jmprieur added 2 commits August 27, 2020 22:26

Addressing John's PR review comments

1eb540f

PR comments

8179083

JunTaoLuo approved these changes Aug 27, 2020

View reviewed changes

Tratcher approved these changes Aug 27, 2020

View reviewed changes

Pilchie assigned JunTaoLuo Aug 27, 2020

captainsafia reviewed Aug 28, 2020

View reviewed changes

...emplates/Web.ProjectTemplates/content/WebApi-CSharp/Controllers/WeatherForecastController.cs Outdated Show resolved Hide resolved

Feedback from @JunTaoLuo, @captainsafia, @Tratcher

205691b

merge from release/5.0

843c2f5

Whitespace

a75f06e

JunTaoLuo approved these changes Aug 28, 2020

View reviewed changes

Microsoft.Graph is brought in transitively by MS.ID.Web

d3b2704

JunTaoLuo merged commit 744e96b into dotnet:release/5.0 Aug 29, 2020

Updating Web project templates to ms.id.web 0.3.0-preview #25309

Updating Web project templates to ms.id.web 0.3.0-preview #25309

Uh oh!

Conversation

jmprieur commented Aug 27, 2020

Uh oh!

JunTaoLuo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

JunTaoLuo commented Aug 27, 2020

Uh oh!

JunTaoLuo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Tratcher left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

JunTaoLuo commented Aug 28, 2020

Uh oh!

jmprieur commented Aug 28, 2020

Uh oh!

javiercn commented Aug 28, 2020

Uh oh!

JunTaoLuo commented Aug 28, 2020

Uh oh!

jmprieur commented Aug 28, 2020

Uh oh!

JunTaoLuo commented Aug 28, 2020

Uh oh!

javiercn commented Aug 28, 2020

Uh oh!

JunTaoLuo left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jmprieur commented Aug 28, 2020

Uh oh!