Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.x] Allow Inertia pages paths modification #1494

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/Contracts/ApiIndexViewResponse.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php

namespace Laravel\Jetstream\Contracts;

use Illuminate\Contracts\Support\Responsable;

interface ApiIndexViewResponse extends Responsable
{
//
}
10 changes: 10 additions & 0 deletions src/Contracts/ProfileShowViewResponse.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php

namespace Laravel\Jetstream\Contracts;

use Illuminate\Contracts\Support\Responsable;

interface ProfileShowViewResponse extends Responsable
{
//
}
10 changes: 10 additions & 0 deletions src/Contracts/TeamsCreateViewResponse.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php

namespace Laravel\Jetstream\Contracts;

use Illuminate\Contracts\Support\Responsable;

interface TeamsCreateViewResponse extends Responsable
{
//
}
10 changes: 10 additions & 0 deletions src/Contracts/TeamsShowViewResponse.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php

namespace Laravel\Jetstream\Contracts;

use Illuminate\Contracts\Support\Responsable;

interface TeamsShowViewResponse extends Responsable
{
//
}
15 changes: 4 additions & 11 deletions src/Http/Controllers/Inertia/ApiTokenController.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Illuminate\Http\Request;
use Illuminate\Routing\Controller;
use Laravel\Jetstream\Contracts\ApiIndexViewResponse;
use Laravel\Jetstream\Jetstream;

class ApiTokenController extends Controller
Expand All @@ -12,19 +13,11 @@ class ApiTokenController extends Controller
* Show the user API token screen.
*
* @param \Illuminate\Http\Request $request
* @return \Inertia\Response
* @return \Laravel\Jetstream\Contracts\ApiIndexViewResponse
*/
public function index(Request $request)
public function index(Request $request): ApiIndexViewResponse
{
return Jetstream::inertia()->render($request, 'API/Index', [
'tokens' => $request->user()->tokens->map(function ($token) {
return $token->toArray() + [
'last_used_ago' => optional($token->last_used_at)->diffForHumans(),
];
}),
'availablePermissions' => Jetstream::$permissions,
'defaultPermissions' => Jetstream::$defaultPermissions,
]);
return app(ApiIndexViewResponse::class);
}

/**
Expand Down
26 changes: 8 additions & 18 deletions src/Http/Controllers/Inertia/TeamController.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
use Laravel\Jetstream\Actions\ValidateTeamDeletion;
use Laravel\Jetstream\Contracts\CreatesTeams;
use Laravel\Jetstream\Contracts\DeletesTeams;
use Laravel\Jetstream\Contracts\TeamsCreateViewResponse;
use Laravel\Jetstream\Contracts\TeamsShowViewResponse;
use Laravel\Jetstream\Contracts\UpdatesTeamNames;
use Laravel\Jetstream\Jetstream;
use Laravel\Jetstream\RedirectsActions;
Expand All @@ -21,40 +23,28 @@ class TeamController extends Controller
*
* @param \Illuminate\Http\Request $request
* @param int $teamId
* @return \Inertia\Response
* @return \Laravel\Jetstream\Contracts\TeamsShowViewResponse
*/
public function show(Request $request, $teamId)
public function show(Request $request, $teamId): TeamsShowViewResponse
{
$team = Jetstream::newTeamModel()->findOrFail($teamId);

Gate::authorize('view', $team);

return Jetstream::inertia()->render($request, 'Teams/Show', [
'team' => $team->load('owner', 'users', 'teamInvitations'),
'availableRoles' => array_values(Jetstream::$roles),
'availablePermissions' => Jetstream::$permissions,
'defaultPermissions' => Jetstream::$defaultPermissions,
'permissions' => [
'canAddTeamMembers' => Gate::check('addTeamMember', $team),
'canDeleteTeam' => Gate::check('delete', $team),
'canRemoveTeamMembers' => Gate::check('removeTeamMember', $team),
'canUpdateTeam' => Gate::check('update', $team),
'canUpdateTeamMembers' => Gate::check('updateTeamMember', $team),
],
]);
return app(TeamsShowViewResponse::class);
}

