adminnistrateur
/
mobilebackendgateway
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove multi auth -> Back to client_credentials auth

This commit is contained in:
DJERY-TOM 2020-03-31 00:52:41 +01:00
parent acc445efef
commit edf677ae1c
6 changed files with 68 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Providers/AuthServiceProvider.php
View File

@ -50,10 +50,10 @@ class AuthServiceProvider extends ServiceProvider
// });
// For customizing access token response
Route::post('/oauth/token', [
'uses' => '\App\Http\Controllers\AccessTokenController@issueToken',
// 'as' => 'passport.token',
'middleware' => 'oauth.providers',
]);
// Route::post('/oauth/token', [
// 'uses' => '\App\Http\Controllers\AccessTokenController@issueToken',
//// 'as' => 'passport.token',
// 'middleware' => 'oauth.providers',
// ]);
}
}

16
bootstrap/app.php
View File

@ -87,13 +87,13 @@ $app->configure('app');
'clients.credentials' => Laravel\Passport\Http\Middleware\
CheckClientCredentials::class,
// ** New middleware **
'auth' => \SMartins\PassportMultiauth\Http\Middleware\MultiAuthenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'can' => \Illuminate\Auth\Middleware\Authorize::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
'oauth.providers' => \SMartins\PassportMultiauth\Http\Middleware\AddCustomProvider::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
// 'auth' => \SMartins\PassportMultiauth\Http\Middleware\MultiAuthenticate::class,
// 'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
// 'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
// 'can' => \Illuminate\Auth\Middleware\Authorize::class,
// 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
// 'oauth.providers' => \SMartins\PassportMultiauth\Http\Middleware\AddCustomProvider::class,
// 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
]);
@ -111,7 +111,7 @@ $app->configure('app');
// $app->register(App\Providers\AppServiceProvider::class);
// $app->register(App\Providers\EventServiceProvider::class);
$app->register(App\Providers\AuthServiceProvider::class);
$app->register(SMartins\PassportMultiauth\Providers\MultiauthServiceProvider::class);
//$app->register(SMartins\PassportMultiauth\Providers\MultiauthServiceProvider::class);
$app->register(Laravel\Passport\PassportServiceProvider::class);
$app->register(Dusterio\LumenPassport\PassportServiceProvider::class);

10
composer.json
View File

@ -8,8 +8,7 @@
"php": "^7.2.5",
"dusterio/lumen-passport": "^0.2.18",
"guzzlehttp/guzzle": "^6.5",
"laravel/lumen-framework": "^7.0",
"smartins/passport-multiauth": "^6.0"
"laravel/lumen-framework": "^7.0"
},
"require-dev": {
"fzaninotto/faker": "^1.9.1",
@ -41,12 +40,5 @@
"post-root-package-install": [
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
]
},
"extra": {
"laravel": {
"dont-discover": [
"laravel/passport"
]
}
}
}

