organizations 0.4.2 → 0.5.0

data/lib/generators/organizations/views/templates/organizations/organizations/index.html.erb

@@ -0,0 +1,93 @@
+<div class="mb-8 flex justify-between items-center">
+  <div>
+    <h1 class="text-2xl font-bold text-gray-900">Organizations</h1>
+    <p class="mt-1 text-sm text-gray-500">Organizations you belong to, with your role in each workspace.</p>
+  </div>
+  <%= link_to new_organization_path,
+    class: "inline-flex items-center gap-2 rounded-lg bg-slate-600 px-4 py-2 text-sm font-semibold text-white shadow-sm hover:bg-slate-500" do %>
+    <%= heroicon "plus", variant: :mini, options: { class: "h-4 w-4" } %>
+    Create Organization
+  <% end %>
+</div>
+
+<% if @organizations.blank? %>
+  <div class="bg-gray-50 rounded-xl border-2 border-dashed border-gray-200 p-12 text-center">
+    <%= heroicon "building-office-2", variant: :outline, options: { class: "mx-auto h-12 w-12 text-gray-400" } %>
+    <h3 class="mt-2 text-sm font-semibold text-gray-900">No organizations</h3>
+    <p class="mt-1 text-sm text-gray-500">Get started by creating a new organization.</p>
+    <div class="mt-6">
+      <%= link_to new_organization_path,
+        class: "inline-flex items-center gap-2 rounded-lg bg-slate-600 px-4 py-2 text-sm font-semibold text-white shadow-sm hover:bg-slate-500" do %>
+        <%= heroicon "plus", variant: :mini, options: { class: "h-4 w-4" } %>
+        New Organization
+      <% end %>
+    </div>
+  </div>
+<% else %>
+  <% role_by_org = @memberships.index_by(&:organization_id) %>
+
+  <div class="bg-white rounded-xl shadow-sm border border-gray-200 overflow-hidden">
+    <table class="min-w-full divide-y divide-gray-200 bg-white">
+      <thead class="bg-gray-50">
+        <tr>
+          <th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Organization</th>
+          <th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Your Role</th>
+          <th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Members</th>
+          <th scope="col" class="px-6 py-3 text-right text-xs font-medium text-gray-500 uppercase tracking-wider">Actions</th>
+        </tr>
+      </thead>
+      <tbody class="bg-white divide-y divide-gray-200">
+        <% @organizations.each do |organization| %>
+          <% membership = role_by_org[organization.id] %>
+          <% is_current = current_organization&.id == organization.id %>
+          <tr class="<%= is_current ? 'bg-slate-50' : 'bg-white hover:bg-gray-50' %>">
+            <td class="px-6 py-4 whitespace-nowrap bg-inherit">
+              <div class="flex items-center gap-3">
+                <span class="inline-flex h-10 w-10 items-center justify-center rounded-lg <%= is_current ? 'bg-slate-600 text-white' : 'bg-gray-200 text-gray-600' %> font-semibold">
+                  <%= organization.name.first.upcase %>
+                </span>
+                <div>
+                  <div class="text-sm font-medium text-gray-900 flex items-center gap-2">
+                    <%= organization.name %>
+                    <% if is_current %>
+                      <span class="inline-flex items-center rounded-full bg-slate-100 px-2 py-0.5 text-xs font-medium text-slate-700">Current</span>
+                    <% end %>
+                  </div>
+                </div>
+              </div>
+            </td>
+            <td class="px-6 py-4 whitespace-nowrap bg-inherit">
+              <span class="inline-flex items-center rounded-md px-2 py-1 text-xs font-medium
+                <%= case membership&.role
+                    when 'owner' then 'bg-amber-100 text-amber-800'
+                    when 'admin' then 'bg-purple-100 text-purple-800'
+                    when 'member' then 'bg-blue-100 text-blue-800'
+                    else 'bg-gray-100 text-gray-800'
+                    end %>">
+                <%= membership&.role&.capitalize || "Unknown" %>
+              </span>
+            </td>
+            <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500 bg-inherit">
+              <%= organization.member_count %> <%= "member".pluralize(organization.member_count) %>
+            </td>
+            <td class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium bg-inherit">
+              <div class="flex items-center justify-end gap-2">
+                <% unless is_current %>
+                  <%= button_to switch_organization_path(organization),
+                    method: :post,
+                    class: "inline-flex items-center rounded-md bg-slate-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm hover:bg-slate-500" do %>
+                    Switch
+                  <% end %>
+                <% end %>
+                <%= link_to organization_path(organization),
+                  class: "inline-flex items-center rounded-md bg-white px-3 py-1.5 text-xs font-semibold text-gray-700 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50" do %>
+                  Open
+                <% end %>
+              </div>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+<% end %>

