adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-08 00:02:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

rephrase logged out user invite accept message to clarify that the

Browse Source 
invite was accepted
This commit is contained in:
Gregor Vostrak
2026-05-20 22:10:10 +02:00
committed by Constantin Graf
parent f9be92894e
commit 12d58ee42c
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Web/OrganizationInvitationController.php
View File

@@ -51,10 +51,10 @@ class OrganizationInvitationController extends Controller
// Logged out — banner on /login. // Logged out — banner on /login.
if (! Auth::check()) { if (! Auth::check()) {
return redirect(route('login')) return redirect(route('login'))
->with('bannerText', __('Please log in to finish joining the :organization organization.', [ ->with('bannerText', __('Great! You have accepted the invitation to join the :organization organization. Please log in to access it.', [
'organization' => $organization->name, 'organization' => $organization->name,
])) ]))
->with('bannerStyle', 'info'); ->with('bannerStyle', 'success');
} }
// Logged in — banner on /dashboard. // Logged in — banner on /dashboard.

4
e2e/invitation-accept.spec.ts
View File

@@ -83,7 +83,9 @@ test.describe('invitation accept banners', () => {
const banner = inviteePage.getByTestId('banner'); const banner = inviteePage.getByTestId('banner');
await expect(banner).toBeVisible(); await expect(banner).toBeVisible();
await expect(banner).toContainText(/Please log in to finish joining the .* organization\./); await expect(banner).toContainText(
/Great! You have accepted the invitation to join the .* organization\. Please log in to access it\./
);
// Logging in lands the invitee on the dashboard — they were already added silently // Logging in lands the invitee on the dashboard — they were already added silently
// by the accept controller, so the inviter's members list shows them. // by the accept controller, so the inviter's members list shows them.

4
tests/Unit/Endpoint/Web/OrganizationInvitationEndpointTest.php
View File

@@ -131,8 +131,8 @@ class OrganizationInvitationEndpointTest extends EndpointTestAbstract
// Assert // Assert
$response->assertValid(); $response->assertValid();
$response->assertRedirect(route('login')); $response->assertRedirect(route('login'));
$response->assertSessionHas('bannerText', 'Please log in to finish joining the '.$user->organization->name.' organization.'); $response->assertSessionHas('bannerText', 'Great! You have accepted the invitation to join the '.$user->organization->name.' organization. Please log in to access it.');
$response->assertSessionHas('bannerStyle', 'info'); $response->assertSessionHas('bannerStyle', 'success');
// Member was added silently — invitation is consumed. // Member was added silently — invitation is consumed.
$this->assertDatabaseHas(Member::class, [ $this->assertDatabaseHas(Member::class, [
'user_id' => $invitee->getKey(), 'user_id' => $invitee->getKey(),