Merge branch 'main' into enhancement/platform-setup-wizard

Author: rsmithlal

Gemfile

@@ -62,7 +62,7 @@ group :development, :test do
   # Fuubar for fancy test progress bar
   gem 'fuubar'
   # Help with managing translation databasde
-  gem 'i18n-tasks', '~> 1.0.12'
+  gem 'i18n-tasks', '~> 1.0.15'
   # Pry for a powerful shell alternative to IRB
   gem 'pry'
   # RuboCop for static code analysis

Gemfile.lock

@@ -19,7 +19,7 @@ GIT
 PATH
   remote: .
   specs:
-    better_together (0.6.0)
+    better_together (0.7.1)
       active_storage_svg_sanitizer
       active_storage_validations
       activerecord-import
@@ -256,8 +256,9 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise-i18n (1.12.1)
+    devise-i18n (1.13.0)
       devise (>= 4.9.0)
+      rails-i18n
     devise-jwt (0.12.1)
       devise (~> 4.0)
       warden-jwt_auth (~> 0.10)
@@ -343,18 +344,18 @@ GEM
       ruby-progressbar (~> 1.4)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    google-protobuf (4.29.3-x86_64-linux)
+    google-protobuf (4.30.0-x86_64-linux)
       bigdecimal
       rake (>= 13)
     groupdate (6.5.1)
       activesupport (>= 7)
     hashie (5.0.0)
-    highline (3.1.0)
+    highline (3.1.2)
       reline
     htmlentities (4.3.4)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (1.0.14)
+    i18n-tasks (1.0.15)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
       erubi
@@ -363,6 +364,7 @@ GEM
       parser (>= 3.2.2.1)
       rails-i18n
       rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.8, >= 1.8.1)
       terminal-table (>= 1.5.1)
     i18n-timezones (1.4.8)
       i18n (>= 0.9.3)
@@ -384,7 +386,7 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
-    json (2.10.1)
+    json (2.10.2)
     json-schema (5.1.1)
       addressable (~> 2.8)
       bigdecimal (~> 3.1)
@@ -420,7 +422,7 @@ GEM
       logger
       mime-types-data (~> 3.2015)
     mime-types-data (3.2025.0107)
-    mini_magick (5.1.2)
+    mini_magick (5.2.0)
       benchmark
       logger
     mini_mime (1.1.5)
@@ -444,7 +446,7 @@ GEM
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)
     nokogiri (1.18.3-x86_64-linux-gnu)
@@ -482,7 +484,7 @@ GEM
     pundit (2.5.0)
       activesupport (>= 3.0.0)
     racc (1.8.1)
-    rack (3.1.11)
+    rack (3.1.12)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-mini-profiler (3.3.1)
@@ -519,7 +521,7 @@ GEM
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    rails-i18n (7.0.9)
+    rails-i18n (7.0.10)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
     railties (7.1.5.1)
@@ -607,7 +609,7 @@ GEM
     rswag-ui (2.16.0)
       actionpack (>= 5.2, < 8.1)
       railties (>= 5.2, < 8.1)
