wip - beacon

Author: flavorjones

app/controllers/join_codes_controller.rb

@@ -18,7 +18,7 @@ def create
     if identity == Current.identity && user.setup?
       redirect_to landing_url(script_name: @join_code.account.slug)
     elsif identity == Current.identity
-      redirect_to new_users_verification_url(script_name: @join_code.account.slug)
+      redirect_to new_users_join_url(script_name: @join_code.account.slug)
     else
       logout_and_send_new_magic_link(identity)
       redirect_to session_magic_link_url(script_name: nil)
@@ -44,6 +44,6 @@ def logout_and_send_new_magic_link(identity)
       magic_link = identity.send_magic_link
       serve_development_magic_link(magic_link)
 
-      session[:return_to_after_authenticating] = new_users_verification_url(script_name: @join_code.account.slug)
+      session[:return_to_after_authenticating] = new_users_join_url(script_name: @join_code.account.slug)
     end
 end

app/controllers/users/verifications_controller.rb

@@ -1,11 +1,6 @@
 class Users::VerificationsController < ApplicationController
-  layout "public"
-
-  def new
-  end
-
   def create
     Current.user.verify
-    redirect_to new_users_join_path
+    head :ok
   end
 end

app/views/users/joins/new.html.erb

@@ -1,5 +1,9 @@
 <% @page_title = "Great! Now enter your name" %>
 
+<% if Current.user && !Current.user.verified? %>
+  <div data-controller="beacon" data-beacon-url-value="<%= users_verifications_path %>"></div>
+<% end %>
+
 <div class="panel panel--centered flex flex-column gap-half">
   <h1 class="txt-large font-weight-black margin-none"><%= @page_title %></h1>
 

app/views/users/verifications/new.html.erb

@@ -138,7 +138,7 @@
 
   namespace :users do
     resources :joins
-    resources :verifications, only: %i[ new create ]
+    resources :verifications, only: %i[ create ]
   end
 
   resource :session do

config/routes.rb

@@ -36,7 +36,7 @@ class JoinCodesControllerTest < ActionDispatch::IntegrationTest
     end
 
     assert_redirected_to session_magic_link_url(script_name: nil)
-    assert_equal new_users_verification_url(script_name: @account.slug), session[:return_to_after_authenticating]
+    assert_equal new_users_join_url(script_name: @account.slug), session[:return_to_after_authenticating]
   end
 
   test "create for existing identity" do
@@ -55,7 +55,7 @@ class JoinCodesControllerTest < ActionDispatch::IntegrationTest
     assert_redirected_to landing_url(script_name: @account.slug)
   end
 
-  test "create for signed-in identity without a user in the account redirects to verification" do
+  test "create for signed-in identity without a user in the account redirects to join" do
     identity = identities(:mike)
     sign_in_as :mike
 
@@ -67,6 +67,6 @@ class JoinCodesControllerTest < ActionDispatch::IntegrationTest
       end
     end
 
-    assert_redirected_to new_users_verification_url(script_name: @account.slug)
+    assert_redirected_to new_users_join_url(script_name: @account.slug)
   end
 end

test/controllers/join_codes_controller_test.rb

@@ -1,24 +1,16 @@
 require "test_helper"
 
 class Users::VerificationsControllerTest < ActionDispatch::IntegrationTest
-  test "new renders the auto-submit form" do
-    sign_in_as :david
-
-    get new_users_verification_path
-
-    assert_response :ok
-  end
-
-  test "create verifies the user and redirects to join" do
-    sign_in_as :david
-
+  test "create verifies the user" do
     user = users(:david)
     user.update_column(:verified_at, nil)
+    sign_in_as user
+
     assert_not user.verified?
 
     post users_verifications_path
 
-    assert_redirected_to new_users_join_path
+    assert_response :ok
     assert user.reload.verified?
   end
 end