Update to display tenant specific tasks

Author: Shama-K

4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/Controllers/ToDoListController.cs

@@ -11,18 +11,15 @@
 
 namespace ToDoListClient.Controllers
 {
-    [Authorize]
+    [AuthorizeForScopes(ScopeKeySection = "TodoList:TodoListScope")]
     public class ToDoListController : Controller
     {
         private IToDoListService _todoListService;
-
         public ToDoListController(IToDoListService todoListService)
         {
             _todoListService = todoListService;
-
         }
 
-        [AuthorizeForScopes(ScopeKeySection = "TodoList:TodoListScope")]
         // GET: TodoList
         public async Task<ActionResult> Index()
         {
@@ -43,18 +40,18 @@ public async Task<IActionResult> Create()
                 {
                     Text = u
                 }).ToList();
+                TempData["TenantId"] = HttpContext.User.GetTenantId();
                 return View(todo);
             }
             catch (WebApiMsalUiRequiredException ex)
             {
-                var a = ex.Message;
                 return Redirect(ex.Message);
             }
         }
         // POST: TodoList/Create
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<ActionResult> Create([Bind("Title,Owner")] ToDoItem todo)
+        public async Task<ActionResult> Create([Bind("Title,Owner,TenantId")] ToDoItem todo)
         {
             await _todoListService.AddAsync(todo);
             return RedirectToAction("Index");
@@ -76,7 +73,7 @@ public async Task<ActionResult> Edit(int id)
         // POST: TodoList/Edit/5
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<ActionResult> Edit(int id, [Bind("Id,Title,Owner")] ToDoItem todo)
+        public async Task<ActionResult> Edit(int id, [Bind("Id,Title,Owner,TenantId")] ToDoItem todo)
         {
             await _todoListService.EditAsync(todo);
             return RedirectToAction("Index");

4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/Models/ToDoItem.cs

@@ -12,5 +12,6 @@ public class ToDoItem
         public string Title { get; set; }
 
         public string Owner { get; set; }
+        public string TenantId { get; set; }
     }
 }

4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/Services/ToDoListService.cs

@@ -18,7 +18,7 @@ namespace ToDoListClient.Services
 {
     public static class TodoListServiceExtensions
     {
-        public static void AddTodoListService(this IServiceCollection services, IConfiguration configuration)
+        public static void AddTodoListService(this IServiceCollection services)
         {
             // https://docs.microsoft.com/en-us/dotnet/standard/microservices-architecture/implement-resilient-applications/use-httpclientfactory-to-implement-resilient-http-requests
             services.AddHttpClient<IToDoListService, ToDoListService>();
@@ -29,7 +29,6 @@ public class ToDoListService : IToDoListService
         private readonly HttpClient _httpClient;
         private readonly string _TodoListScope = string.Empty;
         private readonly string _TodoListBaseAddress = string.Empty;
-        private readonly string _ClientId = string.Empty;
         private readonly string _RedirectUri = string.Empty;
         private readonly string _ApiRedirectUri = string.Empty;
         private readonly ITokenAcquisition _tokenAcquisition;
@@ -40,7 +39,6 @@ public ToDoListService(ITokenAcquisition tokenAcquisition, HttpClient httpClient
             _tokenAcquisition = tokenAcquisition;
             _TodoListScope = configuration["TodoList:TodoListScope"];
             _TodoListBaseAddress = configuration["TodoList:TodoListBaseAddress"];
-            _ClientId = configuration["AzureAd:ClientId"];
             _RedirectUri = configuration["RedirectUri"];
             _ApiRedirectUri = configuration["TodoList:AdminConsentRedirectApi"];
             if (!string.IsNullOrEmpty(_TodoListBaseAddress))

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

@@ -36,7 +36,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddMicrosoftWebAppAuthentication(Configuration)
                 .AddMicrosoftWebAppCallsWebApi(Configuration, new string[] { Configuration["TodoList:TodoListScope"] })
                .AddInMemoryTokenCaches();
-            services.AddTodoListService(Configuration);
+            services.AddTodoListService();
             services.AddControllersWithViews(options =>
             {
                 var policy = new AuthorizationPolicyBuilder()

4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/Views/ToDoList/Create.cshtml

@@ -10,17 +10,15 @@
 <div class="row">
     <div class="col-md-4">
         <form asp-action="Create">
+            <input type="hidden" asp-for="TenantId" value="@((string)TempData["TenantId"])"/>
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
             <div class="form-group">
                 <label asp-for="Title" class="control-label"></label>
                 <input asp-for="Title" class="form-control" />
                 <span asp-validation-for="Title" class="text-danger"></span>
             </div>
             <div class="form-group">
-                @*<label asp-for="Owner" class="control-label"></label>
-        <input asp-for="Owner" class="form-control"  value="@Html.DisplayTextFor(model => model.Owner)"/>
-        <span asp-validation-for="Owner" class="text-danger"></span>*@
-                <label asp-for="Owner" class="control-label"></label>
+               <label asp-for="Owner" class="control-label"></label>
 
                 <select class="form-control" asp-for="Owner" asp-items="@((List<SelectListItem>)TempData["UsersDropDown"])"></select>
 

4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/Views/ToDoList/Edit.cshtml

@@ -9,6 +9,7 @@
     <form asp-action="Edit">
         <div asp-validation-summary="ModelOnly" class="text-danger"></div>
         <input type="hidden" asp-for="Id" />
+        <input type="hidden" asp-for="TenantId"/>
         <div class="form-group">
             <label asp-for="Title" class="control-label"></label>
             <input asp-for="Title" class="form-control" />

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

@@ -39,16 +39,17 @@ public TodoListController(TodoContext context,ITokenAcquisition tokenAcquisition
         public async Task<ActionResult<IEnumerable<TodoItem>>> GetTodoItems()
         {
             HttpContext.VerifyUserHasAnyAcceptedScope(scopeRequiredByApi);
+            string userTenantId = HttpContext.User.GetTenantId();
             try
             {
                 Microsoft.Graph.User user = new User();
                 await _context.TodoItems.ToListAsync();
             }
-            catch(Exception ex)
+            catch(Exception)
             {
-                var a = ex.Message;
+                throw;
             }
-            return await _context.TodoItems.ToListAsync();
+            return await _context.TodoItems.Where(x => x.TenantId == userTenantId).ToListAsync();
         }
 
         // GET: api/TodoItems/5

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

@@ -12,10 +12,6 @@ public class TodoItem
         public string Title { get; set; }
 
         public string Owner { get; set; }
+        public string TenantId { get; set; }
     }
-    //public class Users
-    //{
-    //    public int UserId { get; set; }
-    //    public string UserName { get; set; }
-    //}
 }