plutonium 0.43.1 → 0.44.0

data/lib/generators/pu/invites/templates/packages/invites/app/controllers/invites/welcome_controller.rb.tt

@@ -2,15 +2,19 @@
 
 module Invites
   class WelcomeController < ApplicationController
+<% if rodauth? -%>
+    include Plutonium::Auth::Rodauth(:<%= rodauth_config %>)
+
+    before_action { rodauth.require_authentication }
+<% else -%>
+    before_action :require_authentication
+
+<% end -%>
     include Plutonium::Invites::PendingInviteCheck
 
     prepend_view_path Invites::Engine.root.join("app/views")
     layout "invites/invitation"
 
-<% if rodauth? -%>
-    before_action :require_authentication
-<% end -%>
-
     def index
       @invite = pending_invite
 
@@ -21,10 +25,15 @@ module Invites
       end
     end
 
+    def skip
+      cookies.delete(:pending_invitation)
+      redirect_to after_welcome_path, allow_other_host: false
+    end
+
     private
 
     def invite_class
-      Invites::UserInvite
+      ::Invites::UserInvite
     end
 
     # Returns the path to redirect to after the welcome flow completes.
@@ -37,32 +46,14 @@ module Invites
     def default_redirect_path
       "/"
     end
+<% unless rodauth? -%>
 
-<% if rodauth? -%>
-    def require_authentication
-      redirect_to login_path unless current_user
-    end
-
-    def current_user
-      rodauth.rails_account if rodauth.logged_in?
-    end
-
-    def login_path
-      rodauth.login_path
-    end
-
-    def rodauth
-      request.env["rodauth.<%= rodauth_config %>"]
-    end
-<% else -%>
     def require_authentication
-      # TODO: Implement based on your authentication system
-      redirect_to "/login" unless current_user
+      raise NotImplementedError, "#{self.class}#require_authentication must be implemented for your authentication system"
     end
 
     def current_user
-      # TODO: Implement based on your authentication system
-      nil
+      raise NotImplementedError, "#{self.class}#current_user must be implemented for your authentication system"
     end
 <% end -%>
   end

data/lib/generators/pu/invites/templates/packages/invites/app/interactions/invites/cancel_invite_interaction.rb.tt

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Invites
-  class CancelInviteInteraction < Plutonium::Resource::Interaction
+  class CancelInviteInteraction < Invites::ResourceInteraction
     include Plutonium::Invites::Concerns::CancelInvite
   end
 end

data/lib/generators/pu/invites/templates/packages/invites/app/mailers/invites/user_invite_mailer.rb.tt

@@ -2,6 +2,8 @@
 
 module Invites
   class UserInviteMailer < ApplicationMailer
+    prepend_view_path Invites::Engine.root.join("app/views")
+
     def invitation(user_invite)
       @user_invite = user_invite
       @invitation_url = invitation_url(token: user_invite.token)

data/lib/generators/pu/invites/templates/packages/invites/app/views/invites/user_invitations/show.html.erb.tt

@@ -32,8 +32,9 @@
     <div class="space-y-3 pt-4">
       <%%= form.submit "Accept Invitation",
           class: "w-full pu-btn pu-btn-md pu-btn-primary cursor-pointer" %>
-      <%%= link_to "Cancel", "/",
-          class: "w-full block pu-btn pu-btn-md pu-btn-outline text-center" %>
+      <%%= button_to "Skip for Now", invites_welcome_skip_path,
+          method: :delete,
+          class: "w-full pu-btn pu-btn-md pu-btn-outline text-center" %>
     </div>
   <%% end %>
 </div>

data/lib/generators/pu/invites/templates/packages/invites/app/views/invites/welcome/pending_invitation.html.erb.tt

@@ -18,6 +18,7 @@
   <%%= link_to "View Invitation", invitation_path(token: @invite.token),
       class: "w-full block pu-btn pu-btn-md pu-btn-primary text-center" %>
 
