From 114aab975bc126e4dbd714fee99a1b46025e65be Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Thu, 9 Aug 2018 14:37:47 +0800 Subject: [PATCH 1/5] fix forgot-password --- .gitlab-ci.yml | 2 +- .../Controllers/Auth/ForgotPasswordController.php | 11 +++++++++-- routes/api.php | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 89c16037..87e6b3ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ staging: - chmod 400 ~/.ssh/id_rsa - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' script: - - ssh izyim@40.76.84.105 "cd exchange && git add . && git commit -am "merge staging" && git pull origin master && sudo docker-compose -f docker-prod.yml build && sudo docker-compose -f docker-prod.yml up -d" + - ssh izyim@40.76.84.105 "cd exchange && git pull origin master && sudo docker-compose -f docker-prod.yml build && sudo docker-compose -f docker-prod.yml up -d" environment: name: staging url: https://exchange-staging.izyim.com/ diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index 40375d30..219bdc73 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -26,9 +26,16 @@ class ForgotPasswordController extends Controller * @param string $response * @return \Illuminate\Http\RedirectResponse */ - protected function sendResetLinkEmail($response) + protected function sendResetLink(Request $request) { - return ['status' => trans($response)]; + if($request->input('email')) { + $this->sendResetLinkEmail($request); + } + + return response()->json([ + 'error' => false, + 'email' => $request->input('email'), + ]); } /** diff --git a/routes/api.php b/routes/api.php index a2b2bda0..170d63ec 100644 --- a/routes/api.php +++ b/routes/api.php @@ -60,7 +60,7 @@ Route::group(['middleware' => 'auth:api'], function () { Route::group(['middleware' => 'guest:api'], function () { Route::post('login', 'Auth\LoginController@login')->name('login'); Route::post('register', 'Auth\RegisterController@create'); - Route::post('password/email', 'Auth\ForgotPasswordController@sendResetLinkEmail'); + Route::post('password/email', 'Auth\ForgotPasswordController@sendResetLink'); Route::post('password/reset', 'Auth\ResetPasswordController@reset'); Route::post('oauth/{driver}', 'Auth\OAuthController@redirectToProvider'); Route::get('oauth/{driver}/callback', 'Auth\OAuthController@handleProviderCallback')->name('oauth.callback'); From c09fdabe5a95092c6a03c14abefe6f8a247926ce Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Thu, 9 Aug 2018 14:49:34 +0800 Subject: [PATCH 2/5] fix bank_branch not found --- ...2018_08_02_141753_make_nullable_in_china_bank_slips_table.php | 1 - 1 file changed, 1 deletion(-) diff --git a/database/migrations/2018_08_02_141753_make_nullable_in_china_bank_slips_table.php b/database/migrations/2018_08_02_141753_make_nullable_in_china_bank_slips_table.php index ab744439..3a73ae18 100644 --- a/database/migrations/2018_08_02_141753_make_nullable_in_china_bank_slips_table.php +++ b/database/migrations/2018_08_02_141753_make_nullable_in_china_bank_slips_table.php @@ -20,7 +20,6 @@ class MakeNullableInChinaBankSlipsTable extends Migration $table->string('bank_address')->nullable()->change(); $table->string('swift')->nullable()->change(); $table->string('cnap')->nullable()->change(); - $table->string('bank_branch')->nullable()->change(); $table->string('order_id')->nullable()->change(); $table->decimal('transfer_amount_needed')->nullable()->change(); $table->decimal('actual_transfer_amount')->nullable()->change(); From 9b78b8c669ebdee6b0caab8340e254a5231de409 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Thu, 9 Aug 2018 15:04:03 +0800 Subject: [PATCH 3/5] temporary fix bank_branch not null --- app/Http/Controllers/ChinaBankSlipController.php | 1 + tests/Feature/ChinaBankSlipTest.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/ChinaBankSlipController.php b/app/Http/Controllers/ChinaBankSlipController.php index 0ed406ed..4684fd04 100644 --- a/app/Http/Controllers/ChinaBankSlipController.php +++ b/app/Http/Controllers/ChinaBankSlipController.php @@ -56,6 +56,7 @@ class ChinaBankSlipController extends Controller } $china_bankslip = new ChinaBankSlip; + $china_bankslip->bank_branch = '-'; $china_bankslip->booking_id = $booking->id; $china_bankslip->china_bank_slip_path = $upload_path; $china_bankslip->save(); diff --git a/tests/Feature/ChinaBankSlipTest.php b/tests/Feature/ChinaBankSlipTest.php index 3e9937a9..434b4f41 100644 --- a/tests/Feature/ChinaBankSlipTest.php +++ b/tests/Feature/ChinaBankSlipTest.php @@ -55,7 +55,8 @@ class ChinaBankSlipTest extends TestCase 'actual_transfer_amount' => '12', 'details' => "123123", 'date' => "123123" - ]); + ]); + dd($response->getContent()); if(!file_exists($china_bank_slips_path) || $size_in_kb > 3072){ $response->assertStatus(400); } From c4ff2684de9dbd603e18e81cb62b9898bd431706 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Thu, 9 Aug 2018 15:05:23 +0800 Subject: [PATCH 4/5] remove debug on chinabankslip test --- tests/Feature/ChinaBankSlipTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/Feature/ChinaBankSlipTest.php b/tests/Feature/ChinaBankSlipTest.php index 434b4f41..c720adbf 100644 --- a/tests/Feature/ChinaBankSlipTest.php +++ b/tests/Feature/ChinaBankSlipTest.php @@ -56,7 +56,6 @@ class ChinaBankSlipTest extends TestCase 'details' => "123123", 'date' => "123123" ]); - dd($response->getContent()); if(!file_exists($china_bank_slips_path) || $size_in_kb > 3072){ $response->assertStatus(400); } From c2b1c9aa38ef75905cd1d66c1adc7ccf26b570cd Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Thu, 9 Aug 2018 15:20:26 +0800 Subject: [PATCH 5/5] fix storage link error --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 6b836f64..bf0b69db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,6 +22,7 @@ RUN php artisan clear-compiled COPY wait.sh /usr/local/bin/wait.sh RUN chmod +x /usr/local/bin/wait.sh +RUN rm app/public/storage RUN php artisan storage:link CMD /usr/local/bin/wait.sh && composer update --no-scripts && composer dumpautoload && php artisan migrate && php artisan serve --host=0.0.0.0 --port=8000