refactor: organize middleware/requests into App/ subdirs, add Resources, fix auth routes

- Move middleware to App/ subdir (HandleInertiaRequests, HandleAppearance,
  EnsureSubscribed, EnsureUserSetupIsComplete) matching Sendkit pattern
- Move all Form Requests into organized subdirs (App/Post, App/Workspace,
  App/Media, App/Invite, App/Settings, App/Auth)
- Create AuthUserResource and AuthWorkspaceResource for HandleInertiaRequests
  shared data (role inside currentWorkspace, matching Sendkit pattern)
- Split auth.php into 3 route groups (no middleware, guest, auth) matching
  Sendkit pattern exactly
- Fix UserFactory to include all nullable attributes (current_workspace_id,
  stripe_id, pm_type, pm_last_four, trial_ends_at)
- Fix SocialAccountResource (display_name not name)
- Update frontend for new auth prop structure
- 702 tests passing (2 pre-existing Mastodon failures)
This commit is contained in:
Paulo Castellano 2026-03-29 21:13:30 -03:00
parent fabce14aad
commit a926033d06
34 changed files with 169 additions and 102 deletions

View file

@ -4,8 +4,8 @@
namespace App\Http\Controllers\App;
use App\Http\Requests\StoreChunkedMediaRequest;
use App\Http\Requests\StoreMediaRequest;
use App\Http\Requests\App\Media\StoreChunkedMediaRequest;
use App\Http\Requests\App\Media\StoreMediaRequest;
use App\Models\Media;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\Relation;

View file

@ -8,7 +8,7 @@
use App\Actions\Post\DeletePost;
use App\Actions\Post\UpdatePost;
use App\Enums\SocialAccount\Platform;
use App\Http\Requests\UpdatePostRequest;
use App\Http\Requests\App\Post\UpdatePostRequest;
use App\Models\Post;
use App\Services\Social\PinterestPublisher;
use Carbon\Carbon;

View file

@ -6,8 +6,8 @@
use App\Enums\UserWorkspace\Role;
use App\Http\Controllers\Controller;
use App\Http\Requests\Settings\ProfileDeleteRequest;
use App\Http\Requests\Settings\ProfileUpdateRequest;
use App\Http\Requests\App\Settings\ProfileDeleteRequest;
use App\Http\Requests\App\Settings\ProfileUpdateRequest;
use Illuminate\Contracts\Auth\MustVerifyEmail;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;

View file

@ -6,8 +6,8 @@
use App\Actions\Workspace\CreateWorkspace;
use App\Actions\Workspace\DeleteWorkspace;
use App\Http\Requests\StoreWorkspaceRequest;
use App\Http\Requests\UpdateWorkspaceRequest;
use App\Http\Requests\App\Workspace\StoreWorkspaceRequest;
use App\Http\Requests\App\Workspace\UpdateWorkspaceRequest;
use App\Models\Workspace;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;

View file

@ -8,7 +8,7 @@
use App\Actions\Invite\DeleteInvite;
use App\Actions\Invite\RemoveMember;
use App\Enums\UserWorkspace\Role as WorkspaceRole;
use App\Http\Requests\StoreWorkspaceInviteRequest;
use App\Http\Requests\App\Invite\StoreWorkspaceInviteRequest;
use App\Models\WorkspaceInvite;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;

View file

@ -5,7 +5,7 @@
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Http\Requests\Auth\LoginRequest;
use App\Http\Requests\App\Auth\LoginRequest;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;

View file

@ -1,6 +1,6 @@
<?php
namespace App\Http\Middleware;
namespace App\Http\Middleware\App;
use Closure;
use Illuminate\Http\Request;

View file

@ -1,6 +1,6 @@
<?php
namespace App\Http\Middleware;
namespace App\Http\Middleware\App;
use App\Enums\User\Setup;
use Closure;

View file

@ -1,6 +1,6 @@
<?php
namespace App\Http\Middleware;
namespace App\Http\Middleware\App;
use Closure;
use Illuminate\Http\Request;

View file