-  <%%= link_to "Skip for Now", "/",
-      class: "w-full block pu-btn pu-btn-md pu-btn-outline text-center" %>
+  <%%= button_to "Skip for Now", invites_welcome_skip_path,
+      method: :delete,
+      class: "w-full pu-btn pu-btn-md pu-btn-outline text-center" %>
 </div>

data/lib/generators/pu/lib/plutonium_generators/concerns/logger.rb

@@ -25,6 +25,8 @@ module PlutoniumGenerators
       end
 
       def exception(msg, err)
+        raise err if Rails.env.test?
+
         error "#{msg}\n\n#{err.class}: #{err}\n#{err.backtrace.join("\n")}"
       end
 

data/lib/generators/pu/lib/plutonium_generators/concerns/package_selector.rb

@@ -21,18 +21,16 @@ module PlutoniumGenerators
       end
 
       def available_packages
-        @available_packages ||= begin
-          packages = Dir[Rails.root.join("packages", "*")].map { |dir| File.basename(dir) }
-          packages - reserved_packages
-        end
+        packages = Dir[Rails.root.join("packages", "*")].map { |dir| File.basename(dir) }
+        packages - reserved_packages
       end
 
       def available_portals
-        @available_portals ||= ["main_app"] + available_packages.select { |pkg| pkg.ends_with?("_app") || pkg.ends_with?("_portal") }.sort
+        ["main_app"] + available_packages.select { |pkg| pkg.ends_with?("_app") || pkg.ends_with?("_portal") }.sort
       end
 
       def available_features
-        @available_features ||= ["main_app"] + available_packages.select { |pkg| !(pkg.ends_with?("_app") || pkg.ends_with?("_portal")) }.sort
+        ["main_app"] + available_packages.select { |pkg| !(pkg.ends_with?("_app") || pkg.ends_with?("_portal")) }.sort
       end
 
       def select_package(selected_package = nil, msg: "Select package", pkgs: nil)

