fix some config issues w/the tool (#502)

* fix blazorwasm2-hosted & mvc2-singleorg * fix2 * set a default b2c policy, like we do for the other values, instead of string.empty * fix spacing * fixes to b2c
AzureAD · Aug 26, 2020 · e83d7bb · e83d7bb
1 parent 492b041
commit e83d7bb
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/ProjectTemplates/configuration.json b/ProjectTemplates/configuration.json
@@ -205,7 +205,7 @@
                     "Properties": [
                         {
                             "Property": "AzureAdB2C:ClientId",
-                            "SetFrom": "B2C_HelloApi_ClientId"
+                            "SetFrom": "B2C_Blazorwasm_ClientId"
                         },
                         {
                             "Property": "AzureAdB2C:Authority",
@@ -231,7 +231,7 @@
                     "Replacements": [
                         {
                             "ReplaceFrom": "https://qualified.domain.name/api.id.uri/access_as_user",
-                            "ReplaceBy": "api://93733604-cc77-4a3c-a604-87084dd55348/user_impersonation"
+                            "ReplaceBy": "https://fabrikamb2c.onmicrosoft.com/helloapi/user_impersonation"
                         }
                     ]
                 },
@@ -245,6 +245,10 @@
                         {
                             "Property": "AzureAdB2C:Domain",
                             "SetFrom": "B2C_Domain"
+                        },
+                        {
+                            "Property": "AzureAdB2C:Instance",
+                            "SetFrom": "B2C_Instance"
                         }
                     ]
                 },
@@ -308,6 +312,10 @@
                         {
                             "Property": "AzureAd:Domain",
                             "SetFrom": "AAD_Domain"
+                        },
+                        {
+                            "Property": "AzureAd:TenantId",
+                            "SetFrom": "AAD_TenantId"
                         }
                     ]
                 },
@@ -406,6 +414,10 @@
                         {
                             "Property": "AzureAdB2C:Domain",
                             "SetFrom": "B2C_Domain"
+                        },
+                        {
+                            "Property": "AzureAdB2C:Instance",
+                            "SetFrom": "B2C_Instance"
                         }
                     ]
                 },
@@ -433,6 +445,10 @@
                         {
                             "Property": "AzureAd:Domain",
                             "SetFrom": "AAD_Domain"
+                        },
+                        {
+                            "Property": "AzureAd:TenantId",
+                            "SetFrom": "AAD_TenantId"
                         }
                     ]
                 },

diff --git a/ProjectTemplates/templates/ComponentsWebAssembly-CSharp/.template.config/template.json b/ProjectTemplates/templates/ComponentsWebAssembly-CSharp/.template.config/template.json
@@ -288,7 +288,7 @@
     "SignUpSignInPolicyId": {
       "type": "parameter",
       "datatype": "string",
-      "defaultValue": "",
+      "defaultValue": "b2c_1_susi",
       "replaces": "MySignUpSignInPolicyId",
       "description": "The sign-in and sign-up policy ID for this project (use with IndividualB2C auth)."
     },

diff --git a/ProjectTemplates/templates/StarterWeb-CSharp/appsettings.json b/ProjectTemplates/templates/StarterWeb-CSharp/appsettings.json
@@ -16,7 +16,6 @@
 //    "CallbackPath": "/signin-oidc"
 //  },
 ////#elseif (OrganizationalAuth)
-//    "Instance": "https:////login.microsoftonline.com/",
 //  "AzureAd": {
 //    "Instance": "https:////login.microsoftonline.com/",
 //#if (MultiOrgAuth)