Fold token_b_param into find_b_param

One finder, with create passing build: true. It now writes the session
token on every action, so a tokenized link is what the next tokenless
request lands on.

Finished says "Registration saved" while the email is unconfirmed, and
the stolen bullet names the community network.

Author: sethherr

app/components/register/step_finished/component.en.yml

@@ -8,7 +8,10 @@ en:
         confirming_lets_you: 'Confirming your email lets you:'
         register_another: Register another %{cycle_type}
         registration_complete: Registration complete!
-        report_it_stolen: Report your %{cycle_type} stolen
+        registration_saved: Registration saved
+        report_it_stolen: >-
+          Finish reporting your stolen %{cycle_type} and take advantage of our
+          community network
         verify_your_email_html: >-
           One more step — verify your email. We sent a confirmation link to %{email};
           click it to finish your registration. Everything you've entered is saved.

app/components/register/step_finished/component.html.erb

@@ -27,7 +27,7 @@
       translation(".verify_your_email_html", email: content_tag(:strong, @b_param.owner_email))
     end %>
 
-    <%= render UI::Header::Component.new(text: translation(".registration_complete"), subtitle:) %>
+    <%= render UI::Header::Component.new(text: heading_text, subtitle:) %>
 
     <%# What's still locked behind the confirmation, so the link is worth clicking %>
     <% if @bike.blank? %>

app/components/register/step_finished/component.rb

@@ -15,6 +15,11 @@ def initialize(b_param:, current_user: nil)
       def cycle_type
         @b_param.type
       end
+
+      # Without the bike the registration is only held, waiting on the email
+      def heading_text
+        translation(@bike.present? ? ".registration_complete" : ".registration_saved")
+      end
     end
   end
 end

app/controllers/register_controller.rb

@@ -1,8 +1,8 @@
 class RegisterController < ApplicationController
   before_action :find_b_param, except: %i[new create]
-  # Step 1 carries everything it needs, so an expired token starts a registration
-  # rather than bouncing and losing the submission
-  before_action :find_or_build_b_param, only: %i[create]
+  # An expired token starts a registration rather than bouncing and losing the
+  # submission. assign_organization runs next, so the form's organization_id lands on it
+  before_action -> { find_b_param(build: true) }, only: %i[create]
   before_action :assign_organization, except: %i[new]
   before_action :redirect_finished, only: %i[create update]
   # The step shown depends on server state - a cached page could show a step
@@ -101,25 +101,21 @@ def confirm
     end
   end
 
-  def find_b_param
-    @b_param = token_b_param
-    return if @b_param.present?
-
-    flash[:info] = translation(:registration_not_found) if params[:b_param_token].present?
-    redirect_to new_register_path
-  end
+  # build: only step 1's submission, which carries everything a registration needs
+  def find_b_param(build: false)
+    @b_param = BikeServices::Register.find_token(params_token: params[:b_param_token],
+      session_token: session[:register_b_param_token], user: current_user)
+    @b_param ||= BikeServices::Register.b_param_for(user: current_user) if build
+    if @b_param.blank?
+      flash[:info] = translation(:registration_not_found) if params[:b_param_token].present?
+      return redirect_to(new_register_path)
+    end
 
-  # assign_organization runs next, so the form's organization_id still lands on it
-  def find_or_build_b_param
-    @b_param = token_b_param || BikeServices::Register.b_param_for(user: current_user)
+    # The session follows whichever registration the token named, so the next
+    # tokenless request stays on it
     session[:register_b_param_token] = @b_param.id_token
   end
 
-  def token_b_param
-    BikeServices::Register.find_token(params_token: params[:b_param_token],
-      session_token: session[:register_b_param_token], user: current_user)
-  end
-
   # A finished registration (bike created, or awaiting the email) only shows
   # the completion page - submissions redirect there too, saving nothing
   def redirect_finished

spec/integration/registration/register_spec.rb

@@ -122,7 +122,7 @@
 
     click_button "Complete Bike Registration"
 
-    expect(page).to have_content("Registration complete")
+    expect(page).to have_content("Registration saved")
     expect(page).to have_content("verify your email")
     b_param = BParam.last
     expect(b_param.bike).to include("frame_model" => "Marlin 7", "year" => "2023",

spec/requests/register_request_spec.rb

@@ -492,11 +492,11 @@ def phone_statuses_watched
         expect(b_param.bike).to match_hash_indifferently(bike_details.merge(owner_email:,
           manufacturer_id: manufacturer.id, primary_frame_color_id: color.id.to_s))
         follow_redirect!
-        expect(response.body).to include "Registration complete"
+        expect(response.body).to include "Registration saved"
         expect(response.body).to include "verify your email"
         # Why the confirmation link is worth clicking
         expect(response.body).to include "Confirming your email lets you"
-        expect(response.body).to include "Report your bike stolen"
+        expect(response.body).to include "Finish reporting your stolen bike"
       end
 
       context "with a photo" do