134
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"content-hash": "6d1374e57b722890754a19e8007f068b",
"content-hash": "9e7a1979b3fe8cbe7bb0f48938029862",
"packages": [
{
"name": "brick/math",
@ -1975,16 +1975,16 @@
},
{
"name": "laminas/laminas-zendframework-bridge",
"version": "1.0.1",
"version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-zendframework-bridge.git",
"reference": "0fb9675b84a1666ab45182b6c5b29956921e818d"
"reference": "faf68f6109ceeff24241226033ab59640c7eb63b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/0fb9675b84a1666ab45182b6c5b29956921e818d",
"reference": "0fb9675b84a1666ab45182b6c5b29956921e818d",
"url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/faf68f6109ceeff24241226033ab59640c7eb63b",
"reference": "faf68f6109ceeff24241226033ab59640c7eb63b",
"shasum": ""
},
"require": {
@ -2023,7 +2023,7 @@
"laminas",
"zf"
],
"time": "2020-01-07T22:58:31+00:00"
"time": "2020-03-26T16:07:12+00:00"
},
{
"name": "laravel/lumen-framework",
@ -2453,16 +2453,16 @@
},
{
"name": "nesbot/carbon",
"version": "2.32.0",
"version": "2.32.1",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
"reference": "7410a349613bf32d02d8aaed1c669698ddd2b718"
"reference": "ecb525c766deb3bbbb6a0082ea0e41d3d9ae477c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7410a349613bf32d02d8aaed1c669698ddd2b718",
"reference": "7410a349613bf32d02d8aaed1c669698ddd2b718",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/ecb525c766deb3bbbb6a0082ea0e41d3d9ae477c",
"reference": "ecb525c766deb3bbbb6a0082ea0e41d3d9ae477c",
"shasum": ""
},
"require": {
@ -2520,7 +2520,7 @@
"datetime",
"time"
],
"time": "2020-03-24T16:01:47+00:00"
"time": "2020-03-26T13:04:10+00:00"
},
{
"name": "nikic/fast-route",
@ -3407,58 +3407,6 @@
],
"time": "2020-03-22T02:34:13+00:00"
},
{
"name": "smartins/passport-multiauth",
"version": "v6.0.0",
"source": {
"type": "git",
"url": "https://github.com/sfelix-martins/passport-multiauth.git",
"reference": "f394bc36bbca0bf728b751e4bcfcf311b9ec0e01"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sfelix-martins/passport-multiauth/zipball/f394bc36bbca0bf728b751e4bcfcf311b9ec0e01",
"reference": "f394bc36bbca0bf728b751e4bcfcf311b9ec0e01",
"shasum": ""
},
"require": {
"laravel/passport": "^8.0",
"php": "^7.2"
},
"require-dev": {
"mockery/mockery": "^1.0",
"orchestra/database": "^4.0",
"orchestra/testbench": "^4.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "5.0-dev"
}
},
"autoload": {
"psr-4": {
"SMartins\\PassportMultiauth\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Samuel Martins",
"email": "sfelix_martins@hotmail.com"
}
],
"description": "Add support to multi-auth on Laravel Passport",
"keywords": [
"laravel",
"multi-auth",
"passport"
],
"time": "2020-02-10T13:49:37+00:00"
},
{
"name": "symfony/console",
"version": "v5.0.5",
@ -3982,16 +3930,16 @@
},
{
"name": "symfony/polyfill-ctype",
"version": "v1.14.0",
"version": "v1.15.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38"
"reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/fbdeaec0df06cf3d51c93de80c7eb76e271f5a38",
"reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/4719fa9c18b0464d399f1a63bf624b42b6fa8d14",
"reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14",
"shasum": ""
},
"require": {
@ -4003,7 +3951,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.14-dev"
"dev-master": "1.15-dev"
}
},
"autoload": {
@ -4036,20 +3984,20 @@
"polyfill",
"portable"
],
"time": "2020-01-13T11:15:53+00:00"
"time": "2020-02-27T09:26:54+00:00"
},
{
"name": "symfony/polyfill-intl-idn",
"version": "v1.14.0",
"version": "v1.15.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git",
"reference": "6842f1a39cf7d580655688069a03dd7cd83d244a"
"reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6842f1a39cf7d580655688069a03dd7cd83d244a",
"reference": "6842f1a39cf7d580655688069a03dd7cd83d244a",
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf",
"reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf",
"shasum": ""
},
"require": {
@ -4063,7 +4011,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.14-dev"
"dev-master": "1.15-dev"
}
},
"autoload": {
@ -4098,20 +4046,20 @@
"portable",
"shim"
],
"time": "2020-01-17T12:01:36+00:00"
"time": "2020-03-09T19:04:49+00:00"
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.14.0",
"version": "v1.15.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "34094cfa9abe1f0f14f48f490772db7a775559f2"
"reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/34094cfa9abe1f0f14f48f490772db7a775559f2",
"reference": "34094cfa9abe1f0f14f48f490772db7a775559f2",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/81ffd3a9c6d707be22e3012b827de1c9775fc5ac",
"reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac",
"shasum": ""
},
"require": {
@ -4123,7 +4071,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.14-dev"
"dev-master": "1.15-dev"
}
},
"autoload": {
@ -4157,20 +4105,20 @@
"portable",
"shim"
],
"time": "2020-01-13T11:15:53+00:00"
"time": "2020-03-09T19:04:49+00:00"
},
{
"name": "symfony/polyfill-php72",
"version": "v1.14.0",
"version": "v1.15.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
"reference": "46ecacf4751dd0dc81e4f6bf01dbf9da1dc1dadf"
"reference": "37b0976c78b94856543260ce09b460a7bc852747"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/46ecacf4751dd0dc81e4f6bf01dbf9da1dc1dadf",
"reference": "46ecacf4751dd0dc81e4f6bf01dbf9da1dc1dadf",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/37b0976c78b94856543260ce09b460a7bc852747",
"reference": "37b0976c78b94856543260ce09b460a7bc852747",
"shasum": ""
},
"require": {
@ -4179,7 +4127,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.14-dev"
"dev-master": "1.15-dev"
}
},
"autoload": {
@ -4212,20 +4160,20 @@
"portable",
"shim"
],
"time": "2020-01-13T11:15:53+00:00"
"time": "2020-02-27T09:26:54+00:00"
},
{
"name": "symfony/polyfill-php73",
"version": "v1.14.0",
"version": "v1.15.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php73.git",
"reference": "5e66a0fa1070bf46bec4bea7962d285108edd675"
"reference": "0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/5e66a0fa1070bf46bec4bea7962d285108edd675",
"reference": "5e66a0fa1070bf46bec4bea7962d285108edd675",
"url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7",
"reference": "0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7",
"shasum": ""
},
"require": {
@ -4234,7 +4182,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.14-dev"
"dev-master": "1.15-dev"
}
},
"autoload": {
@ -4270,7 +4218,7 @@
"portable",
"shim"
],
"time": "2020-01-13T11:15:53+00:00"
"time": "2020-02-27T09:26:54+00:00"
},
{
"name": "symfony/process",

22
config/auth.php
View File

@ -14,9 +14,7 @@ return [
*/
'defaults' => [
// 'guard' => env('AUTH_GUARD', 'api'),
'guard' => 'api',
'passwords' => 'users'
'guard' => env('AUTH_GUARD', 'api'),
],
/*
@ -37,15 +35,15 @@ return [
*/
'guards' => [
// 'api' => ['driver' => 'passport'],
'api' => [
'driver' => 'passport',
'provider' => 'users',
],
'agent' => [
'driver' => 'passport',
'provider' => 'agents',
]
'api' => ['driver' => 'passport'],
// 'api' => [
// 'driver' => 'passport',
// 'provider' => 'users',
// ],
// 'agent' => [
// 'driver' => 'passport',
// 'provider' => 'agents',
// ]
],
/*

4
routes/web.php
View File

@ -19,9 +19,9 @@
* Routes for MobileBackend
*/
$router->group(['prefix' => '/mobilebackend/interacted'], function () use ($router){
$router->post('LoginAction', 'MobileBackendController@action');
$router->group(['middleware' => 'auth'], function () use ($router){
$router->group(['middleware' => 'clients.credentials'], function () use ($router){
$router->post('LoginAction', 'MobileBackendController@action');
$router->post('BalanceAction', 'MobileBackendController@action');
$router->post('ConfigAction', 'MobileBackendController@action');
$router->post('DemandeAction', 'MobileBackendController@action');