diff --git a/CHANGELOG.md b/CHANGELOG.md index 31cf96a..515e7fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ each change under the current top section as you work. ### Fixed - A student's **upcoming lessons no longer pile on top of each other**. On the booking page, the lesson name, its date and time, the status badge and the **Cancel** button could render over one another instead of sitting in a tidy row — worst with a long lesson-type name, and on narrow screens, where the row had no phone layout at all. The panel now keeps its shape whatever the theme around it does, long names wrap instead of shoving the Cancel button out of the row, and on a phone the lesson details stack above the buttons. +- The registration page **no longer dead-ends a visitor who is already signed in**. It used to greet them with "You already have an account and are logged in." and nothing else, leaving them to find their own way to the studio. They now get a link onward to the page chosen under the block's **After registration** panel, and the link names it — "Continue to Book a Lesson" rather than the vaguer wording an invited student used to see. With no page chosen, the message appears on its own as before, because sending someone who is already signed in to the sign-in screen helps nobody. ## [1.2.3] diff --git a/docs/features/account-registration.md b/docs/features/account-registration.md index 4e20698..96edd27 100644 --- a/docs/features/account-registration.md +++ b/docs/features/account-registration.md @@ -132,7 +132,7 @@ recorded in `us_policy_acceptances` with `registration_type = account` and The block's **After registration** panel picks the page a student continues to once registration finishes, and whether they get there by hand or automatically. -- **Sign-in page** (`loginPageId` / `login_page_id`) — the target of the "Sign in to your account" link shown after email confirmation (`?us_confirmed=1|ready`, falling back to the WordPress login screen) and of the "Continue to your account" link an invited student sees on the spot (`?us_registered=invite`; no link at all with no page chosen, since an already-signed-in student has no use for the login screen). +- **Sign-in page** (`loginPageId` / `login_page_id`) — the target of the "Sign in to your account" link shown after email confirmation (`?us_confirmed=1|ready`, falling back to the WordPress login screen) and of the **"Continue to _<page title>_"** link every **logged-in** visitor gets (`RegistrationPage::continueLink()`): an invited student who just finished signing up (`?us_registered=invite`), and anyone who simply arrives at the registration page already signed in. The link names the chosen page (via `get_the_title()`) so the visitor knows where it goes; an untitled page falls back to "Continue to your account" rather than reading "Continue to ". Neither gets the WordPress-login-screen fallback — with no page chosen there is no link at all, since sending someone already signed in to the login screen is the same dead end with extra steps. - **Redirect automatically** (`autoRedirect`, block only) — sends the student to that page instead of showing the link, via `BlockRegistrar::maybeAutoRedirect()` on `template_redirect`. It fires only on those two finished states (`RegistrationPage::isRegistrationComplete()`), so the "check your email" step, a validation error, and an `expired` confirmation link are always shown rather than redirected past. With no page chosen nothing happens — there is deliberately no login-screen fallback for the redirect. See `editor-blocks.md`. ## Token Redirect diff --git a/src/Auth/RegistrationPage.php b/src/Auth/RegistrationPage.php index 831de7e..87c0278 100644 --- a/src/Auth/RegistrationPage.php +++ b/src/Auth/RegistrationPage.php @@ -65,24 +65,21 @@ class RegistrationPage { $registered = sanitize_key( Val::string( wp_unslash( $_GET['us_registered'] ?? '' ) ) ); if ( is_user_logged_in() ) { - if ( self::RESULT_INVITE === $registered ) { - // An invited student is done the moment they land here logged in, - // so this is where their "continue" link belongs. The sign-in-page - // fallback is deliberately not used: pointing someone who is - // already signed in at the login screen helps nobody. - $continue = $this->continueUrl( $this->successPageId( $atts ) ); - $link = null === $continue - ? '' - : '

' - . esc_html__( 'Continue to your account', 'unsupervised-schedular' ) - . '

'; + // Both logged-in outcomes are dead ends without somewhere to go next, + // so both offer the same "continue" link to the configured page. + wp_enqueue_style( 'us-scheduler' ); + $link = $this->continueLink( $atts ); + if ( self::RESULT_INVITE === $registered ) { + // An invited student is done the moment they land here logged in. return '

' . esc_html__( 'Your account has been created and you are now logged in.', 'unsupervised-schedular' ) . '

' . $link . '
'; } - return '

' . esc_html__( 'You already have an account and are logged in.', 'unsupervised-schedular' ) . '

'; + return '

' + . esc_html__( 'You already have an account and are logged in.', 'unsupervised-schedular' ) + . '