data/lib/generators/organizations/views/templates/organizations/organizations/new.html.erb

@@ -0,0 +1,10 @@
+<div class="max-w-lg mx-auto">
+  <div class="mb-8">
+    <h1 class="text-2xl font-bold text-gray-900">New Organization</h1>
+    <p class="mt-1 text-sm text-gray-500">Create a new workspace. You will become its owner.</p>
+  </div>
+
+  <div class="bg-white rounded-xl shadow-sm border border-gray-200 p-6">
+    <%= render "form" %>
+  </div>
+</div>

data/lib/generators/organizations/views/templates/organizations/organizations/show.html.erb

@@ -0,0 +1,270 @@
+<%# Permission checks against THIS organization, not current_organization from session %>
+<% is_admin_or_owner = current_user.is_at_least?(:admin, in: @organization) %>
+<% is_owner = current_user.is_owner_of?(@organization) %>
+
+<%# Organization header %>
+<div class="mb-8">
+  <div class="flex items-start justify-between">
+    <div class="flex items-center gap-4">
+      <span class="inline-flex h-14 w-14 items-center justify-center rounded-xl bg-slate-600 text-white font-bold text-2xl shadow-lg">
+        <%= @organization.name.first.upcase %>
+      </span>
+      <div>
+        <h1 class="text-2xl font-bold text-gray-900"><%= @organization.name %></h1>
+        <p class="mt-1 text-gray-500">Manage your organization settings, team members, and invitations.</p>
+      </div>
+    </div>
+    <div class="flex items-center gap-2">
+      <% if is_admin_or_owner %>
+        <%= link_to organizations.new_organization_invitation_path,
+          class: "inline-flex items-center gap-1.5 rounded-lg bg-slate-600 px-4 py-2 text-sm font-semibold text-white shadow-sm hover:bg-slate-500" do %>
+          <%= heroicon "user-plus", variant: :mini, options: { class: "h-4 w-4" } %>
+          Invite Member
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+</div>
+
+<%# Stats grid %>
+<div class="grid grid-cols-1 gap-6 sm:grid-cols-3 mb-8">
+  <div class="bg-white rounded-xl border border-gray-200 shadow-sm p-6">
+    <div class="flex items-center gap-4">
+      <div class="h-12 w-12 rounded-xl bg-slate-100 flex items-center justify-center">
+        <%= heroicon "users", variant: :solid, options: { class: "h-6 w-6 text-slate-600" } %>
+      </div>
+      <div>
+        <p class="text-sm text-gray-500">Team Members</p>
+        <p class="text-2xl font-bold text-gray-900"><%= @organization.member_count %></p>
+      </div>
+    </div>
+  </div>
+
+  <div class="bg-white rounded-xl border border-gray-200 shadow-sm p-6">
+    <div class="flex items-center gap-4">
+      <div class="h-12 w-12 rounded-xl bg-amber-100 flex items-center justify-center">
+        <%= heroicon "envelope", variant: :solid, options: { class: "h-6 w-6 text-amber-600" } %>
+      </div>
+      <div>
+        <p class="text-sm text-gray-500">Pending Invites</p>
+        <p class="text-2xl font-bold text-gray-900"><%= @organization.invitations.pending.count %></p>
+      </div>
+    </div>
+  </div>
+
+  <div class="bg-white rounded-xl border border-gray-200 shadow-sm p-6">
+    <div class="flex items-center gap-4">
+      <div class="h-12 w-12 rounded-xl bg-emerald-100 flex items-center justify-center">
+        <%= heroicon "shield-check", variant: :solid, options: { class: "h-6 w-6 text-emerald-600" } %>
+      </div>
+      <div>
+        <p class="text-sm text-gray-500">Your Role</p>
+        <p class="text-2xl font-bold text-gray-900"><%= current_user.role_in(@organization)&.capitalize || "N/A" %></p>
+      </div>
+    </div>
+  </div>
+</div>
+
+<%# Team Members Card - Full width %>
+<div class="bg-white rounded-xl shadow-sm border border-gray-200 overflow-hidden mb-8">
+  <div class="px-6 py-5 border-b border-gray-200">
+    <div class="flex justify-between items-start">
+      <div>
+        <h2 class="text-lg font-semibold text-gray-900">Team Members</h2>
+        <p class="text-sm text-gray-500 mt-1">All users who belong to this organization with their roles.</p>
+      </div>
+      <% if is_admin_or_owner %>
+        <%= link_to organizations.new_organization_invitation_path,
+          class: "flex-shrink-0 inline-flex items-center gap-2 rounded-lg bg-slate-600 px-4 py-2 text-sm font-semibold text-white shadow-sm hover:bg-slate-500" do %>
+          <%= heroicon "user-plus", variant: :solid, options: { class: "h-4 w-4" } %>
+          Invite
+        <% end %>
+      <% end %>
+    </div>
+    <% unless is_admin_or_owner %>
+      <p class="mt-3 text-xs text-amber-600 bg-amber-50 rounded-lg px-3 py-2">
+        <%= heroicon "lock-closed", variant: :solid, options: { class: "inline h-3 w-3 mr-1" } %>
+        <strong>Invite button hidden.</strong> Only <span class="font-medium">admins</span> and <span class="font-medium">owners</span> can invite new members.
+      </p>
+    <% end %>
+  </div>
+
+  <div class="divide-y divide-gray-100">
+    <% @organization.memberships.includes(:user).order(:created_at).each do |membership| %>
+      <% is_current_user = membership.user_id == current_user.id %>
+      <div class="px-6 py-5 flex items-center justify-between hover:bg-gray-50">
+        <div class="flex items-center gap-4">
+          <span class="inline-flex h-11 w-11 items-center justify-center rounded-full <%= is_current_user ? 'bg-slate-600 text-white' : 'bg-gray-100 text-gray-600' %> font-semibold text-sm">
+            <%= membership.user.email.first.upcase %>
+          </span>
+          <div>
+            <p class="text-sm font-medium text-gray-900">
+              <%= membership.user.email %>
+              <% if is_current_user %>
+                <span class="text-xs text-emerald-600 ml-1">(you)</span>
+              <% end %>
+            </p>
+            <p class="text-xs text-gray-500 mt-0.5">Joined <%= time_ago_in_words(membership.created_at) %> ago</p>
+          </div>
+        </div>
+
+        <div class="flex items-center gap-4">
+          <div class="text-right">
+            <span class="inline-flex items-center rounded-full px-3 py-1 text-xs font-semibold
+              <%= case membership.role
+                  when 'owner' then 'bg-amber-100 text-amber-800'
+                  when 'admin' then 'bg-purple-100 text-purple-800'
+                  when 'member' then 'bg-blue-100 text-blue-800'
+                  else 'bg-gray-100 text-gray-700'
+                  end %>">
+              <%= membership.role.capitalize %>
+            </span>
+          </div>
+
+          <%# Role management for admins/owners %>
+          <% if is_admin_or_owner && !is_current_user && membership.role != 'owner' %>
+            <div class="flex items-center gap-2">
+              <%= form_with(model: membership, url: organizations.membership_path(membership), method: :patch, local: true, class: "flex items-center gap-2") do |form| %>
+                <%= form.select :role,
+                  Organizations::Roles::HIERARCHY.reject { |r| r == :owner }.map { |role| [role.to_s.capitalize, role] },
+                  { selected: membership.role },
+                  class: "rounded-md border-gray-300 text-xs focus:border-slate-500 focus:ring-slate-500 py-1" %>
+                <%= form.submit "Update",
+                  class: "inline-flex items-center rounded-md bg-white px-2 py-1 text-xs font-semibold text-gray-700 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 cursor-pointer" %>
+              <% end %>
+
+              <%= button_to organizations.membership_path(membership),
+                method: :delete,
+                data: { turbo_confirm: "Remove #{membership.user.email} from the organization?" },
+                class: "inline-flex items-center rounded-md bg-red-50 px-2 py-1 text-xs font-medium text-red-700 hover:bg-red-100 cursor-pointer" do %>
+                <%= heroicon "trash", variant: :mini, options: { class: "h-3.5 w-3.5" } %>
+              <% end %>
+            </div>
+          <% elsif is_current_user %>
+            <span class="text-xs text-gray-400 italic">Current user</span>
+          <% elsif membership.role == 'owner' %>
+            <span class="text-xs text-gray-400 italic">Organization owner</span>
+          <% end %>
+
+          <%# Demo: Switch to this user %>
+          <% if membership.user.id != current_user.id %>
+            <%= button_to main_app.switch_user_path(email: membership.user.email),
+              method: :post,
+              data: { turbo: false },
+              class: "inline-flex items-center gap-1.5 rounded-lg bg-gray-100 px-3 py-1.5 text-xs font-medium text-gray-600 hover:bg-gray-200 transition-colors",
+              title: "Demo: Switch to this user to see the UI from their perspective" do %>
+              <%= heroicon "arrow-path", variant: :solid, options: { class: "h-3.5 w-3.5" } %>
+              Impersonate
+            <% end %>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+
+  <div class="px-6 py-3 bg-gray-50 border-t border-gray-100">
+    <p class="text-xs text-gray-500">
+      <strong>Try it:</strong> Click "Impersonate" to switch users and see how the UI changes based on their role permissions.
+    </p>
+  </div>
+
+  <%# Pending invitations %>
+  <% pending = @organization.invitations.pending %>
+  <% if pending.any? && is_admin_or_owner %>
+    <div class="border-t border-gray-200 bg-gray-50 px-6 py-5">
+      <div class="flex items-center justify-between mb-2">
+        <h3 class="text-sm font-semibold text-gray-900">Pending Invitations</h3>
+        <span class="inline-flex items-center rounded-full bg-gray-200 px-2.5 py-0.5 text-xs font-semibold text-gray-700">
+          <%= pending.count %>
+        </span>
+      </div>
+      <p class="text-xs text-gray-500 mb-4">These users have been invited but haven't accepted yet.</p>
+      <div class="space-y-3">
+        <% pending.includes(:invited_by).each do |inv| %>
+          <div class="flex items-center justify-between bg-white rounded-lg px-4 py-3 border border-gray-200">
+            <div class="flex items-center gap-3">
+              <span class="inline-flex h-8 w-8 items-center justify-center rounded-full bg-amber-100 text-amber-600 font-medium text-xs">
+                <%= inv.email.first.upcase %>
+              </span>
+              <div>
+                <span class="text-sm font-medium text-gray-900"><%= inv.email %></span>
+                <span class="ml-2 text-xs text-gray-500 bg-gray-100 px-1.5 py-0.5 rounded">will be <%= inv.role %></span>
+              </div>
+            </div>
+            <div class="flex items-center gap-2">
+              <%= button_to organizations.resend_organization_invitation_path(inv),
+                method: :post,
+                class: "p-1.5 rounded text-gray-400 hover:text-gray-600 hover:bg-gray-100 cursor-pointer",
+                title: "Resend" do %>
+                <%= heroicon "arrow-path", variant: :mini, options: { class: "h-4 w-4" } %>
+              <% end %>
+              <%= button_to organizations.organization_invitation_path(inv),
+                method: :delete,
+                data: { turbo_confirm: "Revoke this invitation?" },
+                class: "p-1.5 rounded text-gray-400 hover:text-red-600 hover:bg-red-50 cursor-pointer",
+                title: "Revoke" do %>
+                <%= heroicon "x-mark", variant: :mini, options: { class: "h-4 w-4" } %>
+              <% end %>
+              <%= button_to main_app.switch_user_path(email: inv.email),
+                method: :post,
+                data: { turbo: false },
+                class: "text-xs font-medium text-gray-600 hover:text-gray-900 cursor-pointer" do %>
+                Impersonate & Accept →
+              <% end %>
+            </div>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  <% end %>
+</div>
+
+<%# Bottom row: Organization Settings + Danger Zone side by side %>
+<div class="grid grid-cols-1 lg:grid-cols-2 gap-6">
+
+  <%# Organization Settings %>
+  <div>
+    <% if is_admin_or_owner %>
+      <div class="bg-white rounded-xl shadow-sm border border-gray-200 overflow-hidden h-full flex flex-col">
+        <div class="px-6 py-4 border-b border-gray-200">
+          <h2 class="text-base font-semibold text-gray-900">Organization Settings</h2>
+        </div>
+        <%= form_with model: @organization, url: organizations.organization_path(@organization), method: :patch, class: "p-5 space-y-4 flex-1" do |f| %>
+          <div>
+            <label class="block text-sm font-medium text-gray-700 mb-1">Name</label>
+            <%= f.text_field :name, class: "block w-full rounded-lg border-gray-300 text-sm shadow-sm focus:border-slate-500 focus:ring-slate-500" %>
+            <p class="mt-1 text-xs text-gray-400">Editable because you're an <code class="bg-gray-100 px-1 rounded"><%= current_user.role_in(@organization) %></code></p>
+          </div>
+          <div>
+            <label class="block text-sm font-medium text-gray-400 mb-1">Slug</label>
+            <div class="flex rounded-lg shadow-sm">
+              <span class="inline-flex items-center px-3 rounded-l-lg border border-r-0 border-gray-200 bg-gray-50 text-gray-400 text-sm">yourapp.com/</span>
+              <input type="text" disabled value="<%= @organization.name.parameterize %>" class="block w-full rounded-r-lg border-gray-200 bg-gray-50 text-sm text-gray-400 cursor-not-allowed" />
+            </div>
+            <p class="mt-1 text-xs text-gray-400">Placeholder field (not functional)</p>
+          </div>
+          <%= f.submit "Save Changes", class: "w-full inline-flex justify-center items-center rounded-lg bg-slate-600 px-4 py-2.5 text-sm font-semibold text-white shadow-sm hover:bg-slate-500 cursor-pointer" %>
+        <% end %>
+      </div>
+    <% else %>
+      <div class="bg-gray-50 rounded-xl border-2 border-dashed border-gray-200 p-6 h-full flex flex-col items-center justify-center">
+        <%= heroicon "lock-closed", variant: :solid, options: { class: "h-10 w-10 text-gray-300" } %>
+        <h3 class="mt-3 text-sm font-semibold text-gray-900 text-center">Organization Settings</h3>
+        <p class="mt-2 text-xs text-gray-500 text-center">Requires <code class="bg-gray-200 px-1 rounded">admin</code> role or higher.</p>
+        <p class="text-xs text-gray-400 text-center">Impersonate an admin or owner to see this.</p>
+      </div>
+    <% end %>
+  </div>
+
+  <%# Danger Zone — owner-only destructive actions (transfer/delete). NOT
+      part of `rails g organizations:views` (it carries its own Stimulus
+      modal + icon dependencies): rendered only when the host app provides
+      the partial. Copy the full-featured one from the gem's
+      test/dummy/app/views/shared/_danger_zone.html.erb. %>
+  <% if lookup_context.exists?("shared/danger_zone", [], true) %>
+    <div>
+      <%= render "shared/danger_zone", organization: @organization %>
+    </div>
+  <% end %>
+
+</div>