@ -1,74 +1,56 @@
<?php
namespace App\Http\Middleware;
declare(strict_types=1);
namespace App\Http\Middleware\App;
use App\Http\Resources\App\HandleInertiaRequests\AuthUserResource;
use App\Http\Resources\App\HandleInertiaRequests\AuthWorkspaceResource;
use App\Models\Language;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Cache;
use Inertia\Middleware;
class HandleInertiaRequests extends Middleware
{
/**
* The root template that's loaded on the first page visit.
*
* @see https://inertiajs.com/server-side-setup#root-template
*
* @var string
*/
protected $rootView = 'app';
/**
* Determines the current asset version.
*
* @see https://inertiajs.com/asset-versioning
*/
public function version(Request $request): ?string
{
return parent::version($request);
}
/**
* Define the props that are shared by default.
*
* @see https://inertiajs.com/shared-data
*
* @return array<string, mixed>
*/
public function share(Request $request): array
{
$user = $request->user();
if ($user) {
if ($user?->language) {
App::setLocale($user->language->code);
}
$currentWorkspace = $user?->currentWorkspace;
$currentRole = null;
if ($user && $currentWorkspace) {
$currentRole = $user->workspaces()
->where('workspaces.id', $currentWorkspace->id)
->first()
?->pivot
?->role;
}
return [
...parent::share($request),
'name' => config('app.name'),
'auth' => [
'user' => $user,
'role' => $currentRole,
'user' => $user ? AuthUserResource::make($user) : null,
'currentWorkspace' => $currentWorkspace ? AuthWorkspaceResource::make($currentWorkspace, $user) : null,
'workspaces' => $user
? $user->workspaces()->get()->map(fn ($ws) => AuthWorkspaceResource::summary($ws))
: [],
],
'currentWorkspace' => $currentWorkspace,
'workspaces' => $user ? $user->workspaces()->select('workspaces.id', 'workspaces.name')->get() : [],
'sidebarOpen' => ! $request->hasCookie('sidebar_state') || $request->cookie('sidebar_state') === 'true',
'flash' => $request->session()->get('flash', []),
'applicationUrl' => config('app.url'),
'env' => config('app.env'),
'locale' => app()->getLocale(),
'languages' => fn () => Cache::remember('languages:public', 3600, fn () => Language::query()->orderBy('name')->get()->toArray()),
'selfHosted' => config('trypost.self_hosted'),
'languages' => Language::all(),
];
}
}

View file

@ -2,7 +2,7 @@
declare(strict_types=1);
namespace App\Http\Requests\Auth;
namespace App\Http\Requests\App\Auth;
use Illuminate\Auth\Events\Lockout;
use Illuminate\Contracts\Validation\Rule;

View file

@ -1,6 +1,6 @@
<?php
namespace App\Http\Requests;
namespace App\Http\Requests\App\Invite;
use App\Enums\UserWorkspace\Role as WorkspaceRole;
use Illuminate\Contracts\Validation\ValidationRule;

View file

@ -1,6 +1,6 @@
<?php
namespace App\Http\Requests;
namespace App\Http\Requests\App\Media;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;

View file

@ -1,6 +1,6 @@
<?php
namespace App\Http\Requests;
namespace App\Http\Requests\App\Media;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;

View file

@ -1,6 +1,6 @@
<?php
namespace App\Http\Requests;
namespace App\Http\Requests\App\Post;
use Illuminate\Foundation\Http\FormRequest;

View file

@ -1,6 +1,6 @@
<?php
namespace App\Http\Requests\Settings;
namespace App\Http\Requests\App\Settings;
use App\Concerns\PasswordValidationRules;
use Illuminate\Contracts\Validation\ValidationRule;

View file

@ -1,6 +1,6 @@
<?php
namespace App\Http\Requests\Settings;
namespace App\Http\Requests\App\Settings;
use App\Concerns\PasswordValidationRules;
use Illuminate\Foundation\Http\FormRequest;

View file

@ -1,6 +1,6 @@
<?php
namespace App\Http\Requests\Settings;
namespace App\Http\Requests\App\Settings;
use App\Concerns\ProfileValidationRules;
use Illuminate\Contracts\Validation\ValidationRule;

View file

@ -1,6 +1,6 @@
<?php
namespace App\Http\Requests;
namespace App\Http\Requests\App\Workspace;
use Illuminate\Foundation\Http\FormRequest;

View file

@ -1,6 +1,6 @@
<?php
namespace App\Http\Requests;
namespace App\Http\Requests\App\Workspace;
use App\Rules\Timezone;
use Illuminate\Foundation\Http\FormRequest;

View file

@ -17,9 +17,8 @@ public function toArray(Request $request): array
return [
'id' => $this->id,
'platform' => $this->platform,
'name' => $this->name,
'display_name' => $this->display_name,
'username' => $this->username,
'avatar' => $this->avatar,
];
}
}

View file

@ -0,0 +1,26 @@
<?php
declare(strict_types=1);
namespace App\Http\Resources\App\HandleInertiaRequests;
use App\Models\User;
class AuthUserResource
{
/**
* @return array<string, mixed>
*/
public static function make(User $user): array
{
return [
'id' => $user->id,
'name' => $user->name,
'email' => $user->email,
'email_verified_at' => $user->email_verified_at?->toIso8601String(),
'current_workspace_id' => $user->current_workspace_id,
'created_at' => $user->created_at->toIso8601String(),
'updated_at' => $user->updated_at->toIso8601String(),
];
}
}

View file

