Merge pull [zefy#18](zefy#18)

Author: anatolinicolae

.gitignore

@@ -1,3 +1,4 @@
 build
 composer.lock
-vendor
+vendor
+.history/

README.md

@@ -10,6 +10,7 @@
 
 <p align="center"><img src="https://laravel.com/assets/img/components/logo-laravel.svg"></p>
 
+This Package Fork from https://github.com/zefy/laravel-sso to modify some change
 
 This package based on [Simple PHP SSO skeleton](https://github.com/zefy/php-simple-sso) package and made suitable for Laravel framework.
 ### Requirements
@@ -29,7 +30,7 @@ Client visits Broker and unique token is generated. When new token is generated
 ### Server
 Install this package using composer.
 ```shell
-$ composer require zefy/laravel-sso
+$ composer require kcpal/laravel-sso
 ```
 
 
@@ -61,6 +62,22 @@ You can create new broker using following Artisan CLI command:
 $ php artisan sso:broker:create {name}
 ```
 
+After that in user model you can add the relation for broker as below:
+```php
+public function broker()
+    {
+        return $this->belongsToMany(Broker::class)
+                    ->where('deleted_at', NULL)
+                    ->withTimestamps();
+    }
+```
+
+Now, you can register or create users using basic Laravel functionality and then set the brokers of that user as below:
+```php
+$user->broker()->sync($brokers)
+```
+Here, `$user` is the object of `User` Model and `$brokers` is the array of ids of broker.
+
 ----------
 
 ### Broker
@@ -142,4 +159,4 @@ Example `.env` options:
 SSO_SERVER_URL=https://server.test
 SSO_BROKER_NAME=site1
 SSO_BROKER_SECRET=892asjdajsdksja74jh38kljk2929023
-```
+```

config/laravel-sso.php

@@ -25,9 +25,11 @@
 
     'usersModel' => \App\User::class,
     'brokersModel' => Zefy\LaravelSSO\Models\Broker::class,
+    'brokersUserModel' => Zefy\LaravelSSO\Models\BrokerUser::class,
 
     // Table used in Zefy\LaravelSSO\Models\Broker model
     'brokersTable' => 'brokers',
+    'brokerUserTable' => 'broker_user',
 
     // Logged in user fields sent to brokers.
     'userFields' => [

database/migrations/2019_05_30_184551_create_broker_user_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateBrokerUserTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create(config('laravel-sso.brokerUserTable', 'broker_user'), function (Blueprint $table) {
+            $table->increments('id');
+
+            $table->integer('user_id')->foreign('user_id')->references('id')->on('users');
+            $table->integer('broker_id')->foreign('broker_id')->references('id')->on('brokers');
+            $table->timestamps();
+            $table->softDeletes();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+            Schema::dropIfExists(config('laravel-sso.brokerUserTable', 'broker_user'));
+    }
+}

src/Controllers/ServerController.php

@@ -54,6 +54,6 @@ public function logout(LaravelSSOServer $server)
      */
     public function userInfo(LaravelSSOServer $server)
     {
-        return $server->userInfo();
+        return $server->checkUserApplicationAuth();
     }
 }

src/LaravelSSOServer.php

@@ -8,6 +8,7 @@
 use Illuminate\Support\Facades\Session;
 use Zefy\SimpleSSO\SSOServer;
 use Zefy\LaravelSSO\Resources\UserResource;
+use Zefy\SimpleSSO\Exceptions\SSOServerException;
 
 class LaravelSSOServer extends SSOServer
 {
@@ -66,7 +67,7 @@ protected function returnJson(?array $response = null, int $httpResponseCode = 2
      */
     protected function authenticate(string $username, string $password)
     {
-        if (!Auth::attempt(['username' => $username, 'password' => $password])) {
+        if (!Auth::attempt(['email' => $username, 'password' => $password])) {
             return false;
         }
 
@@ -97,6 +98,51 @@ protected function getBrokerInfo(string $brokerId)
         return $broker;
     }
 
+    /**
+     * Check for User Auth with Broker Application.
+     *
+     * @return boolean
+     */
+    protected function checkBrokerUserAuthentication()
+    {
+        $userInfo = $this->userInfo();
+        $broker = $this->getBrokerDetail();
+        if(!empty($userInfo->id) && !empty($broker)) {
+            $brokerUser = config('laravel-sso.brokersUserModel')::where('user_id', $userInfo->id)->where('broker_id', $broker->id)->first();
+            if(empty($brokerUser)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Check for the User authorization with application and return error or userinfo
+     *
+     * @return string
+     */
+    public function checkUserApplicationAuth()
+    {
+        try {
+            if(empty($this->checkBrokerUserAuthentication())) {
+                $this->fail('User authorization failed with application.');
+            }
+        } catch (SSOServerException $e) {
+            return $this->returnJson(['error' => $e->getMessage()]);
+        }
+        return $this->userInfo();
+    }
+
+    /**
+     * Returning the broker details
+     *
+     * @return string
+     */
+    public function getBrokerDetail()
+    {
+        return $this->getBrokerInfo($this->brokerId);
+    }
+
     /**
      * Get the information about a user
      *
@@ -107,7 +153,7 @@ protected function getBrokerInfo(string $brokerId)
     protected function getUserInfo(string $username)
     {
         try {
-            $user = config('laravel-sso.usersModel')::where('username', $username)->firstOrFail();
+            $user = config('laravel-sso.usersModel')::where('email', $username)->firstOrFail();
         } catch (ModelNotFoundException $e) {
             return null;
         }

src/Models/BrokerUser.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Zefy\LaravelSSO\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class BrokerUser extends Model
+{
+    use SoftDeletes;
+     /**
+     * Get the table associated with the model.
+     *
+     * @return string
+     */
+    public function getTable()
+    {
+        return config('laravel-sso.brokerUserTable', 'broker_user');
+    }
+}