data/lib/generators/organizations/views/views_generator.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "rails/generators/base"
+
+module Organizations
+  module Generators
+    # Copies the reference views into the host app — the devise-views pattern
+    # (https://github.com/heartcombo/devise#configuring-views) for a BYO-UI
+    # engine: the engine's controllers render HOST views, so a fresh install
+    # hits missing-template errors until these exist. Run:
+    #
+    #   rails generate organizations:views
+    #
+    # and retheme freely — the copies are yours. Tailwind-styled, matching
+    # the gem's test/dummy reference app (the templates here are kept
+    # byte-identical to the dummy's views by a sync test in the gem's suite,
+    # so the dummy remains the living, boot-able preview of what you get).
+    #
+    # NOTE: verified joining (join screens, request queues, access
+    # management) is deliberately NOT part of this set — those surfaces are
+    # host ROUTES + CONTROLLERS too, not just views. Copy the reference
+    # implementation from the gem's test/dummy app instead (see README
+    # "Verified joining — reference UI").
+    class ViewsGenerator < Rails::Generators::Base
+      source_root File.expand_path("templates", __dir__)
+
+      desc "Copies the organizations reference views into app/views/organizations"
+
+      def copy_views
+        directory "organizations", "app/views/organizations"
+      end
+
+      def show_readme
+        say ""
+        say "Organizations views copied to app/views/organizations/ — they're yours now; retheme freely.", :green
+        say "These views use Tailwind classes and the `heroicon` helper: add `gem \"heroicons\"` (or"
+        say "swap the icon calls for your own icon set)."
+        say "The organization page's owner-only Danger Zone (transfer/delete) renders only if you"
+        say "provide app/views/shared/_danger_zone.html.erb — copy the full-featured one (Stimulus"
+        say "confirm modal included) from the gem's test/dummy app."
+        say "Verified-joining surfaces (join screen, request queue, access management) are host"
+        say "controllers + views: copy the reference implementation from the gem's test/dummy app."
+        say ""
+      end
+    end
+  end
+end