' . $link . '
'; } // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- token identifies the invite; the form submit is nonce-checked in maybeHandleSubmit. @@ -353,6 +350,40 @@ class RegistrationPage { return $this->continueUrl( $loginPageId ) ?? wp_login_url(); } + /** + * The "continue" paragraph shown to a logged-in visitor, or an empty string + * when no destination page is configured. The link names the chosen page, so + * the visitor knows where it goes before clicking; an untitled page falls + * back to generic wording rather than reading "Continue to ". + * + * The sign-in-page fallback {@see loginUrl()} applies is deliberately not + * used here: pointing someone who is already signed in at the login screen is + * the same dead end with extra steps, so no link is better than that one. + * + * @param array $atts + */ + private function continueLink( array $atts ): string { + $pageId = $this->successPageId( $atts ); + $continue = $this->continueUrl( $pageId ); + + if ( null === $continue ) { + return ''; + } + + $title = trim( Val::string( get_the_title( $pageId ) ) ); + $label = '' === $title + ? esc_html__( 'Continue to your account', 'unsupervised-schedular' ) + : esc_html( + sprintf( + /* translators: %s: title of the page the student continues to. */ + __( 'Continue to %s', 'unsupervised-schedular' ), + $title + ) + ); + + return '

' . $label . '

'; + } + /** * The chosen post-registration page's URL, or null when none is configured * (or it has since been deleted). Unlike {@see loginUrl()} this has no diff --git a/tests/Unit/Auth/RegistrationPageTest.php b/tests/Unit/Auth/RegistrationPageTest.php index 91f02a3..68e84ff 100644 --- a/tests/Unit/Auth/RegistrationPageTest.php +++ b/tests/Unit/Auth/RegistrationPageTest.php @@ -497,11 +497,61 @@ class RegistrationPageTest extends TestCase Functions\when('is_user_logged_in')->justReturn(true); Functions\when('sanitize_key')->alias(static fn ($v) => strtolower((string) $v)); Functions\expect('get_permalink')->once()->with(4)->andReturn('http://home.test/welcome/'); + Functions\when('get_the_title')->justReturn('Book a Lesson'); $html = $this->ctx['page']->render([ 'loginPageId' => 4 ]); self::assertStringContainsString('now logged in', $html); self::assertStringContainsString('href="http://home.test/welcome/"', $html); + // The link names its destination rather than saying "your account". + self::assertStringContainsString('Continue to Book a Lesson', $html); + } + + public function testContinueLinkFallsBackToGenericWordingForAnUntitledPage(): void + { + Functions\when('is_user_logged_in')->justReturn(true); + Functions\when('sanitize_key')->alias(static fn ($v) => strtolower((string) $v)); + Functions\when('get_permalink')->justReturn('http://home.test/welcome/'); + Functions\when('get_the_title')->justReturn(' '); + + // An untitled page must not produce a link reading "Continue to ". + $html = $this->ctx['page']->render([ 'loginPageId' => 4 ]); + + self::assertStringContainsString('Continue to your account', $html); + self::assertStringContainsString('href="http://home.test/welcome/"', $html); + } + + public function testAlreadyLoggedInVisitorIsLinkedToTheChosenPage(): void + { + // No us_registered flag: someone who simply happens to be signed in and + // lands on the registration page. They still need a way onward. + Functions\when('is_user_logged_in')->justReturn(true); + Functions\when('sanitize_key')->alias(static fn ($v) => strtolower((string) $v)); + Functions\expect('get_permalink')->once()->with(4)->andReturn('http://home.test/welcome/'); + Functions\when('get_the_title')->justReturn('Book a Lesson'); + + $html = $this->ctx['page']->render([ 'loginPageId' => 4 ]); + + self::assertStringContainsString('already have an account', $html); + self::assertStringContainsString('href="http://home.test/welcome/"', $html); + self::assertStringContainsString('Continue to Book a Lesson', $html); + // Not the just-registered message — that branch needs its own flag. + self::assertStringNotContainsString('us-success', $html); + } + + public function testAlreadyLoggedInVisitorGetsNoLinkWithoutAChosenPage(): void + { + Functions\when('is_user_logged_in')->justReturn(true); + Functions\when('sanitize_key')->alias(static fn ($v) => strtolower((string) $v)); + Functions\when('get_permalink')->justReturn(false); + + // A deleted page resolves to false, which must not become a broken link. + $html = $this->ctx['page']->render([ 'loginPageId' => 4 ]); + + self::assertStringContainsString('already have an account', $html); + self::assertStringNotContainsString('ctx['page']->render([])); } public function testContinueUrlIsNullWithoutAResolvablePage(): void