From 2a8fd8ae6d80003cb00b128e60041308f39a62d2 Mon Sep 17 00:00:00 2001
From: GregorVolcanjk <gv0075@student.uni-lj.si>
Date: Sat, 8 Jan 2022 21:01:54 +0100
Subject: [PATCH 1/2] Za vse entitete dolocil pravice

---
 web/Controllers/CustomerController.cs    |  3 +++
 web/Controllers/DistributorController.cs |  3 +++
 web/Controllers/EvidenceController.cs    |  2 ++
 web/Controllers/ItemController.cs        |  2 +-
 web/Views/Customer/Index.cshtml          | 14 +++++++++++---
 web/Views/Distributor/Index.cshtml       | 16 +++++++++++++---
 web/Views/Evidence/Index.cshtml          | 14 +++++++++++---
 web/Views/Item/Index.cshtml              |  5 +----
 web/Views/Warehouse/Index.cshtml         |  7 +++----
 9 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/web/Controllers/CustomerController.cs b/web/Controllers/CustomerController.cs
index dec7e0c..289c5fb 100644
--- a/web/Controllers/CustomerController.cs
+++ b/web/Controllers/CustomerController.cs
@@ -127,6 +127,7 @@ public async Task<IActionResult> Details(int? id)
         }
 
         // GET: Customer/Create