data/lib/organizations/callback_context.rb

@@ -11,6 +11,11 @@ module Organizations
   # - :member_removed => organization, membership, user, removed_by
   # - :role_changed => organization, membership, old_role, new_role, changed_by
   # - :ownership_transferred => organization, old_owner, new_owner
+  # - :member_joining => organization, user, role, joined_via, invitation/join_request (whichever instrument applies)
+  #   (STRICT + pre-persist: raise Organizations::MembershipVetoed to veto — see Configuration#on_member_joining)
+  # - :join_request_created => organization, user, join_request
+  # - :join_request_approved => organization, user, join_request, membership, decided_by (nil for auto-approvals)
+  # - :join_request_rejected => organization, user, join_request, decided_by
   #
   # @example Accessing context data
   #   config.on_organization_created do |ctx|
@@ -30,6 +35,10 @@ module Organizations
     :new_role,        # Symbol - new role (for role_changed)
     :old_owner,       # User instance - previous owner (for ownership_transferred)
     :new_owner,       # User instance - new owner (for ownership_transferred)
+    :join_request,    # Organizations::JoinRequest instance (for join_request_* events)
+    :decided_by,      # User instance - who approved/rejected the join request (nil for auto)
+    :role,            # String/Symbol - the role the membership will be created with (for member_joining)
+    :joined_via,      # String - membership provenance: invited|code|domain_email|allowlist|manual (for member_joining)
     :permission,      # Symbol - the permission that was required (for unauthorized)
     :required_role,   # Symbol - the role that was required (for unauthorized)
     :metadata,        # Hash - additional contextual data

