Merge branch 'shama/MultiTenant' of https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2 into shama/MultiTenant

Author: kalyankrishna1

4-WebApp-your-API/4-3-AnyOrg/AppCreationScripts/Configure.ps1

@@ -257,7 +257,7 @@ Function ConfigureApplications
         Write-Host "'$($user.UserPrincipalName)' added as an application owner to app '$($serviceServicePrincipal.DisplayName)'"
    }
 
-    # rename the user_impersonation scope if it exists to match the readme steps or add a new scope
+    # rename the access_as_user scope if it exists to match the readme steps or add a new scope
     $scopes = New-Object System.Collections.Generic.List[Microsoft.Open.AzureAD.Model.OAuth2Permission]
 
     if ($scopes.Count -ge 0) 
@@ -366,7 +366,7 @@ Function ConfigureApplications
 
 
    # Update config file for 'service'
-   $configFile = $pwd.Path + "\..\TodoListService\appsettings.json"
+   $configFile = $pwd.Path + "\..\ToDoListService\appsettings.json"
    Write-Host "Updating the sample code ($configFile)"
    $dictionary = @{ "Domain" = $tenantName;"TenantId" = 'common';"ClientId" = $serviceAadApplication.AppId;"ClientSecret" = $serviceAppKey };
    UpdateTextFile -configFilePath $configFile -dictionary $dictionary

4-WebApp-your-API/4-3-AnyOrg/AppCreationScripts/sample.json