+        [Authorize(Roles = "Administrator")]
         public IActionResult Create()
         {
             return View();
@@ -149,6 +150,7 @@ public async Task<IActionResult> Create([Bind("ID,FirstName,LastName,Address,ZIP
         }
 
         // GET: Customer/Edit/5
+        [Authorize(Roles = "Administrator, Manager")]
         public async Task<IActionResult> Edit(int? id)
         {
             if (id == null)
@@ -200,6 +202,7 @@ public async Task<IActionResult> Edit(int id, [Bind("ID,FirstName,LastName,Addre
         }
 
         // GET: Customer/Delete/5
+        [Authorize(Roles = "Administrator")]
         public async Task<IActionResult> Delete(int? id)
         {
             if (id == null)
diff --git a/web/Controllers/DistributorController.cs b/web/Controllers/DistributorController.cs
index 5b98b58..5df0d52 100644
--- a/web/Controllers/DistributorController.cs
+++ b/web/Controllers/DistributorController.cs
@@ -120,6 +120,7 @@ public async Task<IActionResult> Details(int? id)
         }
 
         // GET: Distributor/Create
+        [Authorize(Roles = "Administrator, Manager")]
         public IActionResult Create()
         {
             return View();
@@ -142,6 +143,7 @@ public async Task<IActionResult> Create([Bind("ID,Name,Address,ZIP,City,Country"
         }
 
         // GET: Distributor/Edit/5
+        [Authorize(Roles = "Administrator, Manager")]
         public async Task<IActionResult> Edit(int? id)
         {
             if (id == null)
@@ -193,6 +195,7 @@ public async Task<IActionResult> Edit(int id, [Bind("ID,Name,Address,ZIP,City,Co
         }
 
         // GET: Distributor/Delete/5
+        [Authorize(Roles = "Administrator")]
         public async Task<IActionResult> Delete(int? id)
         {
             if (id == null)
diff --git a/web/Controllers/EvidenceController.cs b/web/Controllers/EvidenceController.cs
index 5fd3029..fea669a 100644
--- a/web/Controllers/EvidenceController.cs
+++ b/web/Controllers/EvidenceController.cs
@@ -149,6 +149,7 @@ public async Task<IActionResult> Create([Bind("ID,ItemID,WarehouseID,CustomerID,
         }
 
         // GET: Evidence/Edit/5
+        [Authorize(Roles = "Administrator, Manager")]
         public async Task<IActionResult> Edit(int? id)
         {
             if (id == null)
@@ -206,6 +207,7 @@ public async Task<IActionResult> Edit(int id, [Bind("ID,ItemID,WarehouseID,Custo
         }
 
         // GET: Evidence/Delete/5
+        [Authorize(Roles = "Administrator, Manager")]
         public async Task<IActionResult> Delete(int? id)
         {
             if (id == null)
diff --git a/web/Controllers/ItemController.cs b/web/Controllers/ItemController.cs
index 99f7f02..fe3ed4f 100644
--- a/web/Controllers/ItemController.cs
+++ b/web/Controllers/ItemController.cs
@@ -181,7 +181,7 @@ public async Task<IActionResult> Create([Bind("ID,Name,Description,Quantity,Acti
         }
 
         // GET: Item/Edit/5
-        [Authorize]
+        [Authorize(Roles = "Administrator, Manager")]
         public async Task<IActionResult> Edit(int? id)
         {
             if (id == null)
diff --git a/web/Views/Customer/Index.cshtml b/web/Views/Customer/Index.cshtml
index 81d282f..4f9a7fd 100644
--- a/web/Views/Customer/Index.cshtml
+++ b/web/Views/Customer/Index.cshtml
@@ -67,9 +67,17 @@
                     @Html.DisplayFor(modelItem => item.Country)
                 </td>
                 <td>
-                    <a asp-action="Edit" asp-route-id="@item.ID">Edit</a> |
-                    <a asp-action="Details" asp-route-id="@item.ID">Details</a> |
-                    <a asp-action="Delete" asp-route-id="@item.ID">Delete</a>
+                    <a asp-action="Details" asp-route-id="@item.ID">Details</a>
+                    @if (User.Identity.IsAuthenticated)
+                    {
+                        if (User.IsInRole("Manager")) {
+                            <a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
+                        }
+                        else if (User.IsInRole("Administrator")) {
+                            <a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
+                            <a asp-action="Delete" asp-route-id="@item.ID">Delete</a>
+                        }
+                    }
                 </td>
             </tr>
     }
diff --git a/web/Views/Distributor/Index.cshtml b/web/Views/Distributor/Index.cshtml
index 19357eb..c7db27a 100644
--- a/web/Views/Distributor/Index.cshtml
+++ b/web/Views/Distributor/Index.cshtml
@@ -60,9 +60,19 @@
                     @Html.DisplayFor(modelItem => item.Country)
                 </td>
                 <td>
-                    <a asp-action="Edit" asp-route-id="@item.ID">Edit</a> |
-                    <a asp-action="Details" asp-route-id="@item.ID">Details</a> |
-                    <a asp-action="Delete" asp-route-id="@item.ID">Delete</a>
+                    <a asp-action="Details" asp-route-id="@item.ID">Details</a>
+                    @if (User.Identity.IsAuthenticated)
+                    {
+                        if (User.IsInRole("Manager"))
+                        {
+                            <a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
+                        }
+                        else if (User.IsInRole("Administrator"))
+                        {
+                            <a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
+                            <a asp-action="Delete" asp-route-id="@item.ID">Delete</a>
+                        }
+                    }
                 </td>
             </tr>
     }
diff --git a/web/Views/Evidence/Index.cshtml b/web/Views/Evidence/Index.cshtml
index 49a3f40..45188a4 100644
--- a/web/Views/Evidence/Index.cshtml
+++ b/web/Views/Evidence/Index.cshtml
@@ -55,9 +55,17 @@
                     @Html.DisplayFor(modelItem => item.Customer.LastName), @Html.DisplayFor(modelItem => item.Customer.FirstName)
                 </td>
                 <td>
-                    <a asp-action="Edit" asp-route-id="@item.ID">Edit</a> |
-                    <a asp-action="Details" asp-route-id="@item.ID">Details</a> |
-                    <a asp-action="Delete" asp-route-id="@item.ID">Delete</a>
+                    <a asp-action="Details" asp-route-id="@item.ID">Details</a>
+                    @if (User.Identity.IsAuthenticated)
+                    {
+
+                        if (User.IsInRole("Administrator") || User.IsInRole("Manager"))
+                        {
+                            <a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
+                            <a asp-action="Delete" asp-route-id="@item.ID">Delete</a>  
+                        }
+                    }
+                    
                 </td>
             </tr>
     }
diff --git a/web/Views/Item/Index.cshtml b/web/Views/Item/Index.cshtml
index 9a3b0b8..80098ec 100644
--- a/web/Views/Item/Index.cshtml
+++ b/web/Views/Item/Index.cshtml
@@ -16,9 +16,7 @@
             @* Filter by activity: <input type="checkbox" name="activeBool" value="@ViewData["ActiveFilter"]" />
             <input type="submit" value="Confirm" class="btn btn-default" /> | *@
             <a asp-action="Index" class="btn border border-primary btn-default">Clear filter</a>
-            
-            <a asp-action="Create" class="no-decor btn btn-primary float-end"><B>Add New</B></a>
-
+            <a asp-action="Create" class="no-decor btn btn-primary float-end">Add New</a>
         </p>
     </div>
 </form>
@@ -80,7 +78,6 @@
                     {
                         <a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
                         <a asp-action="Delete" asp-route-id="@item.ID">Delete</a>
-                        <a asp-action="Create" asp-route-id="@item.ID">Create</a>
                     }
                 }
                 <a asp-action="Ship" asp-route-id="@item.ID">Ship</a>
diff --git a/web/Views/Warehouse/Index.cshtml b/web/Views/Warehouse/Index.cshtml
index c27ea8e..4a45372 100644
--- a/web/Views/Warehouse/Index.cshtml
+++ b/web/Views/Warehouse/Index.cshtml
@@ -58,13 +58,12 @@
                     {
                         if (User.IsInRole("Manager"))
                         {
-                            <a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
+                           <a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
                         }
                         else if (User.IsInRole("Administrator"))
                         {
-                            <a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
-                            <a asp-action="Delete" asp-route-id="@item.ID">Delete</a>
-                            <a asp-action="Create" asp-route-id="@item.ID">Create</a>
+                           <a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
+                           <a asp-action="Delete" asp-route-id="@item.ID">Delete</a>
                         }
                     }
                 </td>

From cc447d0001bd1cb19a346bfbd8e854c612bd64b3 Mon Sep 17 00:00:00 2001
From: GregorVolcanjk <gv0075@student.uni-lj.si>
Date: Sun, 9 Jan 2022 18:13:33 +0100
Subject: [PATCH 2/2] Auth view popravek pri item customer distributor

---
 web/Controllers/CustomerController.cs    | 4 ++--
 web/Controllers/DistributorController.cs | 2 +-
 web/Controllers/ItemController.cs        | 2 +-
 web/Views/Customer/Index.cshtml          | 5 +----
 web/Views/Distributor/Index.cshtml       | 6 +-----
 web/Views/Item/Index.cshtml              | 8 ++------
 6 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/web/Controllers/CustomerController.cs b/web/Controllers/CustomerController.cs
index 289c5fb..9598608 100644
--- a/web/Controllers/CustomerController.cs
+++ b/web/Controllers/CustomerController.cs
@@ -127,7 +127,7 @@ public async Task<IActionResult> Details(int? id)
         }
 
         // GET: Customer/Create
-        [Authorize(Roles = "Administrator")]
+        [Authorize(Roles = "Administrator, Manager")]
         public IActionResult Create()
         {
             return View();
@@ -202,7 +202,7 @@ public async Task<IActionResult> Edit(int id, [Bind("ID,FirstName,LastName,Addre
         }
 
         // GET: Customer/Delete/5
-        [Authorize(Roles = "Administrator")]
+        [Authorize(Roles = "Administrator, Manager")]
         public async Task<IActionResult> Delete(int? id)
         {
             if (id == null)
diff --git a/web/Controllers/DistributorController.cs b/web/Controllers/DistributorController.cs
index 5df0d52..9892394 100644
--- a/web/Controllers/DistributorController.cs
+++ b/web/Controllers/DistributorController.cs
@@ -195,7 +195,7 @@ public async Task<IActionResult> Edit(int id, [Bind("ID,Name,Address,ZIP,City,Co
         }
 
         // GET: Distributor/Delete/5
-        [Authorize(Roles = "Administrator")]
+        [Authorize(Roles = "Administrator, Manager")]
         public async Task<IActionResult> Delete(int? id)
         {
             if (id == null)
diff --git a/web/Controllers/ItemController.cs b/web/Controllers/ItemController.cs
index fe3ed4f..99f7f02 100644
--- a/web/Controllers/ItemController.cs
+++ b/web/Controllers/ItemController.cs
@@ -181,7 +181,7 @@ public async Task<IActionResult> Create([Bind("ID,Name,Description,Quantity,Acti
         }
 
         // GET: Item/Edit/5
-        [Authorize(Roles = "Administrator, Manager")]
+        [Authorize]
         public async Task<IActionResult> Edit(int? id)
         {
             if (id == null)
diff --git a/web/Views/Customer/Index.cshtml b/web/Views/Customer/Index.cshtml
index 4f9a7fd..0004da9 100644
--- a/web/Views/Customer/Index.cshtml
+++ b/web/Views/Customer/Index.cshtml
@@ -70,10 +70,7 @@
                     <a asp-action="Details" asp-route-id="@item.ID">Details</a>
                     @if (User.Identity.IsAuthenticated)
                     {
-                        if (User.IsInRole("Manager")) {
-                            <a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
-                        }
-                        else if (User.IsInRole("Administrator")) {
+                        if (User.IsInRole("Administrator") || User.IsInRole("Manager")) {
                             <a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
                             <a asp-action="Delete" asp-route-id="@item.ID">Delete</a>
                         }
diff --git a/web/Views/Distributor/Index.cshtml b/web/Views/Distributor/Index.cshtml
index c7db27a..516b16e 100644
--- a/web/Views/Distributor/Index.cshtml
+++ b/web/Views/Distributor/Index.cshtml
@@ -63,11 +63,7 @@
                     <a asp-action="Details" asp-route-id="@item.ID">Details</a>
                     @if (User.Identity.IsAuthenticated)
                     {
-                        if (User.IsInRole("Manager"))
-                        {
-                            <a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
-                        }
-                        else if (User.IsInRole("Administrator"))
+                        if (User.IsInRole("Administrator") || User.IsInRole("Manager"))
                         {
                             <a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
                             <a asp-action="Delete" asp-route-id="@item.ID">Delete</a>
diff --git a/web/Views/Item/Index.cshtml b/web/Views/Item/Index.cshtml
index 80098ec..44fcf71 100644
--- a/web/Views/Item/Index.cshtml
+++ b/web/Views/Item/Index.cshtml
@@ -68,15 +68,11 @@
             </td>
             <td>
                 <a asp-action="Details" asp-route-id="@item.ID">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
                 @if (User.Identity.IsAuthenticated)
                 {
-                    if (User.IsInRole("Manager"))
+                    if (User.IsInRole("Administrator"))
                     {
-                        <a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
-                    }
-                    else if (User.IsInRole("Administrator"))
-                    {
-                        <a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
                         <a asp-action="Delete" asp-route-id="@item.ID">Delete</a>
                     }
                 }