Merge pull request #43 from nodes-vapor/develop

Gate allow leaf tag

Author: Casperhr

Sources/AdminPanel/Resources/Views/Layout/Partials/Navigation/navigation.leaf

@@ -8,6 +8,14 @@
             Dashboard
         </a>
     </li>
+    
+    #allow(request, "super-admin") {
+    <li class="list-group-heading">
+        Super admin
+    </li>
+    }
+    
+    #allow(request, "admin") {
     <li class="list-group-heading">
         Admin
     </li>
@@ -23,4 +31,5 @@
             Roles
         </a>
     </li>
+    }
 </ul>

Sources/AdminPanel/Support/Gate.swift

@@ -2,15 +2,15 @@ import Vapor
 
 class Gate {
 
-    public let error = Abort.custom(status: .forbidden, message: "User does not have access to this page")
+    public static let error = Abort.custom(status: .forbidden, message: "User does not have access to this page")
 
     /// Check if a backend_users.role is allowed to access
     ///
     /// - Parameters:
     ///   - backendUserRole: role from config
     ///   - role: role from config
     /// - Returns: bool
-    public func allow(_ backendUserRole: String, _ role: String) -> Bool {
+    public static func allow(_ backendUserRole: String, _ role: String) -> Bool {
         guard let roles = Configuration.shared?.roles else {
             print("AdminPanel.Gate missing configuration")
             return false
@@ -53,27 +53,27 @@ class Gate {
         return false
     }
 
-    public func disallow(_ backendUserRole: String, _ role: String) -> Bool {
-        return !allow(backendUserRole, role)
+    public static func disallow(_ backendUserRole: String, _ role: String) -> Bool {
+        return !self.allow(backendUserRole, role)
     }
 
-    public func allowOrFail(_ backendUserRole: String, _ role: String) throws {
-        if disallow(backendUserRole, role) {
-            throw error
+    public static func allowOrFail(_ backendUserRole: String, _ role: String) throws {
+        if self.disallow(backendUserRole, role) {
+            throw self.error
         }
     }
 
-    public func allow(_ backendUser: BackendUser, _ role: String) -> Bool {
-        return allow(backendUser.role, role)
+    public static func allow(_ backendUser: BackendUser?, _ role: String) -> Bool {
+        return self.allow(backendUser?.role ?? "", role)
     }
 
-    public func disallow(_ backendUser: BackendUser, _ role: String) -> Bool {
-        return !allow(backendUser.role, role)
+    public static func disallow(_ backendUser: BackendUser?, _ role: String) -> Bool {
+        return !self.allow(backendUser?.role ?? "", role)
     }
 
-    public func allowOrFail(_ backendUser: BackendUser, _ role: String) throws {
-        if disallow(backendUser, role) {
-            throw error
+    public static func allowOrFail(_ backendUser: BackendUser?, _ role: String) throws {
+        if self.disallow(backendUser, role) {
+            throw self.error
         }
     }
 }

Sources/AdminPanel/Support/LeafTags/Allow.swift

@@ -0,0 +1,31 @@
+import Leaf
+
+public final class Allow: Tag {
+    public let name = "allow"
+    
+    public enum Error: Swift.Error {
+        case expetedTwoArguments(have: [Argument])
+    }
+    
+    public func run(
+        stem: Stem,
+        context: Context,
+        tagTemplate: TagTemplate,
+        arguments: [Argument]) throws -> Node? {
+        guard arguments.count == 2 else { throw Error.expetedTwoArguments(have: arguments) }
+        return nil
+    }
+    
+    public func shouldRender(
+        stem: Stem,
+        context: Context,
+        tagTemplate: TagTemplate,
+        arguments: [Argument],
+        value: Node?) -> Bool {
+        guard let request = arguments.first?.value else { return false }
+        guard let backendUserRole = request["storage", "authedBackendUser", "role"]?.string else { return false }
+        guard let role = arguments[1].value?.string else { return false }
+        
+        return Gate.allow(backendUserRole, role)
+    }
+}

Sources/AdminPanel/Support/Provider.swift

@@ -14,15 +14,16 @@ public final class Provider: Vapor.Provider {
 
         if let leaf = droplet.view as? LeafRenderer {
             // AdminPanel
-            leaf.stem.register(Active());
-            leaf.stem.register(FormOpen());
-            leaf.stem.register(FormClose());
-            leaf.stem.register(FormTextGroup());
-            leaf.stem.register(FormEmailGroup());
-            leaf.stem.register(FormPasswordGroup());
-            leaf.stem.register(FormNumberGroup());
-            leaf.stem.register(FormCheckboxGroup());
-            leaf.stem.register(FormSelectGroup());
+            leaf.stem.register(Active())
+            leaf.stem.register(FormOpen())
+            leaf.stem.register(FormClose())
+            leaf.stem.register(FormTextGroup())
+            leaf.stem.register(FormEmailGroup())
+            leaf.stem.register(FormPasswordGroup())
+            leaf.stem.register(FormNumberGroup())
+            leaf.stem.register(FormCheckboxGroup())
+            leaf.stem.register(FormSelectGroup())
+            leaf.stem.register(Allow())
 
             //Paginator
             leaf.stem.register(PaginatorTag())