From f1550493d24b1f34e0d6bbefe675a3f0e92d81fc Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 17 Jul 2022 20:56:17 +1000 Subject: [PATCH] Laravel 9 release candidate --- .github/workflows/release.yml | 2 +- routes/api.php | 11 +++++++++-- routes/web.php | 26 ++++++++++++++++---------- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 468c791745..dfb99df6e4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: - name: Checkout code uses: actions/checkout@v1 with: - ref: v5-stable + ref: l9 - name: Copy .env file run: | diff --git a/routes/api.php b/routes/api.php index 9b52b448e9..423b5ad75a 100644 --- a/routes/api.php +++ b/routes/api.php @@ -33,16 +33,21 @@ use App\Http\Controllers\ExpenseCategoryController; use App\Http\Controllers\ExpenseController; use App\Http\Controllers\FilterController; use App\Http\Controllers\GroupSettingController; +use App\Http\Controllers\HostedMigrationController; use App\Http\Controllers\ImportController; use App\Http\Controllers\ImportJsonController; +use App\Http\Controllers\InAppPurchase\AppleController; use App\Http\Controllers\InvoiceController; use App\Http\Controllers\LicenseController; use App\Http\Controllers\LogoutController; use App\Http\Controllers\MigrationController; use App\Http\Controllers\OneTimeTokenController; use App\Http\Controllers\PaymentController; +use App\Http\Controllers\PaymentNotificationWebhookController; use App\Http\Controllers\PaymentTermController; +use App\Http\Controllers\PaymentWebhookController; use App\Http\Controllers\PingController; +use App\Http\Controllers\PostMarkController; use App\Http\Controllers\PreviewController; use App\Http\Controllers\PreviewPurchaseOrderController; use App\Http\Controllers\ProductController; @@ -68,6 +73,7 @@ use App\Http\Controllers\Reports\RecurringInvoiceReportController; use App\Http\Controllers\Reports\TaskReportController; use App\Http\Controllers\SchedulerController; use App\Http\Controllers\SelfUpdateController; +use App\Http\Controllers\StaticController; use App\Http\Controllers\SubdomainController; use App\Http\Controllers\SubscriptionController; use App\Http\Controllers\Support\Messages\SendingController; @@ -81,6 +87,7 @@ use App\Http\Controllers\TokenController; use App\Http\Controllers\TwoFactorController; use App\Http\Controllers\UserController; use App\Http\Controllers\VendorController; +use App\Http\Controllers\WebCronController; use App\Http\Controllers\WebhookController; use Illuminate\Support\Facades\Route; @@ -331,6 +338,6 @@ Route::get('token_hash_router', [OneTimeTokenController::class, 'router'])->midd Route::get('webcron', [WebCronController::class, 'index'])->middleware('throttle:100,1'); Route::post('api/v1/get_migration_account', [HostedMigrationController::class, 'getAccount'])->middleware('guest')->middleware('throttle:100,1'); Route::post('api/v1/confirm_forwarding', [HostedMigrationController::class, 'confirmForwarding'])->middleware('guest')->middleware('throttle:100,1'); -Route::post('api/v1/process_webhook', [InAppPurchase\AppleController::class, 'process_webhook'])->middleware('throttle:1000,1'); -Route::post('api/v1/confirm_purchase', [InAppPurchase\AppleController::class, 'confirm_purchase'])->middleware('throttle:1000,1'); +Route::post('api/v1/process_webhook', [AppleController::class, 'process_webhook'])->middleware('throttle:1000,1'); +Route::post('api/v1/confirm_purchase', [AppleController::class, 'confirm_purchase'])->middleware('throttle:1000,1'); Route::fallback([BaseController::class, 'notFound']); diff --git a/routes/web.php b/routes/web.php index 1d3a86c000..a6b65a1c8f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,9 +1,16 @@ middleware(' Route::post('setup/check_mail', [SetupController::class, 'checkMail'])->middleware('guest'); Route::post('setup/check_pdf', [SetupController::class, 'checkPdf'])->middleware('guest'); -Route::get('password/reset', [Auth\ForgotPasswordController::class, 'showLinkRequestForm'])->middleware('domain_db')->name('password.request'); -Route::post('password/email', [Auth\ForgotPasswordController::class, 'sendResetLinkEmail'])->name('password.email'); -Route::get('password/reset/{token}', [Auth\ResetPasswordController::class, 'showResetForm'])->middleware(['domain_db', 'email_db'])->name('password.reset'); -Route::post('password/reset', [Auth\ResetPasswordController::class, 'reset'])->middleware('email_db')->name('password.update'); +Route::get('password/reset', [ForgotPasswordController::class, 'showLinkRequestForm'])->middleware('domain_db')->name('password.request'); +Route::post('password/email', [ForgotPasswordController::class, 'sendResetLinkEmail'])->name('password.email'); +Route::get('password/reset/{token}', [ResetPasswordController::class, 'showResetForm'])->middleware(['domain_db', 'email_db'])->name('password.reset'); +Route::post('password/reset', [ResetPasswordController::class, 'reset'])->middleware('email_db')->name('password.update'); Route::get('wepay/signup/{token}', [WePayController::class, 'signup'])->name('wepay.signup'); Route::get('wepay/finished', [WePayController::class, 'finished'])->name('wepay.finished'); @@ -36,8 +43,7 @@ Route::get('wepay/finished', [WePayController::class, 'finished'])->name('wepay. * Social authentication */ -Route::get('auth/{provider}', [Auth\LoginController::class, 'redirectToProvider']); -// Route::get('auth/{provider}/create', [Auth\LoginController::class, 'redirectToProviderAndCreate']); +Route::get('auth/{provider}', [LoginController::class, 'redirectToProvider']); /* * Inbound routes requiring DB Lookup @@ -50,7 +56,7 @@ Route::middleware('url_db')->group(function () { Route::get('stripe/signup/{token}', [StripeConnectController::class, 'initialize'])->name('stripe_connect.initialization'); Route::get('stripe/completed', [StripeConnectController::class, 'completed'])->name('stripe_connect.return'); -Route::get('checkout/3ds_redirect/{company_key}/{company_gateway_id}/{hash}', [Gateways\Checkout3dsController::class, 'index'])->middleware('domain_db')->name('checkout.3ds_redirect'); -Route::get('mollie/3ds_redirect/{company_key}/{company_gateway_id}/{hash}', [Gateways\Mollie3dsController::class, 'index'])->middleware('domain_db')->name('mollie.3ds_redirect'); -Route::get('gocardless/ibp_redirect/{company_key}/{company_gateway_id}/{hash}', [Gateways\GoCardlessController::class, 'ibpRedirect'])->middleware('domain_db')->name('gocardless.ibp_redirect'); -Route::get('.well-known/apple-developer-merchantid-domain-association', [ClientPortal\ApplePayDomainController::class, 'showAppleMerchantId']); +Route::get('checkout/3ds_redirect/{company_key}/{company_gateway_id}/{hash}', [Checkout3dsController::class, 'index'])->middleware('domain_db')->name('checkout.3ds_redirect'); +Route::get('mollie/3ds_redirect/{company_key}/{company_gateway_id}/{hash}', [Mollie3dsController::class, 'index'])->middleware('domain_db')->name('mollie.3ds_redirect'); +Route::get('gocardless/ibp_redirect/{company_key}/{company_gateway_id}/{hash}', [GoCardlessController::class, 'ibpRedirect'])->middleware('domain_db')->name('gocardless.ibp_redirect'); +Route::get('.well-known/apple-developer-merchantid-domain-association', [ApplePayDomainController::class, 'showAppleMerchantId']);