data/lib/organizations/callbacks.rb

@@ -13,10 +13,15 @@ module Organizations
     EVENTS = %i[
       organization_created
       member_invited
+      member_joining
       member_joined
       member_removed
       role_changed
       ownership_transferred
+      join_request_created
+      join_request_approved
+      join_request_rejected
+      verification_delivery_failed
     ].freeze
 
     module_function
@@ -35,6 +40,22 @@ module Organizations
       strict ? execute_strictly(callback, context) : execute_safely(event, callback, context)
     end
 
+    # Maps each event to its Configuration reader. Adding an event = one
+    # entry here + the EVENTS list + a Configuration attr/block method.
+    CALLBACK_READERS = {
+      organization_created: :on_organization_created_callback,
+      member_invited: :on_member_invited_callback,
+      member_joining: :on_member_joining_callback,
+      member_joined: :on_member_joined_callback,
+      member_removed: :on_member_removed_callback,
+      role_changed: :on_role_changed_callback,
+      ownership_transferred: :on_ownership_transferred_callback,
+      join_request_created: :on_join_request_created_callback,
+      join_request_approved: :on_join_request_approved_callback,
+      join_request_rejected: :on_join_request_rejected_callback,
+      verification_delivery_failed: :on_verification_delivery_failed_callback
+    }.freeze
+
     # Get the callback proc for an event
     # @param event [Symbol] The event type
     # @return [Proc, nil]
@@ -42,20 +63,8 @@ module Organizations
       config = Organizations.configuration
       return nil unless config
 
-      case event
-      when :organization_created
-        config.on_organization_created_callback
-      when :member_invited
-        config.on_member_invited_callback
-      when :member_joined
-        config.on_member_joined_callback
-      when :member_removed
-        config.on_member_removed_callback
-      when :role_changed
-        config.on_role_changed_callback
-      when :ownership_transferred
-        config.on_ownership_transferred_callback
-      end
+      reader = CALLBACK_READERS[event]
+      reader ? config.public_send(reader) : nil
     end
 
     # Execute callback with error isolation
@@ -81,12 +90,11 @@ module Organizations
     end
 
     # Call callback while supporting flexible callback arities.
+    # (Review cleanup: the old `when 1, -1, -2 / else` branches were
+    # identical — zero-arity is the only special case.)
     def invoke_callback(callback, context)
-      case callback.arity
-      when 0
+      if callback.arity.zero?
         callback.call
-      when 1, -1, -2
-        callback.call(context)
       else
         callback.call(context)
       end