Merge pull request #32 from AshrafAlam/master

Coding improvements regarding unused items

Author: jmprieur

TodoListWebApp/Controllers/HomeController.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Diagnostics;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using WebApp_OpenIDConnect_DotNet.Models;

TodoListWebApp/Controllers/TodoController.cs

@@ -58,27 +58,25 @@ public async Task<IActionResult> Index()
 
                     return View(itemList);
                 }
-                else
+
+                //
+                // If the call failed with access denied, then drop the current access token from the cache, 
+                //     and show the user an error indicating they might need to sign-in again.
+                //
+                if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized)
                 {
-                    //
-                    // If the call failed with access denied, then drop the current access token from the cache, 
-                    //     and show the user an error indicating they might need to sign-in again.
-                    //
-                    if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized)
-                    {
-                        var todoTokens = authContext.TokenCache.ReadItems().Where(a => a.Resource == AzureAdOptions.Settings.TodoListResourceId);
-                        foreach (TokenCacheItem tci in todoTokens)
-                            authContext.TokenCache.DeleteItem(tci);
+                    var todoTokens = authContext.TokenCache.ReadItems().Where(a => a.Resource == AzureAdOptions.Settings.TodoListResourceId);
+                    foreach (TokenCacheItem tci in todoTokens)
+                        authContext.TokenCache.DeleteItem(tci);
 
-                        ViewBag.ErrorMessage = "UnexpectedError";
-                        TodoItem newItem = new TodoItem();
-                        newItem.Title = "(No items in list)";
-                        itemList.Add(newItem);
-                        return View(itemList);
-                    }
+                    ViewBag.ErrorMessage = "UnexpectedError";
+                    TodoItem newItem = new TodoItem();
+                    newItem.Title = "(No items in list)";
+                    itemList.Add(newItem);
+                    return View(itemList);
                 }
             }
-            catch (Exception ee)
+            catch (Exception)
             {
                 if (HttpContext.Request.Query["reauth"] == "True")
                 {
@@ -143,27 +141,25 @@ public async Task<ActionResult> Index(string item)
                     {
                         return RedirectToAction("Index");
                     }
-                    else
+
+                    //
+                    // If the call failed with access denied, then drop the current access token from the cache, 
+                    //     and show the user an error indicating they might need to sign-in again.
+                    //
+                    if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized)
                     {
-                        //
-                        // If the call failed with access denied, then drop the current access token from the cache, 
-                        //     and show the user an error indicating they might need to sign-in again.
-                        //
-                        if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized)
-                        {
-                            var todoTokens = authContext.TokenCache.ReadItems().Where(a => a.Resource == AzureAdOptions.Settings.TodoListResourceId);
-                            foreach (TokenCacheItem tci in todoTokens)
-                                authContext.TokenCache.DeleteItem(tci);
-
-                            ViewBag.ErrorMessage = "UnexpectedError";
-                            TodoItem newItem = new TodoItem();
-                            newItem.Title = "(No items in list)";
-                            itemList.Add(newItem);
-                            return View(newItem);
-                        }
+                        var todoTokens = authContext.TokenCache.ReadItems().Where(a => a.Resource == AzureAdOptions.Settings.TodoListResourceId);
+                        foreach (TokenCacheItem tci in todoTokens)
+                            authContext.TokenCache.DeleteItem(tci);
+
+                        ViewBag.ErrorMessage = "UnexpectedError";
+                        TodoItem newItem = new TodoItem();
+                        newItem.Title = "(No items in list)";
+                        itemList.Add(newItem);
+                        return View(newItem);
                     }
                 }
-                catch (Exception ee)
+                catch (Exception)
                 {
                     //
                     // The user needs to re-authorize.  Show them a message to that effect.