From 9bdfd329a2cb07bc8c4173b22ffe329e0775d3d5 Mon Sep 17 00:00:00 2001 From: erishBRBS Date: Fri, 9 May 2025 16:02:55 +0800 Subject: [PATCH] update login response, able to get token --- .env | 3 +- app/Http/Controllers/API/UserController.php | 16 ++++++++- config/services.php | 5 +++ ...1_000001_create_oauth_auth_codes_table.php | 31 ++++++++++++++++ ...00002_create_oauth_access_tokens_table.php | 33 +++++++++++++++++ ...0003_create_oauth_refresh_tokens_table.php | 29 +++++++++++++++ ...6_01_000004_create_oauth_clients_table.php | 35 +++++++++++++++++++ ...te_oauth_personal_access_clients_table.php | 28 +++++++++++++++ routes/api.php | 2 ++ 9 files changed, 180 insertions(+), 2 deletions(-) create mode 100644 database/migrations/2016_06_01_000001_create_oauth_auth_codes_table.php create mode 100644 database/migrations/2016_06_01_000002_create_oauth_access_tokens_table.php create mode 100644 database/migrations/2016_06_01_000003_create_oauth_refresh_tokens_table.php create mode 100644 database/migrations/2016_06_01_000004_create_oauth_clients_table.php create mode 100644 database/migrations/2016_06_01_000005_create_oauth_personal_access_clients_table.php diff --git a/.env b/.env index 5fa11dc..35dde88 100644 --- a/.env +++ b/.env @@ -56,7 +56,7 @@ RNRPHDEV="https://unioilstationlocatorapi.lbteksystems.com/api/" PASSPORT_ADMIN_CLIENT_ID=2 -PASSPORT_ADMIN_CLIENT_SECRET=LmAfZ1tQ780pQNhdfhGhLI6slWHI1QQRtsvffiZS +PASSPORT_ADMIN_CLIENT_SECRET=fvv0uTTB5mKcxwuoanQRmly9dUqgadbyPNWdXlc1 M360_BROADCAST_URL=https://smsapi.mobile360.ph/v2/api/broadcast M360_BROADCAST_USERNAME=unioil @@ -91,3 +91,4 @@ FRONT_END_URL="http://mobileinteglb-993304533.ap-southeast-1.elb.amazonaws.com" #si_num SI_NUM_RANDOM=false + diff --git a/app/Http/Controllers/API/UserController.php b/app/Http/Controllers/API/UserController.php index 8f0b960..63a0e7a 100644 --- a/app/Http/Controllers/API/UserController.php +++ b/app/Http/Controllers/API/UserController.php @@ -187,6 +187,14 @@ class UserController extends Controller $result = app()->handle($request)->getContent(); $result = json_decode($result); + $success['admin'] = [ + 'name' => $admin[0]['firstname'] . ' ' . $admin[0]['lastname'], + 'username' => $admin[0]['username'], + 'email' => $admin[0]['email'], + 'role' => $admin[0]['role'], + 'uuid' => $admin[0]['admin_uuid'], + ]; + $success['token'] = $result->access_token; // $success['refresh_token'] = $result->refresh_token; @@ -204,9 +212,15 @@ class UserController extends Controller return $this->format->unprocessableEntity("Your password is expired",$data); } } - $success['prompt_password'] = 1; $success['admin_uuid'] = $admin[0]['admin_uuid']; + $success['admin'] = [ + 'name' => $admin[0]['firstname'] . ' ' . $admin[0]['lastname'], + 'username' => $admin[0]['username'], + 'email' => $admin[0]['email'], + 'role' => $admin[0]['role'], + 'uuid' => $admin[0]['admin_uuid'], + ]; $message = 'User must change password'; } diff --git a/config/services.php b/config/services.php index 55a520e..c026ea1 100644 --- a/config/services.php +++ b/config/services.php @@ -36,4 +36,9 @@ return [ 'secret' => env('STRIPE_SECRET'), ], + 'passport' => [ + 'password_client_id' => env('PASSWORD_CLIENT_ID'), + 'password_client_secret' => env('PASSWORD_CLIENT_SECRET'), + ], + ]; diff --git a/database/migrations/2016_06_01_000001_create_oauth_auth_codes_table.php b/database/migrations/2016_06_01_000001_create_oauth_auth_codes_table.php new file mode 100644 index 0000000..7b93b40 --- /dev/null +++ b/database/migrations/2016_06_01_000001_create_oauth_auth_codes_table.php @@ -0,0 +1,31 @@ +string('id', 100)->primary(); + $table->unsignedBigInteger('user_id')->index(); + $table->unsignedBigInteger('client_id'); + $table->text('scopes')->nullable(); + $table->boolean('revoked'); + $table->dateTime('expires_at')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('oauth_auth_codes'); + } +}; diff --git a/database/migrations/2016_06_01_000002_create_oauth_access_tokens_table.php b/database/migrations/2016_06_01_000002_create_oauth_access_tokens_table.php new file mode 100644 index 0000000..598798e --- /dev/null +++ b/database/migrations/2016_06_01_000002_create_oauth_access_tokens_table.php @@ -0,0 +1,33 @@ +string('id', 100)->primary(); + $table->unsignedBigInteger('user_id')->nullable()->index(); + $table->unsignedBigInteger('client_id'); + $table->string('name')->nullable(); + $table->text('scopes')->nullable(); + $table->boolean('revoked'); + $table->timestamps(); + $table->dateTime('expires_at')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('oauth_access_tokens'); + } +}; diff --git a/database/migrations/2016_06_01_000003_create_oauth_refresh_tokens_table.php b/database/migrations/2016_06_01_000003_create_oauth_refresh_tokens_table.php new file mode 100644 index 0000000..b007904 --- /dev/null +++ b/database/migrations/2016_06_01_000003_create_oauth_refresh_tokens_table.php @@ -0,0 +1,29 @@ +string('id', 100)->primary(); + $table->string('access_token_id', 100)->index(); + $table->boolean('revoked'); + $table->dateTime('expires_at')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('oauth_refresh_tokens'); + } +}; diff --git a/database/migrations/2016_06_01_000004_create_oauth_clients_table.php b/database/migrations/2016_06_01_000004_create_oauth_clients_table.php new file mode 100644 index 0000000..776ccfa --- /dev/null +++ b/database/migrations/2016_06_01_000004_create_oauth_clients_table.php @@ -0,0 +1,35 @@ +bigIncrements('id'); + $table->unsignedBigInteger('user_id')->nullable()->index(); + $table->string('name'); + $table->string('secret', 100)->nullable(); + $table->string('provider')->nullable(); + $table->text('redirect'); + $table->boolean('personal_access_client'); + $table->boolean('password_client'); + $table->boolean('revoked'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('oauth_clients'); + } +}; diff --git a/database/migrations/2016_06_01_000005_create_oauth_personal_access_clients_table.php b/database/migrations/2016_06_01_000005_create_oauth_personal_access_clients_table.php new file mode 100644 index 0000000..7c9d1e8 --- /dev/null +++ b/database/migrations/2016_06_01_000005_create_oauth_personal_access_clients_table.php @@ -0,0 +1,28 @@ +bigIncrements('id'); + $table->unsignedBigInteger('client_id'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('oauth_personal_access_clients'); + } +}; diff --git a/routes/api.php b/routes/api.php index be644bc..0d5e29f 100644 --- a/routes/api.php +++ b/routes/api.php @@ -2,6 +2,7 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Route; +use App\Http\Controllers\API\AdminController; /* |-------------------------------------------------------------------------- @@ -21,6 +22,7 @@ Route::post('cms/login_changePassword', 'API\UserController@cms_changePassword') Route::post('cms/checkTime', 'API\UserController@checkTime'); Route::get('cms/convertmd5', 'API\UserController@convertmd5'); + Route::get('cms/systemPreference', 'API\SystemPreferenceController@index'); Route::get('cms/systemPreference/{id}', 'API\SystemPreferenceController@show');