Update to new config layout, AzureAd templates #862

HaoK · 2017-05-26T04:28:52Z

Config updates addressing: aspnet/MetaPackages#117

New config's generated:

Individual:

{
  "Microsoft": {
    "AspNetCore": {
      "Hosting": {
        "Kestrel": {
          "Endpoints": {
            "Localhost": {
              "Address": "127.0.0.1",
              "Port": "5779"
            },
            "LocalhostHttps": {
              "Address": "127.0.0.1",
              "Port": "5777",
              "Certificate": "HTTPS"
            }
          }
        }
      },
      "IdentityService": {
        "Issuer": "https://localhost/F7B41B14-FE66-4D62-B9BF-4BBE7ABD2507/v2.0/",
        "SigningCertificates": "IdentityService"
      },
      "Authentication": {
        "Schemes": {
          "IdentityService": {
            "ClientId": "F4AB4DFE-292C-489E-8E4A-A3E43CEA3639",
            "TokenRedirectUrn": "urn:self:aspnet:identity:integrated"
          }
        }
      }
    }
  },
  "ConnectionStrings": {
    "DefaultConnection": "DataSource=.\\mvc_individual.db"
  },
  "Logging": {
    "IncludeScopes": false,
    "Debug": {
      "LogLevel": {
        "Default": "Warning"
      }
    },
    "Console": {
      "LogLevel": {
        "Default": "Warning"
      }
    }
  }
}

B2C:

{
  "Microsoft": {
    "AspNetCore": {
      "Hosting": {
        "Kestrel": {
          "Endpoints": {
            "Localhost": {
              "Address": "127.0.0.1",
              "Port": "5908"
            },
            "LocalhostHttps": {
              "Address": "127.0.0.1",
              "Port": "5906",
              "Certificate": "HTTPS"
            }
          }
        }
      },
      "Authentication": {
        "Schemes": {
          "AzureAdB2C": {
            "AzureAdB2CInstance": "https://login.microsoftonline.com/tfp",
            "ClientId": "90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6",
            "CallbackPath": "/return-here",
            "Domain": "fabrikamb2c.onmicrosoft.com",
            "SignUpSignInPolicyId": "b2c_1_susi",
            "ResetPasswordPolicyId": "b2c_1_reset",
            "EditProfilePolicyId": "b2c_1_edit_profile"
          }
        }
      }
    }
  },
  "Logging": {
    "IncludeScopes": false,
    "Debug": {
      "LogLevel": {
        "Default": "Warning"
      }
    },
    "Console": {
      "LogLevel": {
        "Default": "Warning"
      }
    }
  }
}

Multi-Org:

{
  "Microsoft": {
    "AspNetCore": {
      "Hosting": {
        "Kestrel": {
          "Endpoints": {
            "Localhost": {
              "Address": "127.0.0.1",
              "Port": "5971"
            },
            "LocalhostHttps": {
              "Address": "127.0.0.1",
              "Port": "5969",
              "Certificate": "HTTPS"
            }
          }
        }
      },
      "Authentication": {
        "Schemes": {
          "AzureAd": {
            "AzureAdInstance": "https://login.microsoftonline.com/common",
            "ClientId": "1778fef7-9f7f-4bb3-87e1-0d4bbbe1f6e8",
            "CallbackPath": "/signin-oidc"
          }
        }
      }
    }
  },
  "Logging": {
    "IncludeScopes": false,
    "Debug": {
      "LogLevel": {
        "Default": "Warning"
      }
    },
    "Console": {
      "LogLevel": {
        "Default": "Warning"
      }
    }
  }
}

mlorbetske · 2017-05-27T07:13:33Z

Is this ready to go?

HaoK · 2017-05-27T09:10:39Z

Not yet, we still need to update all the consumers of the config

mlorbetske · 2017-05-31T23:37:29Z

@HaoK any update?

HaoK · 2017-06-01T00:23:48Z

Still waiting to finish the items under the convension based config checkboxes... hopefully soonish

aspnet/Announcements#243

HaoK · 2017-06-01T00:24:10Z

