Massive refactor. Merge forward_auth into App, remove references to unimplemented OIDC federation and SAML features. Add group and user custom claims. Groups now allocate which apps a user can use

app/controllers/admin/applications_controller.rb

@@ -1,6 +1,6 @@
 module Admin
   class ApplicationsController < BaseController
-    before_action :set_application, only: [:show, :edit, :update, :destroy, :regenerate_credentials, :roles, :create_role, :update_role, :assign_role, :remove_role]
+    before_action :set_application, only: [:show, :edit, :update, :destroy, :regenerate_credentials]
 
     def index
       @applications = Application.order(created_at: :desc)
@@ -90,53 +90,6 @@ module Admin
       end
     end
 
-    def roles
-      @application_roles = @application.application_roles.includes(:user_role_assignments)
-      @available_users = User.active.order(:email_address)
-    end
-
-    def create_role
-      @role = @application.application_roles.build(role_params)
-
-      if @role.save
-        redirect_to roles_admin_application_path(@application), notice: "Role created successfully."
-      else
-        @application_roles = @application.application_roles.includes(:user_role_assignments)
-        @available_users = User.active.order(:email_address)
-        render :roles, status: :unprocessable_entity
-      end
-    end
-
-    def update_role
-      @role = @application.application_roles.find(params[:role_id])
-
-      if @role.update(role_params)
-        redirect_to roles_admin_application_path(@application), notice: "Role updated successfully."
-      else
-        @application_roles = @application.application_roles.includes(:user_role_assignments)
-        @available_users = User.active.order(:email_address)
-        render :roles, status: :unprocessable_entity
-      end
-    end
-
-    def assign_role
-      user = User.find(params[:user_id])
-      role = @application.application_roles.find(params[:role_id])
-
-      @application.assign_role_to_user!(user, role.name, source: 'manual')
-
-      redirect_to roles_admin_application_path(@application), notice: "Role assigned successfully."
-    end
-
-    def remove_role
-      user = User.find(params[:user_id])
-      role = @application.application_roles.find(params[:role_id])
-
-      @application.remove_role_from_user!(user, role.name)
-
-      redirect_to roles_admin_application_path(@application), notice: "Role removed successfully."
-    end
-
     private
 
     def set_application
@@ -146,12 +99,8 @@ module Admin
     def application_params
       params.require(:application).permit(
         :name, :slug, :app_type, :active, :redirect_uris, :description, :metadata,
-        :role_mapping_mode, :role_prefix, :role_claim_name, managed_permissions: {}
+        :domain_pattern, headers_config: {}
       )
     end
-
-    def role_params
-      params.require(:application_role).permit(:name, :display_name, :description, :active, permissions: {})
-    end
   end
 end

app/controllers/admin/forward_auth_rules_controller.rb

@@ -1,84 +0,0 @@
-module Admin
-  class ForwardAuthRulesController < BaseController
-    before_action :set_forward_auth_rule, only: [:show, :edit, :update, :destroy]
-
-    def index
-      @forward_auth_rules = ForwardAuthRule.ordered
-    end
-
-    def show
-      @allowed_groups = @forward_auth_rule.allowed_groups
-    end
-
-    def new
-      @forward_auth_rule = ForwardAuthRule.new
-      @available_groups = Group.order(:name)
-    end
-
-    def create
-      @forward_auth_rule = ForwardAuthRule.new(forward_auth_rule_params)
-      # Handle headers configuration
-      @forward_auth_rule.headers_config = process_headers_config(params[:headers_config])
-
-      if @forward_auth_rule.save
-        # Handle group assignments
-        if params[:forward_auth_rule][:group_ids].present?
-          group_ids = params[:forward_auth_rule][:group_ids].reject(&:blank?)
-          @forward_auth_rule.allowed_groups = Group.where(id: group_ids)
-        end
-
-        redirect_to admin_forward_auth_rule_path(@forward_auth_rule), notice: "Forward auth rule created successfully."
-      else
-        @available_groups = Group.order(:name)
-        render :new, status: :unprocessable_entity
-      end
-    end
-
-    def edit
-      @available_groups = Group.order(:name)
-    end
-
-    def update
-      if @forward_auth_rule.update(forward_auth_rule_params)
-        # Handle headers configuration
-        @forward_auth_rule.headers_config = process_headers_config(params[:headers_config])
-        @forward_auth_rule.save!
-
-        # Handle group assignments
-        if params[:forward_auth_rule][:group_ids].present?
-          group_ids = params[:forward_auth_rule][:group_ids].reject(&:blank?)
-          @forward_auth_rule.allowed_groups = Group.where(id: group_ids)
-        else
-          @forward_auth_rule.allowed_groups = []
-        end
-
-        redirect_to admin_forward_auth_rule_path(@forward_auth_rule), notice: "Forward auth rule updated successfully."
-      else
-        @available_groups = Group.order(:name)
-        render :edit, status: :unprocessable_entity
-      end
-    end
-
-    def destroy
-      @forward_auth_rule.destroy
-      redirect_to admin_forward_auth_rules_path, notice: "Forward auth rule deleted successfully."
-    end
-
-    private
-
-    def set_forward_auth_rule
-      @forward_auth_rule = ForwardAuthRule.find(params[:id])
-    end
-
-    def forward_auth_rule_params
-      params.require(:forward_auth_rule).permit(:domain_pattern, :active)
-    end
-
-    def process_headers_config(headers_params)
-      return {} unless headers_params.is_a?(Hash)
-
-      # Clean up headers config - remove empty values, keep only filled ones
-      headers_params.select { |key, value| value.present? }.symbolize_keys
-    end
-  end
-end

app/controllers/admin/groups_controller.rb

@@ -67,7 +67,7 @@ module Admin
     end
 
     def group_params
-      params.require(:group).permit(:name, :description)
+      params.require(:group).permit(:name, :description, custom_claims: {})
     end
   end
 end

app/controllers/admin/users_controller.rb

@@ -76,7 +76,7 @@ module Admin
     end
 
     def user_params
-      params.require(:user).permit(:email_address, :password, :admin, :status)
+      params.require(:user).permit(:email_address, :password, :admin, :status, custom_claims: {})
     end
   end
 end