Merge pull request #128 from marcnewton/master

Multi DB Connection Fixes

Author: jeremykenedy

.env.example

@@ -37,3 +37,13 @@ ROLES_GUI_TITLE_EXTENDED='template_title'
 ROLES_GUI_LARAVEL_ROLES_ENABLED=false
 ROLES_GUI_TOOLTIPS_ENABLED=true
 ROLES_GUI_DATATABLES_JS_ENABLED=false
+
+# Roles API Settings
+ROLES_API_ENABLED=false
+ROLES_API_AUTH_ENABLED=true
+ROLES_API_MIDDLEWARE_ENABLED=true
+ROLES_API_MIDDLEWARE='role:admin'
+ROLES_API_CREATE_ROLE_MIDDLEWARE_TYPE='role'
+ROLES_API_CREATE_ROLE_MIDDLEWARE_TYPE='admin'
+ROLES_API_CREATE_PERMISSION_MIDDLEWARE_TYPE='role'
+ROLES_API_CREATE_PERMISSION_MIDDLEWARE_TYPE='admin'

src/Traits/DatabaseTraits.php renamed to src/Database/Database.php

@@ -1,8 +1,10 @@
 <?php
 
-namespace jeremykenedy\LaravelRoles\Traits;
+namespace jeremykenedy\LaravelRoles\Database;
 
-trait DatabaseTraits
+use Illuminate\Database\Eloquent\Model;
+
+abstract class Database extends Model
 {
     /**
      * The table associated with the model.

src/Database/Migrations/2016_02_09_132439_create_permission_user_table.php

@@ -17,14 +17,15 @@ public function up()
         $table = config('roles.permissionsUserTable');
         $permissionsTable = config('roles.permissionsTable');
         $tableCheck = Schema::connection($connection)->hasTable($table);
+        $userTable = app(config('auth.providers.users.model'))->getTable();
 
         if (!$tableCheck) {
-            Schema::connection($connection)->create($table, function (Blueprint $table) use ($permissionsTable) {
+            Schema::connection($connection)->create($table, function (Blueprint $table) use ($permissionsTable, $userTable) {
                 $table->increments('id')->unsigned();
-                $table->integer('permission_id')->unsigned()->index();
-                $table->foreign('permission_id')->references('id')->on($permissionsTable)->onDelete('cascade');
+                $table->integer('role_id')->unsigned()->index();
+                $table->foreign('role_id')->references('id')->on($permissionsTable)->onDelete('cascade');
                 $table->unsignedBigInteger('user_id')->unsigned()->index();
-                $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
+                $table->foreign('user_id')->references('id')->on($userTable)->onDelete('cascade');
                 $table->timestamps();
                 $table->softDeletes();
             });

src/Models/Permission.php

@@ -2,16 +2,14 @@
 
 namespace jeremykenedy\LaravelRoles\Models;
 
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use jeremykenedy\LaravelRoles\Contracts\PermissionHasRelations as PermissionHasRelationsContract;
-use jeremykenedy\LaravelRoles\Traits\DatabaseTraits;
+use jeremykenedy\LaravelRoles\Database\Database;
 use jeremykenedy\LaravelRoles\Traits\PermissionHasRelations;
 use jeremykenedy\LaravelRoles\Traits\Slugable;
 
-class Permission extends Model implements PermissionHasRelationsContract
+class Permission extends Database implements PermissionHasRelationsContract
 {
-    use DatabaseTraits;
     use PermissionHasRelations;
     use Slugable;
     use SoftDeletes;

src/Models/Role.php

@@ -2,16 +2,14 @@
 
 namespace jeremykenedy\LaravelRoles\Models;
 
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use jeremykenedy\LaravelRoles\Contracts\RoleHasRelations as RoleHasRelationsContract;
-use jeremykenedy\LaravelRoles\Traits\DatabaseTraits;
+use jeremykenedy\LaravelRoles\Database\Database;
 use jeremykenedy\LaravelRoles\Traits\RoleHasRelations;
 use jeremykenedy\LaravelRoles\Traits\Slugable;
 
-class Role extends Model implements RoleHasRelationsContract
+class Role extends Database implements RoleHasRelationsContract
 {
-    use DatabaseTraits;
     use RoleHasRelations;
     use Slugable;
     use SoftDeletes;

src/RolesServiceProvider.php

@@ -37,6 +37,9 @@ public function boot()
         if (config('roles.rolesGuiEnabled')) {
             $this->loadRoutesFrom(__DIR__.'/routes/web.php');
         }
+        if (config('roles.rolesApiEnabled')) {
+            $this->loadRoutesFrom(__DIR__.'/routes/api.php');
+        }
         $this->loadTranslationsFrom(__DIR__.'/resources/lang/', $this->_packageTag);
         $this->registerBladeExtensions();
     }