Default schema for Kestrel endpoints (aspnet/KestrelHttpServer#1875)
Default schema for identity service settings (aspnet/Identity#1255)
Default schema for authentication settings (aspnet/Security#1245)

HaoK · 2017-06-02T00:09:34Z

@danroth27 I've updated this PR and tweaked the AzureAD templates a bit, all the templates build/restore/run (except for IdentityService)

danroth27 · 2017-06-02T04:05:43Z

localize/CHS/Microsoft.TemplateEngine.Cli.resources.dll.lcl

@@ -12,6 +12,51 @@
    <Disp Icon="Str" Expand="true" Disp="true" LocTbl="false" Path=" \ ;Managed Resources \ 0 \ 0" />
    <Item ItemId=";Strings" ItemType="0" PsrId="211" Leaf="false">
      <Disp Icon="Str" LocTbl="false" />
+      <Item ItemId=";AddProjToSlnPostActionFailed" ItemType="0" PsrId="211" Leaf="true">


Why are these changes in this PR?

danroth27 · 2017-06-02T04:06:28Z

...t.DotNet.Web.ProjectTemplates.2.0/content/StarterWeb-CSharp/Controllers/AccountController.cs

-            var properties = new AuthenticationProperties() { RedirectUri = "/" };
-            properties.Items[AzureAdB2COptions.PolicyAuthenticationProperty] = Options.ResetPasswordPolicyId;
-            return Challenge(properties, OpenIdConnectDefaults.AuthenticationScheme);
+            return Challenge(AzureAdB2CDefaults.ResetPasswordAuthenticationScheme);


This looks much nicer!

danroth27 · 2017-06-02T04:08:52Z

...tNet.Web.ProjectTemplates.2.0/content/StarterWeb-CSharp/Extensions/AzureAd/AzureAdOptions.cs

 {
    public class AzureAdOptions
    {
        public string ClientId { get; set; }
        public string ClientSecret { get; set; }
-        public string AzureAdInstance { get; set; }
+        public string Instance { get; set; }


Instance of what? How about BaseUri?

I don't have a strong opinion, we should use whatever the official term for this is, my main intent was to drop the name of of the options from the property

danroth27 · 2017-06-02T04:12:48Z

...b.ProjectTemplates.2.0/content/StarterWeb-CSharp/Extensions/AzureAdB2C/AzureAdB2CDefaults.cs

+{
+    public static class AzureAdB2CDefaults
+    {
+        public const string AuthenticationScheme = "AzureAdB2C";


Is this one used anywhere?

Nope, I'll remove

danroth27 · 2017-06-02T04:13:14Z

...eb.ProjectTemplates.2.0/content/StarterWeb-CSharp/Extensions/AzureAdB2C/AzureAdB2COptions.cs

        public string ClientId { get; set; }
-        public string AzureAdB2CInstance { get; set; }
+        public string Instance { get; set; }


How about BaseUri?

Or maybe InstanceUri?

Does this show up in any UI on the Azure side anywhere? What do they call it?

This is just the base URI so that you could potentially point at a staging environment or some other variant.

danroth27 · 2017-06-02T04:18:23Z

...te_feed/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/StarterWeb-CSharp/appsettings.json

-//    }
+//        "DefaultSignInScheme": "Cookies",
+//        "DefaultAuthenticateScheme": "Cookies",
+//        "DefaultChallengeScheme": "OpenIdConnect",


I don't think the OpenIdConnect scheme is registered anymore given these changes. Should this be AzureAdB2CDefaults.SignUpSignInAuthenticationScheme?

Yup good catch.

mlorbetske

The lcl changes need to be undone, looks good otherwise. I'd like to get an explicit ack that the IdentityService portion not working is expected at this point though (@danroth27)

danroth27 · 2017-06-02T05:08:04Z

@mlorbetske The identity service changes are being handled here: #870

mlorbetske · 2017-06-02T05:41:23Z

Ah, didn't realize that was coordinated with this change. Thanks for the clarification!

This reverts commit 79e5e74.

This reverts commit 0501635.

…ntax as the execute handler

HaoK · 2017-06-02T17:47:12Z

Reverted and rebased, should be good to merge, we can address any other minor tweaks in subsequent PRs

dnfclas added the cla-already-signed label May 26, 2017

mlorbetske requested a review from danroth27 May 26, 2017 07:03

HaoK mentioned this pull request May 26, 2017

Add Microsoft.AspNet.Configuration targeting default configuration schema aspnet/MetaPackages#117

Closed

csigs and others added 3 commits June 1, 2017 11:25

LEGO: check in for master to temporary branch.

0501635

LEGO: check in for master to temporary branch.

79e5e74

Update to new config layout

d079b00

HaoK force-pushed the haok/preview2 branch from bd67061 to d079b00 Compare June 1, 2017 18:25

HaoK added 2 commits June 1, 2017 15:36

Update azure templates

cf01a20

Fixup config

4626893

HaoK changed the title ~~Update to new config layout~~ Update to new config layout, AzureAd templates Jun 2, 2017

Add back some configuration

72f5a86

danroth27 approved these changes Jun 2, 2017

View reviewed changes

mlorbetske suggested changes Jun 2, 2017

View reviewed changes

HaoK and others added 7 commits June 2, 2017 10:37

Revert "LEGO: check in for master to temporary branch."

ea6bc07

This reverts commit 79e5e74.

Revert "LEGO: check in for master to temporary branch."

aa2dbbf

This reverts commit 0501635.

PR tweaks

83089ec

Added file & directory test handlers. Examples in Mvc.json

3a50952

Updated the file inspect handler to use the same token replacement sy…

11036f3

…ntax as the execute handler

Cleaned up usings

f97be4e

updated comment

b8b5791

mlorbetske approved these changes Jun 2, 2017

View reviewed changes

mlorbetske merged commit 3df378f into dotnet:rel/vs2017/3-Preview2 Jun 2, 2017

Update to new config layout, AzureAd templates #862

Update to new config layout, AzureAd templates #862

Uh oh!

Conversation

HaoK commented May 26, 2017

Uh oh!

mlorbetske commented May 27, 2017

Uh oh!

HaoK commented May 27, 2017

Uh oh!

mlorbetske commented May 31, 2017

Uh oh!

HaoK commented Jun 1, 2017

Uh oh!

HaoK commented Jun 1, 2017

Uh oh!

HaoK commented Jun 2, 2017

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!

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!

mlorbetske left a comment

Choose a reason for hiding this comment

Uh oh!

danroth27 commented Jun 2, 2017

Uh oh!

mlorbetske commented Jun 2, 2017

Uh oh!

HaoK commented Jun 2, 2017

Uh oh!

Uh oh!