diff --git a/README.md b/README.md
index e333236..f24dff4 100644
--- a/README.md
+++ b/README.md
@@ -15,10 +15,10 @@ Installation
Installation using composer:
```sh
-composer require designmynight/laravel-mongodb-passport
+composer require sysvale/laravel-mongodb-passport
```
-You need to have your `App\User` class extend `DesignMyNight\Mongodb\Auth\User.php` instead of the default `Illuminate\Foundation\Auth\User`. This user class extends larvel-mongodb eloquent user as well as adding all the standard and required authentication and laravel passport traits.
+You need to have your `App\User` class extend `Sysvale\Mongodb\Auth\User.php` instead of the default `Illuminate\Foundation\Auth\User`. This user class extends larvel-mongodb eloquent user as well as adding all the standard and required authentication and laravel passport traits.
```php
<?php
@@ -26,7 +26,7 @@ You need to have your `App\User` class extend `DesignMyNight\Mongodb\Auth\User.p
namespace App;
use Illuminate\Notifications\Notifiable;
-use DesignMyNight\Mongodb\Auth\User as Authenticatable;
+use Sysvale\Mongodb\Auth\User as Authenticatable;
class User extends Authenticatable
{
@@ -41,17 +41,17 @@ class User extends Authenticatable
5.5.x | 4.0.x, 5.0.x, 6.0.x, 7.0.x | 1.1.x
5.6.x | 4.0.x, 5.0.x, 6.0.x, 7.0.x | 1.1.x
6.x | 4.0.x, 5.0.x, 6.0.x, 7.x, 8.x| 1.2.x
-
+
And add the service provider in `config/app.php`:
```php
-DesignMyNight\Mongodb\MongodbPassportServiceProvider::class,
+Sysvale\Mongodb\MongodbPassportServiceProvider::class,
```
For usage with [Lumen](http://lumen.laravel.com), add the service provider in `bootstrap/app.php`.
```php
-$app->register(DesignMyNight\Mongodb\MongodbPassportServiceProvider::class);
+$app->register(Sysvale\Mongodb\MongodbPassportServiceProvider::class);
```
The service provider will overide the default laravel passport models in order to use mongodb's implementation of eloquent. There is no need to register any additional classes or add any additional configuration other than those outlined in [Laravel Passport](https://github.com/laravel/passport) and [MongoDB](https://github.com/jenssegers/laravel-mongodb).
diff --git a/composer.json b/composer.json
index fb36078..982a715 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
{
- "name": "designmynight/laravel-mongodb-passport",
+ "name": "sysvale/laravel-mongodb-passport",
"description": "A package to allow laravel/passport use with jenssegers/laravel-mongodb",
- "homepage": "https://github.com/designmynight/laravel-mongodb-passport",
+ "homepage": "https://github.com/Sysvale/laravel-mongodb-passport",
"license": "MIT",
"keywords": [
"laravel",
@@ -10,17 +10,17 @@
"laravel-passport",
"mongodb",
"passport",
- "designmynight"
+ "sysvale"
],
"require": {
"php": ">=7.1",
- "illuminate/support": "^5.5 || ^6.0",
- "jenssegers/mongodb": "3.3.* || 3.4.* || 3.5.* || 3.6.*",
- "laravel/passport": "6.0.* || 7.0.* || 7.4.* || 7.5.* || ^8.0 || ^9.0"
+ "illuminate/support": "^5.5 || ^6.0 || ^7.0 || ^8.0",
+ "jenssegers/mongodb": "3.3.* || 3.4.* || 3.5.* || 3.6.* || 3.8.*",
+ "laravel/passport": "6.0.* || 7.0.* || 7.4.* || 7.5.* || ^8.0 || ^9.0 || ^10"
},
"autoload": {
"psr-4": {
- "DesignMyNight\\Mongodb\\": "src"
+ "Sysvale\\Mongodb\\": "src"
}
},
"authors": [
@@ -28,12 +28,16 @@
"name": "DesignMyNight",
"email": "support@designmynight.com",
"role": "Support"
+ },
+ {
+ "name": "Geidson",
+ "email": "geidson@sysvale.com"
}
],
"extra": {
"laravel": {
"providers": [
- "DesignMyNight\\Mongodb\\MongodbPassportServiceProvider"
+ "Sysvale\\Mongodb\\MongodbPassportServiceProvider"
]
}
}
diff --git a/src/Auth/User.php b/src/Auth/User.php
index 5970e0a..cda5168 100644
--- a/src/Auth/User.php
+++ b/src/Auth/User.php
@@ -1,6 +1,6 @@
<?php
-namespace DesignMyNight\Mongodb\Auth;
+namespace Sysvale\Mongodb\Auth;
use Illuminate\Auth\Authenticatable;
use Illuminate\Auth\Passwords\CanResetPassword;
diff --git a/src/Console/ClientCommand.php b/src/Console/ClientCommand.php
new file mode 100644
index 0000000..f82abe0
--- /dev/null
+++ b/src/Console/ClientCommand.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace Sysvale\Mongodb\Console;
+
+use Sysvale\Mongodb\Passport\Client;
+use Laravel\Passport\ClientRepository;
+use Laravel\Passport\Console\ClientCommand as PassportClientCommand;
+
+class ClientCommand extends PassportClientCommand
+{
+ /**
+ * Create a new personal access client.
+ *
+ * @param \Laravel\Passport\ClientRepository $clients
+ * @return void
+ */
+ protected function createPersonalClient(ClientRepository $clients)
+ {
+ $name = $this->option('name') ?: $this->ask(
+ 'What should we name the personal access client?',
+ config('app.name').' Personal Access Client'
+ );
+
+ $client = $clients->createPersonalAccessClient(
+ null, $name, 'http://localhost'
+ );
+
+ $this->info('Personal access client created successfully.');
+
+ $this->patchedOutputClientDetails($client);
+ }
+
+ /**
+ * Create a new password grant client.
+ *
+ * @param \Laravel\Passport\ClientRepository $clients
+ * @return void
+ */
+ protected function createPasswordClient(ClientRepository $clients)
+ {
+ $name = $this->option('name') ?: $this->ask(
+ 'What should we name the password grant client?',
+ config('app.name').' Password Grant Client'
+ );
+
+ $client = $clients->createPasswordGrantClient(
+ null, $name, 'http://localhost'
+ );
+
+ $this->info('Password grant client created successfully.');
+
+ $this->patchedOutputClientDetails($client);
+ }
+
+ /**
+ * Create a client credentials grant client.
+ *
+ * @param \Laravel\Passport\ClientRepository $clients
+ * @return void
+ */
+ protected function createClientCredentialsClient(ClientRepository $clients)
+ {
+ $name = $this->option('name') ?: $this->ask(
+ 'What should we name the client?',
+ config('app.name').' ClientCredentials Grant Client'
+ );
+
+ $client = $clients->create(
+ null, $name, ''
+ );
+
+ $this->info('New client created successfully.');
+
+ $this->patchedOutputClientDetails($client);
+ }
+
+ /**
+ * Create a authorization code client.
+ *
+ * @param \Laravel\Passport\ClientRepository $clients
+ * @return void
+ */
+ protected function createAuthCodeClient(ClientRepository $clients)
+ {
+ $userId = $this->option('user_id') ?: $this->ask(
+ 'Which user ID should the client be assigned to?'
+ );
+
+ $name = $this->option('name') ?: $this->ask(
+ 'What should we name the client?'
+ );
+
+ $redirect = $this->option('redirect_uri') ?: $this->ask(
+ 'Where should we redirect the request after authorization?',
+ url('/auth/callback')
+ );
+
+ $client = $clients->create(
+ $userId, $name, $redirect, false, false, ! $this->option('public')
+ );
+
+ $this->info('New client created successfully.');
+
+ $this->patchedOutputClientDetails($client);
+ }
+
+ /**
+ * Output the client's ID and secret key.
+ *
+ * @param \Laravel\Passport\Client $client
+ * @return void
+ */
+ protected function patchedOutputClientDetails(Client $client)
+ {
+ $this->line('<comment>Client ID:</comment> '.$client->id);
+ $this->line('<comment>Client secret:</comment> '.$client->secret);
+ }
+}
diff --git a/src/MongodbPassportServiceProvider.php b/src/MongodbPassportServiceProvider.php
index 37723a3..fb2c6a5 100644
--- a/src/MongodbPassportServiceProvider.php
+++ b/src/MongodbPassportServiceProvider.php
@@ -1,22 +1,25 @@
<?php
-namespace DesignMyNight\Mongodb;
+namespace Sysvale\Mongodb;
use Illuminate\Support\ServiceProvider;
-use DesignMyNight\Mongodb\Passport\AuthCode;
-use DesignMyNight\Mongodb\Passport\Bridge\RefreshTokenRepository;
-use DesignMyNight\Mongodb\Passport\Client;
-use DesignMyNight\Mongodb\Passport\PersonalAccessClient;
-use DesignMyNight\Mongodb\Passport\RefreshToken;
-use DesignMyNight\Mongodb\Passport\Token;
+use Sysvale\Mongodb\Passport\AuthCode;
+use Sysvale\Mongodb\Console\ClientCommand;
+use Sysvale\Mongodb\Passport\Bridge\RefreshTokenRepository;
+use Sysvale\Mongodb\Passport\Client;
+use Sysvale\Mongodb\Passport\PersonalAccessClient;
+use Sysvale\Mongodb\Passport\Token;
use Laravel\Passport\Bridge\RefreshTokenRepository as PassportRefreshTokenRepository;
+use Laravel\Passport\Console\ClientCommand as PassportClientCommand;
use Laravel\Passport\Passport;
+use Laravel\Passport\TokenRepository as PassportTokenRepository;
+use Sysvale\Mongodb\Passport\TokenRepository;
class MongodbPassportServiceProvider extends ServiceProvider
{
/**
- * @return void
- */
+ * @return void
+ */
public function register()
{
Passport::useAuthCodeModel(AuthCode::class);
@@ -27,5 +30,13 @@ public function register()
$this->app->bind(PassportRefreshTokenRepository::class, function () {
return $this->app->make(RefreshTokenRepository::class);
});
+
+ $this->app->extend(PassportClientCommand::class, function () {
+ return new ClientCommand();
+ });
+
+ $this->app->bind(PassportTokenRepository::class, function () {
+ return $this->app->make(TokenRepository::class);
+ });
}
}
diff --git a/src/Passport/AuthCode.php b/src/Passport/AuthCode.php
index c920a3d..f483936 100644
--- a/src/Passport/AuthCode.php
+++ b/src/Passport/AuthCode.php
@@ -1,6 +1,6 @@
<?php
-namespace DesignMyNight\Mongodb\Passport;
+namespace Sysvale\Mongodb\Passport;
use Jenssegers\Mongodb\Eloquent\Model;
diff --git a/src/Passport/Bridge/RefreshToken.php b/src/Passport/Bridge/RefreshToken.php
index 4d32731..645f3a9 100644
--- a/src/Passport/Bridge/RefreshToken.php
+++ b/src/Passport/Bridge/RefreshToken.php
@@ -1,6 +1,6 @@
<?php
-namespace DesignMyNight\Mongodb\Passport\Bridge;
+namespace Sysvale\Mongodb\Passport\Bridge;
use Jenssegers\Mongodb\Eloquent\Model;
use League\OAuth2\Server\Entities\RefreshTokenEntityInterface;
@@ -9,7 +9,7 @@
/**
* Class RefreshToken
- * @package DesignMyNight\Mongodb\Passport\Bridge
+ * @package Sysvale\Mongodb\Passport\Bridge
*/
class RefreshToken extends Model implements RefreshTokenEntityInterface
{
diff --git a/src/Passport/Bridge/RefreshTokenRepository.php b/src/Passport/Bridge/RefreshTokenRepository.php
index f0805ab..c74f19f 100644
--- a/src/Passport/Bridge/RefreshTokenRepository.php
+++ b/src/Passport/Bridge/RefreshTokenRepository.php
@@ -1,6 +1,6 @@
<?php
-namespace DesignMyNight\Mongodb\Passport\Bridge;
+namespace Sysvale\Mongodb\Passport\Bridge;
use Laravel\Passport\Bridge\RefreshTokenRepository as BaseRefreshTokenRepository;
use Laravel\Passport\Events\RefreshTokenCreated;
diff --git a/src/Passport/Client.php b/src/Passport/Client.php
index 3be09de..631f1e7 100644
--- a/src/Passport/Client.php
+++ b/src/Passport/Client.php
@@ -1,6 +1,6 @@
<?php
-namespace DesignMyNight\Mongodb\Passport;
+namespace Sysvale\Mongodb\Passport;
use Jenssegers\Mongodb\Eloquent\Model;
@@ -79,7 +79,7 @@ public function skipsAuthorization()
{
return false;
}
-
+
/**
* Determine if the client is a confidential client.
*
diff --git a/src/Passport/PersonalAccessClient.php b/src/Passport/PersonalAccessClient.php
index 904f5b3..e95d221 100644
--- a/src/Passport/PersonalAccessClient.php
+++ b/src/Passport/PersonalAccessClient.php
@@ -1,6 +1,6 @@
<?php
-namespace DesignMyNight\Mongodb\Passport;
+namespace Sysvale\Mongodb\Passport;
use Jenssegers\Mongodb\Eloquent\Model;
diff --git a/src/Passport/PersonalAccessTokenFactory.php b/src/Passport/PersonalAccessTokenFactory.php
index 739e07f..1b415de 100644
--- a/src/Passport/PersonalAccessTokenFactory.php
+++ b/src/Passport/PersonalAccessTokenFactory.php
@@ -1,6 +1,6 @@
<?php
-namespace DesignMyNight\Mongodb\Passport;
+namespace Sysvale\Mongodb\Passport;
use Zend\Diactoros\Response;
use Zend\Diactoros\ServerRequest;
diff --git a/src/Passport/RefreshToken.php b/src/Passport/RefreshToken.php
index f696717..c72ca29 100644
--- a/src/Passport/RefreshToken.php
+++ b/src/Passport/RefreshToken.php
@@ -1,6 +1,6 @@
-<?php
+<?php
-namespace DesignMyNight\Mongodb\Passport;
+namespace Sysvale\Mongodb\Passport;
use Jenssegers\Mongodb\Eloquent\Model;
diff --git a/src/Passport/Token.php b/src/Passport/Token.php
index 52b4abf..c7279ae 100644
--- a/src/Passport/Token.php
+++ b/src/Passport/Token.php
@@ -1,6 +1,6 @@
<?php
-namespace DesignMyNight\Mongodb\Passport;
+namespace Sysvale\Mongodb\Passport;
use Jenssegers\Mongodb\Eloquent\Model;
diff --git a/src/Passport/TokenRepository.php b/src/Passport/TokenRepository.php
new file mode 100644
index 0000000..21fd360
--- /dev/null
+++ b/src/Passport/TokenRepository.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Sysvale\Mongodb\Passport;
+
+use Laravel\Passport\TokenRepository as PassportTokenRepository;
+
+class TokenRepository extends PassportTokenRepository
+{
+ /**
+ * Store the given token instance.
+ *
+ * @param \Laravel\Passport\Token $token
+ * @return void
+ */
+
+ public function save($token)
+ {
+ $token->save();
+ }
+
+}