Minor enhancements to the PS scripts

Author: Kalyan Krishna

1-WebApp-OIDC/1-3-AnyOrgOrPersonal/AppCreationScripts/Cleanup.ps1

@@ -55,9 +55,8 @@ This function removes the Azure AD applications for the sample. These applicatio
     if ($app)
     {
         Remove-AzureADApplication -ObjectId $app.ObjectId
-        Write-Host "Removed."
+        Write-Host "Removed WebApp."
+    }
     }
-
-}
 
 Cleanup -Credential $Credential -tenantId $TenantId

1-WebApp-OIDC/1-3-AnyOrgOrPersonal/AppCreationScripts/Configure.ps1

@@ -64,6 +64,8 @@ Function ConfigureApplications
    so that they are consistent with the Applications parameters
 #> 
 
+    $commonendpoint = "common"
+
     # $tenantId is the Active Directory Tenant. This is a GUID which represents the "Directory ID" of the AzureAD tenant
     # into which you want to create the apps. Look it up in the Azure portal in the "Properties" of the Azure AD.
 
@@ -114,8 +116,8 @@ Function ConfigureApplications
    $owner = Get-AzureADApplicationOwner -ObjectId $webAppAadApplication.ObjectId
    if ($owner -eq $null)
    { 
-    Add-AzureADApplicationOwner -ObjectId $webAppAadApplication.ObjectId -RefObjectId $user.ObjectId
-    Write-Host "'$($user.UserPrincipalName)' added as an application owner to app '$($webAppServicePrincipal.DisplayName)'"
+        Add-AzureADApplicationOwner -ObjectId $webAppAadApplication.ObjectId -RefObjectId $user.ObjectId
+        Write-Host "'$($user.UserPrincipalName)' added as an application owner to app '$($webAppServicePrincipal.DisplayName)'"
    }
 
    Write-Host "Done creating the webApp application (WebApp)"
@@ -127,12 +129,19 @@ Function ConfigureApplications
 
 
    # Update config file for 'webApp'
-   $commonendpoint = "common"
    $configFile = $pwd.Path + "\..\appsettings.json"
    Write-Host "Updating the sample code ($configFile)"
-   $dictionary = @{ "ClientId" = $webAppAadApplication.AppId;"TenantId" = $commonendpoint;"Domain" = $tenantName };
+   $dictionary = @{ "ClientId" = $webAppAadApplication.AppId;"Domain" = $tenantName;"TenantId" = $commonendpoint };
    UpdateTextFile -configFilePath $configFile -dictionary $dictionary
-
+   Write-Host ""
+   Write-Host -ForegroundColor Green "------------------------------------------------------------------------------------------------" 
+   Write-Host "IMPORTANT: Please follow the instructions below to complete a few manual step(s) in the Azure portal":
+   Write-Host "- For 'webApp'"
+   Write-Host "  - Navigate to '$webAppPortalUrl'"
+   Write-Host "  - Navigate to the portal and change the ','signInAudeince' to 'AzureADandPersonalMicrosoftAccount'  in the app's manifest !" -ForegroundColor Red 
+
+   Write-Host -ForegroundColor Green "------------------------------------------------------------------------------------------------" 
+     
    Add-Content -Value "</tbody></table></body></html>" -Path createdApps.html  
 }
 

1-WebApp-OIDC/1-3-AnyOrgOrPersonal/AppCreationScripts/sample.json

@@ -19,10 +19,15 @@
       "Audience" : "AzureADandPersonalMicrosoftAccount",
        "HomePage": "https://localhost:44321/",
       "ReplyUrls": "https://localhost:44321/, https://localhost:44321/signin-oidc",
-      "LogoutUrl": "https://localhost:44321/signout-oidc"
-    }
-  ],
+      "LogoutUrl": "https://localhost:44321/signout-oidc",
+      "ManualSteps": [
+        {
+          "Comment" :  "Navigate to the portal and change the ','signInAudeince' to 'AzureADandPersonalMicrosoftAccount'  in the app's manifest !"
+        }
+      ]
 
+    }  
+  ],
   /*
     This section describes how to update the code in configuration files from the apps coordinates, once the apps
     are created in Azure AD.
@@ -39,13 +44,13 @@
           "key": "ClientId",
           "value": ".AppId"
         },
-        {
-          "key": "TenantId",
-          "value": "$commonendpoint"
-        },
         {
           "key": "Domain",
           "value": "$tenantName"
+        },
+        {
+          "key": "TenantId",
+          "value": "$commonendpoint"
         }
       ]
     }

1-WebApp-OIDC/1-3-AnyOrgOrPersonal/README-1-1-to-1-3.md

@@ -16,7 +16,7 @@ endpoint: AAD v2.0
 
 ![Sign in with Azure AD](ReadmeFiles/sign-in.png)
 
-> This is the third chapter of the first phase of this ASP.NET Core Web App tutorial. You learnt previously how to build an ASP.NET Core Web app signing-in users with the Microsoft identity platform in [your organization](../1-1-MyOrg) or [any organization](../1-2-AnyOrg). This chapter describes how to change that application to enable users to sign-in from any work or school account or Microsoft personal account.
+> This is the third chapter of the first phase of this ASP.NET Core Web App tutorials. You learnt previously how to build an ASP.NET Core Web app that signs-in users with the Microsoft identity platform in [your organization](../1-1-MyOrg) or [any organization](../1-2-AnyOrg). This chapter describes how to change that application to enable users to sign-in from any work or school account or Microsoft personal account.
 >
 > If you are not interested in the differentials, but want to understand all the steps, read the full [Readme.md](./Readme.md)
 

1-WebApp-OIDC/1-3-AnyOrgOrPersonal/README.md

@@ -19,7 +19,8 @@ This sample shows how to build an ASP.NET Core 2.2 MVC Web app that uses OpenID
 ![Sign in with Azure AD](ReadmeFiles/sign-in.png)
 
 > This is the first chapter of this ASP.NET Core Web App tutorial. Once you understand how to sign-in users in an ASP.NET Core Web App with Open Id Connect, can learn how to enable your [Web App to call a Web API on behalf of the signed-in user](../../2-WebApp-graph-user) in a later chapter.
-  You can also sign-in users in your own Azure Active Directory organizations, any organization and even with social identities. For more details the parent directory's [Readme.md](../Readme.md)
+You can also sign-in users in your own Azure Active Directory organizations, any organization and even with social identities. For more details the parent directory's [Readme.md](../Readme.md)
+
 ## How to run this sample
 
 To run this sample: