Merge pull request #49 from dmyers/patch-2

[2.1] Added support for customizing tenant model

Author: Artem Brezhnev

config/saml2.php

@@ -2,6 +2,17 @@
 
 return [
 
+    /*
+    |--------------------------------------------------------------------------
+    | Tenant Model
+    |--------------------------------------------------------------------------
+    |
+    | This will allow you to override the tenant model with your own.
+    |
+    */
+
+    'tenantModel' => \Slides\Saml2\Models\Tenant::class,
+
     /*
     |--------------------------------------------------------------------------
     | Use built-in routes

src/Commands/CreateTenant.php

@@ -3,6 +3,7 @@
 namespace Slides\Saml2\Commands;
 
 use Slides\Saml2\Helpers\ConsoleHelper;
+use Slides\Saml2\Models\Tenant;
 use Slides\Saml2\Repositories\TenantRepository;
 
 /**
@@ -93,7 +94,8 @@ public function handle()
             return;
         }
 
-        $tenant = new \Slides\Saml2\Models\Tenant([
+        $class = config('saml2.tenantModel', Tenant::class);
+        $tenant = new $class([
             'key' => $key,
             'uuid' => \Ramsey\Uuid\Uuid::uuid4(),
             'idp_entity_id' => $entityId,

src/Commands/RendersTenants.php

@@ -2,6 +2,7 @@
 
 namespace Slides\Saml2\Commands;
 
+use Slides\Saml2\Models\Tenant;
 use Illuminate\Support\Str;
 
 /**
@@ -22,7 +23,7 @@ trait RendersTenants
     protected function renderTenants($tenants, string $title = null)
     {
         /** @var \Slides\Saml2\Models\Tenant[]|\Illuminate\Database\Eloquent\Collection $tenants */
-        $tenants = $tenants instanceof \Slides\Saml2\Models\Tenant
+        $tenants = $tenants instanceof Tenant
             ? collect([$tenants])
             : $tenants;
 
@@ -53,7 +54,7 @@ protected function renderTenants($tenants, string $title = null)
      *
      * @return array
      */
-    protected function getTenantColumns(\Slides\Saml2\Models\Tenant $tenant)
+    protected function getTenantColumns(Tenant $tenant)
     {
         return [
             'ID' => $tenant->id,
@@ -79,7 +80,7 @@ protected function getTenantColumns(\Slides\Saml2\Models\Tenant $tenant)
      *
      * @return void
      */
-    protected function renderTenantCredentials(\Slides\Saml2\Models\Tenant $tenant)
+    protected function renderTenantCredentials(Tenant $tenant)
     {
         $this->output->section('Credentials for the tenant');
 

src/Repositories/TenantRepository.php

@@ -20,7 +20,8 @@ class TenantRepository
      */
     public function query(bool $withTrashed = false)
     {
-        $query = Tenant::query();
+        $class = config('saml2.tenantModel', Tenant::class);
+        $query = $class::query();
 
         if($withTrashed) {
             $query->withTrashed();

src/ServiceProvider.php

@@ -49,9 +49,10 @@ protected function bootRoutes()
      */
     protected function bootPublishes()
     {
-        $this->publishes([
-            __DIR__ . '/../config/saml2.php' => config_path('saml2.php'),
-        ]);
+        $source = __DIR__ . '/../config/saml2.php';
+
+        $this->publishes([$source => config_path('saml2.php')]);
+        $this->mergeConfigFrom($source, 'saml2');
     }
 
     /**