-    rubocop (1.73.2)
+    rubocop (1.74.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -632,11 +634,11 @@ GEM
       ffi (~> 1.12)
       logger
     rubyzip (2.4.1)
-    sass-embedded (1.83.4-x86_64-linux-gnu)
+    sass-embedded (1.85.1-x86_64-linux-gnu)
       google-protobuf (~> 4.29)
     sassc (2.4.0)
       ffi (~> 1.9)
-    sassc-embedded (1.80.1)
+    sassc-embedded (1.80.4)
       sass-embedded (~> 1.80)
     securerandom (0.4.1)
     selenium-webdriver (4.29.1)
@@ -645,10 +647,10 @@ GEM
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    sentry-rails (5.22.4)
+    sentry-rails (5.23.0)
       railties (>= 5.0)
-      sentry-ruby (~> 5.22.4)
-    sentry-ruby (5.22.4)
+      sentry-ruby (~> 5.23.0)
+    sentry-ruby (5.23.0)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
     shoulda-callback-matchers (1.1.4)
@@ -667,7 +669,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    spring (4.2.1)
+    spring (4.3.0)
     spring-watcher-listen (2.1.0)
       listen (>= 2.7, < 4.0)
       spring (>= 4)
@@ -685,8 +687,8 @@ GEM
     sync (0.5.0)
     term-ansicolor (1.11.2)
       tins (~> 1.0)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
     thor (1.3.2)
     thread (0.2.2)
     thread_safe (0.3.6)
@@ -707,7 +709,9 @@ GEM
     uglifier (4.2.1)
       execjs (>= 0.3.0, < 3)
     unf (0.2.0)
-    unicode-display_width (2.6.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
     uri (1.0.3)
     virtus (2.0.0)
       axiom-types (~> 0.1)
@@ -758,7 +762,7 @@ DEPENDENCIES
   faker
   fog-aws
   fuubar
-  i18n-tasks (~> 1.0.12)
+  i18n-tasks (~> 1.0.15)
   i18n_generators
   listen (>= 3.0.5, < 3.10)
   pg (>= 0.18, < 2.0)

app/controllers/better_together/application_controller.rb

@@ -26,7 +26,7 @@ class ApplicationController < ActionController::Base # rubocop:todo Metrics/Clas
     rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
     rescue_from StandardError, with: :handle_error
 
-    helper_method :default_url_options, :valid_platform_invitation_token_present?
+    helper_method :current_invitation, :default_url_options, :valid_platform_invitation_token_present?
 
     def self.default_url_options
       super.merge(locale: I18n.locale)
@@ -72,29 +72,33 @@ def set_platform_invitation # rubocop:todo Metrics/CyclomaticComplexity, Metrics
         return
       end
 
-      if params[:invitation_code].present?
-        # On first visit with the invitation code, update the session with the token and a new expiry.
-        token = params[:invitation_code]
-        session[:platform_invitation_token] = token
-        session[:platform_invitation_expires_at] ||= Time.current + platform_invitation_expiry_time
-      else
-        # If no params, simply use the token stored in the session.
-        token = session[:platform_invitation_token]
-      end
+      token = if params[:invitation_code].present?
+                # On first visit with the invitation code, update the session with the token and a new expiry.
+                session[:platform_invitation_token] = params[:invitation_code]
+              else
+                # If no params, simply use the token stored in the session.
+                session[:platform_invitation_token]
+              end
 
       return unless token.present?
 
       @platform_invitation = ::BetterTogether::PlatformInvitation.pending.find_by(token: token)
 
-      return if @platform_invitation
-
-      session.delete(:platform_invitation_token)
-      session.delete(:platform_invitation_expires_at)
+      if @platform_invitation
+        session[:platform_invitation_expires_at] ||= Time.current + @platform_invitation.session_duration_mins.minutes
+      else
+        session.delete(:platform_invitation_token)
+        session.delete(:platform_invitation_expires_at)
+      end
     end
     # rubocop:enable Metrics/AbcSize
     # rubocop:enable Metrics/MethodLength
     # rubocop:enable Metrics/PerceivedComplexity
 
+    def current_invitation
+      @platform_invitation
+    end
+
     def check_platform_privacy
       return if helpers.host_platform.privacy_public?
       return if current_user

app/controllers/better_together/platform_invitations_controller.rb

@@ -113,7 +113,10 @@ def set_platform_invitation
     end
 
     def platform_invitation_params
-      params.require(:platform_invitation).permit(:invitee_email, :platform_role_id, :community_role_id, :locale)
+      params.require(:platform_invitation).permit(
+        :invitee_email, :platform_role_id, :community_role_id, :locale,
+        :valid_from, :valid_until, :greeting, :type, :session_duration_mins
+      )
     end
   end
 end

app/controllers/better_together/platforms_controller.rb

@@ -6,6 +6,11 @@ class PlatformsController < FriendlyResourceController # rubocop:todo Style/Docu
     before_action :authorize_platform, only: %i[show edit update destroy]
     after_action :verify_authorized, except: :index
 
+    before_action only: %i[show], if: -> { Rails.env.development? } do
+      # Make sure that all Platform Invitation subclasses are loaded in dev to generate new block buttons
+      ::BetterTogether::PlatformInvitation.load_all_subclasses
+    end
+
     # GET /platforms
     def index
       # @platforms = ::BetterTogether::Platform.all

app/helpers/better_together/form_helper.rb

@@ -99,26 +99,39 @@ def required_label(form_or_object, field, **options) # rubocop:todo Metrics/AbcS
     # rubocop:enable Metrics/MethodLength
 
     # rubocop:todo Metrics/MethodLength
-    def type_select_field(form:, model_class:, selected_type: nil, include_blank: true, **options)
+    # rubocop:todo Metrics/PerceivedComplexity
+    # rubocop:todo Metrics/AbcSize
+    # rubocop:todo Metrics/ParameterLists
+    def type_select_field(form:, model_class:, selected_type: nil, include_model_class: false, include_blank: true,
+                          **options)
+      # rubocop:enable Metrics/ParameterLists
       # Determine if the model is persisted
       disabled = form&.object&.persisted? || false
 
       options = {
-        **options,
         required: true,
         class: 'form-select',
-        disabled: # Disable if the model is persisted
+        disabled:, # Disable if the model is persisted
+        **options
       }
 
       descendants = model_class.descendants.map { |descendant| [descendant.model_name.human, descendant.name] }
 
+      dropdown_values = if include_model_class
+                          [[model_class.model_name.human, model_class.name]] + descendants
+                        else
+                          descendants
+                        end
+
       if form
-        form.select :type, options_for_select(descendants, form.object.type), { include_blank: }, options
+        form.select :type, options_for_select(dropdown_values, form.object.type), { include_blank: }, options
       else
-        select_tag 'type', options_for_select(descendants, selected_type),
+        select_tag 'type', options_for_select(dropdown_values, selected_type),
                    { include_blank: }.merge(options)
       end
     end
+    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/PerceivedComplexity
     # rubocop:enable Metrics/MethodLength
   end
 end

app/mailers/better_together/platform_invitation_mailer.rb

@@ -5,18 +5,21 @@
 module BetterTogether
   # Sends the email to the recipient to accept or decline their invitation to the platform
   class PlatformInvitationMailer < ApplicationMailer
-    def invite(platform_invitation)
+    def invite(platform_invitation) # rubocop:todo Metrics/MethodLength
       @platform_invitation = platform_invitation
       @platform = platform_invitation.invitable
 
       # Override time zone and locale if necessary
       self.locale = platform_invitation.locale
 
       @invitee_email = @platform_invitation.invitee_email
+      return if @invitee_email.blank?
+
+      @greeting = @platform_invitation.greeting
       @valid_from = @platform_invitation.valid_from
       @valid_until = @platform_invitation.valid_until
 
-      @invitation_url = better_together.new_user_registration_url(invitation_code: @platform_invitation.token)
+      @invitation_url = @platform_invitation.url
 
       mail(to: @invitee_email,
            subject: I18n.t('better_together.platform_invitation_mailer.invite.subject',

app/models/better_together/guest_access.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module BetterTogether
+  # Allows for platform managers to allow guest access to the platform
+  class GuestAccess < PlatformInvitation
+    def self.model_name
+      ActiveModel::Name.new(self)
+    end
+
+    def registers_user?
+      false
+    end
+
+    def url
+      BetterTogether::Engine.routes.url_helpers.home_page_url(invitation_code: token, locale:)
+    end
+  end
+end