allow users to accept invitations

Author: thedumbtechguy

app/controllers/application_controller.rb

@@ -1,4 +1,2 @@
 class ApplicationController < ActionController::Base
-  # Only allow modern browsers supporting webp images, web push, badges, import maps, CSS nesting, and CSS :has.
-  # allow_browser versions: :modern
 end

app/rodauth/hacker_rodauth_plugin.rb

@@ -181,6 +181,9 @@ class HackerRodauthPlugin < RodauthPlugin
       redirect "/hacker_dashboard"
     end
 
+    # Redirect to home after login.
+    create_account_redirect "/hacker_dashboard"
+
     # Redirect to home after login.
     login_redirect "/hacker_dashboard"
 

packages/hackathon/app/models/hackathon/invitation.rb

@@ -46,6 +46,10 @@ def send_invitation
     invited! if pending?
   end
 
+  def usable?
+    !accepted? && !declined?
+  end
+
   private
 
   def generate_token

packages/hacker_dashboard_portal/app/controllers/hacker_dashboard_portal/concerns/controller.rb

@@ -11,6 +11,7 @@ module Controller
         before_action :ensure_profile_completed
         before_action :ensure_emergency_contact_exists
         before_action :ensure_joined_team
+        before_action :check_pending_invitation
       end
 
       private
@@ -40,6 +41,25 @@ def ensure_emergency_contact_exists
           redirect_to resource_url_for(::Hackathon::HealthAndSafety, action: :new)
         end
       end
+
+      def current_invitation
+        return unless cookies.encrypted[:invite_token]
+
+        @invitation ||= ::Hackathon::Invitation.find_by(
+          token: cookies.encrypted[:invite_token]
+        )
+      end
+
+      # Complete team membership for invited hacker by allowing them select
+      # their role in the team.
+      def check_pending_invitation
+        return unless current_invitation&.usable?
+
+        redirect_to resource_url_for(
+          ::Hackathon::TeamMembership, action: :new,
+          parent: current_invitation.team
+        )
+      end
     end
   end
 end

packages/hacker_dashboard_portal/app/controllers/hacker_dashboard_portal/hackathon/health_and_safeties_controller.rb

@@ -3,6 +3,7 @@ class HackerDashboardPortal::Hackathon::HealthAndSafetiesController < ::Hackatho
 
   skip_before_action :ensure_emergency_contact_exists, only: [:new, :create]
   skip_before_action :ensure_joined_team, only: [:new, :create]
+  skip_before_action :check_pending_invitation, only: [:new, :create]
 
   layout :resolve_layout
 

packages/hacker_dashboard_portal/app/controllers/hacker_dashboard_portal/hackathon/team_memberships_controller.rb

@@ -4,18 +4,10 @@ class HackerDashboardPortal::Hackathon::TeamMembershipsController < ::Hackathon:
   authorize :invitation, through: :current_invitation
 
   skip_before_action :ensure_joined_team, only: [:new, :create]
-  after_action :cleanup_invitation, only: [:create]
+  skip_before_action :check_pending_invitation, only: [:new, :create]
 
   def present_scoped_entity? = true
 
-  def set_page_title(title)
-    if title == "Create #{resource_class.model_name.human.titleize}"
-      super("Join #{current_parent.name}")
-    else
-      super
-    end
-  end
-
   private
 
   def resource_params
@@ -26,18 +18,6 @@ def resource_params
     end
   end
 
-  def current_invitation
-    return unless cookies.encrypted[:invite_token]
-
-    @invitation ||= ::Hackathon::Invitation.find_by(
-      token: cookies.encrypted[:invite_token]
-    )
-  end
-
-  def cleanup_invitation
-    cookies.delete(:invite_token)
-  end
-
   def redirect_url_after_submit
     if (return_to = url_from(params[:return_to]))
       return return_to

packages/hacker_dashboard_portal/app/controllers/hacker_dashboard_portal/hackathon/teams_controller.rb

@@ -2,7 +2,6 @@ class HackerDashboardPortal::Hackathon::TeamsController < ::Hackathon::TeamsCont
   include HackerDashboardPortal::Concerns::Controller
 
   skip_before_action :ensure_joined_team, only: [:new, :create]
-  before_action :check_invitation, only: [:new, :create]
 
   def present_scoped_entity? = true
 
@@ -16,25 +15,4 @@ def new
 
     super
   end
-
-  private
-
-  # Complete team membership for invited hacker by allowing them select
-  # their role in the team.
-  def check_invitation
-    return unless current_invitation
-
-    redirect_to resource_url_for(
-      ::Hackathon::TeamMembership, action: :new,
-      parent: current_invitation.team
-    )
-  end
-
-  def current_invitation
-    return unless cookies.encrypted[:invite_token]
-
-    @invitation ||= ::Hackathon::Invitation.find_by(
-      token: cookies.encrypted[:invite_token]
-    )
-  end
 end

packages/hacker_dashboard_portal/app/controllers/hacker_dashboard_portal/profiles_controller.rb

@@ -5,6 +5,7 @@ class HackerDashboardPortal::ProfilesController < ::ProfilesController
   skip_before_action :ensure_profile_completed, only: [:edit, :update]
   skip_before_action :ensure_emergency_contact_exists, only: [:new, :create]
   skip_before_action :ensure_joined_team, only: [:new, :create]
+  skip_before_action :check_pending_invitation, only: [:new, :create]
 
   def new
     authorize_current! resource_class

packages/hacker_dashboard_portal/app/definitions/hacker_dashboard_portal/hackathon/team_membership_definition.rb

@@ -4,6 +4,8 @@ class HackerDashboardPortal::Hackathon::TeamMembershipDefinition < ::Hackathon::
   new_page_title -> {
     render_title "Join #{current_parent.name}"
   }
+  new_page_description "Select your role on the team to complete your invitation"
+
   edit_page_title "Update Membership Role"
 
   new_page_breadcrumbs false