/**
* Show the team creation screen.
*
* @param \Illuminate\Http\Request $request
* @return \Inertia\Response
* @return \Laravel\Jetstream\Contracts\TeamsCreateViewResponse
*/
public function create(Request $request)
public function create(Request $request): TeamsCreateViewResponse
{
Gate::authorize('create', Jetstream::newTeamModel());

return Jetstream::inertia()->render($request, 'Teams/Create');
return app(TeamsCreateViewResponse::class);
}

/**
Expand Down
18 changes: 7 additions & 11 deletions src/Http/Controllers/Inertia/UserProfileController.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
use Illuminate\Routing\Controller;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\DB;
use Laravel\Fortify\Features;
use Laravel\Jetstream\Agent;
use Laravel\Jetstream\Jetstream;
use Laravel\Jetstream\Contracts\ProfileShowViewResponse;

class UserProfileController extends Controller
{
Expand All @@ -18,16 +17,13 @@ class UserProfileController extends Controller
* Show the general profile settings screen.
*
* @param \Illuminate\Http\Request $request
* @return \Inertia\Response
* @return \Laravel\Jetstream\Contracts\ProfileShowViewResponse
*/
public function show(Request $request)
public function show(Request $request): ProfileShowViewResponse
{
$this->validateTwoFactorAuthenticationState($request);

return Jetstream::inertia()->render($request, 'Profile/Show', [
'confirmsTwoFactorAuthentication' => Features::optionEnabled(Features::twoFactorAuthentication(), 'confirm'),
'sessions' => $this->sessions($request)->all(),
]);
return app(ProfileShowViewResponse::class);
}