@ -0,0 +1,45 @@
<?php
declare(strict_types=1);
namespace App\Http\Resources\App\HandleInertiaRequests;
use App\Models\User;
use App\Models\Workspace;
class AuthWorkspaceResource
{
/**
* @return array<string, mixed>
*/
public static function make(Workspace $workspace, ?User $user = null): array
{
return [
'id' => $workspace->id,
'name' => $workspace->name,
'timezone' => $workspace->timezone,
'created_at' => $workspace->created_at->toIso8601String(),
'role' => $user ? self::resolveRole($workspace, $user) : null,
];
}
/**
* @return array<string, mixed>
*/
public static function summary(Workspace $workspace): array
{
return [
'id' => $workspace->id,
'name' => $workspace->name,
];
}
private static function resolveRole(Workspace $workspace, User $user): ?string
{
return $workspace->members()
->where('users.id', $user->id)
->first()
?->pivot
?->role;
}
}

View file

@ -1,9 +1,9 @@
<?php
use App\Http\Middleware\Api\AuthenticateApiToken;
use App\Http\Middleware\EnsureSubscribed;
use App\Http\Middleware\HandleAppearance;
use App\Http\Middleware\HandleInertiaRequests;
use App\Http\Middleware\App\EnsureSubscribed;
use App\Http\Middleware\App\HandleAppearance;
use App\Http\Middleware\App\HandleInertiaRequests;
use App\Http\Middleware\Mcp\AuthenticateMcpToken;
use Illuminate\Foundation\Application;
use Illuminate\Foundation\Configuration\Exceptions;

View file

@ -2,10 +2,8 @@
use App\Providers\AppServiceProvider;
use App\Providers\HorizonServiceProvider;
use App\Providers\TelescopeServiceProvider;
return [
AppServiceProvider::class,
HorizonServiceProvider::class,
TelescopeServiceProvider::class,
];

View file