data/lib/generators/pu/lib/plutonium_generators/concerns/rodauth_redirects.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module PlutoniumGenerators
+  module Concerns
+    # Shared logic for updating Rodauth redirect configuration.
+    # Used by generators that need to point login/create_account redirects to /welcome.
+    module RodauthRedirects
+      # Updates login_redirect and create_account_redirect in a Rodauth plugin file
+      # to point to the given path (typically "/welcome").
+      #
+      # @param rodauth_file [String] relative path to the rodauth plugin file
+      # @param redirect_path [String] the path to redirect to (default: "/welcome")
+      def update_rodauth_redirects(rodauth_file, redirect_path: "/welcome")
+        unless File.exist?(Rails.root.join(rodauth_file))
+          say_status :skip, "Rodauth plugin not found: #{rodauth_file}", :yellow
+          return
+        end
+
+        file_content = File.read(Rails.root.join(rodauth_file))
+
+        # Update login_redirect
+        if file_content.match?(/login_redirect\s+["']\/["']/)
+          gsub_file rodauth_file,
+            /login_redirect\s+["']\/["']/,
+            "login_redirect \"#{redirect_path}\""
+        end
+
+        # Update or add create_account_redirect
+        if file_content.include?("create_account_redirect")
+          gsub_file rodauth_file,
+            /create_account_redirect\s+["']\/["']/,
+            "create_account_redirect \"#{redirect_path}\""
+        elsif file_content.include?("login_redirect")
+          inject_into_file rodauth_file,
+            "\n    create_account_redirect \"#{redirect_path}\"\n",
+            after: /login_redirect.*\n/
+        end
+      end
+    end
+  end
+end

data/lib/generators/pu/lib/plutonium_generators/generator.rb

@@ -52,7 +52,11 @@ module PlutoniumGenerators
     # ####################
 
     def prompt
-      @prompt ||= TTY::Prompt.new
+      @prompt ||= if options[:interactive] == false || Rails.env.test?
+        NonInteractivePrompt.new
+      else
+        TTY::Prompt.new
+      end
     end
 
     # def appname

data/lib/generators/pu/lib/plutonium_generators/model_generator_base.rb

@@ -254,7 +254,6 @@ module PlutoniumGenerators
             value
           end
         end
-
       end
 
       def required?

data/lib/generators/pu/lib/plutonium_generators/non_interactive_prompt.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module PlutoniumGenerators
+  # A drop-in replacement for TTY::Prompt that raises on any interactive method.
+  # Used when --no-interactive is passed or when there's no TTY (e.g., tests, CI).
+  class NonInteractivePrompt
+    def select(question, choices = nil, **)
+      raise Thor::Error, "Interactive prompt not available: #{question}. Provide the required option explicitly."
+    end
+
+    def ask(question, **)
+      raise Thor::Error, "Interactive prompt not available: #{question}. Provide the required option explicitly."
+    end
+
+    def yes?(question, **)
+      raise Thor::Error, "Interactive prompt not available: #{question}. Provide the required option explicitly."
+    end
+
+    def no?(question, **)
+      raise Thor::Error, "Interactive prompt not available: #{question}. Provide the required option explicitly."
+    end
+
+    def multi_select(question, **)
+      raise Thor::Error, "Interactive prompt not available: #{question}. Provide the required option explicitly."
+    end
+  end
+end

data/lib/generators/pu/rodauth/templates/app/models/account.rb.tt

@@ -31,5 +31,9 @@ class <%= account_path.classify %> < ResourceRecord
 
   # add misc attribute macros above.
 
+  def to_label
+    <%= login_column %>
+  end
+
   # add methods above. add private methods below.
 end

data/lib/generators/pu/saas/entity_generator.rb

@@ -16,6 +16,7 @@ module Pu
       def start
         generate_entity_resource
         add_unique_index_to_migration
+        add_dynamic_path_parameter
       rescue => e
         exception "#{self.class} failed:", e
       end
@@ -43,6 +44,21 @@ module Pu
           before: /^  end\s*$/
       end
 
+      def add_dynamic_path_parameter
+        dest = selected_destination_feature
+        model_path = if dest == "main_app"
+          "app/models/#{normalized_name}.rb"
+        else
+          "packages/#{dest}/app/models/#{normalized_name}.rb"
+        end
+
+        return unless File.exist?(Rails.root.join(model_path))
+
+        inject_into_file model_path,
+          "  dynamic_path_parameter :name\n",
+          before: /^\s*# add model configurations above\./
+      end
+
       def entity_attributes
         ["name:string", *Array(options[:extra_attributes])]
       end

data/lib/generators/pu/saas/membership_generator.rb

@@ -16,8 +16,8 @@ module Pu
       class_option :entity, type: :string, required: true,
         desc: "The entity model name (e.g., Organization)"
 
-      class_option :roles, type: :array, default: %w[member owner],
-        desc: "Available roles for memberships"
+      class_option :roles, type: :array, default: %w[admin member],
+        desc: "Additional roles for memberships (owner is always included as the first role)"
 
       class_option :extra_attributes, type: :array, default: [],
         desc: "Additional attributes for the membership model"
@@ -211,7 +211,8 @@ module Pu
       end
 
       def roles
-        Array(options[:roles]).flat_map { |r| r.split(",") }.map(&:strip)
+        additional = Array(options[:roles]).flat_map { |r| r.split(",") }.map(&:strip)
+        ["owner", *additional.excluding("owner")]
       end
 
       def roles_enum

data/lib/generators/pu/saas/portal/USAGE

@@ -0,0 +1,15 @@
+Description:
+  Generates a SaaS portal with entity scoping, entity self-management,
+  and navigation helpers.
+
+  Wraps pu:pkg:portal and adds:
+  - Entity registered as a singular resource
+  - Portal-scoped EntityPolicy (update=owner, no destroy)
+  - entity_url and user_entities helpers in portal concerns
+  - Entity controller for the portal
+
+Example:
+  rails g pu:saas:portal --entity-model=Organization --portal-name=Dashboard
+
+  This generates a DashboardPortal scoped to Organization, with
+  entity management and navigation helpers built in.

data/lib/generators/pu/saas/portal_generator.rb

@@ -0,0 +1,122 @@
+# frozen_string_literal: true
+
+require "rails/generators/base"
+require_relative "../lib/plutonium_generators"
+
+module Pu
+  module Saas
+    class PortalGenerator < ::Rails::Generators::Base
+      include PlutoniumGenerators::Generator
+
+      desc "Generate a SaaS portal with entity scoping, entity management, and navigation helpers"
+
+      class_option :entity_model, type: :string, required: true,
+        desc: "The entity model name (e.g., Organization)"
+
+      class_option :user_model, type: :string, default: "User",
+        desc: "The user model name"
+
+      class_option :portal_name, type: :string, default: "Dashboard",
+        desc: "Portal name (e.g., Dashboard generates DashboardPortal)"
+
+      class_option :rodauth, type: :string, default: "user",
+        desc: "Rodauth configuration name"
+
+      def start
+        create_portal
+        connect_entity_to_portal
+        customize_entity_policy
+        add_entity_url_helper
+      rescue => e
+        exception "#{self.class} failed:", e
+      end
+
+      private
+
+      def create_portal
+        generate "pu:pkg:portal", "#{options[:portal_name]} --auth=#{rodauth_config} --scope=#{entity_model}"
+      end
+
+      def connect_entity_to_portal
+        # Shell out so the subprocess can load the newly created entity model
+        generate "pu:res:conn", "#{entity_model} --dest=#{portal_package} --singular --policy"
+      end
+
+      def customize_entity_policy
+        content = <<-RUBY
+
+  def update?
+    current_membership&.owner?
+  end
+
+  def destroy?
+    false
+  end
+
+  def permitted_attributes_for_read
+    [:name]
+  end
+
+  def permitted_attributes_for_update
+    [:name]
+  end
+
+  def permitted_associations
+    []
+  end
+        RUBY
+        inject_into_file entity_policy_path, content, after: /include #{portal_engine}::ResourcePolicy\n/
+      end
+
+      def add_entity_url_helper
+        content = <<-RUBY
+
+      included do
+        helper_method :entity_url, :user_entities
+      end
+
+      private
+
+      # Returns the URL to the current entity's show page.
+      def entity_url
+        resource_url_for(current_scoped_entity)
+      end
+
+      # Returns all entities the current user belongs to (for the entity switcher).
+      def user_entities
+        @user_entities ||= current_user.#{entity_table.pluralize}
+      end
+        RUBY
+        inject_into_file concerns_controller_path, content, after: /# add concerns above\.\n/
+      end
+
+      def entity_model
+        options[:entity_model].camelize
+      end
+
+      def entity_table
+        options[:entity_model].underscore
+      end
+
+      def rodauth_config
+        options[:rodauth]
+      end
+
+      def portal_engine
+        "#{options[:portal_name].camelize}Portal"
+      end
+
+      def portal_package
+        portal_engine.underscore
+      end
+
+      def concerns_controller_path
+        "packages/#{portal_package}/app/controllers/#{portal_package}/concerns/controller.rb"
+      end
+
+      def entity_policy_path
+        "packages/#{portal_package}/app/policies/#{portal_package}/#{entity_table}_policy.rb"
+      end
+    end
+  end
+end

data/lib/generators/pu/saas/setup/USAGE

@@ -1,27 +1,22 @@
 Description:
-    Generate a complete SaaS setup with user account, entity, and membership.
-    This is the recommended way to set up multi-tenant authentication.
+    Generate a complete SaaS setup with user account, entity, membership,
+    portal, welcome flow, invites, and profile.
+
+    This is the recommended way to bootstrap a multi-tenant SaaS app.
 
 Example:
-    rails g pu:saas:setup --user Customer --entity Organization
-    rails g pu:saas:setup --user Customer --entity Organization --roles=member,admin,owner
-    rails g pu:saas:setup --user Customer --entity Organization --no-allow-signup
-    rails g pu:saas:setup --user Customer --entity Organization --user-attributes=name:string
-    rails g pu:saas:setup --user Customer --entity Organization --skip-entity
+    rails g pu:saas:setup --user=User --entity=Organization
 
-    This creates:
-        1. User account (Customer) with Rodauth authentication
-        2. Entity model (Organization) with unique name
-        3. Membership model (OrganizationCustomer) with role enum
+    Full setup with all defaults:
+      - User model with Rodauth authentication
+      - Entity model with unique name and dynamic path parameter
+      - Membership model with owner/admin/member roles
+      - DashboardPortal with entity scoping
+      - Welcome/onboarding flow
+      - User invites package
+      - User profile resource
 
-Options:
-    --user                      User model name (required)
-    --entity                    Entity model name (required)
-    --allow-signup              Allow public registration (default: true)
-    --roles                     Comma-separated membership roles (default: member,owner)
-    --skip-entity               Skip entity model generation
-    --skip-membership           Skip membership model generation
-    --user-attributes           Additional user model attributes
-    --entity-attributes         Additional entity model attributes
-    --membership-attributes     Additional membership model attributes
-    --dest                      Destination package (default: main_app)
+    Customize:
+    rails g pu:saas:setup --user=User --entity=Organization --portal-name=Customer
+    rails g pu:saas:setup --user=User --entity=Organization --no-invites --no-profile
+    rails g pu:saas:setup --user=User --entity=Organization --no-portal

data/lib/generators/pu/saas/setup_generator.rb

@@ -8,10 +8,10 @@ module Pu
     class SetupGenerator < ::Rails::Generators::Base
       include PlutoniumGenerators::Generator
 
-      desc "Generate a complete SaaS setup with user, entity, and membership"
+      desc "Generate a complete SaaS setup with user, entity, membership, portal, and welcome flow"
 
       class_option :user, type: :string, required: true,
-        desc: "The user model name (e.g., Customer)"
+        desc: "The user model name (e.g., User)"
 
       class_option :entity, type: :string, required: true,
         desc: "The entity model name (e.g., Organization)"
@@ -19,8 +19,8 @@ module Pu
       class_option :allow_signup, type: :boolean, default: true,
         desc: "Whether to allow users to sign up to the platform"
 
-      class_option :roles, type: :array, default: %w[member owner],
-        desc: "Available roles for memberships"
+      class_option :roles, type: :array, default: %w[admin member],
+        desc: "Additional roles for memberships (owner is always included as the first role)"
 
       class_option :skip_entity, type: :boolean, default: false,
         desc: "Skip entity model generation"
@@ -37,6 +37,21 @@ module Pu
       class_option :membership_attributes, type: :array, default: [],
         desc: "Additional attributes for the membership model"
 
+      class_option :portal, type: :boolean, default: true,
+        desc: "Generate a portal with entity scoping"
+
+      class_option :portal_name, type: :string, default: "Dashboard",
+        desc: "Portal name (e.g., Dashboard generates DashboardPortal)"
+
+      class_option :welcome, type: :boolean, default: true,
+        desc: "Generate the welcome/onboarding flow"
+
+      class_option :invites, type: :boolean, default: true,
+        desc: "Generate the user invites package"
+
+      class_option :profile, type: :boolean, default: true,
+        desc: "Generate user profile resource"
+
       class_option :api_client, type: :string, default: nil,
         desc: "Generate an API client model (e.g., ApiClient)"
 
@@ -48,6 +63,10 @@ module Pu
         generate_user
         generate_entity unless options[:skip_entity]
         generate_membership unless options[:skip_membership]
+        generate_portal if options[:portal] && !options[:skip_entity]
+        generate_profile if options[:profile]
+        generate_welcome if options[:welcome] && !options[:skip_entity] && options[:portal]
+        generate_invites if options[:invites] && !options[:skip_entity] && !options[:skip_membership]
         generate_api_client if options[:api_client].present?
       rescue => e
         exception "#{self.class} failed:", e
@@ -62,7 +81,6 @@ module Pu
       end
 
       def generate_user
-        # Use class-based invocation to avoid Thor's invoke caching
         klass = Rails::Generators.find_by_namespace("pu:saas:user")
         klass.new(
           [options[:user]],
@@ -76,7 +94,6 @@ module Pu
       end
 
       def generate_entity
-        # Use class-based invocation to avoid Thor's invoke caching
         klass = Rails::Generators.find_by_namespace("pu:saas:entity")
         klass.new(
           [options[:entity]],
@@ -90,7 +107,6 @@ module Pu
       end
 
       def generate_membership
-        # Use class-based invocation to avoid Thor's invoke caching
         klass = Rails::Generators.find_by_namespace("pu:saas:membership")
         klass.new(
           [],
@@ -106,8 +122,34 @@ module Pu
         ).invoke_all
       end
 
+      def generate_portal
+        generate "pu:saas:portal",
+          "--entity-model=#{options[:entity]} --user-model=#{options[:user]}" \
+          " --portal-name=#{options[:portal_name]}" \
+          " --rodauth=#{rodauth_config}"
+      end
+
+      def generate_profile
+        generate "pu:profile:setup",
+          "--user-model=#{options[:user]} --dest=main_app" \
+          "#{" --portal=#{portal_package}" if options[:portal]}"
+      end
+
+      def generate_welcome
+        generate "pu:saas:welcome",
+          "--user-model=#{options[:user]} --entity-model=#{options[:entity]}" \
+          " --portal=#{portal_engine}" \
+          " --rodauth=#{rodauth_config}" \
+          "#{" --profile" if options[:profile]}"
+      end
+
+      def generate_invites
+        generate "pu:invites:install",
+          "--entity-model=#{options[:entity]} --user-model=#{options[:user]} --dest=main_app" \
+          " --rodauth=#{rodauth_config}"
+      end
+
       def generate_api_client
-        # Use class-based invocation to avoid Thor's invoke caching
         klass = Rails::Generators.find_by_namespace("pu:saas:api_client")
         api_client_options = {
           roles: options[:api_client_roles],
@@ -116,11 +158,22 @@ module Pu
           skip: options[:skip]
         }
 
-        # Scope to entity if entity is being generated
         api_client_options[:entity] = options[:entity] unless options[:skip_entity]
 
         klass.new([options[:api_client]], api_client_options).invoke_all
       end
+
+      def rodauth_config
+        options[:user].underscore
+      end
+
+      def portal_package
+        "#{options[:portal_name].underscore}_portal"
+      end
+
+      def portal_engine
+        "#{options[:portal_name].camelize}Portal"
+      end
     end
   end
 end

data/lib/generators/pu/saas/welcome/USAGE

@@ -0,0 +1,27 @@
+Description:
+  Generates a post-login welcome flow with onboarding and entity selection.
+
+  This creates the controllers, views, and routes needed to bridge
+  authentication and the main portal:
+
+  - AuthenticatedController: base controller requiring login
+  - WelcomeController: routing hub (invite check -> onboarding -> entity selection -> portal)
+  - Onboarding view: create first entity (and optional profile)
+  - Entity selection view: choose from multiple entities
+
+Example:
+  rails g pu:saas:welcome --user-model=User --entity-model=Organization --portal=CustomerPortal
+
+  This generates:
+    app/controllers/authenticated_controller.rb
+    app/controllers/welcome_controller.rb
+    app/views/welcome/onboarding.html.erb
+    app/views/welcome/select_entity.html.erb
+
+  And adds routes:
+    GET  /welcome         -> welcome#index
+    GET  /welcome/onboard -> welcome#new_entity
+    POST /welcome/onboard -> welcome#onboard
+
+Options:
+  --profile  Include profile setup in onboarding form