/**
Expand All @@ -36,7 +32,7 @@ public function show(Request $request)
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Support\Collection
*/
public function sessions(Request $request)
public static function sessions(Request $request)
{
if (config('session.driver') !== 'database') {
return collect();
Expand All @@ -48,7 +44,7 @@ public function sessions(Request $request)
->orderBy('last_activity', 'desc')
->get()
)->map(function ($session) use ($request) {
$agent = $this->createAgent($session);
$agent = self::createAgent($session);

return (object) [
'agent' => [
Expand All @@ -69,7 +65,7 @@ public function sessions(Request $request)
* @param mixed $session
* @return \Laravel\Jetstream\Agent
*/
protected function createAgent($session)
protected static function createAgent($session)
{
return tap(new Agent(), fn ($agent) => $agent->setUserAgent($session->user_agent));
}
Expand Down
55 changes: 55 additions & 0 deletions src/Http/Responses/SimpleViewResponse.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?php

namespace Laravel\Jetstream\Http\Responses;

use Illuminate\Contracts\Support\Responsable;
use Laravel\Jetstream\Contracts\ApiIndexViewResponse;
use Laravel\Jetstream\Contracts\ProfileShowViewResponse;
use Laravel\Jetstream\Contracts\TeamsCreateViewResponse;
use Laravel\Jetstream\Contracts\TeamsShowViewResponse;

class SimpleViewResponse implements
ApiIndexViewResponse,
ProfileShowViewResponse,
TeamsCreateViewResponse,
TeamsShowViewResponse
{
/**
* The name of the view or the callable used to generate the view.
*
* @var callable|string
*/
protected $view;

/**
* Create a new response instance.
*
* @param callable|string $view
* @return void
*/
public function __construct($view)
{
$this->view = $view;
}

/**
* Create an HTTP response that represents the object.
*
* @param \Illuminate\Http\Request $request
* @return \Symfony\Component\HttpFoundation\Response
*/
public function toResponse($request)
{
if (! is_callable($this->view) || is_string($this->view)) {
return view($this->view, ['request' => $request]);
}

$response = call_user_func($this->view, $request);

if ($response instanceof Responsable) {
return $response->toResponse($request);
}

return $response;
}
}
57 changes: 57 additions & 0 deletions src/Jetstream.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,17 @@
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Arr;
use Laravel\Jetstream\Contracts\AddsTeamMembers;
use Laravel\Jetstream\Contracts\ApiIndexViewResponse;
use Laravel\Jetstream\Contracts\CreatesTeams;
use Laravel\Jetstream\Contracts\DeletesTeams;
use Laravel\Jetstream\Contracts\DeletesUsers;
use Laravel\Jetstream\Contracts\InvitesTeamMembers;
use Laravel\Jetstream\Contracts\ProfileShowViewResponse;
use Laravel\Jetstream\Contracts\RemovesTeamMembers;
use Laravel\Jetstream\Contracts\TeamsCreateViewResponse;
use Laravel\Jetstream\Contracts\TeamsShowViewResponse;
use Laravel\Jetstream\Contracts\UpdatesTeamNames;
use Laravel\Jetstream\Http\Responses\SimpleViewResponse;

class Jetstream
{
Expand Down Expand Up @@ -487,4 +492,56 @@ public static function ignoreRoutes()

return new static;
}

/**
* Specify which view should be used as the API index view.
*
* @param callable|string $view
* @return void
*/
public static function apiIndexView($view)
{
app()->singleton(ApiIndexViewResponse::class, function () use ($view) {
return new SimpleViewResponse($view);
});
}

/**
* Specify which view should be used as the profile show view.
*
* @param callable|string $view
* @return void
*/
public static function profileShowView($view)
{
app()->singleton(ProfileShowViewResponse::class, function () use ($view) {
return new SimpleViewResponse($view);
});
}

/**
* Specify which view should be used as the teams create view.
*
* @param callable|string $view
* @return void
*/
public static function teamsCreateView($view)
{
app()->singleton(TeamsCreateViewResponse::class, function () use ($view) {
return new SimpleViewResponse($view);
});
}

/**
* Specify which view should be used as the teams show view.
*
* @param callable|string $view
* @return void
*/
public static function teamsShowView($view)
{
app()->singleton(TeamsShowViewResponse::class, function () use ($view) {
return new SimpleViewResponse($view);
});
}
}
44 changes: 44 additions & 0 deletions src/JetstreamServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,15 @@
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Event;
use Illuminate\Support\Facades\Gate;
use Illuminate\Support\Facades\Route;
use Illuminate\Support\ServiceProvider;
use Illuminate\View\Compilers\BladeCompiler;
use Inertia\Inertia;
use Laravel\Fortify\Events\PasswordUpdatedViaController;
use Laravel\Fortify\Features as FortifyFeatures;
use Laravel\Fortify\Fortify;
use Laravel\Jetstream\Http\Controllers\Inertia\UserProfileController;
use Laravel\Jetstream\Http\Livewire\ApiTokenManager;
use Laravel\Jetstream\Http\Livewire\CreateTeamForm;
use Laravel\Jetstream\Http\Livewire\DeleteTeamForm;
Expand Down Expand Up @@ -232,5 +235,46 @@ protected function bootInertia()
Fortify::confirmPasswordView(function () {
return Inertia::render('Auth/ConfirmPassword');
});

Jetstream::apiIndexView(function (Request $request) {
return Jetstream::inertia()->render($request, 'API/Index', [
'tokens' => $request->user()->tokens->map(function ($token) {
return $token->toArray() + [
'last_used_ago' => optional($token->last_used_at)->diffForHumans(),
];
}),
'availablePermissions' => Jetstream::$permissions,
'defaultPermissions' => Jetstream::$defaultPermissions,
]);
});

Jetstream::profileShowView(function (Request $request) {
return Jetstream::inertia()->render($request, 'Profile/Show', [
'confirmsTwoFactorAuthentication' => Features::optionEnabled(FortifyFeatures::twoFactorAuthentication(), 'confirm'),
'sessions' => UserProfileController::sessions($request)->all(),
]);
});

Jetstream::teamsCreateView(function (Request $request) {
return Jetstream::inertia()->render($request, 'Teams/Create');
});

Jetstream::teamsShowView(function (Request $request, $teamId) {
$team = Jetstream::newTeamModel()->findOrFail($teamId);

return Jetstream::inertia()->render($request, 'Teams/Show', [
'team' => $team->load('owner', 'users', 'teamInvitations'),
'availableRoles' => array_values(Jetstream::$roles),
'availablePermissions' => Jetstream::$permissions,
'defaultPermissions' => Jetstream::$defaultPermissions,
'permissions' => [
'canAddTeamMembers' => Gate::check('addTeamMember', $team),
'canDeleteTeam' => Gate::check('delete', $team),
'canRemoveTeamMembers' => Gate::check('removeTeamMember', $team),
'canUpdateTeam' => Gate::check('update', $team),
'canUpdateTeamMembers' => Gate::check('updateTeamMember', $team),
],
]);
});
}
}
Loading
Loading