Allow managers to access resellers by default

hiqdev · Feb 11, 2019 · a824fc3 · a824fc3
1 parent 6e4b6ad
commit a824fc3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/src/Initer.php b/src/Initer.php
@@ -260,7 +260,7 @@ public function getTree()
                 'role:stock.manager',
             ],
             'role:manager' => [
-                'manage',
+                'manage', 'access-reseller',
                 'role:support',
                 'role:document.manager',
                 'role:domain.manager', 'domain.pay', 'domain.push',
@@ -277,6 +277,7 @@ public function getTree()
                 'have-goods',
                 'resell',
                 'role:finance.master',
+                'deny:access-reseller',
                 'role:manager',
             ],
             'role:owner' => [

diff --git a/src/files/items.php b/src/files/items.php
@@ -529,6 +529,7 @@
         'type' => 1,
         'children' => [
             'manage',
+            'access-reseller',
             'role:support',
             'role:document.manager',
             'role:domain.manager',
@@ -555,6 +556,7 @@
             'have-goods',
             'resell',
             'role:finance.master',
+            'deny:access-reseller',
             'role:manager',
         ],
     ],
@@ -1508,6 +1510,12 @@
     'deny:manage' => [
         'type' => 2,
     ],
+    'access-reseller' => [
+        'type' => 2,
+    ],
+    'deny:access-reseller' => [
+        'type' => 2,
+    ],
     'contact.force-verify' => [
         'type' => 2,
     ],
@@ -1562,12 +1570,6 @@
     'deny:client.set-others-allowed-ips' => [
         'type' => 2,
     ],
-    'access-reseller' => [
-        'type' => 2,
-    ],
-    'deny:access-reseller' => [
-        'type' => 2,
-    ],
     'domain.read' => [
         'type' => 2,
     ],

diff --git a/tests/unit/CheckAccessTrait.php b/tests/unit/CheckAccessTrait.php
@@ -153,7 +153,7 @@ public function testAdmin()
     public function testAccounter()
     {
         $this->assertAccesses('role:accounter', [
-            'access-subclients', 'support', 'manage',
+            'access-subclients', 'support', 'manage', 'access-reseller',
             'ticket.read', 'ticket.create', 'ticket.answer', 'ticket.close', 'ticket.update', 'ticket.delete',
             'client.read', 'client.create', 'client.update', 'client.delete', 'client.list',
             'client.set-tmp-pwd', 'contact.set-verified', 'client.block', 'client.unblock',
@@ -194,7 +194,7 @@ public function testAccounter()
     public function testManager()
     {
         $this->assertAccesses('role:manager', [
-            'access-subclients', 'support', 'manage',
+            'access-subclients', 'support', 'manage', 'access-reseller',
             'ticket.read', 'ticket.create', 'ticket.answer', 'ticket.close', 'ticket.update', 'ticket.delete',
             'client.read', 'client.create', 'client.update', 'client.delete', 'client.list',
             'client.set-tmp-pwd', 'contact.set-verified', 'client.block', 'client.unblock',