Skip to content

Commit

Permalink
Merge pull request #12 from zefy/feature/change-broker-table
Browse files Browse the repository at this point in the history
Feature/change broker table
  • Loading branch information
zefy committed Mar 23, 2018
2 parents 3f9e32c + 6d85394 commit 06cdc34
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 9 deletions.
3 changes: 3 additions & 0 deletions config/laravel-sso.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
'usersModel' => \App\User::class,
'brokersModel' => Zefy\LaravelSSO\Models\Broker::class,

// Table used in Zefy\LaravelSSO\Models\Broker model
'brokersTable' => 'brokers',

// Logged in user fields sent to brokers.
'userFields' => [
// Return array field name => database column name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class CreateBrokersTable extends Migration
*/
public function up()
{
Schema::create('brokers', function (Blueprint $table) {
Schema::create(config('laravel-sso.brokersTable', 'brokers'), function (Blueprint $table) {
$table->increments('id');
$table->string('name')->unique();
$table->string('secret');
Expand All @@ -28,6 +28,6 @@ public function up()
*/
public function down()
{
Schema::dropIfExists('brokers');
Schema::dropIfExists(config('laravel-sso.brokersTable', 'brokers'));
}
}
4 changes: 2 additions & 2 deletions src/Commands/CreateBroker.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace Zefy\LaravelSSO\Commands;

use Illuminate\Console\Command;
use Zefy\LaravelSSO\Models\Broker;

class CreateBroker extends Command
{
Expand Down Expand Up @@ -38,7 +37,8 @@ public function __construct()
*/
public function handle()
{
$broker = new Broker();
$brokerClass = app(config('laravel-sso.brokersModel'));
$broker = new $brokerClass;

$broker->name = $this->argument('name');
$broker->secret = str_random(40);
Expand Down
4 changes: 2 additions & 2 deletions src/Commands/DeleteBroker.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace Zefy\LaravelSSO\Commands;

use Illuminate\Console\Command;
use Zefy\LaravelSSO\Models\Broker;

class DeleteBroker extends Command
{
Expand Down Expand Up @@ -38,7 +37,8 @@ public function __construct()
*/
public function handle()
{
$broker = Broker::where('name', $this->argument('name'))->firstOrFail();
$brokerClass = app(config('laravel-sso.brokersModel'));
$broker = $brokerClass::where('name', $this->argument('name'))->firstOrFail();
$broker->delete();

$this->info('Broker with name `' . $this->argument('name') . '` successfully deleted.');
Expand Down
4 changes: 2 additions & 2 deletions src/Commands/ListBrokers.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace Zefy\LaravelSSO\Commands;

use Illuminate\Console\Command;
use Zefy\LaravelSSO\Models\Broker;

class ListBrokers extends Command
{
Expand Down Expand Up @@ -40,7 +39,8 @@ public function handle()
{
$headers = ['ID', 'Name', 'Secret'];

$brokers = Broker::all(['id', 'name', 'secret'])->toArray();
$brokerClass = app(config('laravel-sso.brokersModel'));
$brokers = $brokerClass::all(['id', 'name', 'secret'])->toArray();

$this->table($headers, $brokers);
}
Expand Down
10 changes: 9 additions & 1 deletion src/Models/Broker.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,13 @@

class Broker extends Model
{
// Everything working by default.
/**
* Get the table associated with the model.
*
* @return string
*/
public function getTable()
{
return config('laravel-sso.brokersTable', 'brokers');
}
}

0 comments on commit 06cdc34

Please sign in to comment.