@ -134,7 +134,9 @@
},
"extra": {
"laravel": {
"dont-discover": []
"dont-discover": [
"laravel/telescope"
]
}
},
"config": {

View file

@ -16,7 +16,7 @@
|
*/
'enabled' => env('TELESCOPE_ENABLED', true),
'enabled' => env('TELESCOPE_ENABLED', false),
/*
|--------------------------------------------------------------------------
@ -42,7 +42,7 @@
|
*/
'path' => env('TELESCOPE_PATH', 'telescope'),
'path' => env('TELESCOPE_PATH', 'debug'),
/*
|--------------------------------------------------------------------------

View file

@ -31,7 +31,12 @@ public function definition(): array
'email_verified_at' => now(),
'password' => static::$password ??= Hash::make('password'),
'remember_token' => Str::random(10),
'current_workspace_id' => null,
'language_id' => Language::factory(),
'stripe_id' => null,
'pm_type' => null,
'pm_last_four' => null,
'trial_ends_at' => null,
'two_factor_secret' => null,
'two_factor_recovery_codes' => null,
'two_factor_confirmed_at' => null,

View file

@ -42,7 +42,7 @@ const props = withDefaults(defineProps<Props>(), {
const page = usePage();
const auth = computed(() => page.props.auth);
const currentWorkspace = computed(() => page.props.currentWorkspace);
const currentWorkspace = computed(() => page.props.auth.currentWorkspace);
const { urlIsActive } = useActiveUrl();
function activeItemStyles(url: NonNullable<InertiaLinkProps['href']>) {

View file

@ -66,8 +66,8 @@ interface Language {
const page = usePage();
const auth = computed(() => page.props.auth);
const currentWorkspace = computed<Workspace | null>(() => page.props.currentWorkspace as Workspace | null);
const workspaces = computed<Workspace[]>(() => page.props.workspaces as Workspace[]);
const currentWorkspace = computed<Workspace | null>(() => page.props.auth.currentWorkspace as Workspace | null);
const workspaces = computed<Workspace[]>(() => page.props.auth.workspaces as Workspace[]);
const languages = computed<Language[]>(() => page.props.languages as Language[]);
const currentLanguage = computed(() => languages.value.find(l => l.id === auth.value.user.language_id));
@ -109,7 +109,7 @@ const postsNavItems = computed<NavItem[]>(() => [
},
]);
const canManageWorkspace = computed(() => auth.value.role !== 'member');
const canManageWorkspace = computed(() => auth.value.currentWorkspace?.role !== 'member');
const configNavItems = computed(() => {
const items: NavItem[] = [

View file

@ -20,8 +20,8 @@ interface Workspace {
}
const page = usePage();
const currentWorkspace = computed<Workspace | null>(() => page.props.currentWorkspace as Workspace | null);
const workspaces = computed<Workspace[]>(() => page.props.workspaces as Workspace[]);
const currentWorkspace = computed<Workspace | null>(() => page.props.auth.currentWorkspace as Workspace | null);
const workspaces = computed<Workspace[]>(() => page.props.auth.workspaces as Workspace[]);
function switchWorkspace(workspace: Workspace) {
router.post(switchMethod.url(workspace.id), {}, {

View file

@ -16,7 +16,7 @@ import { type NavItem, type SharedData } from '@/types';
const page = usePage<SharedData>();
const auth = computed(() => page.props.auth);
const canManageWorkspace = computed(() => auth.value.role !== 'member');
const canManageWorkspace = computed(() => auth.value.currentWorkspace?.role !== 'member');
const navItems = computed<NavItem[]>(() => {
const items: NavItem[] = [

View file

@ -25,7 +25,7 @@
use App\Http\Controllers\Auth\TikTokController;
use App\Http\Controllers\Auth\XController;
use App\Http\Controllers\Auth\YouTubeController;
use App\Http\Middleware\EnsureUserSetupIsComplete;
use App\Http\Middleware\App\EnsureUserSetupIsComplete;
use Illuminate\Support\Facades\Route;
Route::group(

View file

@ -15,41 +15,51 @@
Route::group(
[
'domain' => 'app.'.parse_url(config('app.url'), PHP_URL_HOST),
'middleware' => ['web'],
],
function () {
Route::middleware('guest')->group(function () {
Route::get('/register', [RegisteredUserController::class, 'create'])->name('register');
Route::post('/register', [RegisteredUserController::class, 'store'])->name('register.store');
Route::get('/login', [AuthenticatedSessionController::class, 'create'])->name('login');
Route::post('/login', [AuthenticatedSessionController::class, 'store'])->name('login.store');
Route::get('/forgot-password', [PasswordResetLinkController::class, 'create'])->name('password.request');
Route::post('/forgot-password', [PasswordResetLinkController::class, 'store'])->name('password.email');
Route::get('/reset-password/{token}', [NewPasswordController::class, 'create'])->name('password.reset');
Route::post('/reset-password', [NewPasswordController::class, 'store'])->name('password.store');
});
// Invite routes - accessible by both guests and authenticated users
Route::get('/invites/{invite}', [AcceptInviteController::class, 'show'])->name('app.invites.show');
Route::post('/invites/{invite}/accept', [AcceptInviteController::class, 'accept'])->name('app.invites.accept')->middleware('auth');
Route::post('/invites/{invite}/decline', [AcceptInviteController::class, 'decline'])->name('app.invites.decline')->middleware('auth');
}
);
Route::middleware('auth')->group(function () {
Route::get('/verify-email', EmailVerificationPromptController::class)->name('verification.notice');
Route::group(
[
'domain' => 'app.'.parse_url(config('app.url'), PHP_URL_HOST),
'middleware' => ['guest'],
],
function () {
Route::get('/register', [RegisteredUserController::class, 'create'])->name('register');
Route::post('/register', [RegisteredUserController::class, 'store'])->name('register.store');
Route::get('/verify-email/{id}/{hash}', VerifyEmailController::class)
->middleware(['signed', 'throttle:6,1'])
->name('verification.verify');
Route::get('/login', [AuthenticatedSessionController::class, 'create'])->name('login');
Route::post('/login', [AuthenticatedSessionController::class, 'store'])->name('login.store');
Route::post('/email/verification-notification', [EmailVerificationNotificationController::class, 'store'])
->middleware('throttle:6,1')
->name('verification.send');
Route::get('/forgot-password', [PasswordResetLinkController::class, 'create'])->name('password.request');
Route::post('/forgot-password', [PasswordResetLinkController::class, 'store'])->name('password.email');
Route::post('/logout', [AuthenticatedSessionController::class, 'destroy'])->name('logout');
});
Route::get('/reset-password/{token}', [NewPasswordController::class, 'create'])->name('password.reset');
Route::post('/reset-password', [NewPasswordController::class, 'store'])->name('password.store');
}
);
}); // end domain group
Route::group(
[
'domain' => 'app.'.parse_url(config('app.url'), PHP_URL_HOST),
'middleware' => ['auth'],
],
function () {
Route::get('/verify-email', EmailVerificationPromptController::class)->name('verification.notice');
Route::get('/verify-email/{id}/{hash}', VerifyEmailController::class)
->middleware(['signed', 'throttle:6,1'])
->name('verification.verify');
Route::post('/email/verification-notification', [EmailVerificationNotificationController::class, 'store'])
->middleware('throttle:6,1')
->name('verification.send');
Route::post('/logout', [AuthenticatedSessionController::class, 'destroy'])->name('logout');
Route::post('/invites/{invite}/accept', [AcceptInviteController::class, 'accept'])->name('app.invites.accept');
Route::post('/invites/{invite}/decline', [AcceptInviteController::class, 'decline'])->name('app.invites.decline');
}
);