@@ -58,7 +58,7 @@
     {
       "App": "service",
       "SettingKind": "Text",
-      "SettingFile": "\\..\\TodoListService\\appsettings.json",
+      "SettingFile": "\\..\\ToDoListService\\appsettings.json",
       "Mappings": [
         {
           "key": "Domain",

4-WebApp-your-API/4-3-AnyOrg/Readme.md

@@ -44,7 +44,7 @@ description: "Protect a multi-tenant SaaS web application and a Web API which ca
 
 ## About this sample
 
-This sample demonstrates how to protect a **multi-tenant** ASP.NET Core MVC web application (TodoListClient) which calls another **multi-tenant** ASP.NET Core Web API (TodoListService) with Microsoft Identity Platform. This sample builds on the concepts introduced in the [Build a multi-tenant SaaS web application that calls Microsoft Graph using Azure AD & OpenID Connect](../../../2-WebApp-graph-user\2-3-Multi-Tenant/README.md) sample. We advise you go through that sample once before trying this sample.  
+This sample demonstrates how to protect a **multi-tenant** ASP.NET Core MVC web application (TodoListClient) which calls another **multi-tenant** ASP.NET Core Web API (ToDoListService) with Microsoft Identity Platform. This sample builds on the concepts introduced in the [Build a multi-tenant SaaS web application that calls Microsoft Graph using Azure AD & OpenID Connect](../../../2-WebApp-graph-user\2-3-Multi-Tenant/README.md) sample. We advise you go through that sample once before trying this sample.  
 
 ### Scenario
 
@@ -140,12 +140,12 @@ As a first step you'll need to:
 1. Sign in to the [Azure portal](https://portal.azure.com).
 1. If your account is present in more than one Azure AD tenant, select your profile at the top right corner in the menu on top of the page, and then **switch directory** to change your portal session to the desired Azure AD tenant..
 
-#### Register the service app (WebApi-MultiTenant-TodoListService-v2)
+#### Register the service app (WebApi-MultiTenant-ToDoListService-v2)
 
 1. Navigate to the Microsoft identity platform for developers [App registrations](https://go.microsoft.com/fwlink/?linkid=2083908) page.
 1. Select **New registration**.
 1. In the **Register an application page** that appears, enter your application's registration information:
-   - In the **Name** section, enter a meaningful application name that will be displayed to users of the app, for example `WebApi-MultiTenant-TodoListService-v2`.
+   - In the **Name** section, enter a meaningful application name that will be displayed to users of the app, for example `WebApi-MultiTenant-ToDoListService-v2`.
    - Under **Supported account types**, select **Accounts in any organizational directory**.
    - In the **Redirect URI (optional)** section, select **Web** in the combo-box and enter the following redirect URI: `https://localhost:44351/api/Home`.
 1. Select **Register** to create the application.
@@ -171,24 +171,24 @@ The first thing that we need to do is to declare the unique [resource](https://d
    - Select **Add a scope** button open the **Add a scope** screen and Enter the values as indicated below:
         - For **Scope name**, use `access_as_user`.
         - Select **Admins and users** options for **Who can consent?**
-        - For **Admin consent display name** type `Access WebApi-MultiTenant-TodoListService-v2`
-        - For **Admin consent description** type `Allows the app to access WebApi-MultiTenant-TodoListService-v2 as the signed-in user.`
-        - For **User consent display name** type `Access WebApi-MultiTenant-TodoListService-v2`
-        - For **User consent description** type `Allow the application to access WebApi-MultiTenant-TodoListService-v2 on your behalf.`
+        - For **Admin consent display name** type `Access WebApi-MultiTenant-ToDoListService-v2`
+        - For **Admin consent description** type `Allows the app to access WebApi-MultiTenant-ToDoListService-v2 as the signed-in user.`
+        - For **User consent display name** type `Access WebApi-MultiTenant-ToDoListService-v2`
+        - For **User consent description** type `Allow the application to access WebApi-MultiTenant-ToDoListService-v2 on your behalf.`
         - Keep **State** as **Enabled**
         - Click on the **Add scope** button on the bottom to save this scope.
 
-#### Configure the service app (WebApi-MultiTenant-TodoListService-v2) to use your app registration
+#### Configure the service app (WebApi-MultiTenant-ToDoListService-v2) to use your app registration
 
 Open the project in your IDE (like Visual Studio or Visual Studio Code) to configure the code.
 
 >In the steps below, "ClientID" is the same as "Application ID" or "AppId".
 
-1. Open the `TodoListService\appsettings.json` file
+1. Open the `ToDoListService\appsettings.json` file
 1. Find the app key `Domain` and replace the existing value with your Azure AD tenant name.
 1. Find the app key `TenantId` and replace the existing value with 'common'.
-1. Find the app key `ClientId` and replace the existing value with the application ID (clientId) of the `WebApi-MultiTenant-TodoListService-v2` application copied from the Azure portal.
-1. Find the app key `ClientSecret` and replace the existing value with the key you saved during the creation of the `WebApi-MultiTenant-TodoListService-v2` app, in the Azure portal.
+1. Find the app key `ClientId` and replace the existing value with the application ID (clientId) of the `WebApi-MultiTenant-ToDoListService-v2` application copied from the Azure portal.
+1. Find the app key `ClientSecret` and replace the existing value with the key you saved during the creation of the `WebApi-MultiTenant-ToDoListService-v2` app, in the Azure portal.
 
 #### Register the client app (WebApp-MultiTenant-ToDoListClient-v2)
 
@@ -216,8 +216,8 @@ Open the project in your IDE (like Visual Studio or Visual Studio Code) to confi
 1. In the app's registration screen, click on the **API permissions** blade in the left to open the page where we add access to the APIs that your application needs.
    - Click the **Add a permission** button and then,
    - Ensure that the **My APIs** tab is selected.
-   - In the list of APIs, select the API `WebApi-MultiTenant-TodoListService-v2`.
-   - In the **Delegated permissions** section, select the **Access 'WebApi-MultiTenant-TodoListService-v2'** in the list. Use the search box if necessary.
+   - In the list of APIs, select the API `WebApi-MultiTenant-ToDoListService-v2`.
+   - In the **Delegated permissions** section, select the **Access 'WebApi-MultiTenant-ToDoListService-v2'** in the list. Use the search box if necessary.
    - Click on the **Add permissions** button at the bottom.
 
 #### Configure the client app (WebApp-MultiTenant-ToDoListClient-v2) to use your app registration
@@ -233,8 +233,8 @@ Open the project in your IDE (like Visual Studio or Visual Studio Code) to confi
 1. Find the app key `ClientSecret` and replace the existing value with the key you saved during the creation of the `WebApp-MultiTenant-ToDoListClient-v2` app, in the Azure portal.
 1. Find the app key `RedirectUri` and replace the existing value with the base address of the WebApp-MultiTenant-ToDoListClient-v2 project (by default `https://localhost:44321/`).
 1. Find the app key `TodoListScope` and replace the existing value with ScopeDefault.
-1. Find the app key `TodoListAppId` and replace the existing value with the application ID (clientId) of the `WebApi-MultiTenant-TodoListService-v2` application copied from the Azure portal.
-1. Find the app key `TodoListBaseAddress` and replace the existing value with the base address of the WebApi-MultiTenant-TodoListService-v2 project (by default `https://localhost:44351/`).
+1. Find the app key `TodoListAppId` and replace the existing value with the application ID (clientId) of the `WebApi-MultiTenant-ToDoListService-v2` application copied from the Azure portal.
+1. Find the app key `TodoListBaseAddress` and replace the existing value with the base address of the WebApi-MultiTenant-ToDoListService-v2 project (by default `https://localhost:44351/`).
 1. Find the app key `AdminConsentRedirectApi` and replace the existing value with "https://localhost:44351/api/Home".
 
 ### Step 3: Run the sample
@@ -257,7 +257,7 @@ This behavior is expected as the browser is not authenticated. The Web applicati
 ##### Step 1. Install .NET Core dependencies
 
 ```console
-   cd TodoListService
+   cd ToDoListService
    dotnet restore
 ```
 
@@ -289,7 +289,7 @@ In both the console windows execute the below command:
 
 Open your browser and navigate to `https://localhost:44321`.
 
-> NOTE: Remember, the To-Do list is stored in memory in this `TodoListService` app. Each time you run the projects, your To-Do list will get emptied.
+> NOTE: Remember, the To-Do list is stored in memory in this `ToDoListService` app. Each time you run the projects, your To-Do list will get emptied.
 
 ### Testing the Application
 
@@ -365,9 +365,9 @@ New-AzureADServicePrincipal -AppId -DisplayName
 
 ### Provisioning your Multi-tenant Apps in another Azure AD Tenant programatically
 
-Often the user-based consent will be disabled in an Azure AD tenant or your application will be requesting permissions that requires a tenant-admin consent. In these scenarios, your application will need to utilize the `/adminconsent` endpoint to provision both the **ToDoListClient** and the **TodoListService** before the users from that tenant are able to sign-in to your app.
+Often the user-based consent will be disabled in an Azure AD tenant or your application will be requesting permissions that requires a tenant-admin consent. In these scenarios, your application will need to utilize the `/adminconsent` endpoint to provision both the **ToDoListClient** and the **ToDoListService** before the users from that tenant are able to sign-in to your app.
 
-When provisioning, you have to take care of the dependency in the topology where the **ToDoListClient** is dependent on **TodoListService**. So in such a case, you would provision the **TodoListService** before the **ToDoListClient**.
+When provisioning, you have to take care of the dependency in the topology where the **ToDoListClient** is dependent on **ToDoListService**. So in such a case, you would provision the **ToDoListService** before the **ToDoListClient**.
 
 ### Code for the Web App (TodoListClient)
 
@@ -466,7 +466,7 @@ public async Task<IActionResult> Create()
 }
 ```
 
-### Code for the Web API (TodoListService)
+### Code for the Web API (ToDoListService)
 
 #### Admin consent Client Redirect
 

4-WebApp-your-API/4-3-AnyOrg/TodoListService/Controllers/HomeController.cs

@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 
-namespace TodoListService.Controllers
+namespace ToDoListService.Controllers
 {
     [Route("api/[controller]")]
     [Microsoft.AspNetCore.Authorization.AllowAnonymous]

4-WebApp-your-API/4-3-AnyOrg/TodoListService/Controllers/TodoListController.cs

@@ -6,15 +6,15 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.EntityFrameworkCore;
-using TodoListAPI.Models;
+using ToDoListService.Models;
 using Microsoft.Identity.Web.Resource;
 using Microsoft.Identity.Web;
 using Microsoft.Identity.Client;
 using System.Net.Http.Headers;
 using Microsoft.Graph;
 using System.Net;
 
-namespace TodoListAPI.Controllers
+namespace ToDoListService.Controllers
 {
     [Authorize]
     [Route("api/[controller]")]

4-WebApp-your-API/4-3-AnyOrg/TodoListService/Models/TodoContext.cs

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 
-namespace TodoListAPI.Models
+namespace ToDoListService.Models
 {
     public class TodoContext : DbContext
     {

4-WebApp-your-API/4-3-AnyOrg/TodoListService/Models/TodoItem.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace TodoListAPI.Models
+namespace ToDoListService.Models
 {
     public class TodoItem
     {

4-WebApp-your-API/4-3-AnyOrg/TodoListService/Program.cs

@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 
-namespace TodoListAPI
+namespace ToDoListService
 {
     public class Program
     {

4-WebApp-your-API/4-3-AnyOrg/TodoListService/Properties/launchSettings.json

@@ -17,7 +17,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "TodoListService": {
+    "ToDoListService": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {

4-WebApp-your-API/4-3-AnyOrg/TodoListService/Startup.cs

@@ -6,12 +6,12 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.EntityFrameworkCore;
-using TodoListAPI.Models;
+using ToDoListService.Models;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using System.Linq;
 using System;
 
-namespace TodoListAPI
+namespace ToDoListService
 {
     public class Startup
     {

4-WebApp-your-API/4-3-AnyOrg/TodoListService/TodoListService.csproj renamed to 4-WebApp-your-API/4-3-AnyOrg/TodoListService/ToDoListService.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <UserSecretsId>aspnet-TodoListAPI-BA938C29-8BAB-4664-A688-8FD54049C1C3</UserSecretsId>
+    <UserSecretsId>aspnet-ToDoListService-BA938C29-8BAB-4664-A688-8FD54049C1C3</UserSecretsId>
     <WebProject_DirectoryAccessLevelKey>1</WebProject_DirectoryAccessLevelKey>
   </PropertyGroup>
 
@@ -21,4 +21,4 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.3" Condition="'$(Configuration)' == 'Debug'" />
   </ItemGroup>
 
-</Project>
+</Project>

4-WebApp-your-API/4-3-AnyOrg/WebApp-Calls-WebAPI-AnyOrg-v2.sln

@@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.30011.22
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ToDoListClient", "ToDoListClient\ToDoListClient.csproj", "{76DD6C86-2323-4F29-A6EB-FF336144EBFA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TodoListService", "TodoListService\TodoListService.csproj", "{F6AA7AF4-A64C-42B6-BDE4-3E1A49FE4207}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ToDoListService", "TodoListService\ToDoListService.csproj", "{F6AA7AF4-A64C-42B6-BDE4-3E1A49FE4207}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution