Merge pull request #1 from osindex/master

🐛 update casbin version

Author: leeqvip

composer.json

@@ -11,7 +11,7 @@
     "license": "Apache-2.0",
     "require": {
     	"laravel/framework": "~5.1",
-    	"casbin/casbin": ">=0.1.0"
+    	"casbin/casbin": ">=0.2.1"
     },
     "require-dev": {
         "phpunit/phpunit": "~5.7|~6.0|~7.0|~8.0",

src/Commands/GroupAdd.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace Lauthz\Commands;
+
+use Illuminate\Console\Command;
+use Lauthz\Facades\Enforcer;
+
+/**
+ * PolicyAdd class.
+ */
+class GroupAdd extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'group:add
+                            {policy : the rule separated by commas}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Adds a role inheritance rule to the current policy.';
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $params = explode(',', $this->argument('policy'));
+        array_walk($params, function (&$value) {
+            $value = trim($value);
+        });
+        $ret = Enforcer::addGroupingPolicy(...$params);
+        if ($ret) {
+            $this->info('Grouping `' . implode(', ', $params) . '` created');
+        } else {
+            $this->error('Grouping `' . implode(', ', $params) . '` creation failed');
+        }
+
+        return $ret ? 0 : 1;
+    }
+}

src/LauthzServiceProvider.php

@@ -2,9 +2,9 @@
 
 namespace Lauthz;
 
+use Illuminate\Support\ServiceProvider;
 use Lauthz\Models\Rule;
 use Lauthz\Observers\RuleObserver;
-use Illuminate\Support\ServiceProvider;
 
 class LauthzServiceProvider extends ServiceProvider
 {
@@ -14,17 +14,18 @@ class LauthzServiceProvider extends ServiceProvider
     public function boot()
     {
         if ($this->app->runningInConsole()) {
-            $this->publishes([__DIR__.'/../database/migrations' => database_path('migrations')], 'laravel-lauthz-migrations');
-            $this->publishes([__DIR__.'/../config/lauthz-rbac-model.conf' => config_path('lauthz-rbac-model.conf')], 'laravel-lauthz-config');
-            $this->publishes([__DIR__.'/../config/lauthz.php' => config_path('lauthz.php')], 'laravel-lauthz-config');
+            $this->publishes([__DIR__ . '/../database/migrations' => database_path('migrations')], 'laravel-lauthz-migrations');
+            $this->publishes([__DIR__ . '/../config/lauthz-rbac-model.conf' => config_path('lauthz-rbac-model.conf')], 'laravel-lauthz-config');
+            $this->publishes([__DIR__ . '/../config/lauthz.php' => config_path('lauthz.php')], 'laravel-lauthz-config');
 
             $this->commands([
+                Commands\GroupAdd::class,
                 Commands\PolicyAdd::class,
                 Commands\RoleAssign::class,
             ]);
         }
 
-        $this->mergeConfigFrom(__DIR__.'/../config/lauthz.php', 'lauthz');
+        $this->mergeConfigFrom(__DIR__ . '/../config/lauthz.php', 'lauthz');
 
         $this->bootObserver();
     }

tests/Commands/GroupAddTest.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Lauthz\Tests\Commands;
+
+use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Support\Facades\Artisan;
+use Lauthz\Facades\Enforcer;
+use Lauthz\Tests\TestCase;
+
+class GroupAddTest extends TestCase
+{
+    use DatabaseMigrations;
+
+    public function testHandle()
+    {
+        $this->assertFalse(Enforcer::hasGroupingPolicy('eve', 'writer', 'domain'));
+
+        $exitCode = Artisan::call('group:add', ['policy' => 'eve, writer, domain']);
+        $this->assertTrue(0 === $exitCode);
+        $this->assertTrue(Enforcer::hasGroupingPolicy('eve', 'writer', 'domain'));
+
+        $exitCode = Artisan::call('group:add', ['policy' => 'eve, writer, domain']);
+        $this->assertFalse(0 === $exitCode);
+    }
+}