fix(app): repair next_url machinery

Author: johnbchron

crates/site-app/src/components/navbar.rs

@@ -4,7 +4,7 @@ use leptos::{either::Either, prelude::*};
 use models::AuthUser;
 
 use self::org_selector::OrgSelectorPopover;
-use crate::{hooks::OrgHook, navigation::next_url_hook};
+use crate::{hooks::OrgHook, navigation::next_url_encoded_hook};
 
 #[component]
 pub fn Navbar() -> impl IntoView {
@@ -46,7 +46,7 @@ fn NavbarUserArea() -> impl IntoView {
 
 #[component]
 fn LoggedOutUserAuthActions() -> impl IntoView {
-  let next_url = next_url_hook();
+  let next_url = next_url_encoded_hook();
   let signup_url =
     Signal::derive(move || format!("/auth/signup?next={}", next_url()));
   let login_url =

crates/site-app/src/hooks/login_hook.rs

@@ -4,7 +4,7 @@ use leptos::{ev::Event, prelude::*};
 use models::dvf::{EmailAddress, EmailAddressError};
 
 use crate::{
-  navigation::{navigate_to, next_url_hook},
+  navigation::{navigate_to, next_url_string_hook},
   reactive_utils::touched_input_bindings,
 };
 
@@ -13,7 +13,7 @@ pub struct LoginHook {
   email_signal:          RwSignal<String>,
   password_signal:       RwSignal<String>,
   submit_touched_signal: RwSignal<bool>,
-  next_url_memo:         Memo<String>,
+  next_url_memo:         Signal<String>,
   action:                Action<(), Result<bool, String>>,
 }
 
@@ -22,7 +22,7 @@ impl LoginHook {
     let email_signal = RwSignal::new(String::new());
     let password_signal = RwSignal::new(String::new());
     let submit_touched_signal = RwSignal::new(false);
-    let next_url_memo = next_url_hook();
+    let next_url_memo = next_url_string_hook();
 
     let action = Action::new_local(move |(): &()| {
       // json body for authenticate endpoint
@@ -140,6 +140,10 @@ impl LoginHook {
   pub fn create_redirect_effect(&self) -> Effect<LocalStorage> {
     let (action, next_url_memo) = (self.action, self.next_url_memo);
     Effect::new(move || {
+      leptos::logging::log!(
+        "redirect effect set to navigate to {:?}",
+        next_url_memo()
+      );
       if action.value().get() == Some(Ok(true)) {
         navigate_to(&next_url_memo());
       }

crates/site-app/src/hooks/signup_hook.rs

@@ -4,7 +4,7 @@ use leptos::{ev::Event, prelude::*};
 use models::dvf::{EmailAddress, EmailAddressError, HumanName, HumanNameError};
 
 use crate::{
-  navigation::{navigate_to, next_url_hook},
+  navigation::{navigate_to, next_url_string_hook},
   reactive_utils::touched_input_bindings,
 };
 
@@ -14,7 +14,7 @@ pub struct SignupHook {
   password_signal:         RwSignal<String>,
   confirm_password_signal: RwSignal<String>,
   submit_touched_signal:   RwSignal<bool>,
-  next_url_memo:           Memo<String>,
+  next_url_memo:           Signal<String>,
   action:                  Action<(), Result<bool, String>>,
 }
 
@@ -25,7 +25,7 @@ impl SignupHook {
     let password_signal = RwSignal::new(String::new());
     let confirm_password_signal = RwSignal::new(String::new());
     let submit_touched_signal = RwSignal::new(false);
-    let next_url_memo = next_url_hook();
+    let next_url_memo = next_url_string_hook();
 
     let action = Action::new_local(move |(): &()| {
       // json body for authenticate endpoint
@@ -203,6 +203,10 @@ impl SignupHook {
 
   pub fn create_redirect_effect(&self) -> Effect<LocalStorage> {
     let (action, next_url_memo) = (self.action, self.next_url_memo);
+    leptos::logging::log!(
+      "redirect effect set to navigate to {:?}",
+      next_url_memo()
+    );
     Effect::new(move || {
       if action.value().get() == Some(Ok(true)) {
         navigate_to(&next_url_memo());

crates/site-app/src/navigation.rs

@@ -46,18 +46,34 @@ pub fn navigate_to(path: &str) {
 }
 
 /// Gets the next URL if it's already set or sets it to the current page.
-#[allow(unused_variables)]
-pub fn next_url_hook() -> Memo<String> {
+pub fn next_url_string_hook() -> Signal<String> {
+  #[cfg(not(feature = "ssr"))]
+  use leptos_router::location::LocationProvider;
+
   #[cfg(feature = "ssr")]
   let current_url = leptos_router::hooks::use_url()();
-  #[cfg(feature = "hydrate")]
-  let current_url = <leptos_router::location::BrowserUrl as leptos_router::location::LocationProvider>::current().unwrap();
+  #[cfg(not(feature = "ssr"))]
+  let current_url = leptos_router::location::BrowserUrl::current()
+    .expect("failed to get current browser url");
+
+  leptos::logging::log!("current_url = {current_url:?}");
 
-  // set it to the existing next url or the current URL escaped
-  Memo::new(move |_| {
+  Signal::stored(
     current_url
       .search_params()
+      .clone()
       .get("next")
-      .unwrap_or(Url::escape(&url_to_full_path(&current_url)))
+      .unwrap_or(url_to_full_path(&current_url)),
+  )
+}
+
+/// Url-enccodes the next URL if it's already set or sets it to the current
+/// page. Suitable for propagating the next URL by setting the param to this
+/// value in links.
+pub fn next_url_encoded_hook() -> Signal<String> {
+  let next_url = next_url_string_hook();
+  Signal::derive(move || {
+    let next_url = next_url();
+    Url::escape(&next_url)
   })
 }