From a926033d06108299316dea0e7ba1a38432b998f4 Mon Sep 17 00:00:00 2001 From: Paulo Castellano Date: Sun, 29 Mar 2026 21:13:30 -0300 Subject: [PATCH] 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) --- app/Http/Controllers/App/MediaController.php | 4 +- app/Http/Controllers/App/PostController.php | 2 +- .../App/Settings/ProfileController.php | 4 +- .../Controllers/App/WorkspaceController.php | 4 +- .../App/WorkspaceInviteController.php | 2 +- .../Auth/AuthenticatedSessionController.php | 2 +- .../Middleware/{ => App}/EnsureSubscribed.php | 2 +- .../{ => App}/EnsureUserSetupIsComplete.php | 2 +- .../Middleware/{ => App}/HandleAppearance.php | 2 +- .../{ => App}/HandleInertiaRequests.php | 46 ++++-------- .../Requests/{ => App}/Auth/LoginRequest.php | 2 +- .../Invite}/StoreWorkspaceInviteRequest.php | 2 +- .../Media}/StoreChunkedMediaRequest.php | 2 +- .../{ => App/Media}/StoreMediaRequest.php | 2 +- .../{ => App/Post}/UpdatePostRequest.php | 2 +- .../Settings/PasswordUpdateRequest.php | 2 +- .../Settings/ProfileDeleteRequest.php | 2 +- .../Settings/ProfileUpdateRequest.php | 2 +- .../Workspace}/StoreWorkspaceRequest.php | 2 +- .../Workspace}/UpdateWorkspaceRequest.php | 2 +- .../Resources/Api/SocialAccountResource.php | 3 +- .../AuthUserResource.php | 26 +++++++ .../AuthWorkspaceResource.php | 45 ++++++++++++ bootstrap/app.php | 6 +- bootstrap/providers.php | 2 - composer.json | 4 +- config/telescope.php | 4 +- database/factories/UserFactory.php | 5 ++ resources/js/components/AppHeader.vue | 2 +- resources/js/components/AppSidebar.vue | 6 +- resources/js/components/WorkspaceSwitcher.vue | 4 +- resources/js/layouts/settings/Layout.vue | 2 +- routes/app.php | 2 +- routes/auth.php | 70 +++++++++++-------- 34 files changed, 169 insertions(+), 102 deletions(-) rename app/Http/Middleware/{ => App}/EnsureSubscribed.php (97%) rename app/Http/Middleware/{ => App}/EnsureUserSetupIsComplete.php (97%) rename app/Http/Middleware/{ => App}/HandleAppearance.php (93%) rename app/Http/Middleware/{ => App}/HandleInertiaRequests.php (51%) rename app/Http/Requests/{ => App}/Auth/LoginRequest.php (98%) rename app/Http/Requests/{ => App/Invite}/StoreWorkspaceInviteRequest.php (96%) rename app/Http/Requests/{ => App/Media}/StoreChunkedMediaRequest.php (98%) rename app/Http/Requests/{ => App/Media}/StoreMediaRequest.php (97%) rename app/Http/Requests/{ => App/Post}/UpdatePostRequest.php (95%) rename app/Http/Requests/{ => App}/Settings/PasswordUpdateRequest.php (93%) rename app/Http/Requests/{ => App}/Settings/ProfileDeleteRequest.php (91%) rename app/Http/Requests/{ => App}/Settings/ProfileUpdateRequest.php (91%) rename app/Http/Requests/{ => App/Workspace}/StoreWorkspaceRequest.php (92%) rename app/Http/Requests/{ => App/Workspace}/UpdateWorkspaceRequest.php (94%) create mode 100644 app/Http/Resources/App/HandleInertiaRequests/AuthUserResource.php create mode 100644 app/Http/Resources/App/HandleInertiaRequests/AuthWorkspaceResource.php diff --git a/app/Http/Controllers/App/MediaController.php b/app/Http/Controllers/App/MediaController.php index 398cbdb1..fac1e850 100644 --- a/app/Http/Controllers/App/MediaController.php +++ b/app/Http/Controllers/App/MediaController.php @@ -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; diff --git a/app/Http/Controllers/App/PostController.php b/app/Http/Controllers/App/PostController.php index cf2e8482..18f584dc 100644 --- a/app/Http/Controllers/App/PostController.php +++ b/app/Http/Controllers/App/PostController.php @@ -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; diff --git a/app/Http/Controllers/App/Settings/ProfileController.php b/app/Http/Controllers/App/Settings/ProfileController.php index 838c6f26..6f845551 100644 --- a/app/Http/Controllers/App/Settings/ProfileController.php +++ b/app/Http/Controllers/App/Settings/ProfileController.php @@ -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; diff --git a/app/Http/Controllers/App/WorkspaceController.php b/app/Http/Controllers/App/WorkspaceController.php index d94d39dc..afe0691d 100644 --- a/app/Http/Controllers/App/WorkspaceController.php +++ b/app/Http/Controllers/App/WorkspaceController.php @@ -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; diff --git a/app/Http/Controllers/App/WorkspaceInviteController.php b/app/Http/Controllers/App/WorkspaceInviteController.php index 36ca8905..39068f01 100644 --- a/app/Http/Controllers/App/WorkspaceInviteController.php +++ b/app/Http/Controllers/App/WorkspaceInviteController.php @@ -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; diff --git a/app/Http/Controllers/Auth/AuthenticatedSessionController.php b/app/Http/Controllers/Auth/AuthenticatedSessionController.php index c3ce6dd6..6b77847d 100644 --- a/app/Http/Controllers/Auth/AuthenticatedSessionController.php +++ b/app/Http/Controllers/Auth/AuthenticatedSessionController.php @@ -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; diff --git a/app/Http/Middleware/EnsureSubscribed.php b/app/Http/Middleware/App/EnsureSubscribed.php similarity index 97% rename from app/Http/Middleware/EnsureSubscribed.php rename to app/Http/Middleware/App/EnsureSubscribed.php index e5e5ec29..e1354a48 100644 --- a/app/Http/Middleware/EnsureSubscribed.php +++ b/app/Http/Middleware/App/EnsureSubscribed.php @@ -1,6 +1,6 @@ */ 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(), ]; } } diff --git a/app/Http/Requests/Auth/LoginRequest.php b/app/Http/Requests/App/Auth/LoginRequest.php similarity index 98% rename from app/Http/Requests/Auth/LoginRequest.php rename to app/Http/Requests/App/Auth/LoginRequest.php index db82457c..e240dfc8 100644 --- a/app/Http/Requests/Auth/LoginRequest.php +++ b/app/Http/Requests/App/Auth/LoginRequest.php @@ -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; diff --git a/app/Http/Requests/StoreWorkspaceInviteRequest.php b/app/Http/Requests/App/Invite/StoreWorkspaceInviteRequest.php similarity index 96% rename from app/Http/Requests/StoreWorkspaceInviteRequest.php rename to app/Http/Requests/App/Invite/StoreWorkspaceInviteRequest.php index f5027daa..5ec53661 100644 --- a/app/Http/Requests/StoreWorkspaceInviteRequest.php +++ b/app/Http/Requests/App/Invite/StoreWorkspaceInviteRequest.php @@ -1,6 +1,6 @@ $this->id, 'platform' => $this->platform, - 'name' => $this->name, + 'display_name' => $this->display_name, 'username' => $this->username, - 'avatar' => $this->avatar, ]; } } diff --git a/app/Http/Resources/App/HandleInertiaRequests/AuthUserResource.php b/app/Http/Resources/App/HandleInertiaRequests/AuthUserResource.php new file mode 100644 index 00000000..1d12f47b --- /dev/null +++ b/app/Http/Resources/App/HandleInertiaRequests/AuthUserResource.php @@ -0,0 +1,26 @@ + + */ + 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(), + ]; + } +} diff --git a/app/Http/Resources/App/HandleInertiaRequests/AuthWorkspaceResource.php b/app/Http/Resources/App/HandleInertiaRequests/AuthWorkspaceResource.php new file mode 100644 index 00000000..49bacbc2 --- /dev/null +++ b/app/Http/Resources/App/HandleInertiaRequests/AuthWorkspaceResource.php @@ -0,0 +1,45 @@ + + */ + 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 + */ + 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; + } +} diff --git a/bootstrap/app.php b/bootstrap/app.php index b0957dd7..e8b623e8 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -1,9 +1,9 @@ env('TELESCOPE_ENABLED', true), + 'enabled' => env('TELESCOPE_ENABLED', false), /* |-------------------------------------------------------------------------- @@ -42,7 +42,7 @@ | */ - 'path' => env('TELESCOPE_PATH', 'telescope'), + 'path' => env('TELESCOPE_PATH', 'debug'), /* |-------------------------------------------------------------------------- diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index 6082d653..fa6b2251 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -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, diff --git a/resources/js/components/AppHeader.vue b/resources/js/components/AppHeader.vue index 45c1bc5b..cc851cdf 100644 --- a/resources/js/components/AppHeader.vue +++ b/resources/js/components/AppHeader.vue @@ -42,7 +42,7 @@ const props = withDefaults(defineProps(), { 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) { diff --git a/resources/js/components/AppSidebar.vue b/resources/js/components/AppSidebar.vue index 22a88daf..da375dde 100644 --- a/resources/js/components/AppSidebar.vue +++ b/resources/js/components/AppSidebar.vue @@ -66,8 +66,8 @@ interface Language { const page = usePage(); const auth = computed(() => page.props.auth); -const currentWorkspace = computed(() => page.props.currentWorkspace as Workspace | null); -const workspaces = computed(() => page.props.workspaces as Workspace[]); +const currentWorkspace = computed(() => page.props.auth.currentWorkspace as Workspace | null); +const workspaces = computed(() => page.props.auth.workspaces as Workspace[]); const languages = computed(() => 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(() => [ }, ]); -const canManageWorkspace = computed(() => auth.value.role !== 'member'); +const canManageWorkspace = computed(() => auth.value.currentWorkspace?.role !== 'member'); const configNavItems = computed(() => { const items: NavItem[] = [ diff --git a/resources/js/components/WorkspaceSwitcher.vue b/resources/js/components/WorkspaceSwitcher.vue index f46febb5..1600fbf8 100644 --- a/resources/js/components/WorkspaceSwitcher.vue +++ b/resources/js/components/WorkspaceSwitcher.vue @@ -20,8 +20,8 @@ interface Workspace { } const page = usePage(); -const currentWorkspace = computed(() => page.props.currentWorkspace as Workspace | null); -const workspaces = computed(() => page.props.workspaces as Workspace[]); +const currentWorkspace = computed(() => page.props.auth.currentWorkspace as Workspace | null); +const workspaces = computed(() => page.props.auth.workspaces as Workspace[]); function switchWorkspace(workspace: Workspace) { router.post(switchMethod.url(workspace.id), {}, { diff --git a/resources/js/layouts/settings/Layout.vue b/resources/js/layouts/settings/Layout.vue index e1b5e66d..5c730818 100644 --- a/resources/js/layouts/settings/Layout.vue +++ b/resources/js/layouts/settings/Layout.vue @@ -16,7 +16,7 @@ import { type NavItem, type SharedData } from '@/types'; const page = usePage(); const auth = computed(() => page.props.auth); -const canManageWorkspace = computed(() => auth.value.role !== 'member'); +const canManageWorkspace = computed(() => auth.value.currentWorkspace?.role !== 'member'); const navItems = computed(() => { const items: NavItem[] = [ diff --git a/routes/app.php b/routes/app.php index e5aec5a4..bb610185 100644 --- a/routes/app.php +++ b/routes/app.php @@ -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( diff --git a/routes/auth.php b/routes/auth.php index 2ac434db..920b9e09 100644 --- a/routes/auth.php +++ b/routes/auth.php @@ -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'); + } +);