Skip to content

Commit d516b39

Browse files
authored
Use named routes (gnikyt#730)
1 parent 3d5b478 commit d516b39

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

src/ShopifyApp/Http/Middleware/ITP.php

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
use Illuminate\Support\Facades\View;
1414
use Illuminate\Support\Str;
1515

16+
use function Osiset\ShopifyApp\getShopifyConfig;
17+
1618
/**
1719
* Ensuring ITP process.
1820
*/
@@ -56,11 +58,19 @@ public function handle(Request $request, Closure $next)
5658
*/
5759
protected function redirect(Request $request): HttpResponse
5860
{
61+
$authUrl = URL::secure(
62+
URL::route(
63+
getShopifyConfig('route_names.itp'),
64+
['shop' => $request->get('shop')],
65+
false
66+
)
67+
);
68+
5969
return Response::make(
6070
View::make(
6171
'shopify-app::auth.fullpage_redirect',
6272
[
63-
'authUrl' => URL::secure('itp').'?'.Arr::query(['shop' => $request->get('shop')]),
73+
'authUrl' => $authUrl,
6474
'shopDomain' => $request->get('shop'),
6575
]
6676
)
@@ -74,6 +84,6 @@ protected function redirect(Request $request): HttpResponse
7484
*/
7585
protected function ask(): RedirectResponse
7686
{
77-
return Redirect::route('itp.ask');
87+
return Redirect::route(getShopifyConfig('route_names.itp.ask'));
7888
}
7989
}

src/ShopifyApp/Traits/ItpController.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@
33
namespace Osiset\ShopifyApp\Traits;
44

55
use Illuminate\Contracts\View\View as ViewView;
6+
use Illuminate\Http\RedirectResponse;
67
use Illuminate\Http\Request;
78
use Illuminate\Support\Facades\Cookie;
89
use Illuminate\Support\Facades\Redirect;
910
use Illuminate\Support\Facades\URL;
1011
use Illuminate\Support\Facades\View;
1112

13+
use function Osiset\ShopifyApp\getShopifyConfig;
14+
1215
/**
1316
* Responsible for handling ITP issues.
1417
*/
@@ -27,7 +30,7 @@ public function attempt(Request $request)
2730
// Create samesite cookie
2831
Cookie::queue('itp', true, 6000, null, null, true, true, false, 'none');
2932

30-
return Redirect::route('home', [
33+
return Redirect::route(getShopifyConfig('route_names.home'), [
3134
'shop' => $request->query('shop'),
3235
'itp' => true,
3336
]);
@@ -42,7 +45,7 @@ public function attempt(Request $request)
4245
public function ask(): ViewView
4346
{
4447
return View::make('shopify-app::itp.ask', [
45-
'redirect' => URL::route('home'),
48+
'redirect' => URL::route(getShopifyConfig('route_names.home')),
4649
]);
4750
}
4851
}

0 commit comments

Comments
 (0)